From aad9824174c1f761502ce5650b71372699844d89 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 19 Feb 2020 11:46:09 +0000 Subject: [PATCH] .upptst git-svn-id: svn://ultimatepp.org/upp/trunk@14040 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- upptst/TestChStyle/TestChStyle.lay | 67 ++++++++++++++---------------- 1 file changed, 32 insertions(+), 35 deletions(-) diff --git a/upptst/TestChStyle/TestChStyle.lay b/upptst/TestChStyle/TestChStyle.lay index 0765d27ce..5c242fb85 100644 --- a/upptst/TestChStyle/TestChStyle.lay +++ b/upptst/TestChStyle/TestChStyle.lay @@ -1,18 +1,18 @@ -LAYOUT(TestChStyleLayout, 808, 504) +LAYOUT(TestChStyleLayout, 972, 492) ITEM(OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(12, 140).TopPosZ(324, 128)) - ITEM(EditString, readonly, SetEditable(false).LeftPosZ(68, 80).TopPosZ(52, 19)) - ITEM(DropList, dl_readonly, SetEditable(false).LeftPosZ(156, 96).TopPosZ(52, 19)) - ITEM(WithDropChoice, dc_readonly, SetEditable(false).LeftPosZ(260, 96).TopPosZ(52, 19)) - ITEM(EditString, disabled, LeftPosZ(68, 80).TopPosZ(76, 19)) - ITEM(DropList, dl_disabled, LeftPosZ(156, 96).TopPosZ(76, 19)) - ITEM(WithDropChoice, dc_disabled, LeftPosZ(260, 96).TopPosZ(76, 19)) - ITEM(EditString, normal1, LeftPosZ(68, 80).TopPosZ(28, 19)) - ITEM(DropList, dl_normal1, LeftPosZ(156, 96).TopPosZ(28, 19)) - ITEM(WithDropChoice, dc_normal1, LeftPosZ(260, 96).TopPosZ(28, 19)) + ITEM(EditString, readonly, SetEditable(false).LeftPosZ(20, 80).TopPosZ(52, 19)) + ITEM(DropList, dl_readonly, SetEditable(false).LeftPosZ(108, 96).TopPosZ(52, 19)) + ITEM(WithDropChoice, dc_readonly, SetEditable(false).LeftPosZ(212, 96).TopPosZ(52, 19)) + ITEM(EditString, disabled, LeftPosZ(20, 80).TopPosZ(76, 19)) + ITEM(DropList, dl_disabled, LeftPosZ(108, 96).TopPosZ(76, 19)) + ITEM(WithDropChoice, dc_disabled, LeftPosZ(212, 96).TopPosZ(76, 19)) + ITEM(EditString, normal1, LeftPosZ(20, 80).TopPosZ(28, 19)) + ITEM(DropList, dl_normal1, LeftPosZ(108, 96).TopPosZ(28, 19)) + ITEM(WithDropChoice, dc_normal1, LeftPosZ(212, 96).TopPosZ(28, 19)) ITEM(DropTime, dv___10, LeftPosZ(20, 120).TopPosZ(100, 19)) ITEM(DropDate, dv___11, LeftPosZ(144, 104).TopPosZ(100, 19)) - ITEM(LabelBox, dv___12, SetLabel(t_("LabelBox")).LeftPosZ(432, 148).TopPosZ(24, 104)) - ITEM(Label, dv___13, SetLabel(t_("Label")).LeftPosZ(440, 40).TopPosZ(52, 19)) + ITEM(LabelBox, dv___12, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104)) + ITEM(Label, dv___13, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19)) ITEM(DropTime, tm_dis, LeftPosZ(20, 120).TopPosZ(124, 19)) ITEM(DropDate, dt_dis, LeftPosZ(144, 104).TopPosZ(124, 19)) ITEM(EditIntSpin, spin_sides, LeftPosZ(20, 64).TopPosZ(148, 19)) @@ -24,39 +24,36 @@ LAYOUT(TestChStyleLayout, 808, 504) ITEM(EditIntSpin, dis2, LeftPosZ(20, 64).TopPosZ(196, 19)) ITEM(Option, option3, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(208, 16)) ITEM(Switch, switch1, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(192, 40)) - ITEM(TabCtrl, tab, LeftPosZ(432, 150).TopPosZ(136, 100)) + ITEM(TabCtrl, tab, LeftPosZ(316, 150).TopPosZ(136, 100)) ITEM(Label, dv___26, SetLabel(t_("This is label")).SetInk(Cyan).LeftPosZ(16, 168).TopPosZ(240, 19)) - ITEM(DropTime, dv___27, LeftPosZ(432, 120).TopPosZ(252, 19)) + ITEM(DropTime, dv___27, LeftPosZ(316, 120).TopPosZ(252, 19)) ITEM(SliderCtrl, dv___28, LeftPosZ(16, 64).TopPosZ(272, 24)) ITEM(Button, dis, SetLabel(t_("disabled")).LeftPosZ(88, 56).TopPosZ(272, 24)) ITEM(ArrayCtrl, dv___30, LeftPosZ(256, 52).TopPosZ(216, 100)) ITEM(ProgressIndicator, pi, LeftPosZ(172, 136).TopPosZ(332, 12)) ITEM(SliderCtrl, dv___32, LeftPosZ(180, 20).TopPosZ(356, 88)) UNTYPED(sample, LeftPosZ(228, 160).TopPosZ(360, 80)) - ITEM(DropList, dl_empty, LeftPosZ(596, 96).TopPosZ(4, 19)) - ITEM(WithDropChoice, dc_empty, LeftPosZ(596, 96).TopPosZ(28, 19)) - ITEM(DataPusher, dv___36, LeftPosZ(596, 152).TopPosZ(52, 24)) - ITEM(EditString, es_error, LeftPosZ(596, 164).TopPosZ(80, 19)) - ITEM(WithDropChoice, dc_error, LeftPosZ(596, 96).TopPosZ(104, 19)) - ITEM(WithDropChoice, dc_error2, LeftPosZ(696, 96).TopPosZ(104, 19)) - ITEM(EditIntSpin, dv___40, LeftPosZ(592, 64).TopPosZ(132, 56)) - ITEM(EditIntSpin, dv___41, LeftPosZ(668, 36).TopPosZ(132, 19)) - ITEM(EditString, normal, LeftPosZ(608, 180).TopPosZ(204, 48)) - ITEM(DropList, dl_normal, LeftPosZ(608, 180).TopPosZ(256, 44)) - ITEM(WithDropChoice, dc_normal, LeftPosZ(608, 180).TopPosZ(304, 44)) - ITEM(ArrayCtrl, list, LeftPosZ(648, 150).TopPosZ(356, 136)) + ITEM(DropList, dl_empty, LeftPosZ(480, 96).TopPosZ(4, 19)) + ITEM(WithDropChoice, dc_empty, LeftPosZ(480, 96).TopPosZ(28, 19)) + ITEM(DataPusher, dv___36, LeftPosZ(480, 152).TopPosZ(52, 24)) + ITEM(EditString, es_error, LeftPosZ(480, 164).TopPosZ(80, 19)) + ITEM(WithDropChoice, dc_error, LeftPosZ(480, 96).TopPosZ(104, 19)) + ITEM(WithDropChoice, dc_error2, LeftPosZ(580, 96).TopPosZ(104, 19)) + ITEM(EditIntSpin, dv___40, LeftPosZ(476, 64).TopPosZ(132, 56)) + ITEM(EditIntSpin, dv___41, LeftPosZ(552, 36).TopPosZ(132, 19)) + ITEM(EditString, normal, LeftPosZ(492, 180).TopPosZ(204, 48)) + ITEM(DropList, dl_normal, LeftPosZ(492, 180).TopPosZ(256, 44)) + ITEM(WithDropChoice, dc_normal, LeftPosZ(492, 180).TopPosZ(304, 44)) + ITEM(ArrayCtrl, list, LeftPosZ(492, 176).TopPosZ(352, 136)) ITEM(Button, standard, SetLabel(t_("Standard")).LeftPosZ(8, 80).TopPosZ(464, 20)) ITEM(Button, classic, SetLabel(t_("Classic")).LeftPosZ(96, 80).TopPosZ(464, 20)) ITEM(Button, host, SetLabel(t_("Host")).LeftPosZ(184, 80).TopPosZ(464, 20)) ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(304, 80).TopPosZ(464, 20)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(508, 80).TopPosZ(464, 20)) - ITEM(Label, dv___51, SetLabel(t_("EditField")).HSizePosZ(68, 660).TopPosZ(4, 19)) - ITEM(Label, dv___52, SetLabel(t_("DropList")).HSizePosZ(156, 572).TopPosZ(4, 19)) - ITEM(Label, dv___53, SetLabel(t_("WithDropChoice")).HSizePosZ(260, 468).TopPosZ(4, 19)) - ITEM(Label, dv___54, SetLabel(t_("Normal")).LeftPosZ(4, 60).TopPosZ(28, 19)) - ITEM(Label, dv___55, SetLabel(t_("ReadOnly")).LeftPosZ(4, 60).TopPosZ(52, 19)) - ITEM(Label, dv___56, SetLabel(t_("Disabled")).LeftPosZ(4, 60).TopPosZ(76, 19)) - ITEM(ColorPusher, color, LeftPosZ(152, 76).TopPosZ(284, 36)) - ITEM(DropTree, droptree, LeftPosZ(452, 100).TopPosZ(284, 19)) + ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(392, 80).TopPosZ(464, 20)) + ITEM(ColorPusher, color, LeftPosZ(152, 64).TopPosZ(264, 24)) + ITEM(DropTree, droptree, LeftPosZ(316, 120).TopPosZ(276, 19)) + ITEM(TreeCtrl, dv___53, LeftPosZ(696, 152).TopPosZ(12, 196)) + ITEM(RichTextView, dv___54, LeftPosZ(696, 152).TopPosZ(348, 136)) + ITEM(ColumnList, dv___55, LeftPosZ(696, 152).TopPosZ(212, 132)) END_LAYOUT