# HG changeset patch
# User displacer
# Date 1190140671 0
# Node ID ec5f057ab2681295f245f4d4b6dd6ce80c6a6229
# Parent 38bdde6a54c1bd6f41ad8dc00f1ddaeb1b2848ae
kdevelop project add, initial weapons scheme button
diff -r 38bdde6a54c1 -r ec5f057ab268 QTfrontend/CMakeLists.txt
--- a/QTfrontend/CMakeLists.txt Tue Sep 18 18:24:02 2007 +0000
+++ b/QTfrontend/CMakeLists.txt Tue Sep 18 18:37:51 2007 +0000
@@ -66,7 +66,8 @@
binds.cpp
SDLs.cpp
playrecordpage.cpp
- hwconsts.cpp)
+ hwconsts.cpp
+ selectWeapon.cpp)
if (WIN32)
set(hwfr_src ${hwfr_src} res/hedgewars.rc)
@@ -97,7 +98,8 @@
netudpwidget.h
chatwidget.h
SDLs.h
- playrecordpage.h)
+ playrecordpage.h
+ selectWeapon.h)
set(hwfr_hdrs
binds.h
diff -r 38bdde6a54c1 -r ec5f057ab268 QTfrontend/hedgewars.pro
--- a/QTfrontend/hedgewars.pro Tue Sep 18 18:24:02 2007 +0000
+++ b/QTfrontend/hedgewars.pro Tue Sep 18 18:37:51 2007 +0000
@@ -41,7 +41,8 @@
chatwidget.h \
SDLs.h \
playrecordpage.h \
- hwconsts.h
+ hwconsts.h \
+ selectWeapon.h
SOURCES += binds.cpp \
@@ -73,7 +74,8 @@
chatwidget.cpp \
SDLs.cpp \
playrecordpage.cpp \
- hwconsts.cpp
+ hwconsts.cpp \
+ selectWeapon.cpp
TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_ru.ts
diff -r 38bdde6a54c1 -r ec5f057ab268 QTfrontend/hwform.cpp
--- a/QTfrontend/hwform.cpp Tue Sep 18 18:24:02 2007 +0000
+++ b/QTfrontend/hwform.cpp Tue Sep 18 18:37:51 2007 +0000
@@ -44,6 +44,7 @@
#include "netudpwidget.h"
#include "chatwidget.h"
#include "playrecordpage.h"
+#include "selectWeapon.h"
HWForm::HWForm(QWidget *parent)
: QMainWindow(parent), pnetserver(0), pUdpServer(0), editedTeam(0)
@@ -85,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()));
+ // TODO
connect(ui.pageNet->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
connect(ui.pageNet->BtnNetConnect, SIGNAL(clicked()), this, SLOT(NetConnect()));
diff -r 38bdde6a54c1 -r ec5f057ab268 QTfrontend/pages.cpp
--- a/QTfrontend/pages.cpp Tue Sep 18 18:24:02 2007 +0000
+++ b/QTfrontend/pages.cpp Tue Sep 18 18:37:51 2007 +0000
@@ -395,6 +395,12 @@
BtnBack->setFont(*font14);
BtnBack->setText(QPushButton::tr("Back"));
pageLayout->addWidget(BtnBack, 4, 0);
+
+ WeaponsButt = new QPushButton(this);
+ WeaponsButt->setFont(*font14);
+ WeaponsButt->setText(QPushButton::tr("Weapons scheme"));
+ pageLayout->addWidget(WeaponsButt, 1, 0);
+
}
PageNet::PageNet(QWidget* parent) : QWidget(parent)
diff -r 38bdde6a54c1 -r ec5f057ab268 QTfrontend/pages.h
--- a/QTfrontend/pages.h Tue Sep 18 18:24:02 2007 +0000
+++ b/QTfrontend/pages.h Tue Sep 18 18:37:51 2007 +0000
@@ -130,6 +130,7 @@
public:
PageOptions(QWidget* parent = 0);
+ QPushButton* WeaponsButt;
QPushButton *BtnBack;
QGroupBox *groupBox;
QPushButton *BtnNewTeam;
diff -r 38bdde6a54c1 -r ec5f057ab268 hedgewars.kdevelop
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hedgewars.kdevelop Tue Sep 18 18:37:51 2007 +0000
@@ -0,0 +1,244 @@
+<?xml version = '1.0'?>
+<kdevelop>
+ <general>
+ <author>Igor Ulyanov</author>
+ <email>disinbox@gmail.com</email>
+ <version>1</version>
+ <projectmanagement>KDevCustomProject</projectmanagement>
+ <primarylanguage>C++</primarylanguage>
+ <ignoreparts/>
+ <projectname>hedgewars</projectname>
+ </general>
+ <kdevcustomproject>
+ <run>
+ <directoryradio>executable</directoryradio>
+ </run>
+ <filetypes>
+ <filetype>*.java</filetype>
+ <filetype>*.h</filetype>
+ <filetype>*.H</filetype>
+ <filetype>*.hh</filetype>
+ <filetype>*.hxx</filetype>
+ <filetype>*.hpp</filetype>
+ <filetype>*.c</filetype>
+ <filetype>*.C</filetype>
+ <filetype>*.cc</filetype>
+ <filetype>*.cpp</filetype>
+ <filetype>*.c++</filetype>
+ <filetype>*.cxx</filetype>
+ <filetype>Makefile</filetype>
+ <filetype>CMakeLists.txt</filetype>
+ </filetypes>
+ <blacklist>
+ <path>bin</path>
+ <path>bin/CMakeLists.txt</path>
+ <path>bin/Makefile</path>
+ <path>hedgewars/Makefile</path>
+ <path>hedgewars/test.c</path>
+ <path>QTfrontend/moc_about.cxx</path>
+ <path>QTfrontend/moc_chatwidget.cxx</path>
+ <path>QTfrontend/moc_fpsedit.cxx</path>
+ <path>QTfrontend/moc_frameTeam.cxx</path>
+ <path>QTfrontend/moc_gamecfgwidget.cxx</path>
+ <path>QTfrontend/moc_game.cxx</path>
+ <path>QTfrontend/moc_gameuiconfig.cxx</path>
+ <path>QTfrontend/moc_hedgehogerWidget.cxx</path>
+ <path>QTfrontend/moc_hwform.cxx</path>
+ <path>QTfrontend/moc_hwmap.cxx</path>
+ <path>QTfrontend/moc_mapContainer.cxx</path>
+ <path>QTfrontend/moc_netclient.cpp</path>
+ <path>QTfrontend/moc_netconnectedclient.cxx</path>
+ <path>QTfrontend/moc_netserver.cxx</path>
+ <path>QTfrontend/moc_netudpserver.cxx</path>
+ <path>QTfrontend/moc_netudpwidget.cxx</path>
+ <path>QTfrontend/moc_newnetclient.cxx</path>
+ <path>QTfrontend/moc_pages.cxx</path>
+ <path>QTfrontend/moc_playrecordpage.cxx</path>
+ <path>QTfrontend/moc_proto.cxx</path>
+ <path>QTfrontend/moc_SDLs.cxx</path>
+ <path>QTfrontend/moc_selectWeapon.cxx</path>
+ <path>QTfrontend/moc_SquareLabel.cxx</path>
+ <path>QTfrontend/moc_tcpBase.cxx</path>
+ <path>QTfrontend/moc_teamselect.cxx</path>
+ <path>QTfrontend/moc_teamselhelper.cxx</path>
+ <path>QTfrontend/moc_vertScrollArea.cxx</path>
+ <path>QTfrontend/qrc_hedgewars.cxx</path>
+ <path>share</path>
+ <path>share/CMakeLists.txt</path>
+ <path>share/hedgewars</path>
+ <path>share/hedgewars/CMakeLists.txt</path>
+ <path>share/hedgewars/Data</path>
+ <path>share/hedgewars/Data/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Fonts</path>
+ <path>share/hedgewars/Data/Fonts/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Fonts/Makefile</path>
+ <path>share/hedgewars/Data/Forts</path>
+ <path>share/hedgewars/Data/Forts/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Forts/Makefile</path>
+ <path>share/hedgewars/Data/Graphics</path>
+ <path>share/hedgewars/Data/Graphics/AmmoMenu</path>
+ <path>share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Graphics/AmmoMenu/Makefile</path>
+ <path>share/hedgewars/Data/Graphics/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Graphics/Graves</path>
+ <path>share/hedgewars/Data/Graphics/Graves/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Graphics/Graves/Makefile</path>
+ <path>share/hedgewars/Data/Graphics/Makefile</path>
+ <path>share/hedgewars/Data/Locale</path>
+ <path>share/hedgewars/Data/Locale/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Locale/Makefile</path>
+ <path>share/hedgewars/Data/Makefile</path>
+ <path>share/hedgewars/Data/Maps</path>
+ <path>share/hedgewars/Data/Maps/cheese</path>
+ <path>share/hedgewars/Data/Maps/cheese/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Maps/cheese/Makefile</path>
+ <path>share/hedgewars/Data/Maps/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Maps/Makefile</path>
+ <path>share/hedgewars/Data/Maps/mushrooms</path>
+ <path>share/hedgewars/Data/Maps/mushrooms/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Maps/mushrooms/Makefile</path>
+ <path>share/hedgewars/Data/Music</path>
+ <path>share/hedgewars/Data/Music/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Music/Makefile</path>
+ <path>share/hedgewars/Data/Sounds</path>
+ <path>share/hedgewars/Data/Sounds/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Sounds/Makefile</path>
+ <path>share/hedgewars/Data/Themes</path>
+ <path>share/hedgewars/Data/Themes/avematan</path>
+ <path>share/hedgewars/Data/Themes/avematan/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/avematan/Makefile</path>
+ <path>share/hedgewars/Data/Themes/bubbles</path>
+ <path>share/hedgewars/Data/Themes/bubbles/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/bubbles/Makefile</path>
+ <path>share/hedgewars/Data/Themes/cheese</path>
+ <path>share/hedgewars/Data/Themes/cheese/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/cheese/Makefile</path>
+ <path>share/hedgewars/Data/Themes/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/ethereal</path>
+ <path>share/hedgewars/Data/Themes/ethereal/Makefile</path>
+ <path>share/hedgewars/Data/Themes/Makefile</path>
+ <path>share/hedgewars/Data/Themes/norsk</path>
+ <path>share/hedgewars/Data/Themes/norsk/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/norsk/Makefile</path>
+ <path>share/hedgewars/Data/Themes/steel</path>
+ <path>share/hedgewars/Data/Themes/steel/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/steel/Makefile</path>
+ <path>share/hedgewars/Data/Themes/tibet</path>
+ <path>share/hedgewars/Data/Themes/tibet/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/tibet/Makefile</path>
+ <path>share/hedgewars/Data/Themes/wood</path>
+ <path>share/hedgewars/Data/Themes/wood/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/wood/Makefile</path>
+ <path>share/hedgewars/Data/Themes/xtheme</path>
+ <path>share/hedgewars/Data/Themes/xtheme/CMakeLists.txt</path>
+ <path>share/hedgewars/Data/Themes/xtheme/Makefile</path>
+ <path>share/hedgewars/Makefile</path>
+ <path>share/Makefile</path>
+ </blacklist>
+ </kdevcustomproject>
+ <kdevdebugger>
+ <general>
+ <dbgshell/>
+ </general>
+ </kdevdebugger>
+ <kdevdoctreeview>
+ <ignoretocs>
+ <toc>ada</toc>
+ <toc>ada_bugs_gcc</toc>
+ <toc>bash</toc>
+ <toc>bash_bugs</toc>
+ <toc>clanlib</toc>
+ <toc>fortran_bugs_gcc</toc>
+ <toc>gnome1</toc>
+ <toc>gnustep</toc>
+ <toc>gtk</toc>
+ <toc>gtk_bugs</toc>
+ <toc>haskell</toc>
+ <toc>haskell_bugs_ghc</toc>
+ <toc>java_bugs_gcc</toc>
+ <toc>java_bugs_sun</toc>
+ <toc>kde2book</toc>
+ <toc>opengl</toc>
+ <toc>pascal_bugs_fp</toc>
+ <toc>php</toc>
+ <toc>php_bugs</toc>
+ <toc>perl</toc>
+ <toc>perl_bugs</toc>
+ <toc>python</toc>
+ <toc>python_bugs</toc>
+ <toc>qt-kdev3</toc>
+ <toc>ruby</toc>
+ <toc>ruby_bugs</toc>
+ <toc>sdl</toc>
+ <toc>sw</toc>
+ <toc>w3c-dom-level2-html</toc>
+ <toc>w3c-svg</toc>
+ <toc>w3c-uaag10</toc>
+ <toc>wxwidgets_bugs</toc>
+ </ignoretocs>
+ <ignoreqt_xml>
+ <toc>Guide to the Qt Translation Tools</toc>
+ <toc>Qt Assistant Manual</toc>
+ <toc>Qt Designer Manual</toc>
+ <toc>Qt Reference Documentation</toc>
+ <toc>qmake User Guide</toc>
+ </ignoreqt_xml>
+ <ignoredoxygen>
+ <toc>KDE Libraries (Doxygen)</toc>
+ </ignoredoxygen>
+ </kdevdoctreeview>
+ <kdevfilecreate>
+ <filetypes/>
+ <useglobaltypes>
+ <type ext="ui" />
+ <type ext="cpp" />
+ <type ext="h" />
+ </useglobaltypes>
+ </kdevfilecreate>
+ <kdevcppsupport>
+ <qt>
+ <used>false</used>
+ <version>3</version>
+ <includestyle>3</includestyle>
+ <root>/usr/qt/3</root>
+ <designerintegration>EmbeddedKDevDesigner</designerintegration>
+ <qmake>/usr/qt/3/bin/qmake</qmake>
+ <designer>/usr/qt/3/bin/designer</designer>
+ <designerpluginpaths/>
+ </qt>
+ <references/>
+ <codecompletion>
+ <automaticCodeCompletion>false</automaticCodeCompletion>
+ <automaticArgumentsHint>true</automaticArgumentsHint>
+ <automaticHeaderCompletion>true</automaticHeaderCompletion>
+ <codeCompletionDelay>250</codeCompletionDelay>
+ <argumentsHintDelay>400</argumentsHintDelay>
+ <headerCompletionDelay>250</headerCompletionDelay>
+ <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
+ <completionBoxItemOrder>0</completionBoxItemOrder>
+ <howEvaluationContextMenu>true</howEvaluationContextMenu>
+ <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
+ <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
+ <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
+ <processPrimaryTypes>true</processPrimaryTypes>
+ <processFunctionArguments>false</processFunctionArguments>
+ <preProcessAllHeaders>false</preProcessAllHeaders>
+ <parseMissingHeadersExperimental>false</parseMissingHeadersExperimental>
+ <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
+ <alwaysParseInBackground>true</alwaysParseInBackground>
+ <usePermanentCaching>true</usePermanentCaching>
+ <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+ <includePaths>.;</includePaths>
+ </codecompletion>
+ </kdevcppsupport>
+ <kdevfileview>
+ <groups>
+ <hidenonprojectfiles>false</hidenonprojectfiles>
+ <hidenonlocation>false</hidenonlocation>
+ </groups>
+ <tree>
+ <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+ <hidenonprojectfiles>true</hidenonprojectfiles>
+ </tree>
+ </kdevfileview>
+</kdevelop>