merge
authorunc0rr
Sat, 11 Dec 2010 21:27:43 +0300
changeset 4508 2a14477d1d15
parent 4500 22d06b4be225 (diff)
parent 4507 0f9b86942c19 (current diff)
child 4509 816a0bff5019
merge
--- a/QTfrontend/hwform.h	Sat Dec 11 18:48:14 2010 +0100
+++ b/QTfrontend/hwform.h	Sat Dec 11 21:27:43 2010 +0300
@@ -153,7 +153,8 @@
         ID_PAGE_SCHEME          = 16,
         ID_PAGE_ADMIN           = 17,
         ID_PAGE_NETTYPE         = 18,
-        ID_PAGE_CAMPAIGN        = 19
+        ID_PAGE_CAMPAIGN        = 19,
+        ID_PAGE_DRAWMAP         = 20
         };
     HWGame * game;
     HWNetServer* pnetserver;
--- a/QTfrontend/pages.cpp	Sat Dec 11 18:48:14 2010 +0100
+++ b/QTfrontend/pages.cpp	Sat Dec 11 21:27:43 2010 +0300
@@ -2010,3 +2010,12 @@
 
     BtnBack = addButton(":/res/Exit.png", pageLayout, 4, 0, true);
 }
+
+/////////////////////////////////////////////////
+
+PageDrawMap::PageDrawMap(QWidget* parent) : AbstractPage(parent)
+{
+    QGridLayout * pageLayout = new QGridLayout(this);
+
+    BtnBack = addButton(":/res/Exit.png", pageLayout, 0, 0, true);
+}
--- a/QTfrontend/pages.h	Sat Dec 11 18:48:14 2010 +0100
+++ b/QTfrontend/pages.h	Sat Dec 11 21:27:43 2010 +0300
@@ -572,4 +572,16 @@
     QPushButton * BtnOfficialServer;
 };
 
+
+class PageDrawMap : public AbstractPage
+{
+    Q_OBJECT
+
+public:
+    PageDrawMap(QWidget* parent = 0);
+
+    QPushButton * BtnBack;
+
+};
+
 #endif // PAGES_H
--- a/QTfrontend/ui_hwform.cpp	Sat Dec 11 18:48:14 2010 +0100
+++ b/QTfrontend/ui_hwform.cpp	Sat Dec 11 21:27:43 2010 +0300
@@ -116,4 +116,7 @@
 
     pageCampaign = new PageCampaign();
     Pages->addWidget(pageCampaign);
+
+    pageDrawMap = new PageDrawMap();
+    Pages->addWidget(pageDrawMap);
 }
--- a/QTfrontend/ui_hwform.h	Sat Dec 11 18:48:14 2010 +0100
+++ b/QTfrontend/ui_hwform.h	Sat Dec 11 21:27:43 2010 +0300
@@ -40,6 +40,7 @@
 class PageScheme;
 class PageAdmin;
 class PageNetType;
+class PageDrawMap;
 class QStackedLayout;
 class QFont;
 class QWidget;
@@ -72,6 +73,7 @@
     PageAdmin *pageAdmin;
     PageNetType *pageNetType;
     PageCampaign *pageCampaign;
+    PageDrawMap *pageDrawMap;
 
     QStackedLayout *Pages;
     QFont *font14;
@@ -79,8 +81,6 @@
     void setupUi(HWForm *HWForm);
     void SetupFonts();
     void SetupPages(QWidget *Parent, HWForm *HWForm);
-    void SetupPageNetChat(QWidget *Parent);
-    void SetupPageNetGame(QWidget *Parent);
 };
 
 #endif // UI_HWFORM_H