From f17f4e2ace9b34f88bf382c7f7d452ebb22afff8 Mon Sep 17 00:00:00 2001 From: klugier Date: Wed, 18 Mar 2020 19:04:27 +0000 Subject: [PATCH] IDE: Setup layouts tweeks. git-svn-id: svn://ultimatepp.org/upp/trunk@14177 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/ide/ide.lay | 70 +++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/uppsrc/ide/ide.lay b/uppsrc/ide/ide.lay index d8ae50ad1..69cb5800f 100644 --- a/uppsrc/ide/ide.lay +++ b/uppsrc/ide/ide.lay @@ -480,42 +480,42 @@ LAYOUT(StatLayout, 732, 552) ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(8, 64).BottomPosZ(8, 24)) END_LAYOUT -LAYOUT(SetupFontLayout, 528, 176) +LAYOUT(SetupFontLayout, 528, 312) ITEM(Label, dv___0, SetLabel(t_("Normal")).LeftPosZ(4, 48).TopPosZ(4, 19)) - ITEM(DropList, face, HSizePosZ(52, 268).TopPosZ(4, 19)) - ITEM(DropList, height, RightPosZ(210, 50).TopPosZ(4, 19)) - ITEM(Option, bold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(4, 18)) - ITEM(Option, italic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(4, 18)) + ITEM(DropList, face, HSizePosZ(52, 160).TopPosZ(4, 19)) + ITEM(DropList, height, RightPosZ(102, 54).TopPosZ(4, 19)) + ITEM(Option, bold, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(4, 18)) + ITEM(Option, italic, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(4, 18)) ITEM(Label, dv___5, SetLabel(t_("V. split")).LeftPosZ(4, 48).TopPosZ(28, 19)) - ITEM(DropList, vface, HSizePosZ(52, 268).TopPosZ(28, 19)) - ITEM(DropList, vheight, RightPosZ(210, 50).TopPosZ(28, 19)) - ITEM(Option, vbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(28, 18)) - ITEM(Option, vitalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(28, 18)) + ITEM(DropList, vface, HSizePosZ(52, 160).TopPosZ(28, 19)) + ITEM(DropList, vheight, RightPosZ(102, 54).TopPosZ(28, 19)) + ITEM(Option, vbold, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(28, 18)) + ITEM(Option, vitalic, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(28, 18)) ITEM(Label, dv___10, SetLabel(t_("Small")).LeftPosZ(4, 52).TopPosZ(52, 19)) - ITEM(DropList, face1, HSizePosZ(52, 268).TopPosZ(52, 19)) - ITEM(DropList, height1, RightPosZ(210, 50).TopPosZ(52, 19)) - ITEM(Option, bold1, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(52, 18)) - ITEM(Option, italic1, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(52, 18)) + ITEM(DropList, face1, HSizePosZ(52, 160).TopPosZ(52, 19)) + ITEM(DropList, height1, RightPosZ(102, 54).TopPosZ(52, 19)) + ITEM(Option, bold1, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(52, 18)) + ITEM(Option, italic1, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(52, 18)) ITEM(Label, dv___15, SetLabel(t_("Special")).LeftPosZ(4, 48).TopPosZ(76, 19)) - ITEM(DropList, face2, HSizePosZ(52, 268).TopPosZ(76, 19)) - ITEM(DropList, height2, RightPosZ(210, 50).TopPosZ(76, 19)) - ITEM(Option, bold2, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(76, 18)) - ITEM(Option, italic2, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(76, 18)) + ITEM(DropList, face2, HSizePosZ(52, 160).TopPosZ(76, 19)) + ITEM(DropList, height2, RightPosZ(102, 54).TopPosZ(76, 19)) + ITEM(Option, bold2, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(76, 18)) + ITEM(Option, italic2, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(76, 18)) ITEM(Label, dv___20, SetLabel(t_("Console")).LeftPosZ(4, 48).TopPosZ(100, 19)) - ITEM(DropList, cface, HSizePosZ(52, 268).TopPosZ(100, 19)) - ITEM(DropList, cheight, RightPosZ(210, 50).TopPosZ(100, 19)) - ITEM(Option, cbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(100, 18)) - ITEM(Option, citalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(100, 18)) + ITEM(DropList, cface, HSizePosZ(52, 160).TopPosZ(100, 19)) + ITEM(DropList, cheight, RightPosZ(102, 54).TopPosZ(100, 19)) + ITEM(Option, cbold, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(100, 18)) + ITEM(Option, citalic, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(100, 18)) ITEM(Label, dv___25, SetLabel(t_(".t file")).LeftPosZ(4, 48).TopPosZ(124, 19)) - ITEM(DropList, tface, HSizePosZ(52, 268).TopPosZ(124, 19)) - ITEM(DropList, theight, RightPosZ(210, 50).TopPosZ(124, 19)) - ITEM(Option, tbold, SetLabel(t_("Bold")).RightPosZ(162, 44).TopPosZ(124, 18)) - ITEM(Option, titalic, SetLabel(t_("Italic")).RightPosZ(114, 44).TopPosZ(124, 18)) - ITEM(Button, defaults, SetLabel(t_("Restore defaults")).LeftPosZ(412, 116).TopPosZ(152, 24)) + ITEM(DropList, tface, HSizePosZ(52, 160).TopPosZ(124, 19)) + ITEM(DropList, theight, RightPosZ(102, 54).TopPosZ(124, 19)) + ITEM(Option, tbold, SetLabel(t_("Bold")).RightPosZ(54, 44).TopPosZ(124, 18)) + ITEM(Option, titalic, SetLabel(t_("Italic")).RightPosZ(6, 44).TopPosZ(124, 18)) + ITEM(Button, defaults, SetLabel(t_("Restore defaults")).RightPosZ(8, 116).BottomPosZ(4, 24)) END_LAYOUT -LAYOUT(SetupHlLayout, 544, 300) - ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).TopPosZ(4, 292)) +LAYOUT(SetupHlLayout, 544, 316) + ITEM(ArrayCtrl, hlstyle, LeftPosZ(4, 368).VSizePosZ(4, 4)) ITEM(Label, dv___1, SetLabel(t_("Scope highlighting")).LeftPosZ(380, 160).TopPosZ(4, 16)) ITEM(Switch, hilite_scope, SetLabel(t_("None\n2 colors\n5 colors")).LeftPosZ(380, 160).TopPosZ(20, 20)) ITEM(Label, dv___3, SetLabel(t_("Matching bracket highlighting")).LeftPosZ(380, 160).TopPosZ(52, 16)) @@ -526,9 +526,9 @@ LAYOUT(SetupHlLayout, 544, 300) ITEM(Option, thousands_separator, SetLabel(t_("Thousands separator")).LeftPosZ(380, 160).TopPosZ(200, 18)) ITEM(Option, hline, SetLabel(t_("Line")).LeftPosZ(432, 160).TopPosZ(228, 18)) ITEM(Option, vline, SetLabel(t_("Column")).LeftPosZ(480, 84).TopPosZ(228, 18)) - ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).LeftPosZ(380, 160).TopPosZ(252, 20)) - ITEM(Button, hl_restore_dark, SetLabel(t_("Dark theme")).LeftPosZ(460, 80).TopPosZ(276, 20)) - ITEM(Button, hl_restore_white, SetLabel(t_("White theme")).LeftPosZ(380, 76).TopPosZ(276, 20)) + ITEM(Button, hl_restore, SetLabel(t_("Restore default colors")).RightPosZ(4, 160).BottomPosZ(28, 20)) + ITEM(Button, hl_restore_dark, SetLabel(t_("Dark theme")).RightPosZ(4, 80).BottomPosZ(4, 20)) + ITEM(Button, hl_restore_white, SetLabel(t_("White theme")).RightPosZ(88, 76).BottomPosZ(4, 20)) ITEM(Label, dv___14, SetLabel(t_("Current")).LeftPosZ(380, 40).TopPosZ(228, 18)) END_LAYOUT @@ -602,7 +602,7 @@ LAYOUT(SetupIdeLayout, 512, 316) ITEM(Button, mate, SetLabel(t_("Mate")).LeftPosZ(300, 56).TopPosZ(240, 20)) ITEM(Option, output_per_assembly, SetLabel(t_("Use unique output directory per assembly (append assembly name to output directory)")).HSizePosZ(4, 4).TopPosZ(268, 16)) ITEM(Label, dv___17, SetLabel(t_("In editor mode, path for .usc files")).LeftPosZ(4, 192).TopPosZ(288, 20)) - ITEM(EditString, uscpath, LeftPosZ(172, 336).TopPosZ(288, 19)) + ITEM(EditString, uscpath, HSizePosZ(172, 4).TopPosZ(288, 19)) ITEM(DropDate, showtimeafter, LeftPosZ(220, 136).TopPosZ(123, 19)) ITEM(Label, dv___20, SetLabel(t_("HYDRA threads")).LeftPosZ(212, 80).TopPosZ(4, 19)) ITEM(EditIntSpin, hydra1_threads, Max(64).Min(1).LeftPosZ(344, 48).TopPosZ(4, 19)) @@ -615,7 +615,7 @@ LAYOUT(SetupIdeLayout, 512, 316) ITEM(Label, dv___28, SetLabel(t_("(needs restart)")).LeftPosZ(272, 88).TopPosZ(168, 19)) END_LAYOUT -LAYOUT(SetupAstyleLayout, 544, 288) +LAYOUT(SetupAstyleLayout, 544, 312) ITEM(LabelBox, dv___0, SetLabel(t_("Indents")).LeftPosZ(4, 180).TopPosZ(4, 140)) ITEM(Option, BracketIndent, SetLabel(t_("Brackets")).LeftPosZ(12, 64).TopPosZ(20, 16)) ITEM(Option, NamespaceIndent, SetLabel(t_("Namespaces")).LeftPosZ(84, 92).TopPosZ(20, 16)) @@ -645,10 +645,10 @@ LAYOUT(SetupAstyleLayout, 544, 288) ITEM(Option, OperatorPaddingMode, SetLabel(t_("Pad operators with spaces")).LeftPosZ(4, 180).TopPosZ(222, 18)) ITEM(Option, EmptyLineFill, SetLabel(t_("Fill empty lines")).LeftPosZ(4, 180).TopPosZ(244, 16)) ITEM(Option, TabSpaceConversionMode, SetLabel(t_("Convert tabs to spaces")).HSizePosZ(4, 360).TopPosZ(264, 18)) - ITEM(Button, Test, SetLabel(t_("Test")).LeftPosZ(284, 56).TopPosZ(260, 23)) + ITEM(Button, Test, SetLabel(t_("Test")).RightPosZ(208, 56).BottomPosZ(5, 23)) ITEM(LabelBox, dv___30, SetLabel(t_("Test box")).HSizePosZ(344, 4).VSizePosZ(4, 4)) ITEM(LineEdit, TestBox, SetFont(MonospaceZ(11)).HSizePosZ(348, 8).VSizePosZ(20, 8)) - ITEM(Button, Defaults, SetLabel(t_("Upp defaults")).LeftPosZ(208, 72).TopPosZ(260, 23)) + ITEM(Button, Defaults, SetLabel(t_("Upp defaults")).RightPosZ(268, 72).BottomPosZ(5, 23)) END_LAYOUT LAYOUT(GotoLayout, 796, 524)