# HG changeset patch
# User unc0rr
# Date 1190145166 0
# Node ID f6e5f4e122dba6878d05937ee3f134315f6d0d5b
# Parent  7c7b90c402d3644e06ebf2be9d0a06e0b60d7b2f
Select weapon scheme page

diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/hwform.cpp	Tue Sep 18 19:52:46 2007 +0000
@@ -86,6 +86,7 @@
 	connect(ui.pageOptions->BtnEditTeam,	SIGNAL(clicked()),	this, SLOT(EditTeam()));
 	connect(ui.pageOptions->BtnSaveOptions,	SIGNAL(clicked()),	config, SLOT(SaveOptions()));
 	connect(ui.pageOptions->BtnSaveOptions,	SIGNAL(clicked()),	this, SLOT(GoBack()));
+	connect(ui.pageOptions->WeaponsButt,	SIGNAL(clicked()),	this, SLOT(GoToSelectWeapon()));
 	// TODO
 
 	connect(ui.pageNet->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
@@ -112,6 +113,8 @@
 	connect(ui.pageTraining->BtnStartTrain,	SIGNAL(clicked()),	this, SLOT(StartTraining()));
 	connect(ui.pageTraining->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
 
+	connect(ui.pageSelectWeapon->BtnBack,	SIGNAL(clicked()),	this, SLOT(GoBack()));
+
 	GoToPage(ID_PAGE_MAIN);
 }
 
@@ -159,6 +162,11 @@
 	GoToPage(ID_PAGE_SETUP);
 }
 
+void HWForm::GoToSelectWeapon()
+{
+	GoToPage(ID_PAGE_SELECTWEAPON);
+}
+
 void HWForm::GoToInfo()
 {
 	GoToPage(ID_PAGE_INFO);
diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/hwform.h
--- a/QTfrontend/hwform.h	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/hwform.h	Tue Sep 18 19:52:46 2007 +0000
@@ -52,6 +52,7 @@
 	void GoToInfo();
 	void GoToSimpleGame();
 	void GoToTraining();
+	void GoToSelectWeapon();
 	void GoToPage(quint8 id);
 	void GoBack();
 	void btnExitPressed();
@@ -95,7 +96,8 @@
 		ID_PAGE_MAIN            =  8,
 		ID_PAGE_GAMESTATS       =  9,
 		ID_PAGE_SINGLEPLAYER    = 10,
-		ID_PAGE_TRAINING	= 11
+		ID_PAGE_TRAINING        = 11,
+		ID_PAGE_SELECTWEAPON    = 12
 		};
 	HWGame * game;
 	HWTeam * editedTeam;
diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/pages.cpp	Tue Sep 18 19:52:46 2007 +0000
@@ -583,6 +583,20 @@
 	BtnBack->setFont(*font14);
 	BtnBack->setText(QPushButton::tr("Back"));
 	pageLayout->addWidget(BtnBack, 1, 0);
-
 }
 
+PageSelectWeapon::PageSelectWeapon(QWidget* parent) : QWidget(parent)
+{
+	QFont * font14 = new QFont("MS Shell Dlg", 14);
+	QGridLayout * pageLayout = new QGridLayout(this);
+	pageLayout->setMargin(25);
+	pageLayout->setColumnStretch(0, 1);
+	pageLayout->setColumnStretch(1, 2);
+	pageLayout->setColumnStretch(2, 1);
+
+	BtnBack = new QPushButton(this);
+	BtnBack->setFont(*font14);
+	BtnBack->setText(QPushButton::tr("Back"));
+	pageLayout->addWidget(BtnBack, 1, 0);
+}
+
diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/pages.h
--- a/QTfrontend/pages.h	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/pages.h	Tue Sep 18 19:52:46 2007 +0000
@@ -227,5 +227,14 @@
 	QPushButton *BtnBack;
 };
 
+class PageSelectWeapon : public QWidget
+{
+	Q_OBJECT
+
+public:
+	PageSelectWeapon(QWidget* parent = 0);
+
+	QPushButton *BtnBack;
+};
 
 #endif // PAGES_H
diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/ui_hwform.cpp
--- a/QTfrontend/ui_hwform.cpp	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/ui_hwform.cpp	Tue Sep 18 19:52:46 2007 +0000
@@ -89,4 +89,7 @@
 
 	pageTraining = new PageTraining();
 	Pages->addWidget(pageTraining);
+
+	pageSelectWeapon = new PageSelectWeapon();
+	Pages->addWidget(pageSelectWeapon);
 }
diff -r 7c7b90c402d3 -r f6e5f4e122db QTfrontend/ui_hwform.h
--- a/QTfrontend/ui_hwform.h	Tue Sep 18 18:53:54 2007 +0000
+++ b/QTfrontend/ui_hwform.h	Tue Sep 18 19:52:46 2007 +0000
@@ -32,6 +32,7 @@
 class PageGameStats;
 class PageSinglePlayer;
 class PageTraining;
+class PageSelectWeapon;
 class QStackedLayout;
 class QFont;
 class QWidget;
@@ -55,6 +56,7 @@
 	PageGameStats *pageGameStats;
 	PageSinglePlayer *pageSinglePlayer;
 	PageTraining *pageTraining;
+	PageSelectWeapon *pageSelectWeapon;
 
 	QStackedLayout *Pages;
 	QFont *font14;
diff -r 7c7b90c402d3 -r f6e5f4e122db hedgewars.kdevelop
--- a/hedgewars.kdevelop	Tue Sep 18 18:53:54 2007 +0000
+++ b/hedgewars.kdevelop	Tue Sep 18 19:52:46 2007 +0000
@@ -8,10 +8,20 @@
     <primarylanguage>C++</primarylanguage>
     <ignoreparts/>
     <projectname>hedgewars</projectname>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description></description>
+    <versioncontrol>kdevsubversion</versioncontrol>
   </general>
   <kdevcustomproject>
     <run>
       <directoryradio>executable</directoryradio>
+      <customdirectory>/</customdirectory>
+      <mainprogram>bin/hedgewars</mainprogram>
+      <programargs></programargs>
+      <terminal>false</terminal>
+      <autocompile>true</autocompile>
+      <envvars/>
     </run>
     <filetypes>
       <filetype>*.java</filetype>
@@ -135,11 +145,44 @@
       <path>share/hedgewars/Makefile</path>
       <path>share/Makefile</path>
     </blacklist>
+    <general>
+      <activedir/>
+    </general>
+    <build>
+      <buildtool>make</buildtool>
+      <builddir></builddir>
+    </build>
+    <make>
+      <abortonerror>false</abortonerror>
+      <numberofjobs>1</numberofjobs>
+      <prio>0</prio>
+      <dontact>false</dontact>
+      <makebin></makebin>
+      <defaulttarget></defaulttarget>
+      <makeoptions></makeoptions>
+      <selectedenvironment>default</selectedenvironment>
+      <environments>
+        <default/>
+      </environments>
+    </make>
   </kdevcustomproject>
   <kdevdebugger>
     <general>
-      <dbgshell/>
+      <dbgshell></dbgshell>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
     </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
   </kdevdebugger>
   <kdevdoctreeview>
     <ignoretocs>
@@ -198,7 +241,7 @@
   <kdevcppsupport>
     <qt>
       <used>false</used>
-      <version>3</version>
+      <version>4</version>
       <includestyle>3</includestyle>
       <root>/usr/qt/3</root>
       <designerintegration>EmbeddedKDevDesigner</designerintegration>
@@ -229,7 +272,19 @@
       <usePermanentCaching>true</usePermanentCaching>
       <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
       <includePaths>.;</includePaths>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
     </codecompletion>
+    <creategettersetter>
+      <prefixGet></prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
   </kdevcppsupport>
   <kdevfileview>
     <groups>
@@ -239,6 +294,24 @@
     <tree>
       <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <hidenonprojectfiles>true</hidenonprojectfiles>
+      <showvcsfields>false</showvcsfields>
     </tree>
   </kdevfileview>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem></docsystem>
+      <docurl></docurl>
+      <usermanualurl></usermanualurl>
+    </projectdoc>
+  </kdevdocumentation>
+  <ctagspart>
+    <customArguments/>
+    <customTagfilePath/>
+  </ctagspart>
 </kdevelop>