From 1d72959cf77e85bceab70cedb8fd1a0273cb43b7 Mon Sep 17 00:00:00 2001 From: Mirek Fidler Date: Tue, 2 Dec 2025 13:31:03 +0100 Subject: [PATCH] CtrlLib: .upt for Basic CtrlLib app now has MyApp option --- uppsrc/CtrlLib/Normal.upt | 10 ++- uppsrc/ide/IconDes/IconDes.iml | 107 +++++++++++++++++++-------------- 2 files changed, 69 insertions(+), 48 deletions(-) diff --git a/uppsrc/CtrlLib/Normal.upt b/uppsrc/CtrlLib/Normal.upt index 20beded6d..4c4ef5ef9 100644 --- a/uppsrc/CtrlLib/Normal.upt +++ b/uppsrc/CtrlLib/Normal.upt @@ -1,6 +1,7 @@ template "U++ Basic CtrlLib application" main; option "Create header" header; +option "Add MyApp" myapp; @@<:PACKAGE:>.h ??header @@ -16,9 +17,14 @@ using namespace Upp; #include <:?header:>"<:PACKAGE:>.h"<:/:> using namespace Upp;<:.:> - +<:?myapp:> +struct MyApp : TopWindow { + void Paint(Draw& w) override; +}; +<:.:> GUI_APP_MAIN -{ +{<:?myapp:> + MyApp().Run();<:.:> } @@<:PACKAGE:>.upp uses diff --git a/uppsrc/ide/IconDes/IconDes.iml b/uppsrc/ide/IconDes/IconDes.iml index c57e44ff7..9af5530cc 100644 --- a/uppsrc/ide/IconDes/IconDes.iml +++ b/uppsrc/ide/IconDes/IconDes.iml @@ -77,7 +77,7 @@ IMAGE_ID(BlurSharpen__UHD) IMAGE_ID(Colorize__UHD) IMAGE_ID(Chroma__UHD) IMAGE_ID(Contrast__UHD) -IMAGE_ID(Upscale) +IMAGE_ID(Upscale__UHD) IMAGE_ID(Slice__UHD) IMAGE_ID(RemoveAlpha__UHD) IMAGE_ID(Smoothen__UHD) @@ -134,6 +134,7 @@ IMAGE_ID(BlurSharpen) IMAGE_ID(Colorize) IMAGE_ID(Chroma) IMAGE_ID(Contrast) +IMAGE_ID(Upscale) IMAGE_ID(Slice) IMAGE_ID(RemoveAlpha) IMAGE_ID(Smoothen) @@ -2284,51 +2285,65 @@ IMAGE_DATA(195,180,57,127,1,12,206,237,223,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 IMAGE_END_DATA(928, 1) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,154,247,175,21,69,20,199,23,141,10,214,167,98,71,197,18,37,96,71,99,140,209,24,67,44,49,4,69,17) -IMAGE_DATA(91,244,217,27,42,216,43,187,26,59,162,24,3,136,49,196,18,67,140,96,195,16,99,44,1,34,150,216,125,246,254,179) -IMAGE_DATA(255,195,187,124,39,158,213,201,56,51,119,230,236,238,157,189,239,157,111,242,201,75,200,157,61,187,159,57,231,222,121,151) -IMAGE_DATA(151,13,100,3,89,120,242,78,150,205,249,59,203,14,92,152,101,99,38,68,44,212,214,235,76,91,29,183,190,232,252,71) -IMAGE_DATA(78,63,103,108,224,173,215,175,225,186,143,242,117,174,245,133,246,44,54,31,33,235,203,107,40,167,174,215,133,172,87,251) -IMAGE_DATA(82,101,125,238,121,93,47,214,235,247,95,213,95,204,122,223,254,185,174,23,218,63,190,245,156,254,173,58,63,254,249,157) -IMAGE_DATA(52,152,13,198,93,79,34,145,72,36,18,137,68,34,145,72,36,18,137,68,210,207,233,36,34,213,253,180,205,131,248,239) -IMAGE_DATA(77,221,182,145,202,67,170,186,109,35,149,135,84,117,219,70,42,15,169,234,182,141,84,30,82,213,141,163,211,105,22,167) -IMAGE_DATA(133,238,107,183,26,30,238,140,5,153,14,254,125,12,216,4,108,74,108,70,108,14,182,0,99,125,117,29,30,182,195,154) -IMAGE_DATA(1,176,61,216,1,236,8,198,131,157,192,206,96,23,176,43,216,13,236,14,246,32,246,36,246,6,19,255,169,219,14,255) -IMAGE_DATA(165,47,87,24,78,199,129,45,213,190,128,173,193,54,96,91,96,115,23,235,223,231,116,31,176,47,216,15,236,79,28,64) -IMAGE_DATA(76,34,38,131,41,77,251,55,123,49,192,157,75,2,199,105,104,63,102,204,247,31,151,211,131,136,131,193,33,224,80,112) -IMAGE_DATA(24,56,28,28,1,166,130,35,193,81,28,255,12,167,49,238,92,18,170,204,120,183,126,12,241,95,16,186,11,151,83,197) -IMAGE_DATA(209,196,49,196,177,196,113,196,241,224,4,134,255,42,51,30,226,206,37,161,202,140,251,250,81,123,182,104,255,10,155,83) -IMAGE_DATA(197,137,196,52,226,36,226,100,112,10,56,21,156,198,240,95,199,103,142,207,157,75,66,149,25,119,245,163,241,108,78,255) -IMAGE_DATA(133,129,190,206,230,84,49,157,152,65,156,14,206,0,51,193,153,224,44,112,54,195,127,149,207,28,223,117,181,126,180,166) -IMAGE_DATA(202,140,187,250,49,196,191,233,222,244,175,48,157,42,102,131,115,192,185,224,60,112,62,184,128,184,144,184,136,225,63,102) -IMAGE_DATA(198,255,183,126,200,67,23,15,85,102,220,214,143,150,103,11,246,111,238,129,233,116,16,92,12,46,1,151,130,203,192,229) -IMAGE_DATA(224,10,112,37,184,10,92,13,174,97,248,143,153,241,174,206,237,251,224,10,123,198,109,253,168,63,83,94,209,191,66,119) -IMAGE_DATA(122,45,152,3,174,3,215,131,27,192,92,48,15,220,8,110,2,55,131,91,24,254,67,103,156,229,222,231,159,102,132,51) -IMAGE_DATA(227,102,63,154,207,196,241,159,91,220,148,78,111,5,183,129,219,193,29,224,78,112,23,184,27,220,3,230,131,28,20,12) -IMAGE_DATA(255,161,51,222,148,127,206,140,235,253,104,115,207,245,111,238,65,233,244,94,112,31,113,63,241,32,241,16,120,24,60,2) -IMAGE_DATA(30,101,248,15,157,241,166,252,115,102,92,239,71,155,251,186,252,43,148,211,5,224,49,176,16,60,14,158,0,139,192,147) -IMAGE_DATA(196,83,196,98,134,255,144,25,103,187,15,240,207,153,241,178,31,205,103,9,241,159,27,175,179,161,95,83,57,93,2,150) -IMAGE_DATA(130,167,193,50,240,12,241,44,177,156,120,142,225,63,120,198,27,242,207,153,241,5,93,220,215,233,95,241,60,234,189,0) -IMAGE_DATA(94,36,94,34,86,16,47,19,175,48,252,119,155,241,74,238,3,252,235,78,67,103,124,137,231,125,167,14,255,230,30,172) -IMAGE_DATA(68,61,197,42,240,42,120,13,188,14,222,0,111,130,213,224,45,34,214,127,208,140,55,225,31,215,53,157,114,103,188,105) -IMAGE_DATA(255,138,53,168,251,54,241,14,241,46,241,30,120,31,124,192,240,239,155,241,178,31,43,237,129,199,191,238,148,59,227,30) -IMAGE_DATA(127,149,252,155,123,176,22,117,215,19,31,18,27,192,71,224,99,240,9,248,148,225,223,55,227,101,63,54,229,95,119,26) -IMAGE_DATA(58,227,230,253,247,202,191,226,115,212,255,2,124,9,190,2,95,131,111,192,183,96,8,124,199,240,239,154,113,179,31,217) -IMAGE_DATA(123,224,241,175,191,111,174,33,98,103,60,207,237,184,138,22,5,206,155,22,60,215,249,151,31,81,251,39,240,51,248,5) -IMAGE_DATA(252,10,126,3,191,131,63,192,159,12,255,174,25,183,245,35,107,15,60,254,117,167,107,137,216,25,239,165,255,245,195,195) -IMAGE_DATA(157,85,96,25,120,0,168,179,139,58,191,171,223,93,213,119,55,123,49,252,187,62,199,109,253,88,183,127,221,233,103,68) -IMAGE_DATA(236,140,247,210,127,224,255,119,71,225,154,113,91,63,214,237,95,119,250,61,248,1,196,206,120,191,251,119,205,184,173,31) -IMAGE_DATA(107,245,79,231,255,210,233,95,202,63,102,122,157,54,227,139,192,252,46,51,222,239,254,93,51,110,235,199,218,253,211,30) -IMAGE_DATA(40,167,227,44,207,50,129,240,61,99,31,249,151,72,36,18,137,68,34,25,109,177,158,139,92,191,227,216,206,227,89,19) -IMAGE_DATA(231,207,33,247,217,46,228,252,233,58,79,186,53,20,29,27,158,235,52,122,254,119,125,143,97,59,143,139,255,250,253,71) -IMAGE_DATA(253,253,179,248,175,223,127,44,77,249,103,210,83,255,109,160,129,239,31,196,127,34,255,53,220,79,223,251,207,3,225,184) -IMAGE_DATA(15,241,31,90,223,188,23,162,167,223,191,185,238,103,150,70,191,248,231,186,31,205,254,99,223,151,50,143,127,174,251,209) -IMAGE_DATA(234,191,219,158,184,95,35,254,197,191,248,23,255,35,210,191,7,87,226,29,197,184,18,255,226,95,252,143,108,255,97,247) -IMAGE_DATA(150,170,110,239,252,183,219,131,248,23,255,226,95,252,139,127,241,47,254,197,127,61,254,11,7,237,243,32,254,197,127,27) -IMAGE_DATA(112,101,164,214,109,27,169,60,164,170,219,54,82,121,72,85,183,109,164,242,144,170,110,219,72,229,33,85,221,182,145,202) -IMAGE_DATA(67,170,186,177,247,35,145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,72,36,18,137,68,34,145,244,93,54,2) -IMAGE_DATA(34,83,36,83,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) -IMAGE_END_DATA(1408, 2) +IMAGE_DATA(120,156,237,209,203,109,3,49,16,131,97,151,227,178,220,137,75,119,32,228,144,131,31,136,119,71,250,169,33,9,232,186) +IMAGE_DATA(203,249,120,189,93,110,151,62,185,63,222,191,100,126,62,249,103,147,249,249,214,63,91,212,230,140,127,182,56,159,42,255) +IMAGE_DATA(236,112,44,213,254,217,225,187,204,242,207,14,255,203,108,255,236,240,57,171,252,179,193,235,172,244,207,14,207,33,252,179) +IMAGE_DATA(193,95,40,255,108,240,27,210,63,27,240,254,238,27,208,246,238,27,208,238,238,27,208,230,238,27,208,222,238,27,208,214) +IMAGE_DATA(238,27,208,206,238,27,208,198,241,215,126,221,67,251,186,111,64,219,238,234,95,213,149,182,221,105,131,25,61,105,215,29) +IMAGE_DATA(252,103,246,164,93,149,55,88,209,145,54,85,245,95,213,145,54,85,219,96,117,63,218,83,201,159,232,71,123,170,108,64) +IMAGE_DATA(117,163,45,21,252,201,110,180,101,252,247,124,138,246,241,231,111,87,232,16,255,254,254,103,55,80,233,68,27,198,127,223) +IMAGE_DATA(167,102,31,127,254,102,165,46,241,239,237,127,116,3,165,62,180,95,183,123,213,250,184,221,171,214,199,237,94,181,62,110) +IMAGE_DATA(247,170,245,113,187,87,173,143,219,189,106,125,220,238,85,235,227,118,175,90,31,183,123,213,250,184,221,171,214,71,237,222) +IMAGE_DATA(217,55,43,117,137,127,252,227,175,115,107,252,53,252,103,222,173,210,35,254,241,39,110,87,232,16,255,254,254,85,161,123) +IMAGE_DATA(209,142,180,127,181,65,252,227,191,147,125,181,3,245,223,221,253,171,44,136,127,118,241,175,240,88,253,191,78,246,21,46) +IMAGE_DATA(171,254,211,221,255,168,205,138,127,56,216,31,53,154,249,109,250,209,113,246,87,75,252,123,132,118,117,182,31,161,109,227) +IMAGE_DATA(175,253,186,135,246,117,182,31,161,141,227,175,249,92,66,59,59,219,143,208,214,206,246,35,180,183,179,253,8,109,238,108) +IMAGE_DATA(63,66,187,59,219,143,196,158,77,236,217,196,158,77,236,217,196,157,77,236,217,196,157,77,220,217,196,157,77,220,217,196) +IMAGE_DATA(156,77,204,217,236,109,253,3,131,203,114,255,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(480, 1) + +IMAGE_BEGIN_DATA +IMAGE_DATA(120,156,237,218,247,139,36,69,24,198,241,81,81,239,204,57,103,69,14,115,68,68,20,17,49,32,98,206,162,107,206,57) +IMAGE_DATA(167,155,81,204,103,56,17,79,79,68,12,136,136,158,153,67,196,192,121,24,49,187,230,252,143,236,248,20,190,35,69,89) +IMAGE_DATA(85,83,245,118,247,84,207,238,243,194,231,23,185,157,154,249,118,191,187,125,123,206,153,232,76,116,56,28,14,135,195,225) +IMAGE_DATA(112,56,28,14,135,195,225,112,56,51,102,250,133,148,122,63,109,235,192,254,163,57,183,109,74,117,40,117,110,219,148,234) +IMAGE_DATA(80,234,220,182,41,213,161,212,185,109,83,170,67,169,115,243,244,251,205,10,86,24,254,181,43,79,77,245,103,65,199,134) +IMAGE_DATA(255,190,12,44,11,203,137,229,197,10,176,34,204,138,157,27,232,176,58,190,102,13,88,19,214,130,181,97,29,88,23,214) +IMAGE_DATA(131,245,97,3,216,16,54,130,141,197,166,98,115,216,226,223,115,219,209,127,208,43,52,138,166,179,97,37,115,93,96,21) +IMAGE_DATA(88,21,86,3,95,187,220,254,177,166,91,194,86,176,53,108,35,182,21,115,196,118,176,125,211,253,221,123,49,161,93,40) +IMAGE_DATA(130,166,105,234,253,216,81,126,255,9,53,221,65,236,8,59,193,206,176,11,236,10,187,193,238,176,7,236,169,233,175,104) +IMAGE_DATA(154,211,46,20,161,202,142,15,187,31,83,250,247,132,221,34,212,212,216,75,236,45,246,17,251,138,253,96,127,69,255,42) +IMAGE_DATA(59,158,210,46,20,161,202,142,199,238,71,235,179,101,247,55,124,77,141,3,196,129,226,32,113,48,28,2,135,194,97,138) +IMAGE_DATA(254,117,252,204,137,181,11,69,168,178,227,161,251,209,249,108,193,254,61,135,253,117,190,166,198,225,226,8,113,36,28,5) +IMAGE_DATA(71,195,49,112,44,28,175,232,95,229,103,78,236,117,173,251,209,59,85,118,60,116,63,166,244,119,219,187,253,13,183,169) +IMAGE_DATA(113,2,156,8,39,193,201,112,10,156,42,78,19,167,43,250,231,236,248,255,190,126,50,98,72,135,42,59,238,187,31,61) +IMAGE_DATA(159,45,185,191,123,13,220,166,19,112,6,156,9,103,193,217,112,14,156,11,231,193,249,112,1,92,168,232,159,179,227,67) +IMAGE_DATA(155,251,175,67,104,212,59,238,187,31,237,207,212,173,216,223,176,155,94,4,23,195,37,112,41,92,6,151,195,21,112,37) +IMAGE_DATA(92,5,87,195,53,138,254,169,59,174,106,31,235,47,59,162,217,113,247,126,116,63,147,166,127,215,211,102,208,244,90,184) +IMAGE_DATA(14,174,135,27,224,70,184,9,110,134,91,96,46,116,161,167,232,159,186,227,77,245,215,236,184,125,63,250,218,107,251,187) +IMAGE_DATA(215,96,208,244,86,184,77,220,46,238,20,119,193,221,112,15,220,171,232,159,186,227,77,245,215,236,184,125,63,250,218,215) +IMAGE_DATA(213,223,48,77,231,193,125,112,63,60,0,15,194,124,120,72,60,44,30,81,244,79,217,113,117,251,132,254,154,29,31,220) +IMAGE_DATA(143,238,103,73,233,223,117,254,156,143,253,154,166,233,2,120,20,30,131,133,240,184,120,66,60,41,158,82,244,79,222,241) +IMAGE_DATA(134,250,107,118,124,222,144,246,117,246,55,158,198,121,207,192,179,226,57,241,188,120,65,188,168,232,63,108,199,43,181,79) +IMAGE_DATA(232,111,55,77,221,241,5,145,239,59,117,244,119,175,193,75,56,207,88,4,47,195,43,240,42,188,6,175,195,27,240,166) +IMAGE_DATA(200,237,159,180,227,77,244,199,235,186,77,181,59,222,116,127,99,49,206,125,75,188,45,222,17,239,194,123,240,190,162,127) +IMAGE_DATA(108,199,7,247,99,165,107,16,233,111,55,213,238,120,164,95,165,254,238,53,88,130,115,151,138,15,197,71,240,49,124,2) +IMAGE_DATA(159,194,103,138,254,177,29,31,220,143,77,245,183,155,166,238,184,251,254,71,213,223,248,2,231,127,9,95,193,215,240,13) +IMAGE_DATA(124,11,223,193,36,124,175,232,31,218,113,247,126,84,95,131,72,127,251,251,230,98,145,187,227,221,174,95,232,208,94,15) +IMAGE_DATA(207,155,30,145,215,249,207,79,56,251,103,248,5,126,133,223,224,119,248,3,254,132,191,20,253,67,59,238,187,31,85,215) +IMAGE_DATA(32,210,223,110,186,68,228,238,248,40,251,47,157,154,234,47,130,133,112,7,152,103,23,243,252,110,254,238,106,126,119,179) +IMAGE_DATA(153,162,127,232,231,184,239,126,172,187,191,221,244,115,145,187,227,163,236,159,248,239,221,89,66,59,238,187,31,235,238,111) +IMAGE_DATA(55,253,1,126,132,220,29,31,247,254,161,29,247,221,143,181,246,151,231,255,65,211,191,77,127,236,244,7,214,142,207,135) +IMAGE_DATA(185,67,118,124,220,251,135,118,220,119,63,214,222,95,174,129,105,58,219,243,89,54,17,177,207,56,70,253,57,28,14,135) +IMAGE_DATA(195,225,112,102,218,120,159,139,66,127,199,241,61,143,119,154,120,254,156,12,63,219,165,60,127,134,158,39,195,25,122,125) +IMAGE_DATA(159,200,235,52,250,252,31,250,61,134,239,121,156,253,235,239,159,245,255,63,179,127,253,253,115,53,213,95,105,164,253,219) +IMAGE_DATA(160,129,223,63,176,127,161,254,53,188,159,177,239,223,77,164,105,159,210,63,245,124,247,189,136,145,254,254,45,244,126,142) +IMAGE_DATA(179,140,75,127,109,251,153,220,63,247,251,82,39,210,95,219,126,166,246,31,118,77,194,127,134,253,217,159,253,217,127,90) +IMAGE_DATA(246,143,8,77,126,163,156,86,236,207,254,236,63,189,251,167,189,183,82,231,142,174,127,187,59,176,63,251,179,63,251,179) +IMAGE_DATA(63,251,179,63,251,215,211,191,23,208,190,14,236,207,254,109,16,154,233,122,110,219,148,234,80,234,220,182,41,213,161,212) +IMAGE_DATA(185,109,83,170,67,169,115,219,166,84,135,82,231,182,77,169,14,165,206,205,125,63,28,14,135,195,225,112,56,28,14,135) +IMAGE_DATA(195,225,112,56,28,14,135,195,225,112,56,28,206,216,205,63,132,91,107,10,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(1280, 1) IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,216,75,110,3,49,16,3,81,31,39,199,242,77,146,155,39,139,89,228,107,27,227,72,170,110,177,8,112,223)