From 92a2ef1ec703bc35c36dfd629f046cb1c98df4f0 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 22 Mar 2009 10:19:46 +0000 Subject: [PATCH] syncing uppdev git-svn-id: svn://ultimatepp.org/upp/trunk@998 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppdev/Iml2/test.iml | 12 +++ uppdev/Menu/menu.cpp | 180 +++++++++++++++++---------------- uppdev/TcpSocket/TcpSocket.cpp | 9 ++ uppdev/TcpSocket/TcpSocket.upp | 9 ++ uppdev/alpha/beta/beta.upp | 24 ++--- uppdev/alpha/beta/init | 4 + 6 files changed, 137 insertions(+), 101 deletions(-) create mode 100644 uppdev/TcpSocket/TcpSocket.cpp create mode 100644 uppdev/TcpSocket/TcpSocket.upp create mode 100644 uppdev/alpha/beta/init diff --git a/uppdev/Iml2/test.iml b/uppdev/Iml2/test.iml index 20d476e57..d849bd340 100644 --- a/uppdev/Iml2/test.iml +++ b/uppdev/Iml2/test.iml @@ -1,4 +1,5 @@ PREMULTIPLIED +IMAGE_ID(upp) IMAGE_ID(Princess) IMAGE_ID(LoginListTop0) IMAGE_ID(Test) @@ -9,6 +10,17 @@ IMAGE_ID(asd) IMAGE_ID(test) IMAGE_ID(LoginListTop0) +IMAGE_BEGIN_DATA +IMAGE_DATA(120,156,237,218,75,14,131,48,16,4,81,31,141,163,229,230,73,102,129,132,144,197,199,198,244,120,166,74,242,38,43,94) +IMAGE_DATA(67,148,5,41,75,89,202,218,151,136,136,136,186,250,252,127,78,103,57,81,204,173,215,60,187,251,200,111,31,175,103,132) +IMAGE_DATA(95,109,86,250,213,94,165,95,109,85,250,213,206,35,255,214,123,118,90,252,106,163,210,175,246,41,253,106,219,85,255,190) +IMAGE_DATA(189,183,230,194,63,191,29,255,24,191,218,212,235,191,114,111,163,248,159,222,237,237,123,225,173,172,110,43,179,221,194,159) +IMAGE_DATA(215,110,225,207,107,183,240,231,245,243,221,207,237,183,240,227,199,159,119,3,252,247,252,209,54,200,238,183,178,111,208,226) +IMAGE_DATA(143,182,67,207,6,179,156,40,254,214,251,27,229,25,168,85,120,255,195,251,79,252,143,252,255,69,237,187,226,223,122,207) +IMAGE_DATA(206,93,191,247,13,222,240,123,222,224,45,191,215,13,106,237,189,53,71,107,106,175,218,239,109,3,133,223,211,6,42,191) +IMAGE_DATA(151,29,90,175,121,68,234,45,70,239,70,68,68,20,165,31,182,36,145,117,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(256, 1) + IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,91,207,79,27,71,20,158,216,78,176,129,16,210,8,83,210,53,196,137,226,86,78,74,21,84,17,14,21,84) IMAGE_DATA(106,41,81,15,92,146,37,74,14,61,132,28,160,135,170,238,141,67,201,33,162,82,15,64,114,32,61,84,165,233,177,254) diff --git a/uppdev/Menu/menu.cpp b/uppdev/Menu/menu.cpp index 56df508d9..b856e91f0 100644 --- a/uppdev/Menu/menu.cpp +++ b/uppdev/Menu/menu.cpp @@ -1,89 +1,91 @@ -#include - -using namespace Upp; - -struct App : public TopWindow { - bool numbers_enabled; - EditString test; - - void Action2(int a, int b) { PromptOK(AsString(a) + AsString(b)); } - - void Exit() - { - Close(); - } - - void EnableNumbers() - { - numbers_enabled = !numbers_enabled; - } - - void ShowNumber(int n) - { - PromptOK(AsString(n)); - } - - void SubMenu(Bar& bar) - { - for(int i = 0; i < 10; i++) - bar.Add("xxxxxx " + AsString(i), THISBACK1(ShowNumber, i)); - } - - void Menu(Bar& bar) - { - bar.Add("THISBACK2", THISBACK2(Action2, 10, 11)); - bar.Add("Enable numbers", THISBACK(EnableNumbers)) - .Check(numbers_enabled); - bar.Add(numbers_enabled, "Numbers", CtrlImg::cut(), THISBACK(SubMenu)); - bar.Add(numbers_enabled, "Numbers", CtrlImg::information(), THISBACK(SubMenu)); - bar.Separator(); - bar.Add("Zoom &Out", CtrlImg::error(), THISBACK(Exit)); - bar.Add("Exit", THISBACK(Exit)) - .Key(K_CTRL_E); - } - - void BigMenu(Bar& bar) - { - for(int i = 0; i < 100; i++) - bar.Add(AsString(i), THISBACK1(ShowNumber, i)); - } - - void MainBar(Bar& bar) - { - bar.Add("Problem", THISBACK(Menu)); - bar.Add("Menu", THISBACK(Menu)); - bar.Add("Menu", THISBACK(Menu)); - bar.Add("BigMenu", THISBACK(BigMenu)); - bar.AddNC(test); - } - - virtual void RightDown(Point p, dword) - { - MenuBar bar; - MainBar(bar); - bar.Execute(); - } - - virtual void LeftDown(Point p, dword) - { - MenuBar bar; - BigMenu(bar); - bar.Execute(); - } - - MenuBar menu; - - typedef App CLASSNAME; - - App() - { - numbers_enabled = true; - AddFrame(menu); - menu.Set(THISBACK(MainBar)); - } -}; - -GUI_APP_MAIN -{ - App().Run(); -} +#include + +using namespace Upp; + +struct App : public TopWindow { + bool numbers_enabled; + EditString test; + + void Action2(int a, int b) { PromptOK(AsString(a) + AsString(b)); } + + void Exit() + { + Close(); + } + + void EnableNumbers() + { + numbers_enabled = !numbers_enabled; + } + + void ShowNumber(int n) + { + PromptOK(AsString(n)); + } + + void SubMenu(Bar& bar) + { + for(int i = 0; i < 10; i++) + bar.Add("xxxxxx " + AsString(i), THISBACK1(ShowNumber, i)); + } + + void Menu(Bar& bar) + { + bar.Add("THISBACK2", THISBACK2(Action2, 10, 11)); + bar.Add("Enable numbers", THISBACK(EnableNumbers)) + .Check(numbers_enabled); + bar.Add(numbers_enabled, "Numbers", CtrlImg::cut(), THISBACK(SubMenu)); + bar.Add(numbers_enabled, "Numbers", CtrlImg::information(), THISBACK(SubMenu)); + bar.Separator(); + bar.Add("Zoom &Out", CtrlImg::error(), THISBACK(Exit)); + bar.Add("Zoom Aut", CtrlImg::error(), THISBACK(Exit)); + bar.Add("Zoom Aut", CtrlImg::error(), THISBACK(Exit)); + bar.Add("Exit", THISBACK(Exit)) + .Key(K_CTRL_E); + } + + void BigMenu(Bar& bar) + { + for(int i = 0; i < 100; i++) + bar.Add(AsString(i), THISBACK1(ShowNumber, i)); + } + + void MainBar(Bar& bar) + { + bar.Add("Problem", THISBACK(Menu)); + bar.Add("Menu", THISBACK(Menu)); + bar.Add("Menu", THISBACK(Menu)); + bar.Add("BigMenu", THISBACK(BigMenu)); + bar.AddNC(test); + } + + virtual void RightDown(Point p, dword) + { + MenuBar bar; + MainBar(bar); + bar.Execute(); + } + + virtual void LeftDown(Point p, dword) + { + MenuBar bar; + BigMenu(bar); + bar.Execute(); + } + + MenuBar menu; + + typedef App CLASSNAME; + + App() + { + numbers_enabled = true; + AddFrame(menu); + menu.Set(THISBACK(MainBar)); + } +}; + +GUI_APP_MAIN +{ + App().Run(); +} diff --git a/uppdev/TcpSocket/TcpSocket.cpp b/uppdev/TcpSocket/TcpSocket.cpp new file mode 100644 index 000000000..0e7de6897 --- /dev/null +++ b/uppdev/TcpSocket/TcpSocket.cpp @@ -0,0 +1,9 @@ +#include + +using namespace Upp; + +CONSOLE_APP_MAIN +{ + +} + diff --git a/uppdev/TcpSocket/TcpSocket.upp b/uppdev/TcpSocket/TcpSocket.upp new file mode 100644 index 000000000..bce852754 --- /dev/null +++ b/uppdev/TcpSocket/TcpSocket.upp @@ -0,0 +1,9 @@ +uses + Core; + +file + TcpSocket.cpp; + +mainconfig + "" = ""; + diff --git a/uppdev/alpha/beta/beta.upp b/uppdev/alpha/beta/beta.upp index 458d97e30..5d9d379e7 100644 --- a/uppdev/alpha/beta/beta.upp +++ b/uppdev/alpha/beta/beta.upp @@ -1,12 +1,12 @@ -uses - CtrlLib; - -file - "beta.h" - , main.cpp - , "beta.lay" - , "beta.iml" -; - -mainconfig - "" = "GUI MT"; +uses + CtrlLib; + +file + beta.h, + main.cpp, + beta.lay, + beta.iml; + +mainconfig + "" = "GUI MT"; + diff --git a/uppdev/alpha/beta/init b/uppdev/alpha/beta/init new file mode 100644 index 000000000..009b657fe --- /dev/null +++ b/uppdev/alpha/beta/init @@ -0,0 +1,4 @@ +#ifndef _alpha_beta_icpp_init_stub +#define _alpha_beta_icpp_init_stub +#include "CtrlLib/init" +#endif