diff --git a/uppdev/RichEditTest/test.tpp/test$en-us.tpp b/uppdev/RichEditTest/test.tpp/test$en-us.tpp index 312e85a61..2b2dfd459 100644 --- a/uppdev/RichEditTest/test.tpp/test$en-us.tpp +++ b/uppdev/RichEditTest/test.tpp/test$en-us.tpp @@ -24792,4 +24792,4 @@ type of tabulation&] [s0; [/_4 sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssss sssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssssafdasdfa sdfasdfsdfgsdfgsdfgdddddddddvgvgggggggggggggggggggggggggggggggggggggggggggggggggg -ggggggggggggggggggggggggggggggggg]] \ No newline at end of file +ggggggggggggggggggggggggggggggggg]]] \ No newline at end of file diff --git a/uppdev/RichEditTest/test.tpp/test$en-us.tppi b/uppdev/RichEditTest/test.tpp/test$en-us.tppi index 884552188..62b3e5dd8 100644 --- a/uppdev/RichEditTest/test.tpp/test$en-us.tppi +++ b/uppdev/RichEditTest/test.tpp/test$en-us.tppi @@ -30,5 +30,5 @@ COMPRESSED 48,12,134,193,48,24,6,195,224,24,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,28,115,2,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,184,230,26,10,131,97,48,12,134,193,48,24,6,199,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,224,152,19,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,53,215,80,24,12,131,97,48,12,134,193,48,56,198,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,199,156,192,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,174,185,134,194,96,24,12,131,97,48,12,134,193,49,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,56,230,4,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,112,205,53,20,6,195,96,24,12,131,97,48,12,142,49,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,49,39,48,24,6,195,96,24,12,131,97,48,12,134,193,48, 24,6,195,96,24,12,131,107,174,161,48,24,6,195,96,24,12,131,97,112,140,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,142,57,129,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,92,115,13,133,193,48,24,6,195,96,24,12,131,99,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,112,204,9,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,224,154,107,40,12,134,193,48,24,6,195,96,24,28,99,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,99,78,96,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,215,92,67,97,48,12,134,193,48,24,6,195,224,24,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,28,115,2,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,184,230,26,10,131,97,48,12,134,193,48,24,6,199,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,224,152,19,24,12,131, 97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,53,215,80,24,12,131,97,48,12,134,193,48,56,198,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,199,156,192,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,174,185,134,194,96,24,12,131,97,48,12,134,193,49,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,56,230,4,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,97,112,205,53,20,6,195,96,24,12,131,97,48,12,142,49,12,134,193,48,24,6,195,96,24,12,131,97,48,12,134,193,49,39,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,96,24,12,131,107,174,161,48,24,6,195,96,24,12,131,97,112,140,97,48,12,134,193,48,24,6,195,96,24,12,131,97,48,12,142,57,129,193,48,24,6,195,96,24,12,131,97,48,12,134,193,48,24,6,195,224,127,55,12,78,231,253,193,213,239,245,255,249,7,74,76,137,255,41,37,14,207,160,79,59,201,252, -223,242,39,29,244,215,58,252,249,213,111,255,234,231,229,249,203,243,223,254,231,244,244,255,0,206,167,2,213, +223,242,39,29,244,215,58,252,249,213,111,255,234,231,229,249,203,243,223,254,231,244,244,244,255,0,209,217,3,50, diff --git a/uppdev/colorpopup/colorpopup.h b/uppdev/colorpopup/colorpopup.h index 0125f750b..df8f213cb 100644 --- a/uppdev/colorpopup/colorpopup.h +++ b/uppdev/colorpopup/colorpopup.h @@ -3,11 +3,11 @@ #include +using namespace Upp; + #define LAYOUTFILE #include - - class colorpopup : public WithcolorpopupLayout { public: typedef colorpopup CLASSNAME; diff --git a/uppdev/colorpopup/colorpopup.lay b/uppdev/colorpopup/colorpopup.lay index 158c029b6..269b8b51b 100644 --- a/uppdev/colorpopup/colorpopup.lay +++ b/uppdev/colorpopup/colorpopup.lay @@ -1,4 +1,4 @@ -LAYOUT(colorpopupLayout, 496, 240) +LAYOUT(colorpopupLayout, 700, 240) ITEM(ColorPusher, c0, LeftPosZ(8, 84).TopPosZ(36, 20)) ITEM(Label, dv___1, SetLabel(t_("Full. Scolors(0)")).LeftPosZ(8, 84).TopPosZ(8, 19)) ITEM(Label, dv___2, SetLabel(t_("Full. Scolors(1)")).LeftPosZ(108, 84).TopPosZ(8, 19)) @@ -9,7 +9,10 @@ LAYOUT(colorpopupLayout, 496, 240) ITEM(ColorPusher, c3, LeftPosZ(300, 84).TopPosZ(36, 20)) ITEM(Label, dv___8, SetLabel(t_("NotNull.NoRamp")).LeftPosZ(392, 84).TopPosZ(8, 19)) ITEM(ColorPusher, c4, LeftPosZ(392, 84).TopPosZ(36, 20)) - ITEM(SliderCtrl, dv___10, LeftPosZ(20, 160).TopPosZ(80, 15)) - ITEM(DocEdit, dv___11, HSizePosZ(196, 160).TopPosZ(68, 76)) - ITEM(LineEdit, dv___12, HSizePosZ(196, 160).TopPosZ(148, 76)) + ITEM(Label, dv___10, SetLabel(t_("WithVoid")).LeftPosZ(484, 84).TopPosZ(8, 19)) + ITEM(ColorPusher, c5, LeftPosZ(484, 84).TopPosZ(36, 20)) + ITEM(SliderCtrl, dv___12, LeftPosZ(20, 160).TopPosZ(80, 15)) + ITEM(DocEdit, dv___13, HSizePosZ(196, 364).TopPosZ(68, 76)) + ITEM(LineEdit, dv___14, HSizePosZ(196, 364).TopPosZ(148, 76)) END_LAYOUT + diff --git a/uppdev/colorpopup/colorpopup.upp b/uppdev/colorpopup/colorpopup.upp index 0160c2386..30ae0ced1 100644 --- a/uppdev/colorpopup/colorpopup.upp +++ b/uppdev/colorpopup/colorpopup.upp @@ -1,12 +1,11 @@ -uses - CtrlLib; - -file - "colorpopup.h" - , main.cpp - , "colorpopup.lay" - -; - -mainconfig - "" = "GUI ST"; +uses + CtrlLib; + +file + colorpopup.h, + main.cpp, + colorpopup.lay; + +mainconfig + "" = "GUI ST"; + diff --git a/uppdev/colorpopup/init b/uppdev/colorpopup/init new file mode 100644 index 000000000..85007cdb1 --- /dev/null +++ b/uppdev/colorpopup/init @@ -0,0 +1,4 @@ +#ifndef _colorpopup_icpp_init_stub +#define _colorpopup_icpp_init_stub +#include "CtrlLib/init" +#endif diff --git a/uppdev/colorpopup/main.cpp b/uppdev/colorpopup/main.cpp index 4c2485008..62302a887 100644 --- a/uppdev/colorpopup/main.cpp +++ b/uppdev/colorpopup/main.cpp @@ -10,9 +10,11 @@ colorpopup::colorpopup() c2.NotNull(); c3.NoRampWheel(); c4.NotNull().NoRampWheel(); + c5.WithVoid(); } GUI_APP_MAIN { + DUMP(VoidColor()); colorpopup().Run(); }