git-svn-id: svn://ultimatepp.org/upp/trunk@13850 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-01-10 17:04:15 +00:00
parent b3fe362f4f
commit f2ccf16bc8
2 changed files with 34 additions and 21 deletions

View file

@ -1,4 +1,4 @@
LAYOUT(TestChStyleLayout, 484, 376)
LAYOUT(TestChStyleLayout, 484, 492)
ITEM(OptionBox, dv___0, SetLabel(t_("OptionBox")).LeftPosZ(8, 468).TopPosZ(8, 328))
ITEM(EditString, normal, LeftPosZ(20, 80).TopPosZ(28, 19))
ITEM(DropList, dl_normal, LeftPosZ(108, 96).TopPosZ(28, 19))
@ -13,19 +13,24 @@ LAYOUT(TestChStyleLayout, 484, 376)
ITEM(DropDate, dv___11, LeftPosZ(144, 104).TopPosZ(100, 19))
ITEM(LabelBox, dv___12, SetLabel(t_("LabelBox")).LeftPosZ(316, 148).TopPosZ(24, 104))
ITEM(EditIntSpin, dv___13, LeftPosZ(20, 64).TopPosZ(124, 19))
ITEM(Option, dv___14, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 56).TopPosZ(124, 16))
ITEM(Switch, dv___15, SetLabel(t_("One\nTwo")).LeftPosZ(176, 48).TopPosZ(124, 32))
ITEM(SliderCtrl, dv___16, LeftPosZ(20, 64).TopPosZ(156, 24))
ITEM(SliderCtrl, dv___17, LeftPosZ(184, 20).TopPosZ(192, 136))
ITEM(ProgressIndicator, pi, LeftPosZ(176, 136).TopPosZ(160, 24))
ITEM(ArrayCtrl, list, LeftPosZ(20, 150).TopPosZ(188, 136))
ITEM(Option, dv___14, ThreeState(true).SetLabel(t_("Option")).LeftPosZ(92, 80).TopPosZ(124, 16))
ITEM(Option, option1, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(144, 16))
ITEM(Option, option2, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(164, 16))
ITEM(Option, option3, ThreeState(true).SetLabel(t_("Disabled")).LeftPosZ(92, 80).TopPosZ(184, 16))
ITEM(Switch, dv___18, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(124, 40))
ITEM(Switch, switch1, SetLabel(t_("One\nTwo")).LeftPosZ(176, 84).TopPosZ(168, 40))
ITEM(SliderCtrl, dv___20, LeftPosZ(16, 64).TopPosZ(272, 24))
ITEM(SliderCtrl, dv___21, LeftPosZ(180, 20).TopPosZ(356, 88))
ITEM(ProgressIndicator, pi, LeftPosZ(172, 136).TopPosZ(320, 24))
ITEM(ArrayCtrl, list, LeftPosZ(16, 150).TopPosZ(304, 136))
ITEM(TabCtrl, tab, LeftPosZ(316, 150).TopPosZ(136, 100))
ITEM(Button, standard, SetLabel(t_("Standard")).LeftPosZ(12, 80).TopPosZ(348, 20))
ITEM(Button, classic, SetLabel(t_("Classic")).LeftPosZ(100, 80).TopPosZ(348, 20))
ITEM(Button, host, SetLabel(t_("Host")).LeftPosZ(188, 80).TopPosZ(348, 20))
ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(308, 80).TopPosZ(348, 20))
ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(396, 80).TopPosZ(348, 20))
ITEM(Label, dv___26, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
UNTYPED(sample, LeftPosZ(232, 232).TopPosZ(244, 80))
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(392, 80).TopPosZ(464, 20))
ITEM(Label, dv___30, SetLabel(t_("Label")).LeftPosZ(324, 40).TopPosZ(52, 19))
UNTYPED(sample, LeftPosZ(228, 232).TopPosZ(360, 80))
ITEM(Button, dis, SetLabel(t_("disabled")).LeftPosZ(88, 56).TopPosZ(272, 24))
END_LAYOUT

View file

@ -14,7 +14,6 @@ void Dc(WithDropChoice<EditString>& dc)
dc <<= "Case1";
}
TestChStyle::TestChStyle()
{
AddFrame(menu);
@ -53,6 +52,20 @@ TestChStyle::TestChStyle()
Dc(dc_readonly);
Dc(dc_disabled);
dc_disabled.Disable();
dis.Disable();
option1.Disable();
option1 <<= false;
option2.Disable();
option2 <<= Null;
option3.Disable();
option3 <<= true;
switch1.Disable();
switch1 <<= 1;
#ifdef CPP_11
standard << [] { Ctrl::SetSkin(ChStdSkin); };
@ -77,13 +90,8 @@ TestChStyle::TestChStyle()
GUI_APP_MAIN
{
DDUMP(GTK_MAJOR_VERSION);
DDUMP(GTK_MINOR_VERSION);
DDUMP(DPI(1));
DDUMP(Ctrl::SCL(1));
Ctrl::SetDarkThemeEnabled();
Ctrl::SetSkin(ChStdSkin);
TestChStyle().Run();
}