diff --git a/examples/Bombs/main.cpp b/examples/Bombs/main.cpp index 23f119d33..35cd22a49 100644 --- a/examples/Bombs/main.cpp +++ b/examples/Bombs/main.cpp @@ -175,7 +175,7 @@ Bombs::Bombs() menu.Sub("File", [=](Bar& bar) { bar.Add("Exit", Breaker(IDOK)); bar.Separator(); - bar.Add("About..", [] { PromptOK("[*A9/ uBombs]&[A5 Ultimate`+`+ example]"); }); + bar.Add("About..", [] { PromptOK("[*A9/ uBombs]&[A5 U`+`+ example]"); }); }); menu.Sub("Game", [=](Bar& bar) { bar.Add("Restart", [=] { Generate(); }); diff --git a/examples/EyeCare/app.tpp/about_en-us.tpp b/examples/EyeCare/app.tpp/about_en-us.tpp index 6e896d642..3ea624715 100644 --- a/examples/EyeCare/app.tpp/about_en-us.tpp +++ b/examples/EyeCare/app.tpp/about_en-us.tpp @@ -1,5 +1,18 @@ -TITLE("EyeCare/u++ 1.0") -COMPRESSED -120,156,173,145,75,111,220,32,20,133,255,10,82,166,85,155,135,135,123,1,131,237,77,95,89,69,106,163,84,81,23,150,167,48,54,201,208,248,37,27,107,102,84,53,191,189,56,211,42,170,162,40,155,178,0,113,225,124,231,30,200,145,44,22,244,148,30,209,23,70,250,201,222,152,169,246,69,238,56,87,153,65,145,221,93,124,73,178,227,119,111,98,254,118,166,64,160,48,9,76,9,6,28,227,48,1,3,20,200,56,40,76,184,98,76,209,180,172,205,56,22,121,141,74,101,179,8,79,241,8,165,64,144,92,113,5,76,42,12,90,164,20,169,68,1,156,41,20,105,101,199,178,200,141,98,217,241,85,28,68,108,118,10,112,10,49,114,201,145,50,138,60,88,129,82,28,164,80,44,137,227,180,52,189,119,93,251,199,203,1,32,100,107,144,89,232,249,254,254,62,2,78,15,29,240,0,3,202,67,171,16,106,148,163,4,145,208,68,40,80,148,5,184,144,84,164,189,25,76,243,124,116,241,98,116,73,83,231,109,64,28,159,0,200,32,137,79,227,35,224,50,4,85,140,11,37, -105,48,71,68,198,16,24,38,9,138,88,200,116,99,77,101,135,34,255,249,253,23,201,71,250,16,63,127,117,254,249,236,250,43,57,223,219,143,102,176,203,73,159,232,19,2,17,45,94,23,243,29,70,14,235,106,227,125,175,83,189,212,203,169,239,117,52,118,211,80,218,155,110,184,181,58,106,173,215,75,19,202,11,87,89,189,120,191,238,38,175,23,182,213,103,211,168,163,141,111,234,21,201,87,43,114,57,173,107,87,146,170,107,140,107,201,122,79,138,235,7,59,111,77,243,159,108,14,24,114,101,93,211,215,182,177,173,55,243,191,145,238,38,116,240,8,223,110,183,58,218,238,182,174,186,181,62,136,131,129,94,174,200,118,247,237,80,41,158,222,46,187,202,246,67,247,195,150,126,222,52,122,89,187,245,96,134,125,56,127,4,153,177,95,17,187,51,179,123,49,71,124,194,233,7,183,55,237,157,142,92,59,91,94,30,182,228,67,87,59,83,144,105,116,237,45,241,27,251,143,240,153,183,112,109,101,119,127,147,95,215,222,53,198,219,249,69,139,168,248,13,86,169,13,138, - +topic "EyeCare/u++ 1.0"; +[i448;a25;kKO9;*@(64)2 $$1,0#37138531426314131252341829483380:class] +[l288;2 $$2,2#27521748481378242620020725143825:desc] +[a83;*R6 $$3,0#31310162474203024125188417583966:caption] +[l288;i1121;b17;O9;~~~.1408;2 $$4,0#10431211400427159095818037425705:param] +[i448;a25;kKO9;*@(64)2 $$5,0#37138531426314131252341829483370:item] +[*+117 $$6,6#14700283458701402223321329925657:header] +[2 $$0,0#00000000000000000000000000000000:Default] +[{_} +[s0;%% [*R6 EyeCare/u`+`+ 1.0]&] +[s0;3 &] +[s0; Public domain by [^http`:`/`/upp`.sourceforge`.net`/app`$ide`$About`$en`-us`.html^ U +`+`+ team]&] +[s0;^http`:`/`/upp`.sourceforge`.net`/app`$ide`$About`$en`-us`.html^ &] +[s0; Reimplementation of [^http`:`/`/www`.wxwidgets`.org`/^ wxWidgets] +[^http`:`/`/www`.codeproject`.com`/library`/wxwidgets`.asp^ example] +by [^http`:`/`/www`.priyank`.in`/^ Priyank Bolia] using the [^https`:`/`/www`.ultimatepp`.org`/^ U +`+`+] framework.]] \ No newline at end of file diff --git a/examples/EyeCare/app.tpp/about_en-us.tppi b/examples/EyeCare/app.tpp/about_en-us.tppi index b27e29d76..4102b99cd 100644 --- a/examples/EyeCare/app.tpp/about_en-us.tppi +++ b/examples/EyeCare/app.tpp/about_en-us.tppi @@ -1,5 +1,6 @@ TITLE("EyeCare/u++ 1.0") COMPRESSED -120,156,173,145,75,111,220,32,20,133,255,10,82,166,85,155,135,135,123,1,131,237,77,95,89,69,106,163,84,81,23,150,167,48,54,201,208,248,37,27,107,102,84,53,191,189,56,211,42,170,162,40,155,178,0,113,225,124,231,30,200,145,44,22,244,148,30,209,23,70,250,201,222,152,169,246,69,238,56,87,153,65,145,221,93,124,73,178,227,119,111,98,254,118,166,64,160,48,9,76,9,6,28,227,48,1,3,20,200,56,40,76,184,98,76,209,180,172,205,56,22,121,141,74,101,179,8,79,241,8,165,64,144,92,113,5,76,42,12,90,164,20,169,68,1,156,41,20,105,101,199,178,200,141,98,217,241,85,28,68,108,118,10,112,10,49,114,201,145,50,138,60,88,129,82,28,164,80,44,137,227,180,52,189,119,93,251,199,203,1,32,100,107,144,89,232,249,254,254,62,2,78,15,29,240,0,3,202,67,171,16,106,148,163,4,145,208,68,40,80,148,5,184,144,84,164,189,25,76,243,124,116,241,98,116,73,83,231,109,64,28,159,0,200,32,137,79,227,35,224,50,4,85,140,11,37, -105,48,71,68,198,16,24,38,9,138,88,200,116,99,77,101,135,34,255,249,253,23,201,71,250,16,63,127,117,254,249,236,250,43,57,223,219,143,102,176,203,73,159,232,19,2,17,45,94,23,243,29,70,14,235,106,227,125,175,83,189,212,203,169,239,117,52,118,211,80,218,155,110,184,181,58,106,173,215,75,19,202,11,87,89,189,120,191,238,38,175,23,182,213,103,211,168,163,141,111,234,21,201,87,43,114,57,173,107,87,146,170,107,140,107,201,122,79,138,235,7,59,111,77,243,159,108,14,24,114,101,93,211,215,182,177,173,55,243,191,145,238,38,116,240,8,223,110,183,58,218,238,182,174,186,181,62,136,131,129,94,174,200,118,247,237,80,41,158,222,46,187,202,246,67,247,195,150,126,222,52,122,89,187,245,96,134,125,56,127,4,153,177,95,17,187,51,179,123,49,71,124,194,233,7,183,55,237,157,142,92,59,91,94,30,182,228,67,87,59,83,144,105,116,237,45,241,27,251,143,240,153,183,112,109,101,119,127,147,95,215,222,53,198,219,249,69,139,168,248,13,86,169,13,138, +120,156,165,146,203,110,219,48,16,69,127,133,64,156,162,141,93,153,51,36,69,74,218,244,185,234,162,65,128,162,11,65,46,105,153,142,217,232,5,137,130,98,20,205,183,151,138,13,244,133,34,139,106,65,129,67,221,123,238,12,149,59,206,85,102,80,100,119,31,62,38,217,213,171,231,49,127,129,100,177,128,21,189,96,18,152,18,12,56,198,97,1,6,40,144,113,80,152,112,197,152,162,105,89,153,97,40,242,10,149,202,102,17,174,240,2,165,64,144,92,113,5,76,42,12,90,164,20,169,68,1,156,41,20,233,206,14,101,145,27,197,178,171,155,56,136,216,76,10,230,20,98,228,146,35,101,20,121,64,129,82,28,164,80,44,137,227,180,52,157,119,109,115,102,57,0,132,108,11,50,11,153,31,30,30,34,224,244,148,128,7,51,160,60,68,133,80,163,28,37,136,132,38,66,129,162,44,152,11,73,69,218,153,222,212,69,254,175,214,197,147,173,75,154,58,111,131,197,213,18,64,6,73,188,138,47,128,203,208,168,98,92,40,73,3,28,17,25,67,96,152,36,40,98,33,211, +131,53,59,219,23,249,204,160,129,65,159,120,210,119,118,111,198,202,23,249,183,47,223,73,62,208,236,242,146,228,243,208,222,31,237,91,211,219,245,168,151,122,73,32,162,197,179,98,62,103,228,244,38,215,227,182,114,37,217,181,181,113,13,217,30,73,190,57,120,223,233,84,175,245,122,236,58,29,13,237,216,151,118,223,246,183,86,71,141,245,122,109,66,121,225,118,86,47,94,111,219,209,235,133,109,244,203,113,208,209,193,215,213,134,124,122,100,121,27,38,119,130,252,183,227,57,235,141,117,117,87,217,218,54,222,204,119,76,218,253,111,113,167,105,210,209,116,63,185,221,173,245,65,28,0,122,189,33,211,253,231,83,165,248,251,235,178,221,217,174,111,191,218,210,207,155,90,175,43,183,237,77,127,12,231,63,141,204,208,109,136,189,55,51,189,248,115,72,143,62,93,239,142,166,185,211,145,107,102,228,245,105,75,222,180,149,51,5,25,7,215,220,18,127,176,103,225,240,139,50,92,155,171,141,183,243,96,206,129,31,7,88,144,125,248,247,236,212,246,119,81,81,252,0,172,188, +8,176, diff --git a/examples/EyeCare/app.tpp/all.i b/examples/EyeCare/app.tpp/all.i index dcbfc8c5d..3b061401d 100644 --- a/examples/EyeCare/app.tpp/all.i +++ b/examples/EyeCare/app.tpp/all.i @@ -1,4 +1,4 @@ -TOPIC("about_en-us") -#include "about_en-us.tppi" -END_TOPIC - +TOPIC("about_en-us") +#include "about_en-us.tppi" +END_TOPIC + diff --git a/examples/GoogleMaps/GoogleMaps.cpp b/examples/GoogleMaps/GoogleMaps.cpp index 747395dd0..9a66b1076 100644 --- a/examples/GoogleMaps/GoogleMaps.cpp +++ b/examples/GoogleMaps/GoogleMaps.cpp @@ -15,7 +15,7 @@ String GetGoogleMap(double center_x, double center_y, int zoom, int cx, int cy, const char *format, String *error) { String request; - request << "http://maps.google.com/maps/api/staticmap?center=" << + request << "https://maps.google.com/maps/api/staticmap?center=" << AsString(center_y) << ',' << AsString(center_x) << "&zoom=" << zoom << "&size=" << cx << 'x' << cy << diff --git a/examples/GoogleMaps/GoogleMaps.lay b/examples/GoogleMaps/GoogleMaps.lay index 31de455cd..3fdf62e4e 100644 --- a/examples/GoogleMaps/GoogleMaps.lay +++ b/examples/GoogleMaps/GoogleMaps.lay @@ -1,15 +1,15 @@ LAYOUT(MapDlgLayout, 428, 340) UNTYPED(map, HSizePosZ(8, 136).VSizePosZ(8, 8)) - ITEM(Button, zoomout, SetLabel(t_("-")).RightPosZ(104, 24).TopPosZ(8, 20)) - ITEM(DropList, zoom, RightPosZ(40, 60).TopPosZ(8, 19)) - ITEM(Button, zoomin, SetLabel(t_("+")).RightPosZ(8, 24).TopPosZ(8, 20)) - ITEM(Button, up, RightPosZ(56, 24).TopPosZ(40, 40)) - ITEM(Button, left, RightPosZ(88, 40).TopPosZ(80, 24)) - ITEM(Button, right, RightPosZ(8, 40).TopPosZ(80, 24)) - ITEM(Button, down, RightPosZ(56, 24).TopPosZ(104, 40)) - ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(72, 56).BottomPosZ(8, 24)) - ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(8, 56).BottomPosZ(8, 24)) - ITEM(Label, gpsy, SetFrame(BlackFrame()).RightPosZ(8, 120).TopPosZ(164, 24)) - ITEM(Label, gpsx, SetFrame(BlackFrame()).RightPosZ(8, 120).TopPosZ(192, 24)) + ITEM(Upp::Button, zoomout, SetLabel(t_("-")).RightPosZ(104, 24).TopPosZ(8, 20)) + ITEM(Upp::DropList, zoom, RightPosZ(40, 60).TopPosZ(8, 19)) + ITEM(Upp::Button, zoomin, SetLabel(t_("+")).RightPosZ(8, 24).TopPosZ(8, 20)) + ITEM(Upp::Button, up, RightPosZ(56, 24).TopPosZ(40, 40)) + ITEM(Upp::Button, left, RightPosZ(88, 40).TopPosZ(80, 24)) + ITEM(Upp::Button, right, RightPosZ(8, 40).TopPosZ(80, 24)) + ITEM(Upp::Button, down, RightPosZ(56, 24).TopPosZ(104, 40)) + ITEM(Upp::Button, cancel, SetLabel(t_("Cancel")).RightPosZ(68, 60).BottomPosZ(8, 24)) + ITEM(Upp::Button, ok, SetLabel(t_("OK")).RightPosZ(4, 60).BottomPosZ(8, 24)) + ITEM(Upp::Label, gpsy, SetFrame(Upp::BlackFrame()).RightPosZ(8, 120).TopPosZ(164, 24)) + ITEM(Upp::Label, gpsx, SetFrame(Upp::BlackFrame()).RightPosZ(8, 120).TopPosZ(192, 24)) END_LAYOUT diff --git a/examples/GoogleMaps/GoogleMaps.upp b/examples/GoogleMaps/GoogleMaps.upp index 55f8c5270..b0ae99034 100644 --- a/examples/GoogleMaps/GoogleMaps.upp +++ b/examples/GoogleMaps/GoogleMaps.upp @@ -1,7 +1,8 @@ description "Example using GoogleMaps static API to display the map of given location\377"; uses - CtrlLib; + CtrlLib, + Core/SSL; file GoogleMaps.h, diff --git a/examples/GoogleMaps/MapDlg.cpp b/examples/GoogleMaps/MapDlg.cpp index 5d56c561a..3c4dc0939 100644 --- a/examples/GoogleMaps/MapDlg.cpp +++ b/examples/GoogleMaps/MapDlg.cpp @@ -106,7 +106,7 @@ MapDlgDlg::MapDlgDlg() SetRect(sz); for(int i = 0; i < 22; i++) - zoom.Add(i); + zoom.Add(i); zoom <<= 17; zoom <<= THISBACK(LoadMap); zoomin <<= THISBACK(ZoomIn); diff --git a/examples/HelloWorld/hello.cpp b/examples/HelloWorld/Hello.cpp similarity index 73% rename from examples/HelloWorld/hello.cpp rename to examples/HelloWorld/Hello.cpp index 28dc9351d..8ddb130dc 100644 --- a/examples/HelloWorld/hello.cpp +++ b/examples/HelloWorld/Hello.cpp @@ -7,8 +7,6 @@ class HelloWorld : public TopWindow { StatusBar status; public: - typedef HelloWorld CLASSNAME; - HelloWorld(); }; @@ -20,13 +18,13 @@ HelloWorld::HelloWorld() menu.Set([=](Bar& bar) { menu.Sub("File", [=](Bar& bar) { bar.Add("About..", [=] { - PromptOK("{{1@5 [@9= This is the]::@2 [A5@0 Ultimate`+`+ Hello world sample}}"); + PromptOK("{{1@5 [@9= This is the]::@2 [A5@0 U`+`+ Hello world sample}}"); }); bar.Separator(); bar.Add("Exit", [=] { Close(); }); }); }); - status = "Welcome to the Ultimate++ !"; + status = "Welcome to the U++!"; } GUI_APP_MAIN diff --git a/examples/HelloWorld/HelloWorld.upp b/examples/HelloWorld/HelloWorld.upp index 39cb8ce57..f7db8efeb 100644 --- a/examples/HelloWorld/HelloWorld.upp +++ b/examples/HelloWorld/HelloWorld.upp @@ -4,7 +4,7 @@ uses CtrlLib; file - hello.cpp; + Hello.cpp; mainconfig "" = "GUI"; diff --git a/examples/Puzzle/Puzzle.cpp b/examples/Puzzle/Puzzle.cpp index 14307c359..35ec63654 100644 --- a/examples/Puzzle/Puzzle.cpp +++ b/examples/Puzzle/Puzzle.cpp @@ -129,7 +129,7 @@ void Puzzle::LeftDown(Point p, dword) void Puzzle::About() { - PromptOK("[A5 Puzzle]&Using [*^http://www.ultimatepp.org^ Ultimate`+`+] technology."); + PromptOK("[A5 Puzzle]&Using [*^https`:`/`/www`.ultimatepp`.org`/^ U`+`+] technology."); } void Puzzle::Scores() diff --git a/examples/UWord/UWord.cpp b/examples/UWord/UWord.cpp index af882440d..628e3d109 100644 --- a/examples/UWord/UWord.cpp +++ b/examples/UWord/UWord.cpp @@ -211,7 +211,7 @@ void UWord::Pdf() void UWord::About() { - PromptOK("[A5 uWord]&Using [*^www://upp.sf.net^ U`+`+] technology."); + PromptOK("[A5 uWord]&Using [*^https`:`/`/www`.ultimatepp`.org`/^ U`+`+] technology."); } void UWord::Destroy()