# 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 @@ + + + + Igor Ulyanov + disinbox@gmail.com + 1 + KDevCustomProject + C++ + + hedgewars + + + + executable + + + *.java + *.h + *.H + *.hh + *.hxx + *.hpp + *.c + *.C + *.cc + *.cpp + *.c++ + *.cxx + Makefile + CMakeLists.txt + + + bin + bin/CMakeLists.txt + bin/Makefile + hedgewars/Makefile + hedgewars/test.c + QTfrontend/moc_about.cxx + QTfrontend/moc_chatwidget.cxx + QTfrontend/moc_fpsedit.cxx + QTfrontend/moc_frameTeam.cxx + QTfrontend/moc_gamecfgwidget.cxx + QTfrontend/moc_game.cxx + QTfrontend/moc_gameuiconfig.cxx + QTfrontend/moc_hedgehogerWidget.cxx + QTfrontend/moc_hwform.cxx + QTfrontend/moc_hwmap.cxx + QTfrontend/moc_mapContainer.cxx + QTfrontend/moc_netclient.cpp + QTfrontend/moc_netconnectedclient.cxx + QTfrontend/moc_netserver.cxx + QTfrontend/moc_netudpserver.cxx + QTfrontend/moc_netudpwidget.cxx + QTfrontend/moc_newnetclient.cxx + QTfrontend/moc_pages.cxx + QTfrontend/moc_playrecordpage.cxx + QTfrontend/moc_proto.cxx + QTfrontend/moc_SDLs.cxx + QTfrontend/moc_selectWeapon.cxx + QTfrontend/moc_SquareLabel.cxx + QTfrontend/moc_tcpBase.cxx + QTfrontend/moc_teamselect.cxx + QTfrontend/moc_teamselhelper.cxx + QTfrontend/moc_vertScrollArea.cxx + QTfrontend/qrc_hedgewars.cxx + share + share/CMakeLists.txt + share/hedgewars + share/hedgewars/CMakeLists.txt + share/hedgewars/Data + share/hedgewars/Data/CMakeLists.txt + share/hedgewars/Data/Fonts + share/hedgewars/Data/Fonts/CMakeLists.txt + share/hedgewars/Data/Fonts/Makefile + share/hedgewars/Data/Forts + share/hedgewars/Data/Forts/CMakeLists.txt + share/hedgewars/Data/Forts/Makefile + share/hedgewars/Data/Graphics + share/hedgewars/Data/Graphics/AmmoMenu + share/hedgewars/Data/Graphics/AmmoMenu/CMakeLists.txt + share/hedgewars/Data/Graphics/AmmoMenu/Makefile + share/hedgewars/Data/Graphics/CMakeLists.txt + share/hedgewars/Data/Graphics/Graves + share/hedgewars/Data/Graphics/Graves/CMakeLists.txt + share/hedgewars/Data/Graphics/Graves/Makefile + share/hedgewars/Data/Graphics/Makefile + share/hedgewars/Data/Locale + share/hedgewars/Data/Locale/CMakeLists.txt + share/hedgewars/Data/Locale/Makefile + share/hedgewars/Data/Makefile + share/hedgewars/Data/Maps + share/hedgewars/Data/Maps/cheese + share/hedgewars/Data/Maps/cheese/CMakeLists.txt + share/hedgewars/Data/Maps/cheese/Makefile + share/hedgewars/Data/Maps/CMakeLists.txt + share/hedgewars/Data/Maps/Makefile + share/hedgewars/Data/Maps/mushrooms + share/hedgewars/Data/Maps/mushrooms/CMakeLists.txt + share/hedgewars/Data/Maps/mushrooms/Makefile + share/hedgewars/Data/Music + share/hedgewars/Data/Music/CMakeLists.txt + share/hedgewars/Data/Music/Makefile + share/hedgewars/Data/Sounds + share/hedgewars/Data/Sounds/CMakeLists.txt + share/hedgewars/Data/Sounds/Makefile + share/hedgewars/Data/Themes + share/hedgewars/Data/Themes/avematan + share/hedgewars/Data/Themes/avematan/CMakeLists.txt + share/hedgewars/Data/Themes/avematan/Makefile + share/hedgewars/Data/Themes/bubbles + share/hedgewars/Data/Themes/bubbles/CMakeLists.txt + share/hedgewars/Data/Themes/bubbles/Makefile + share/hedgewars/Data/Themes/cheese + share/hedgewars/Data/Themes/cheese/CMakeLists.txt + share/hedgewars/Data/Themes/cheese/Makefile + share/hedgewars/Data/Themes/CMakeLists.txt + share/hedgewars/Data/Themes/ethereal + share/hedgewars/Data/Themes/ethereal/Makefile + share/hedgewars/Data/Themes/Makefile + share/hedgewars/Data/Themes/norsk + share/hedgewars/Data/Themes/norsk/CMakeLists.txt + share/hedgewars/Data/Themes/norsk/Makefile + share/hedgewars/Data/Themes/steel + share/hedgewars/Data/Themes/steel/CMakeLists.txt + share/hedgewars/Data/Themes/steel/Makefile + share/hedgewars/Data/Themes/tibet + share/hedgewars/Data/Themes/tibet/CMakeLists.txt + share/hedgewars/Data/Themes/tibet/Makefile + share/hedgewars/Data/Themes/wood + share/hedgewars/Data/Themes/wood/CMakeLists.txt + share/hedgewars/Data/Themes/wood/Makefile + share/hedgewars/Data/Themes/xtheme + share/hedgewars/Data/Themes/xtheme/CMakeLists.txt + share/hedgewars/Data/Themes/xtheme/Makefile + share/hedgewars/Makefile + share/Makefile + + + + + + + + + + ada + ada_bugs_gcc + bash + bash_bugs + clanlib + fortran_bugs_gcc + gnome1 + gnustep + gtk + gtk_bugs + haskell + haskell_bugs_ghc + java_bugs_gcc + java_bugs_sun + kde2book + opengl + pascal_bugs_fp + php + php_bugs + perl + perl_bugs + python + python_bugs + qt-kdev3 + ruby + ruby_bugs + sdl + sw + w3c-dom-level2-html + w3c-svg + w3c-uaag10 + wxwidgets_bugs + + + Guide to the Qt Translation Tools + Qt Assistant Manual + Qt Designer Manual + Qt Reference Documentation + qmake User Guide + + + KDE Libraries (Doxygen) + + + + + + + + + + + + + false + 3 + 3 + /usr/qt/3 + EmbeddedKDevDesigner + /usr/qt/3/bin/qmake + /usr/qt/3/bin/designer + + + + + false + true + true + 250 + 400 + 250 + false + 0 + true + true + false + std=_GLIBCXX_STD;__gnu_cxx=std + true + false + false + false + false + true + true + false + .; + + + + + false + false + + + *.o,*.lo,CVS + true + + +