github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-06-17 14:15:20 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib, ide: Fixed Tip order in .lay

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@15311 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-10-27 13:59:36 +00:00
parent ee17425099
commit 86505f2c11
2 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

36
uppsrc/CtrlLib/CtrlLib.usc
View file

@ -426,7 +426,7 @@ ctrl DataPusher {
>Base;
Frame SetFrame = default;
bool SetEditable = true @1;
Text Tip;
Text Tip @1;
Paint(w) {
r = GetRect();
@ -443,7 +443,7 @@ ctrl ColorPusher {
>Base;
Frame SetFrame = default;
bool SetEditable = true @1;
Text Tip;
Text Tip @1;
bool NotNull = false;
bool WithVoid = false;
bool SColors = false;
@ -478,7 +478,7 @@ ctrl Button {
Text SetLabel ? "Button label";
Font SetFont = StdFont();
Frame SetFrame @1;
Text Tip;
Text Tip @1;
Paint(w) {
r = GetRect();
@ -718,7 +718,7 @@ ctrl EditField {
bool AlignRight @1;
bool SetEditable = true @4 ? "Editable";
Frame SetFrame = default @5;
Text Tip @6;
Text Tip @5;
bool WantFocus = true @7;
Paint(w) {
@ -745,10 +745,10 @@ ctrl DocEdit {
GetStdSize() { sz = GetMinSize(); sz.cx *= 8; return sz; }
Font SetFont = StdFont();
Frame SetFrame = default;
Frame SetFrame = default @1;
bool SetEditable = true @1 ? "Editable";
bool WantFocus = true;
Text Tip;
Text Tip @1;
// Qtf SetInfo @1 ? "Info of control" ;
Paint(w) {
@ -779,7 +779,7 @@ ctrl LineEdit {
// bool AlignRight @1;
bool SetEditable = true @4 ? "Editable";
Frame SetFrame = default @5;
Text Tip @6;
Text Tip @5;
bool WantFocus = true @7;
Paint(w) {
@ -1035,7 +1035,7 @@ ctrl DropList {
bool DisplayAll = false;
bool AlwaysDrop = false @1;
bool NotNull = false;
Text Tip;
Text Tip @2;
// Qtf SetInfo @1 ? "Info of control" ;
Paint(w) {
@ -1062,7 +1062,7 @@ ctrl DropTree {
bool AutoResize = false;
bool DropFocus = false;
bool AlwaysDrop = false @1;
Text Tip;
Text Tip @2;
// Qtf SetInfo @1 ? "Info of control" ;
Paint(w) {
@ -1080,7 +1080,7 @@ template WithDropChoice {
bool Dropping = true;
String Appending = ", ";
raw SetDropLines = 16;
Text Tip;
Text Tip @1;
Paint(w) {
CtrlPaint(w);
@ -1334,7 +1334,7 @@ ctrl DropDate {
Frame SetFrame = default;
bool SetEditable = true @2 ? "Editable";
bool WantFocus = true;
Text Tip;
Text Tip @2;
Paint(w) {
r = GetRect();
@ -1361,8 +1361,8 @@ ctrl DropTime {
bool NotNull = false;
Frame SetFrame = default;
bool SetEditable = true @2 ? "Editable";
bool WantFocus = true;
Text Tip;
bool WantFocus = true @2;
Text Tip @2;
Paint(w) {
r = GetRect();
@ -1398,11 +1398,11 @@ ctrl Clock {
group "Input fields";
GetMinSize() { return Size(150, 156); }
GetStdSize() { return Size(150, 156); }
Frame SetFrame = BlackFrame();
Frame SetFrame = BlackFrame() @2;
bool SetEditable = true @2 ? "Editable";
bool WantFocus = true;
bool WantFocus = true @2;
bool Seconds = true;
Text Tip;
Text Tip @2;
PaintPtr(w, cmx, cmy, pos, m, d, color, cf) {
dx = m * sin(pos * 2 * 3.1415);
@ -1489,11 +1489,11 @@ ctrl Calendar {
Frame SetFrame = BlackFrame();
bool SetEditable = true @2 ? "Editable";
bool WantFocus = true;
bool WantFocus = true @2;
bool SelectAll = true;
bool SwapMonthYear = false;
bool OneButton = false;
Text Tip;
Text Tip @2;
Paint(w) {
ts = GetTextSize("X");

16
uppsrc/ide/ide.lay
View file

@ -5,10 +5,10 @@ LAYOUT(SelectPackageLayout, 740, 432)
ITEM(DropList, filter, Tip(t_("Select which packages should be displayed")).LeftPosZ(4, 156).BottomPosZ(9, 19))
ITEM(EditString, search, Tip(t_("Search for the concrete package")).LeftPosZ(164, 124).BottomPosZ(9, 19))
ITEM(Option, brief, SetLabel(t_("Brief list")).Tip(t_("If set, displays simplify packages list. Otherwise, the detailed list is shown.")).LeftPosZ(296, 68).BottomPosZ(8, 20))
ITEM(Button, newu, Tip(t_("Create new package in the currently selected assembly..")).SetLabel(t_("&New package")).RightPosZ(142, 90).BottomPosZ(6, 22))
ITEM(Button, ok, Tip(t_("Open selected package")).SetLabel(t_("OK")).RightPosZ(74, 64).BottomPosZ(6, 22))
ITEM(Button, cancel, Tip(t_("Cancel package selection")).SetLabel(t_("Cancel")).RightPosZ(6, 64).BottomPosZ(6, 22))
ITEM(Button, help, Tip(t_("Learn more about packages, assemblies and nests.. (Highly recommended for all U++ beginners)")).SetLabel(t_("?")).RightPosZ(236, 20).BottomPosZ(6, 22))
ITEM(Button, newu, SetLabel(t_("&New package")).Tip(t_("Create new package in the currently selected assembly..")).RightPosZ(142, 90).BottomPosZ(6, 22))
ITEM(Button, ok, SetLabel(t_("OK")).Tip(t_("Open selected package")).RightPosZ(74, 64).BottomPosZ(6, 22))
ITEM(Button, cancel, SetLabel(t_("Cancel")).Tip(t_("Cancel package selection")).RightPosZ(6, 64).BottomPosZ(6, 22))
ITEM(Button, help, SetLabel(t_("?")).Tip(t_("Learn more about packages, assemblies and nests.. (Highly recommended for all U++ beginners)")).RightPosZ(236, 20).BottomPosZ(6, 22))
END_LAYOUT
LAYOUT(ConfigLayout, 724, 214)
@ -100,7 +100,7 @@ LAYOUT(FindFileLayout, 450, 540)
ITEM(EditField, mask, HSizePosZ(4, 6).TopPosZ(4, 19))
ITEM(ArrayCtrl, list, AutoHideSb(true).HSizePosZ(4, 6).VSizePosZ(28, 36))
ITEM(Option, searchInCurrentPackage, SetLabel(t_("Search in current package")).HSizePosZ(6, 260).BottomPosZ(6, 20))
ITEM(Button, help, Tip(t_("Learn more about find file..")).SetLabel(t_("?")).RightPosZ(146, 20).BottomPosZ(6, 22))
ITEM(Button, help, SetLabel(t_("?")).Tip(t_("Learn more about find file..")).RightPosZ(146, 20).BottomPosZ(6, 22))
ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(6, 64).BottomPosZ(6, 22))
ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(6, 22))
END_LAYOUT
@ -833,11 +833,11 @@ LAYOUT(BaseSetupLayout, 608, 104)
END_LAYOUT
LAYOUT(NestEditorLayout, 420, 388)
ITEM(Button, add, Tip(t_("Add row")).SetLabel(t_("Insert path")).RightPosZ(256, 88).TopPosZ(8, 23))
ITEM(Button, add, SetLabel(t_("Insert path")).Tip(t_("Add row")).RightPosZ(256, 88).TopPosZ(8, 23))
ITEM(Button, down, Tip(t_("Move down")).RightPosZ(36, 24).TopPosZ(8, 23))
ITEM(Button, up, Tip(t_("Move up")).RightPosZ(8, 24).TopPosZ(8, 23))
ITEM(Button, edit, Tip(t_("Edit row")).SetLabel(t_("Edit path")).RightPosZ(168, 84).TopPosZ(8, 23))
ITEM(Button, remove, Tip(t_("Delete row")).SetLabel(t_("Remove path")).RightPosZ(64, 100).TopPosZ(8, 23))
ITEM(Button, edit, SetLabel(t_("Edit path")).Tip(t_("Edit row")).RightPosZ(168, 84).TopPosZ(8, 23))
ITEM(Button, remove, SetLabel(t_("Remove path")).Tip(t_("Delete row")).RightPosZ(64, 100).TopPosZ(8, 23))
ITEM(ArrayCtrl, nests, HSizePosZ(4, 8).VSizePosZ(36, 40))
ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))