--- a/QTfrontend/pages.cpp Mon Jan 07 13:09:10 2008 +0000
+++ b/QTfrontend/pages.cpp Mon Jan 07 15:44:13 2008 +0000
@@ -308,7 +308,7 @@
AGGroupBox = new QGroupBox(this);
AGGroupBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
AGGroupBox->setTitle(QGroupBox::tr("Audio/Graphic options"));
- pageLayout->addWidget(AGGroupBox, 1, 1);
+ pageLayout->addWidget(AGGroupBox, 2, 1);
QVBoxLayout * GBAlayout = new QVBoxLayout(AGGroupBox);
QHBoxLayout * GBAreslayout = new QHBoxLayout(0);
@@ -351,12 +351,21 @@
BtnBack = addButton("Back", pageLayout, 4, 0);
- WeaponsButt = addButton("Weapons scheme", pageLayout, 1, 0);
+ QGroupBox* groupWeapons = new QGroupBox(this);
+ groupWeapons->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ groupWeapons->setTitle(QGroupBox::tr("Weapons"));
+ pageLayout->addWidget(groupWeapons, 1, 0, 1, 3);
+ QGridLayout * WeaponsLayout = new QGridLayout(groupWeapons);
+
+ WeaponsButt = addButton("Weapons scheme", WeaponsLayout, 0, 0);
+ WeaponsName = new QComboBox(this);
+ WeaponsLayout->addWidget(WeaponsName, 0, 1);
+ WeaponEdit = addButton("Edit", WeaponsLayout, 0, 2);
NNGroupBox = new QGroupBox(this);
NNGroupBox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
NNGroupBox->setTitle(QGroupBox::tr("Net options"));
- pageLayout->addWidget(NNGroupBox, 1, 2);
+ pageLayout->addWidget(NNGroupBox, 2, 2);
QGridLayout * GBNlayout = new QGridLayout(NNGroupBox);
labelNN = new QLabel(NNGroupBox);
--- a/QTfrontend/pages.h Mon Jan 07 13:09:10 2008 +0000
+++ b/QTfrontend/pages.h Mon Jan 07 15:44:13 2008 +0000
@@ -174,6 +174,9 @@
PageOptions(QWidget* parent = 0);
QPushButton* WeaponsButt;
+ QPushButton* WeaponEdit;
+ QComboBox* WeaponsName;
+
QPushButton *BtnBack;
QGroupBox *groupBox;
QPushButton *BtnNewTeam;
--- a/hedgewars.kdevelop Mon Jan 07 13:09:10 2008 +0000
+++ b/hedgewars.kdevelop Mon Jan 07 15:44:13 2008 +0000
@@ -18,20 +18,20 @@
<projectname>hedgewars</projectname>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
- <description></description>
+ <description/>
<versioncontrol>kdevsubversion</versioncontrol>
- <defaultencoding></defaultencoding>
+ <defaultencoding/>
</general>
<kdevcustomproject>
<run>
<directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
<mainprogram>bin/hedgewars</mainprogram>
- <programargs></programargs>
+ <programargs/>
<terminal>false</terminal>
<autocompile>true</autocompile>
<envvars/>
- <globaldebugarguments></globaldebugarguments>
+ <globaldebugarguments/>
<globalcwd></globalcwd>
<useglobalprogram>false</useglobalprogram>
<autoinstall>false</autoinstall>
@@ -172,16 +172,16 @@
</general>
<build>
<buildtool>make</buildtool>
- <builddir></builddir>
+ <builddir/>
</build>
<make>
<abortonerror>true</abortonerror>
<numberofjobs>1</numberofjobs>
<prio>0</prio>
<dontact>false</dontact>
- <makebin></makebin>
- <defaulttarget></defaulttarget>
- <makeoptions></makeoptions>
+ <makebin/>
+ <defaulttarget/>
+ <makeoptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -189,9 +189,9 @@
</make>
<other>
<prio>0</prio>
- <otherbin></otherbin>
- <defaulttarget></defaulttarget>
- <otheroptions></otheroptions>
+ <otherbin/>
+ <defaulttarget/>
+ <otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
@@ -200,12 +200,12 @@
</kdevcustomproject>
<kdevdebugger>
<general>
- <dbgshell></dbgshell>
+ <dbgshell/>
<programargs/>
- <gdbpath></gdbpath>
- <configGdbScript></configGdbScript>
- <runShellScript></runShellScript>
- <runGdbScript></runGdbScript>
+ <gdbpath/>
+ <configGdbScript/>
+ <runShellScript/>
+ <runGdbScript/>
<breakonloadinglibs>true</breakonloadinglibs>
<separatetty>false</separatetty>
<floatingtoolbar>false</floatingtoolbar>
@@ -311,7 +311,7 @@
<includeTypedefs>false</includeTypedefs>
</codecompletion>
<creategettersetter>
- <prefixGet></prefixGet>
+ <prefixGet/>
<prefixSet>set</prefixSet>
<prefixVariable>m_,_</prefixVariable>
<parameterName>theValue</parameterName>