sheepy-clone: QTfrontend/hwform.cpp@9541b2a76067 (annotated)

184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1	/*
1066 1f1b3686a2b0 Update copyright headers a bit unc0rr parents: 989 diff changeset	2	* Hedgewars, a free turn based strategy game
3236 4ab3917d7d44 Update (c) lines to 2010 as unc0rr requested - they all had varying values so I just took the first year mentioned, then tacked on -2010 nemo parents: 3159 diff changeset	3	* Copyright (c) 2005-2010 Andrey Korotaev <unC0Rr@gmail.com>
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	4	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	5	* This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	6	* it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	7	* the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	8	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	9	* This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	12	* GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	13	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	14	* You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	15	* along with this program; if not, write to the Free Software
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	16	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	17	*/
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	18
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	19	#include <QFile>
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	20	#include <QTextStream>
407 c7890ba9ed6e lost connection to server warning message displacer parents: 383 diff changeset	21	#include <QMessageBox>
502 bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	22	#include <QPushButton>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	23	#include <QListWidget>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	24	#include <QStackedLayout>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	25	#include <QLineEdit>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	26	#include <QLabel>
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	27	#include <QRadioButton>
654 1019b8fa8638 Finish asking host/port dialog implementation unc0rr parents: 653 diff changeset	28	#include <QSpinBox>
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	29	#include <QCloseEvent>
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	30	#include <QCheckBox>
1377 a9e768739345 - Customize QTextBrowser look unc0rr parents: 1376 diff changeset	31	#include <QTextBrowser>
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	32	#include <QAction>
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	33	#include <QTimer>
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	34	#include <QScrollBar>
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	35	#include <QDataWidgetMapper>
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	36	#include <QTableView>
2874 3c7c2bf1ba38 A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature. nemo parents: 2845 diff changeset	37	#include <QCryptographicHash>
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	38	#include <QSignalMapper>
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	39
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	40	#include "hwform.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	41	#include "game.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	42	#include "team.h"
1907 a104432e8301 Random team generator rework by ttsmj unc0rr parents: 1905 diff changeset	43	#include "namegen.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	44	#include "teamselect.h"
681 7a20c50988ec working weapons select displacer parents: 674 diff changeset	45	#include "selectWeapon.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	46	#include "gameuiconfig.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	47	#include "pages.h"
1621 d1ded2532d3f - svn maintenance unc0rr parents: 1600 diff changeset	48	#include "statsPage.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	49	#include "hwconsts.h"
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	50	#include "newnetclient.h"
329 4c3aad46baa5 Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes unc0rr parents: 328 diff changeset	51	#include "gamecfgwidget.h"
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	52	#include "netserverslist.h"
634 b9db5ff5cfdb Fix some bugs unc0rr parents: 632 diff changeset	53	#include "netudpserver.h"
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	54	#include "chatwidget.h"
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	55	#include "playrecordpage.h"
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	56	#include "input_ip.h"
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	57	#include "ammoSchemeModel.h"
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	58	#include "bgwidget.h"
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	59	#include "xfire.h"
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	60	#include "drawmapwidget.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	61
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	62	#ifdef __APPLE__
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	63	#include "CocoaInitializer.h"
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	64	#include "M3Panel.h"
2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	65	#ifdef SPARKLE_ENABLED
2511 446aac3c05a4 update appcast link koda parents: 2468 diff changeset	66	#define SPARKLE_APPCAST_URL "http://www.hedgewars.org/download/appcast.xml"
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	67	#include "SparkleAutoUpdater.h"
57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	68	#endif
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	69	#endif
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	70
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	71	// I started handing this down to each place it touches, but it was getting ridiculous
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	72	// and this one flag does not warrant a static class
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	73	bool frontendEffects = true;
2874 3c7c2bf1ba38 A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature. nemo parents: 2845 diff changeset	74	QString playerHash;
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	75
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	76	HWForm::HWForm(QWidget *parent)
637 8fa7ed5e13bd Fix bad behavior when quickly click Connect button more than once unc0rr parents: 636 diff changeset	77	: QMainWindow(parent), pnetserver(0), pRegisterServer(0), editedTeam(0), hwnet(0)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	78	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	79	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	80	xfire_init();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	81	#endif
4429 f9a949ef955b add null check nemo parents: 4428 diff changeset	82	game = NULL;
2773 e94f240a8a41 Have game beep when someone joins lobby/room. Controlled by Sound option nemo parents: 2742 diff changeset	83	gameSettings = new QSettings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat);
3019 d6e19f35d98d Frontend: smxx parents: 2948 diff changeset	84	frontendEffects = gameSettings->value("frontend/effects", true).toBool();
2874 3c7c2bf1ba38 A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature. nemo parents: 2845 diff changeset	85	playerHash = QString(QCryptographicHash::hash(gameSettings->value("net/nick","").toString().toLatin1(), QCryptographicHash::Md5).toHex());
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	86
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	87	ui.setupUi(this);
3284 7ffd0e20ad08 Palewolf: sheepluva parents: 3283 diff changeset	88	setMinimumSize(760, 580);
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	89	setFocusPolicy(Qt::StrongFocus);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	90	CustomizePalettes();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	91
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	92	ui.pageOptions->CBResolution->addItems(sdli.getResolutions());
1225 f882a92ef872 Play music in menu also, with fading effects when run game unc0rr parents: 1223 diff changeset	93
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	94	config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini");
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	95
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	96	namegen = new HWNamegen();
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	97
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	98	#ifdef __APPLE__
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	99	panel = new M3Panel;
2395 d01d3bf3e1de makes the updater optional at compile time koda parents: 2392 diff changeset	100	#ifdef SPARKLE_ENABLED
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	101	AutoUpdater* updater;
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	102	CocoaInitializer initializer;
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	103	updater = new SparkleAutoUpdater(SPARKLE_APPCAST_URL);
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	104	if (updater && config->isAutoUpdateEnabled())
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	105	updater->checkForUpdates();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	106	#endif
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	107	#endif
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	108
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	109	UpdateTeamsLists();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	110	UpdateCampaignPage(0);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	111	UpdateWeapons();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	112
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	113	pageSwitchMapper = new QSignalMapper(this);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	114	connect(pageSwitchMapper, SIGNAL(mapped(int)), this, SLOT(GoToPage(int)));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	115
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	116	connect(config, SIGNAL(frontendFullscreen(bool)), this, SLOT(onFrontendFullscreen(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	117	onFrontendFullscreen(config->isFrontendFullscreen());
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	118
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	119	connect(ui.pageMain->BtnSinglePlayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	120	pageSwitchMapper->setMapping(ui.pageMain->BtnSinglePlayer, ID_PAGE_SINGLEPLAYER);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	121
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	122	connect(ui.pageMain->BtnSetup, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	123	pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	124
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	125	connect(ui.pageMain->BtnNet, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	126	pageSwitchMapper->setMapping(ui.pageMain->BtnNet, ID_PAGE_NETTYPE);
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	127	connect(ui.pageMain->BtnInfo, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	128	pageSwitchMapper->setMapping(ui.pageMain->BtnInfo, ID_PAGE_INFO);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	129
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	130	connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	131	connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	132
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	133	connect(ui.pageEditTeam->BtnTeamSave, SIGNAL(clicked()), this, SLOT(TeamSave()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	134	connect(ui.pageEditTeam->BtnTeamDiscard, SIGNAL(clicked()), this, SLOT(TeamDiscard()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	135
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	136	connect(ui.pageEditTeam->signalMapper, SIGNAL(mapped(const int &)), this, SLOT(RandomName(const int &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	137	connect(ui.pageEditTeam->randTeamButton, SIGNAL(clicked()), this, SLOT(RandomNames()));
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	138
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	139	connect(ui.pageMultiplayer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	140	connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	141	connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	142	ui.pageMultiplayer->BtnStartMPGame, SLOT(setEnabled(bool)));
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	143	connect(ui.pageMultiplayer, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup()));
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	144	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToSchemes(int)), this, SLOT(GoToScheme(int)));
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	145	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToWeapons(int)), this, SLOT(GoToSelectWeaponSet(int)));
4511 df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	146	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	147	pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP);
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	148
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	149
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	150	connect(ui.pagePlayDemo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	151	connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	152	connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	153
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	154	connect(ui.pageOptions->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	155	connect(ui.pageOptions->BtnNewTeam, SIGNAL(clicked()), this, SLOT(NewTeam()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	156	connect(ui.pageOptions->BtnEditTeam, SIGNAL(clicked()), this, SLOT(EditTeam()));
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	157	connect(ui.pageOptions->BtnDeleteTeam, SIGNAL(clicked()), this, SLOT(DeleteTeam()));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	158	connect(ui.pageOptions->BtnSaveOptions, SIGNAL(clicked()), config, SLOT(SaveOptions()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	159	connect(ui.pageOptions->BtnSaveOptions, SIGNAL(clicked()), this, SLOT(GoBack()));
4232 3a7862405c36 tweak interface, there is no need to manually add new weapons and schemes to the filter list koda parents: 4091 diff changeset	160	#ifndef __APPLE__
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	161	connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles()));
4232 3a7862405c36 tweak interface, there is no need to manually add new weapons and schemes to the filter list koda parents: 4091 diff changeset	162	#endif
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	163
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	164	connect(ui.pageOptions->WeaponEdit, SIGNAL(clicked()), this, SLOT(GoToSelectWeapon()));
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	165	connect(ui.pageOptions->WeaponNew, SIGNAL(clicked()), this, SLOT(GoToSelectNewWeapon()));
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	166	connect(ui.pageOptions->WeaponDelete, SIGNAL(clicked()), this, SLOT(DeleteWeaponSet()));
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	167	connect(ui.pageOptions->SchemeEdit, SIGNAL(clicked()), this, SLOT(GoToEditScheme()));
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	168	connect(ui.pageOptions->SchemeNew, SIGNAL(clicked()), this, SLOT(GoToNewScheme()));
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	169	connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme()));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	170	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsChanged()), this, SLOT(UpdateWeapons()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	171
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	172	connect(ui.pageNet->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	173	connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	174	connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	175	pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	176
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	177	connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	178
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	179	connect(ui.pageNetServer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	180	connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	181
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	182	connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	183	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(setEnabledGameStart(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	184	ui.pageNetGame->BtnGo, SLOT(setEnabled(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	185	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(setEnabledGameStart(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	186	ui.pageNetGame->BtnStart, SLOT(setEnabled(bool)));
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	187	connect(ui.pageNetGame, SIGNAL(SetupClicked()), this, SLOT(IntermediateSetup()));
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	188	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToSchemes(int)), this, SLOT(GoToScheme(int)));
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	189	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToWeapons(int)), this, SLOT(GoToSelectWeaponSet(int)));
4511 df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	190	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	191	pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	192
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	193	connect(ui.pageRoomsList->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	194	connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	195	pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN);
187 96c3154efee5 "About" page, not yet filled with content unc0rr parents: 184 diff changeset	196
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	197	connect(ui.pageInfo->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
1312 0078e4f72d40 Create a page for rooms list unc0rr parents: 1311 diff changeset	198
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	199	connect(ui.pageGameStats->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	200
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	201	connect(ui.pageSinglePlayer->BtnSimpleGamePage, SIGNAL(clicked()), this, SLOT(SimpleGame()));
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	202	connect(ui.pageSinglePlayer->BtnTrainPage, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	203	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnTrainPage, ID_PAGE_TRAINING);
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	204
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	205	connect(ui.pageSinglePlayer->BtnCampaignPage, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	206	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnCampaignPage, ID_PAGE_CAMPAIGN);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	207
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	208	connect(ui.pageSinglePlayer->BtnMultiplayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	209	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnMultiplayer, ID_PAGE_MULTIPLAYER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	210
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	211	connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	212	connect(ui.pageSinglePlayer->BtnDemos, SIGNAL(clicked()), this, SLOT(GoToDemos()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	213	connect(ui.pageSinglePlayer->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	214
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	215	connect(ui.pageTraining->BtnStartTrain, SIGNAL(clicked()), this, SLOT(StartTraining()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	216	connect(ui.pageTraining->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	217
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	218	connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign()));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	219	connect(ui.pageCampaign->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	220	connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	221
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	222	connect(ui.pageSelectWeapon->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	223
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	224	connect(ui.pageSelectWeapon->BtnDelete, SIGNAL(clicked()),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	225	ui.pageSelectWeapon->pWeapons, SLOT(deleteWeaponsName())); // executed first
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	226	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsDeleted()),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	227	this, SLOT(UpdateWeapons())); // executed second
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	228	//connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsDeleted()),
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	229	// this, SLOT(GoBack())); // executed third
718 f93a38d2c982 delete weapon button added displacer parents: 717 diff changeset	230
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	231	connect(ui.pageScheme->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	232
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	233	connect(ui.pageAdmin->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
1905 b1ec8db513f2 - Use QCryptographicHash for md5 unc0rr parents: 1902 diff changeset	234
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	235	connect(ui.pageNetType->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	236	connect(ui.pageNetType->BtnLAN, SIGNAL(clicked()), this, SLOT(GoToNet()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	237	connect(ui.pageNetType->BtnOfficialServer, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer()));
1950 09ad18a1be11 Implement two buttons unc0rr parents: 1925 diff changeset	238
4511 df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	239	connect(ui.pageDrawMap->BtnBack, SIGNAL(clicked()), this, SLOT(GoBack()));
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	240
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	241
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	242	ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	243	ui.pageScheme->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	244	ui.pageMultiplayer->gameCFG->GameSchemes->setModel(ammoSchemeModel);
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	245	ui.pageOptions->SchemesName->setModel(ammoSchemeModel);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	246
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	247	wBackground = NULL;
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	248	if (config->isFrontendEffects()) {
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	249	wBackground = new BGWidget(this);
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	250	wBackground->setFixedSize(this->width(), this->height());
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	251	wBackground->lower();
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	252	wBackground->init();
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	253	wBackground->startAnimation();
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	254	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	255
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	256	PagesStack.push(ID_PAGE_MAIN);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	257	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	258	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	259
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	260	#ifdef USE_XFIRE
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	261	void HWForm::updateXfire(void)
67815ee123d7 Frontend: smxx parents: 2820 diff changeset	262	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	263	if(hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	264	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	265	xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare("netserver.hedgewars.org:46631") ? "Official server" : hwnet->getHost().toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	266	switch(hwnet->getClientState())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	267	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	268	case 1: // Connecting
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	269	xfire_setvalue(XFIRE_STATUS, "Connecting");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	270	xfire_setvalue(XFIRE_NICKNAME, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	271	xfire_setvalue(XFIRE_ROOM, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	272	case 2: // In lobby
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	273	xfire_setvalue(XFIRE_STATUS, "Online");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	274	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	275	xfire_setvalue(XFIRE_ROOM, "In game lobby");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	276	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	277	case 3: // In room
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	278	xfire_setvalue(XFIRE_STATUS, "Online");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	279	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	280	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (waiting for players)").toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	281	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	282	case 5: // In game
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	283	xfire_setvalue(XFIRE_STATUS, "Online");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	284	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	285	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (playing or spectating)").toAscii());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	286	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	287	default:
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	288	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	289	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	290	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	291	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	292	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	293	xfire_setvalue(XFIRE_STATUS, "Offline");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	294	xfire_setvalue(XFIRE_NICKNAME, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	295	xfire_setvalue(XFIRE_ROOM, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	296	xfire_setvalue(XFIRE_SERVER, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	297	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	298	xfire_update();
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	299	}
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	300	#endif
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	301
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	302	void HWForm::onFrontendFullscreen(bool value)
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	303	{
1163 5186cf914549 fullscreen disabling fixed displacer parents: 1162 diff changeset	304	if (value)
5186cf914549 fullscreen disabling fixed displacer parents: 1162 diff changeset	305	setWindowState(windowState() \| Qt::WindowFullScreen);
5186cf914549 fullscreen disabling fixed displacer parents: 1162 diff changeset	306	else {
5186cf914549 fullscreen disabling fixed displacer parents: 1162 diff changeset	307	setWindowState(windowState() & !Qt::WindowFullScreen);
5186cf914549 fullscreen disabling fixed displacer parents: 1162 diff changeset	308	}
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	309	}
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	310
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	311	void HWForm::keyReleaseEvent(QKeyEvent *event)
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	312	{
4392 95e27e12d0e9 Fix koda's esc key binding so leaving rooms works correctly with it nemo parents: 4232 diff changeset	313	if (event->key() == Qt::Key_Escape /\|\| event->key() == Qt::Key_Backspace/ )
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	314	this->GoBack();
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	315	}
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	316
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	317	void HWForm::CustomizePalettes()
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	318	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	319	QList<QScrollBar > allSBars = findChildren<QScrollBar >();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	320	QPalette pal = palette();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	321	pal.setColor(QPalette::WindowText, QColor(0xff, 0xcc, 0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	322	pal.setColor(QPalette::Button, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	323	pal.setColor(QPalette::Base, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	324	pal.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	325
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	326	for (int i = 0; i < allSBars.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	327	allSBars.at(i)->setPalette(pal);
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	328	}
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	329
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	330	void HWForm::UpdateWeapons()
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	331	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	332	QVector<QComboBox*> combos;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	333	combos.push_back(ui.pageOptions->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	334	combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	335	combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName);
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	336	combos.push_back(ui.pageSelectWeapon->selectWeaponSet);
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	337
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	338	QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	339
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	340	for(QVector<QComboBox*>::iterator it = combos.begin(); it != combos.end(); ++it) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	341	(*it)->clear();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	342
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	343	for(int i = 0; i < names.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	344	(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i]));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	345
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	346	int pos = (*it)->findText("Default");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	347	if (pos != -1) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	348	(*it)->setCurrentIndex(pos);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	349	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	350	}
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	351	}
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	352
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	353	void HWForm::UpdateTeamsLists(const QStringList* editable_teams)
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	354	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	355	QStringList teamslist;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	356	if(editable_teams) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	357	teamslist =* editable_teams;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	358	} else {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	359	teamslist = config->GetTeamsList();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	360	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	361
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	362	if(teamslist.empty()) {
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	363	HWTeam defaultTeam(tr("DefaultTeam"));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	364	defaultTeam.SaveToFile();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	365	teamslist.push_back(tr("DefaultTeam"));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	366	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	367
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	368	ui.pageOptions->CBTeamName->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	369	ui.pageOptions->CBTeamName->addItems(teamslist);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	370	ui.pageCampaign->CBTeam->clear();
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	371	ui.pageCampaign->CBTeam->addItems(teamslist);
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	372	}
4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	373
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	374	void HWForm::GoToSelectNewWeapon()
436045756181 working save weapons to file displacer parents: 687 diff changeset	375	{
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	376	ui.pageSelectWeapon->pWeapons->newWeaponsName();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	377	GoToPage(ID_PAGE_SELECTWEAPON);
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	378	}
436045756181 working save weapons to file displacer parents: 687 diff changeset	379
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	380	void HWForm::GoToSelectWeapon()
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	381	{
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	382	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	383	GoToPage(ID_PAGE_SELECTWEAPON);
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	384	}
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	385
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	386	void HWForm::GoToSelectWeaponSet(int index)
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	387	{
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	388	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(index);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	389	GoToPage(ID_PAGE_SELECTWEAPON);
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	390	}
91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	391
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	392	void HWForm::GoToSaves()
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	393	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	394	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Save);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	395
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	396	GoToPage(ID_PAGE_DEMOS);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	397	}
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	398
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	399	void HWForm::GoToDemos()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	400	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	401	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Demo);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	402
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	403	GoToPage(ID_PAGE_DEMOS);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	404	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	405
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	406	void HWForm::GoToNet()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	407	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	408	ui.pageNet->updateServersList();
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	409
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	410	GoToPage(ID_PAGE_NET);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	411	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	412
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	413	void HWForm::GoToScheme(int index)
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	414	{
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	415	ui.pageScheme->selectScheme->setCurrentIndex(index);
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	416	GoToPage(ID_PAGE_SCHEME);
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	417	}
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	418
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	419	void HWForm::GoToNewScheme()
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	420	{
4410 f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	421	ui.pageScheme->newRow();
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	422	GoToPage(ID_PAGE_SCHEME);
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	423	}
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	424
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	425	void HWForm::GoToEditScheme()
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	426	{
f9e38ce1e813 a Henek-koda production: nicer game config screen, fixed scheme-weapon lock, added scheme editing to config page and some minor stuff Henek parents: 4392 diff changeset	427	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	428	GoToPage(ID_PAGE_SCHEME);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	429	}
75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	430
496 00465a8ef129 merged new team from branch displacer parents: 493 diff changeset	431	void HWForm::OnPageShown(quint8 id, quint8 lastid)
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	432	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	433	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	434	updateXfire();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	435	#endif
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	436	if(id == ID_PAGE_DRAWMAP)
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	437	{
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	438	DrawMapScene * scene;
4535 301df2c84b97 The Fix unc0rr parents: 4525 diff changeset	439	if(lastid == ID_PAGE_MULTIPLAYER)
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	440	scene = ui.pageMultiplayer->gameCFG->pMapContainer->getDrawMapScene();
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	441	else
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	442	scene = ui.pageNetGame->pGameCFG->pMapContainer->getDrawMapScene();
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	443
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	444	ui.pageDrawMap->drawMapWidget->setScene(scene);
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	445	}
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	446	if(lastid == ID_PAGE_DRAWMAP)
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	447	{
4535 301df2c84b97 The Fix unc0rr parents: 4525 diff changeset	448	if(id == ID_PAGE_MULTIPLAYER)
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	449	ui.pageMultiplayer->gameCFG->pMapContainer->mapDrawingFinished();
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	450	else
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	451	ui.pageNetGame->pGameCFG->pMapContainer->mapDrawingFinished();
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	452	}
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	453
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	454	if (id == ID_PAGE_MULTIPLAYER \|\| id == ID_PAGE_NETGAME) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	455	QStringList tmNames = config->GetTeamsList();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	456	TeamSelWidget* curTeamSelWidget;
3324 339b271d6641 Frontend: smxx parents: 3284 diff changeset	457	ui.pageOptions->BtnNewTeam->setVisible(false);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	458	ui.pageOptions->BtnEditTeam->setVisible(false);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	459	ui.pageOptions->BtnDeleteTeam->setVisible(false);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	460	ui.pageOptions->CBTeamName->setVisible(false);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	461	ui.pageOptions->LblNoEditTeam->setVisible(true);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	462
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	463	if(id == ID_PAGE_MULTIPLAYER) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	464	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	465	} else {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	466	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	467	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	468
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	469	QList<HWTeam> teamsList;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	470	for(QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	471	HWTeam team(*it);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	472	team.LoadFromFile();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	473	teamsList.push_back(team);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	474	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	475
4524 65c294aedaea Don't reset teams when returning from draw map page unc0rr parents: 4520 diff changeset	476	if(lastid == ID_PAGE_SETUP \|\| lastid == ID_PAGE_DRAWMAP) { // _TEAM
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	477	if (editedTeam) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	478	curTeamSelWidget->addTeam(*editedTeam);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	479	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	480	} else if(lastid != ID_PAGE_GAMESTATS
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	481	&& lastid != ID_PAGE_INGAME
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	482	&& lastid != ID_PAGE_SCHEME
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	483	&& lastid != ID_PAGE_SELECTWEAPON) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	484	curTeamSelWidget->resetPlayingTeams(teamsList);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	485	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	486	} else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	487	if (id == ID_PAGE_GAMESTATS)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	488	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	489	ui.pageGameStats->renderStats();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	490	}
2845 19db164dd20d Frontend: smxx parents: 2822 diff changeset	491
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	492	if(id == ID_PAGE_MAIN)
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	493	{
3324 339b271d6641 Frontend: smxx parents: 3284 diff changeset	494	ui.pageOptions->BtnNewTeam->setVisible(true);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	495	ui.pageOptions->BtnEditTeam->setVisible(true);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	496	ui.pageOptions->BtnDeleteTeam->setVisible(true);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	497	ui.pageOptions->CBTeamName->setVisible(true);
339b271d6641 Frontend: smxx parents: 3284 diff changeset	498	ui.pageOptions->LblNoEditTeam->setVisible(false);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	499	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	500
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	501	// load and save ignore/friends lists
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	502	if(lastid == ID_PAGE_NETGAME) // leaving a room
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	503	ui.pageNetGame->pChatWidget->saveLists(ui.pageOptions->editNetNick->text());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	504	else if(lastid == ID_PAGE_ROOMSLIST) // leaving the lobby
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	505	ui.pageRoomsList->chatWidget->saveLists(ui.pageOptions->editNetNick->text());
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	506
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	507	if(id == ID_PAGE_NETGAME) // joining a room
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	508	ui.pageNetGame->pChatWidget->loadLists(ui.pageOptions->editNetNick->text());
4428 2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	509	// joining the lobby
2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	510	else if(id == ID_PAGE_ROOMSLIST) {
4429 f9a949ef955b add null check nemo parents: 4428 diff changeset	511	if ( hwnet && game && game->gameState == gsStarted) { // abnormal exit - kick or room destruction - send kills.
4430 cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	512	game->netSuspend = true;
4428 2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	513	game->KillAllTeams();
2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	514	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	515	ui.pageRoomsList->chatWidget->loadLists(ui.pageOptions->editNetNick->text());
4428 2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	516	}
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	517	}
b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	518
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	519	void HWForm::GoToPage(int id)
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	520	{
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	521	int lastid = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	522	PagesStack.push(ui.Pages->currentIndex());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	523	OnPageShown(id, lastid);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	524	ui.Pages->setCurrentIndex(id);
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	525	}
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	526
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	527	void HWForm::GoBack()
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	528	{
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	529	int id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop();
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	530	int curid = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	531	ui.Pages->setCurrentIndex(id);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	532	OnPageShown(id, curid);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	533
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	534	if (id == ID_PAGE_CONNECTING)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	535	GoBack();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	536	if (id == ID_PAGE_NETSERVER)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	537	GoBack();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	538	if ((!hwnet) && (id == ID_PAGE_ROOMSLIST))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	539	GoBack();
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	540
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	541	if ((!hwnet) \|\| (!hwnet->isInRoom()))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	542	if (id == ID_PAGE_NETGAME \|\| id == ID_PAGE_NETGAME)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	543	GoBack();
1672 6a451649558c Properly handle room deletion in respect of pages switching unc0rr parents: 1671 diff changeset	544
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	545	if (curid == ID_PAGE_ROOMSLIST) NetDisconnect();
4432 81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	546	if (curid == ID_PAGE_NETGAME) hwnet->partRoom();
81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	547	// need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick
81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	548	//if (curid == ID_PAGE_NETGAME && (!game \|\| game->gameState != gsStarted)) hwnet->partRoom();
1902 aeadb10c2d77 Add delete button and scheme selection combobox to scheme edit page unc0rr parents: 1899 diff changeset	549
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	550	if (curid == ID_PAGE_SCHEME)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	551	ammoSchemeModel->Save();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	552	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	553
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	554	void HWForm::btnExitPressed()
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	555	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	556	eggTimer.start();
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	557	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	558
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	559	void HWForm::btnExitClicked()
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	560	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	561	if (eggTimer.elapsed() < 3000){
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	562	#ifdef __APPLE__
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	563	panel->showInstallController();
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	564	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	565	close();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	566	}
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	567	else
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	568	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	569	QPushButton * btn = findChild<QPushButton *>("imageButt");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	570	if (btn)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	571	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	572	btn->setIcon(QIcon(":/res/bonus.png"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	573	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	574	}
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	575	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	576
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	577	void HWForm::IntermediateSetup()
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	578	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	579	quint8 id=ui.Pages->currentIndex();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	580	TeamSelWidget* curTeamSelWidget;
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	581
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	582	if(id == ID_PAGE_MULTIPLAYER) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	583	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	584	} else {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	585	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	586	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	587
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	588	QList<HWTeam> teams = curTeamSelWidget->getDontPlayingTeams();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	589	QStringList tmnames;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	590	for(QList<HWTeam>::iterator it = teams.begin(); it != teams.end(); ++it) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	591	tmnames += it->TeamName;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	592	}
3757 ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	593	//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	594	UpdateTeamsLists();
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	595
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	596	GoToPage(ID_PAGE_SETUP);
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	597	}
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	598
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	599	void HWForm::NewTeam()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	600	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	601	editedTeam = new HWTeam("unnamed");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	602	editedTeam->SetToPage(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	603	GoToPage(ID_PAGE_SETUP_TEAM);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	604	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	605
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	606	void HWForm::EditTeam()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	607	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	608	editedTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	609	editedTeam->LoadFromFile();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	610	editedTeam->SetToPage(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	611	GoToPage(ID_PAGE_SETUP_TEAM);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	612	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	613
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	614	void HWForm::DeleteTeam()
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	615	{
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	616	QMessageBox reallyDelete(QMessageBox::Question, QMessageBox::tr("Teams"), QMessageBox::tr("Really delete this team?"), QMessageBox::Ok \| QMessageBox::Cancel);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	617
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	618	if (reallyDelete.exec() == QMessageBox::Ok) {
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	619	editedTeam = new HWTeam(ui.pageOptions->CBTeamName->currentText());
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	620	editedTeam->DeleteFile();
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	621
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	622	// Remove from lists
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	623	ui.pageOptions->CBTeamName->removeItem(ui.pageOptions->CBTeamName->currentIndex());
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	624	}
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	625	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	626
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	627	void HWForm::RandomNames()
4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	628	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	629	editedTeam->GetFromPage(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	630	namegen->TeamRandomNames(editedTeam,FALSE);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	631	editedTeam->SetToPage(this);
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	632	}
4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	633
4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	634	void HWForm::RandomName(const int &i)
4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	635	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	636	editedTeam->GetFromPage(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	637	namegen->TeamRandomName(editedTeam,i);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	638	editedTeam->SetToPage(this);
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	639	}
4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	640
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	641	void HWForm::TeamSave()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	642	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	643	editedTeam->GetFromPage(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	644	editedTeam->SaveToFile();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	645	delete editedTeam;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	646	editedTeam=0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	647	UpdateTeamsLists();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	648	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	649	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	650
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	651	void HWForm::TeamDiscard()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	652	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	653	delete editedTeam;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	654	editedTeam=0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	655	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	656	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	657
4416 29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	658	void HWForm::DeleteScheme()
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	659	{
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	660	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	661	if (ui.pageOptions->SchemesName->currentIndex() < ammoSchemeModel->numberOfDefaultSchemes) {
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	662	QMessageBox::warning(0, QMessageBox::tr("Schemes"), QMessageBox::tr("Can not delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()));
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	663	} else {
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	664	ui.pageScheme->deleteRow();
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	665	}
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	666	}
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	667
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	668	void HWForm::DeleteWeaponSet()
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	669	{
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	670	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex());
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	671	ui.pageSelectWeapon->pWeapons->deleteWeaponsName();
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	672	}
29d2d1548387 adding a combobox to weapon editor as scheme editor, added a few notices for deleting and some buttons in this area. Henek parents: 4410 diff changeset	673
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	674	void HWForm::SimpleGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	675	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	676	CreateGame(0, 0, *cDefaultAmmoStore);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	677	game->StartQuick();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	678	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	679
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	680	void HWForm::PlayDemo()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	681	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	682	QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	683	if (!curritem)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	684	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	685	QMessageBox::critical(this,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	686	tr("Error"),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	687	tr("Please select record from the list above"),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	688	tr("OK"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	689	return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	690	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	691	CreateGame(0, 0, 0);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	692	game->PlayDemo(curritem->data(Qt::UserRole).toString());
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	693	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	694
666 07fa9a74a074 Abstract HWForm from custom PageNet implementation unc0rr parents: 665 diff changeset	695	void HWForm::NetConnectServer(const QString & host, quint16 port)
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	696	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	697	_NetConnect(host, port, ui.pageOptions->editNetNick->text());
1395 46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	698	}
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	699
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	700	void HWForm::NetConnectOfficialServer()
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	701	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	702	NetConnectServer("netserver.hedgewars.org", 46631);
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	703	}
595d8663254d update button for udp servers list displacer parents: 412 diff changeset	704
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	705	void HWForm::_NetConnect(const QString & hostName, quint16 port, const QString & nick)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	706	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	707	if(hwnet) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	708	hwnet->Disconnect();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	709	delete hwnet;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	710	hwnet=0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	711	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	712
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	713	ui.pageRoomsList->chatWidget->clear();
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	714
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	715	hwnet = new HWNewNet(config, ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget);
637 8fa7ed5e13bd Fix bad behavior when quickly click Connect button more than once unc0rr parents: 636 diff changeset	716
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	717	GoToPage(ID_PAGE_CONNECTING);
1800 f1df2eb32a16 "connecting" page unc0rr parents: 1797 diff changeset	718
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	719	connect(hwnet, SIGNAL(showMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
1512 43742041c211 - Don't send 'Bad param' msg, as the only reason of it is just some lag unc0rr parents: 1509 diff changeset	720
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	721	connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	722	connect(hwnet, SIGNAL(Connected()), this, SLOT(NetConnected()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	723	connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	724	connect(hwnet, SIGNAL(LeftRoom()), this, SLOT(NetLeftRoom()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	725	connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&)));
4392 95e27e12d0e9 Fix koda's esc key binding so leaving rooms works correctly with it nemo parents: 4232 diff changeset	726	//connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), hwnet, SLOT(partRoom()));
329 4c3aad46baa5 Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes unc0rr parents: 328 diff changeset	727
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	728	// rooms list page stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	729	connect(hwnet, SIGNAL(roomsList(const QStringList&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	730	ui.pageRoomsList, SLOT(setRoomsList(const QStringList&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	731	connect(hwnet, SIGNAL(adminAccess(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	732	ui.pageRoomsList, SLOT(setAdmin(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	733	connect(hwnet, SIGNAL(adminAccess(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	734	ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	735
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	736	connect(hwnet, SIGNAL(serverMessage(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	737	ui.pageRoomsList->chatWidget, SLOT(onServerMessage(const QString&)));
1584 90f6a5abad17 Save much space for chat widget on lobby page by removing server message widget (now this messages goes to chat) unc0rr parents: 1577 diff changeset	738
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	739	connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	740	hwnet, SLOT(CreateRoom(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	741	connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	742	hwnet, SLOT(JoinRoom(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	743	// connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	744	// this, SLOT(NetGameMaster()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	745	// connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	746	// this, SLOT(NetGameSlave()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	747	connect(ui.pageRoomsList, SIGNAL(askForRoomList()),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	748	hwnet, SLOT(askRoomsList()));
1313 f4c54e9e1b8c - Introduce a bit of state miachine in client code (should be more robust and verbosive now) unc0rr parents: 1312 diff changeset	749
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	750	// room status stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	751	connect(hwnet, SIGNAL(roomMaster(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	752	this, SLOT(NetGameChangeStatus(bool)));
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	753
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	754	// net page stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	755	connect(hwnet, SIGNAL(chatStringFromNet(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	756	ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	757	connect(hwnet, SIGNAL(setReadyStatus(const QString &, bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	758	ui.pageNetGame->pChatWidget, SLOT(setReadyStatus(const QString &, bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	759	connect(hwnet, SIGNAL(chatStringFromMe(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	760	ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	761	connect(hwnet, SIGNAL(roomMaster(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	762	ui.pageNetGame->pChatWidget, SLOT(adminAccess(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	763	connect(ui.pageNetGame->pChatWidget, SIGNAL(chatLine(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	764	hwnet, SLOT(chatLineToNet(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	765	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	766	connect(hwnet, SIGNAL(setMyReadyStatus(bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	767	ui.pageNetGame, SLOT(setReadyStatus(bool)));
1577 e3e37c730dc0 - Decrease font size in chat unc0rr parents: 1576 diff changeset	768
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	769	// chat widget actions
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	770	connect(ui.pageNetGame->pChatWidget, SIGNAL(kick(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	771	hwnet, SLOT(kickPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	772	connect(ui.pageNetGame->pChatWidget, SIGNAL(ban(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	773	hwnet, SLOT(banPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	774	connect(ui.pageNetGame->pChatWidget, SIGNAL(info(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	775	hwnet, SLOT(infoPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	776	connect(ui.pageNetGame->pChatWidget, SIGNAL(follow(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	777	hwnet, SLOT(followPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	778	connect(ui.pageRoomsList->chatWidget, SIGNAL(kick(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	779	hwnet, SLOT(kickPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	780	connect(ui.pageRoomsList->chatWidget, SIGNAL(ban(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	781	hwnet, SLOT(banPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	782	connect(ui.pageRoomsList->chatWidget, SIGNAL(info(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	783	hwnet, SLOT(infoPlayer(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	784	connect(ui.pageRoomsList->chatWidget, SIGNAL(follow(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	785	hwnet, SLOT(followPlayer(const QString&)));
1566 6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit unc0rr parents: 1531 diff changeset	786
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	787	// chatting
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	788	connect(ui.pageRoomsList->chatWidget, SIGNAL(chatLine(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	789	hwnet, SLOT(chatLineToLobby(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	790	connect(hwnet, SIGNAL(chatStringLobby(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	791	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	792	connect(hwnet, SIGNAL(chatStringFromMeLobby(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	793	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)));
1568 15a446307993 Lobby chat should work now unc0rr parents: 1566 diff changeset	794
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	795	// nick list stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	796	connect(hwnet, SIGNAL(nickAdded(const QString&, bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	797	ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&, bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	798	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	799	ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	800	connect(hwnet, SIGNAL(nickAddedLobby(const QString&, bool)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	801	ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	802	connect(hwnet, SIGNAL(nickRemovedLobby(const QString&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	803	ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&)));
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	804
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	805	// teams selecting stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	806	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(hhogsNumChanged(const HWTeam&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	807	hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	808	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(teamColorChanged(const HWTeam&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	809	hwnet, SLOT(onTeamColorChanged(const HWTeam&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	810	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(teamWillPlay(HWTeam)), hwnet, SLOT(AddTeam(HWTeam)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	811	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(acceptRequested(HWTeam)), hwnet, SLOT(AddTeam(HWTeam)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	812	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(teamNotPlaying(const HWTeam&)), hwnet, SLOT(RemoveTeam(const HWTeam&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	813	connect(hwnet, SIGNAL(hhnumChanged(const HWTeam&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	814	ui.pageNetGame->pNetTeamsWidget, SLOT(changeHHNum(const HWTeam&)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	815	connect(hwnet, SIGNAL(teamColorChanged(const HWTeam&)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	816	ui.pageNetGame->pNetTeamsWidget, SLOT(changeTeamColor(const HWTeam&)));
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	817
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	818	// admin stuff
3283 18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	819	connect(hwnet, SIGNAL(serverMessageNew(const QString&)), ui.pageAdmin, SLOT(serverMessageNew(const QString &)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	820	connect(hwnet, SIGNAL(serverMessageOld(const QString&)), ui.pageAdmin, SLOT(serverMessageOld(const QString &)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	821	connect(hwnet, SIGNAL(latestProtocolVar(int)), ui.pageAdmin, SLOT(protocol(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	822	connect(ui.pageAdmin, SIGNAL(setServerMessageNew(const QString&)), hwnet, SLOT(setServerMessageNew(const QString &)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	823	connect(ui.pageAdmin, SIGNAL(setServerMessageOld(const QString&)), hwnet, SLOT(setServerMessageOld(const QString &)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	824	connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	825	connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars()));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	826	connect(ui.pageAdmin->pbClearAccountsCache, SIGNAL(clicked()), hwnet, SLOT(clearAccountsCache()));
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	827
1898 f0ab0c77946d Send scheme data over net (but recieving part isn't implemented yet) unc0rr parents: 1897 diff changeset	828	// disconnect
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	829	connect(hwnet, SIGNAL(Disconnected()), this, SLOT(ForcedDisconnect()), Qt::QueuedConnection);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	830
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	831	hwnet->Connect(hostName, port, nick);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	832	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	833
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	834	void HWForm::NetConnect()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	835	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	836	HWHostPortDialog * hpd = new HWHostPortDialog(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	837	hpd->leHost->setText(*netHost);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	838	hpd->sbPort->setValue(netPort);
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	839
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	840	if (hpd->exec() == QDialog::Accepted)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	841	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	842	config->SaveOptions();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	843	delete netHost;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	844	netHost = new QString(hpd->leHost->text());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	845	netPort = hpd->sbPort->value();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	846	NetConnectServer(*netHost, netPort);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	847	}
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	848	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	849
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	850	void HWForm::NetStartServer()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	851	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	852	config->SaveOptions();
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	853
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	854	pnetserver = new HWNetServer;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	855	if(!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	856	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	857	QMessageBox::critical(0, tr("Error"),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	858	tr("Unable to start the server"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	859	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	860	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	861	return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	862	}
672 08ed55ea1e2a - Fix a bug when server fails to start, and then connecting to another server on the same host (strange, the fix won't work on my machine) unc0rr parents: 668 diff changeset	863
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	864	QTimer::singleShot(250, this, SLOT(AsyncNetServerStart()));
672 08ed55ea1e2a - Fix a bug when server fails to start, and then connecting to another server on the same host (strange, the fix won't work on my machine) unc0rr parents: 668 diff changeset	865
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	866	pRegisterServer = new HWNetUdpServer(0,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	867	ui.pageNetServer->leServerDescr->text(),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	868	ui.pageNetServer->sbPort->value());
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	869	}
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	870
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	871	void HWForm::AsyncNetServerStart()
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	872	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	873	NetConnectServer("localhost", pnetserver->getRunningPort());
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	874	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	875
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	876	void HWForm::NetDisconnect()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	877	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	878	if(hwnet) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	879	hwnet->Disconnect();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	880	delete hwnet;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	881	hwnet = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	882	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	883	if(pnetserver) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	884	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	885	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	886	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	887	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	888	}
659 5eafb20566f1 - Fix some stupid object casts unc0rr parents: 658 diff changeset	889
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	890	pnetserver->StopServer();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	891	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	892	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	893	}
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	894	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	895
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	896	void HWForm::ForcedDisconnect()
09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	897	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	898	if(pnetserver) return; // we have server - let it care of all things
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	899	if (hwnet) {
4536 11bd8c7e4118 Fix crash on forced disconnect unc0rr parents: 4535 diff changeset	900	HWNewNet * tmp = hwnet;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	901	hwnet = 0;
4536 11bd8c7e4118 Fix crash on forced disconnect unc0rr parents: 4535 diff changeset	902	tmp->deleteLater();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	903	QMessageBox::warning(this, QMessageBox::tr("Network"),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	904	QMessageBox::tr("Connection to server is lost"));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	905
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	906	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	907	if (ui.Pages->currentIndex() != ID_PAGE_NET) GoBack();
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	908	}
09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	909
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	910	void HWForm::NetConnected()
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	911	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	912	GoToPage(ID_PAGE_ROOMSLIST);
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	913	}
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	914
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	915	void HWForm::NetGameEnter()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	916	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	917	ui.pageNetGame->pChatWidget->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	918	GoToPage(ID_PAGE_NETGAME);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	919	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	920
339 7535ab6c3820 Run game message added, team and config info provided for net game displacer parents: 338 diff changeset	921	void HWForm::AddNetTeam(const HWTeam& team)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	922	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	923	ui.pageNetGame->pNetTeamsWidget->addTeam(team);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	924	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	925
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	926	void HWForm::StartMPGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	927	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	928	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	929	ammo = ui.pageMultiplayer->gameCFG->WeaponsName->itemData(
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	930	ui.pageMultiplayer->gameCFG->WeaponsName->currentIndex()
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	931	).toString();
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	932
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	933	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	934
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	935	game->StartLocal();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	936	}
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	937
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	938	void HWForm::GameStateChanged(GameState gameState)
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	939	{
4430 cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	940	quint8 id = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	941	switch(gameState) {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	942	case gsStarted: {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	943	Music(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	944	if (wBackground) wBackground->stopAnimation();
4428 2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	945	if (!hwnet \|\| (!hwnet->isRoomChief() \|\| !hwnet->isInRoom())) GoToPage(ID_PAGE_INGAME);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	946	ui.pageGameStats->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	947	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	948	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	949	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	950	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	951	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	952	//setVisible(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	953	setFocusPolicy(Qt::NoFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	954	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	955	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	956	case gsFinished: {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	957	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	958	setFocusPolicy(Qt::StrongFocus);
4430 cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	959	if (id == ID_PAGE_INGAME) GoBack();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	960	Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	961	if (wBackground) wBackground->startAnimation();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	962	GoToPage(ID_PAGE_GAMESTATS);
4430 cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	963	if (hwnet && (!game \|\| !game->netSuspend)) hwnet->gameFinished();
cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	964	if (game) game->netSuspend = false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	965	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	966	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	967	default: {
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	968	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	969	setFocusPolicy(Qt::StrongFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	970	quint8 id = ui.Pages->currentIndex();
4428 2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	971	if (id == ID_PAGE_INGAME \|\|
2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	972	// was room chief and the game was aborted
2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	973	(hwnet && hwnet->isRoomChief() && hwnet->isInRoom() &&
2bc3d3475edf Try to kill off all teams if the player returns to the lobby in mid-game. Also leave game room open for admins to kick/restrict joins etc. NEEDS TESTING PROBABLY BROKE SOMETHING OR OTHER nemo parents: 4416 diff changeset	974	(gameState == gsInterrupted \|\| gameState == gsStopped \|\| gameState == gsDestroyed))) {
4430 cacda05a053e Try suppressing those annoying "incorrect state" messages without actually breaking net play. Alter prior checks on GoBack. NEEDS TESTING. nemo parents: 4429 diff changeset	975	if (id == ID_PAGE_INGAME) GoBack();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	976	Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	977	if (wBackground) wBackground->startAnimation();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	978	if (hwnet) hwnet->gameFinished();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	979	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	980	};
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	981	}
307 96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	982	}
96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	983
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	984	void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo)
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	985	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	986	game = new HWGame(config, gamecfg, ammo, pTeamSelWidget);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	987	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	988	connect(game, SIGNAL(GameStats(char, const QString &)), ui.pageGameStats, SLOT(GameStats(char, const QString &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	989	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	990	connect(game, SIGNAL(HaveRecord(bool, const QByteArray &)), this, SLOT(GetRecord(bool, const QByteArray &)));
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	991	}
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	992
a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	993	void HWForm::ShowErrorMessage(const QString & msg)
a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	994	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	995	QMessageBox::warning(this,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	996	"Hedgewars",
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	997	msg);
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	998	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	999
eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1000	void HWForm::GetRecord(bool isDemo, const QByteArray & record)
eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1001	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1002	QString filename;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1003	QByteArray demo = record;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1004	QString recordFileName =
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1005	config->appendDateTimeToRecordName() ?
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1006	QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") :
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1007	"LastRound";
1487 b4cc59a6d50a Add an option to name records with current date and time unc0rr parents: 1427 diff changeset	1008
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1009	if (isDemo)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1010	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1011	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1012	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1013	demo.replace(QByteArray("\x02TS"), QByteArray("\x02TD"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1014	filename = cfgdir->absolutePath() + "/Demos/" + recordFileName + "." + *cProtoVer + ".hwd";
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1015	} else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1016	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1017	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TS"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1018	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TS"));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1019	filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws";
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1020	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1021
eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1022
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1023	QFile demofile(filename);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1024	if (!demofile.open(QIODevice::WriteOnly))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1025	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1026	ShowErrorMessage(tr("Cannot save record to file %1").arg(filename));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1027	return ;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1028	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1029	demofile.write(demo.constData(), demo.size());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1030	demofile.close();
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1031	}
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1032
74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1033	void HWForm::StartTraining()
74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1034	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1035	CreateGame(0, 0, 0);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1036
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1037	game->StartTraining(ui.pageTraining->CBSelect->itemData(ui.pageTraining->CBSelect->currentIndex()).toString());
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1038	}
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1039
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1040	void HWForm::StartCampaign()
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1041	{
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1042	CreateGame(0, 0, 0);
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1043
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1044	game->StartCampaign(ui.pageCampaign->CBSelect->itemData(ui.pageCampaign->CBSelect->currentIndex()).toString());
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1045	}
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1046
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1047	void HWForm::CreateNetGame()
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1048	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1049	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1050	ammo = ui.pageNetGame->pGameCFG->WeaponsName->itemData(
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1051	ui.pageNetGame->pGameCFG->WeaponsName->currentIndex()
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1052	).toString();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	1053
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1054	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo);
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1055
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1056	connect(game, SIGNAL(SendNet(const QByteArray &)), hwnet, SLOT(SendNet(const QByteArray &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1057	connect(game, SIGNAL(SendChat(const QString &)), hwnet, SLOT(chatLineToNet(const QString &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1058	connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1059	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1060	connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)));
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1061
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1062	game->StartNet();
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1063	}
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1064
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1065	void HWForm::closeEvent(QCloseEvent *event)
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1066	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1067	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1068	xfire_free();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1069	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1070	config->SaveOptions();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1071	event->accept();
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1072	}
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1073
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1074	void HWForm::Music(bool checked)
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1075	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1076	if (checked)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1077	sdli.StartMusic();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1078	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1079	sdli.StopMusic();
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1080	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1081
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1082	void HWForm::NetGameChangeStatus(bool isMaster)
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1083	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1084	if (isMaster)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1085	NetGameMaster();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1086	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1087	NetGameSlave();
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1088	}
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1089
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1090	void HWForm::NetGameMaster()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1091	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1092	ui.pageNetGame->setMasterMode(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1093	ui.pageNetGame->restrictJoins->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1094	ui.pageNetGame->restrictTeamAdds->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1095	ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1096	ui.pageNetGame->pGameCFG->setEnabled(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1097	ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1098
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1099	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1100	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1101	// disconnect connections first to ensure their inexistance and not to connect twice
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1102	ui.pageNetGame->BtnStart->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1103	ui.pageNetGame->restrictJoins->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1104	ui.pageNetGame->restrictTeamAdds->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1105	connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), hwnet, SLOT(startGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1106	connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1107	connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1108	connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1109	SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1110	ui.pageNetGame->pGameCFG,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1111	SLOT(resendSchemeData())
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1112	);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1113	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1114	}
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1115
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1116	void HWForm::NetGameSlave()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1117	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1118	ui.pageNetGame->pGameCFG->setEnabled(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1119	ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1120
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1121	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1122	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1123	NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1124	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1125	ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1126
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1127	ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1128	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1129	this, SLOT(selectFirstNetScheme()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1130	}
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1131
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1132	ui.pageNetGame->setMasterMode(false);
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1133	}
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1134
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1135	void HWForm::selectFirstNetScheme()
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1136	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1137	ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1138	}
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1139
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1140	void HWForm::NetLeftRoom()
305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1141	{
4433 e0092290b7c5 do GoBack if also INGAME due to kick nemo parents: 4432 diff changeset	1142	if (ui.Pages->currentIndex() == ID_PAGE_NETGAME \|\| ui.Pages->currentIndex() == ID_PAGE_INGAME)
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1143	GoBack();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1144	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1145	qWarning("Left room while not in room");
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1146	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1147
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1148	void HWForm::resizeEvent(QResizeEvent * event)
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1149	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1150	int w = event->size().width();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1151	int h = event->size().height();
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1152	if (wBackground) {
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1153	wBackground->setFixedSize(w, h);
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1154	wBackground->move(0, 0);
c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1155	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1156	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1157
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1158	void HWForm::UpdateCampaignPage(int index)
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1159	{
4560 5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1160	Q_UNUSED(index);
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1161
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1162	HWTeam team(ui.pageCampaign->CBTeam->currentText());
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1163	ui.pageCampaign->CBSelect->clear();
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1164
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1165	QDir tmpdir;
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1166	tmpdir.cd(datadir->absolutePath());
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1167	tmpdir.cd("Missions/Campaign");
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1168	tmpdir.setFilter(QDir::Files);
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1169	QStringList entries = tmpdir.entryList(QStringList("#.lua"));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1170	//entries.sort();
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1171	for(int i = 0; (i < entries.count()) && (i <= team.CampaignProgress); i++)
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1172	ui.pageCampaign->CBSelect->addItem(QString(entries[i]).replace(QRegExp("^(\\d+)#(.+)\\.lua"), QComboBox::tr("Mission") + " \\1: \\2"), QString(entries[i]).replace(QRegExp("^(.*)\\.lua"), "\\1"));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1173	}
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1174
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1175	void HWForm::AssociateFiles()
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1176	{
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1177	bool success = true;
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1178	#ifdef _WIN32
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1179	QSettings registry_hkcr("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1180	registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1181	registry_hkcr.setValue(".hws/Default", "Hedgewars.Save");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1182	registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1183	registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1184	registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1185	registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",0");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1186	registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\"");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1187	registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\"");
4090 4b165832d232 disable file association on mac for now koda parents: 4085 diff changeset	1188	#elif defined __APPLE__
4b165832d232 disable file association on mac for now koda parents: 4085 diff changeset	1189	success = false;
4232 3a7862405c36 tweak interface, there is no need to manually add new weapons and schemes to the filter list koda parents: 4091 diff changeset	1190	// TODO; also enable button in pages.cpp and signal in hwform.cpp
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1191	#else
4091 f89b8d0afbe1 set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there. nemo parents: 4090 diff changeset	1192	// this is a little silly due to all the system commands below anyway - just use mkdir -p ? Does have the advantage of the alert I guess
4085 6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1193	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1194	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1195	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime");
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1196	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages");
4085 6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1197	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1198	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1199	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/applications");
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1200	if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars-mimeinfo.xml "+QDir::home().absolutePath()+"/.local/share/mime/packages").toLocal8Bit().constData())==0;
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1201	if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hwengine.desktop "+QDir::home().absolutePath()+"/.local/share/applications").toLocal8Bit().constData())==0;
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1202	if (success) success = system(("update-mime-database "+QDir::home().absolutePath()+"/.local/share/mime").toLocal8Bit().constData())==0;
4091 f89b8d0afbe1 set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there. nemo parents: 4090 diff changeset	1203	if (success) success = system("xdg-mime default hwengine.desktop application/x-hedgewars-demo")==0;
f89b8d0afbe1 set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there. nemo parents: 4090 diff changeset	1204	if (success) success = system("xdg-mime default hwengine.desktop application/x-hedgewars-save")==0;
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1205	#endif
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1206	if (success) QMessageBox::information(0, "", QMessageBox::tr("All file associations have been set."));
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1207	else QMessageBox::information(0, "", QMessageBox::tr("File association failed."));
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1208	}
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	1209

author	unc0rr
	Sat, 29 Jan 2011 13:43:07 +0300
branch	server_refactor
changeset 4610	9541b2a76067
parent 4560	5d6c7f88db73
child 4576	d85062310790
permissions	-rw-r--r--