hedgewars: QTfrontend/hwform.cpp@89ddfe10e52b (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
6952 7f70f37bbf08 license header year range adjustments sheepluva parents: 6944 diff changeset	3	* Copyright (c) 2004-2012 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
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	19	#include <QDir>
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	20	#include <QFile>
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	21	#include <QTextStream>
407 c7890ba9ed6e lost connection to server warning message displacer parents: 383 diff changeset	22	#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	23	#include <QPushButton>
8415 02acf6b92f52 Moved room name edit box from footer to top of page. Also shows room name when in slave mode. dag10 parents: 8407 diff changeset	24	#include <QSpinBox>
502 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 <QListWidget>
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 <QStackedLayout>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	27	#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	28	#include <QLabel>
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	29	#include <QRadioButton>
654 1019b8fa8638 Finish asking host/port dialog implementation unc0rr parents: 653 diff changeset	30	#include <QSpinBox>
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	31	#include <QCloseEvent>
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	32	#include <QCheckBox>
1377 a9e768739345 - Customize QTextBrowser look unc0rr parents: 1376 diff changeset	33	#include <QTextBrowser>
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	34	#include <QAction>
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	35	#include <QTimer>
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	36	#include <QScrollBar>
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	37	#include <QDataWidgetMapper>
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	38	#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	39	#include <QCryptographicHash>
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	40	#include <QSignalMapper>
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	41	#include <QShortcut>
5651 a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	42	#include <QDesktopServices>
8328 03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	43	#include <QDesktopWidget>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	44	#include <QApplication>
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	45	#include <QInputDialog>
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	46	#include <QPropertyAnimation>
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	47	#include <QSettings>
9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	48
9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	49	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	50	#include <QGraphicsEffect>
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	51	#include <QParallelAnimationGroup>
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	52	#endif
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	53
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	54	#include "hwform.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	55	#include "game.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	56	#include "team.h"
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	57	#include "campaign.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	58	#include "teamselect.h"
681 7a20c50988ec working weapons select displacer parents: 674 diff changeset	59	#include "selectWeapon.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	60	#include "gameuiconfig.h"
5204 e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	61	#include "pageinfo.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	62	#include "pagetraining.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	63	#include "pagesingleplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	64	#include "pageselectweapon.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	65	#include "pageadmin.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	66	#include "pagecampaign.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	67	#include "pagescheme.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	68	#include "pagenetgame.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	69	#include "pageroomslist.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	70	#include "pageconnecting.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	71	#include "pageoptions.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	72	#include "pageeditteam.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	73	#include "pagemultiplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	74	#include "pagenet.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	75	#include "pagemain.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	76	#include "pagenetserver.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	77	#include "pagedrawmap.h"
5205 78138ae93820 some headers cleanup and rename of stats and playrecord pages for consistency koda parents: 5204 diff changeset	78	#include "pagegamestats.h"
5567 44c9a577b082 Tiny bit of progress on download page - hooked it up to "Info" button for now. nemo parents: 5255 diff changeset	79	#include "pageplayrecord.h"
44c9a577b082 Tiny bit of progress on download page - hooked it up to "Info" button for now. nemo parents: 5255 diff changeset	80	#include "pagedata.h"
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	81	#include "pagevideos.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	82	#include "hwconsts.h"
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	83	#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	84	#include "gamecfgwidget.h"
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	85	#include "netserverslist.h"
634 b9db5ff5cfdb Fix some bugs unc0rr parents: 632 diff changeset	86	#include "netudpserver.h"
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	87	#include "chatwidget.h"
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	88	#include "input_ip.h"
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	89	#include "input_password.h"
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	90	#include "ammoSchemeModel.h"
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	91	#include "bgwidget.h"
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	92	#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	93	#include "drawmapwidget.h"
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	94	#include "mouseoverfilter.h"
6732 c906dc78091f Start switching to rooms list model. To be continued. unc0rr parents: 6720 diff changeset	95	#include "roomslistmodel.h"
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	96	#include "recorder.h"
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	97	#include "playerslistmodel.h"
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	98	#include "feedbackdialog.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	99
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	100	#include "MessageDialog.h"
6930 d187ea93fc4f renaming HWDataManager -> DataManager sheepluva parents: 6911 diff changeset	101	#include "DataManager.h"
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	102	#include "AutoUpdater.h"
6160 863d3edf5690 cleaning up some more, also adding a WIP file. changes: hats in the hat selection are now sorted like this: NoHat, Reserved hats (alphabetically), All other hats (alphabeticall) sheepluva parents: 6151 diff changeset	103
8328 03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	104	#ifdef Q_WS_WIN
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	105	#define WINVER 0x0500
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	106	#include <windows.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	107	#else
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	108	#include <unistd.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	109	#include <sys/types.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	110	#endif
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	111
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	112	#ifdef Q_WS_MAC
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	113	#include <sys/sysctl.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	114	#endif
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	115
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	116	#ifdef __APPLE__
2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	117	#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	118	#ifdef SPARKLE_ENABLED
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	119	#include "SparkleAutoUpdater.h"
57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	120	#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	121	#endif
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	122
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	123
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	124	// 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	125	// 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	126	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	127	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	128
6572 0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	129	GameUIConfig* HWForm::config = NULL;
0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	130
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	131	HWForm::HWForm(QWidget *parent, QString styleSheet)
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	132	: QMainWindow(parent)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	133	, game(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	134	, pnetserver(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	135	, pRegisterServer(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	136	, editedTeam(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	137	, hwnet(0)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	138	{
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	139	// set music track
8049 133e22b5c410 Get rid of DataManager::findFileForRead unc0rr parents: 7933 diff changeset	140	SDLInteraction::instance().setMusicTrack("/Music/main_theme.ogg");
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	141
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	142	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	143	xfire_init();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	144	#endif
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	145	this->setStyleSheet(styleSheet);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	146	ui.setupUi(this);
8424 225ede46e3dc On pagenetgame, when window is too small the map/game options becomes a tabbed interface to allow for a few lines of chat to always be visible. dag10 parents: 8416 diff changeset	147	setMinimumSize(760, 580);
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	148	//setFocusPolicy(Qt::StrongFocus);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	149	CustomizePalettes();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	150
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	151	ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions());
1225 f882a92ef872 Play music in menu also, with fading effects when run game unc0rr parents: 1223 diff changeset	152
8098 4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	153	config = new GameUIConfig(this, "physfs://hedgewars.ini");
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	154	frontendEffects = config->value("frontend/effects", true).toBool();
a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	155	playerHash = QString(QCryptographicHash::hash(config->value("net/nick","").toString().toUtf8(), QCryptographicHash::Md5).toHex());
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	156
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	157	ui.pageRoomsList->setSettings(config);
8453 06541556df53 Reorganized layout and appearance of rooms list page. dag10 parents: 8451 diff changeset	158	ui.pageNetGame->setSettings(config);
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	159	ui.pageNetGame->chatWidget->setSettings(config);
a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	160	ui.pageRoomsList->chatWidget->setSettings(config);
8346 3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	161	ui.pageOptions->setConfig(config);
8151 25b95d6224fc Google Code-in: Move video preferences in settings tab Mitchell Kember <mk12360@gmail.com> parents: 8140 diff changeset	162	#ifdef VIDEOREC
8196 ed5001115265 Fixed crash that occured after recording a video (pagevideos' config wasn't set). Mitchell Kember <mk12360@gmail.com> parents: 8183 diff changeset	163	ui.pageVideos->init(config);
8151 25b95d6224fc Google Code-in: Move video preferences in settings tab Mitchell Kember <mk12360@gmail.com> parents: 8140 diff changeset	164	#endif
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	165
8287 e2a5dece221f Fix non-osx build broken in ra874d00df4a4. Dudes... :( unc0rr parents: 8284 diff changeset	166	#ifdef __APPLE__
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	167	AutoUpdater* updater = NULL;
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	168	if (config->isAutoUpdateEnabled())
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	169	{
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	170	#ifdef __APPLE__
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	171	#ifdef SPARKLE_ENABLED
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	172	updater = new SparkleAutoUpdater();
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	173	#endif
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	174	#endif
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	175	if (updater)
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	176	{
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	177	updater->checkForUpdates();
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	178	delete updater;
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	179	}
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	180	}
8287 e2a5dece221f Fix non-osx build broken in ra874d00df4a4. Dudes... :( unc0rr parents: 8284 diff changeset	181	#endif
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	182
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	183	#ifdef __APPLE__
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	184	panel = new M3Panel;
5087 d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	185
d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	186	QShortcut *hideFrontend = new QShortcut(QKeySequence("Ctrl+M"), this);
d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	187	connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized()));
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	188	#else
4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	189	// ctrl+q closes frontend for consistency
6960 822f8269e13f map, theme & style selection won't be lost on data updata now (except the selected map/theme/style is deleted ofc). enabling F5 key to reload data :> sheepluva parents: 6952 diff changeset	190	QShortcut * closeFrontend = new QShortcut(QKeySequence("Ctrl+Q"), this);
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	191	connect (closeFrontend, SIGNAL(activated()), this, SLOT(close()));
7824 3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	192	//QShortcut * updateData = new QShortcut(QKeySequence("F5"), this);
3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	193	//connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload()));
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	194	#endif
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	195
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	196	UpdateTeamsLists();
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	197	InitCampaignPage();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	198	UpdateCampaignPage(0);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	199	UpdateWeapons();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	200
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	201	// connect all goBack signals
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	202	int nPages = ui.Pages->count();
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	203
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	204	for (int i = 0; i < nPages; i++)
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	205	connect(ui.Pages->widget(i), SIGNAL(goBack()), this, SLOT(GoBack()));
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	206
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	207	pageSwitchMapper = new QSignalMapper(this);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	208	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	209
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	210	connect(config, SIGNAL(frontendFullscreen(bool)), this, SLOT(onFrontendFullscreen(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	211	onFrontendFullscreen(config->isFrontendFullscreen());
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	212
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	213	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	214	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	215
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	216	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	217	pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	218
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	219	connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), this, SLOT(showFeedbackDialog()));
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	220
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	221	connect(ui.pageMain->BtnInfo, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
5763 d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	222	pageSwitchMapper->setMapping(ui.pageMain->BtnInfo, ID_PAGE_INFO);
d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	223
d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	224	connect(ui.pageMain->BtnDataDownload, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	225	pageSwitchMapper->setMapping(ui.pageMain->BtnDataDownload, ID_PAGE_DATADOWNLOAD);
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	226
7015 08642c7da4a3 add DLC button to net game room sheepluva parents: 7004 diff changeset	227
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	228	#ifdef VIDEOREC
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	229	connect(ui.pageMain->BtnVideos, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	230	pageSwitchMapper->setMapping(ui.pageMain->BtnVideos, ID_PAGE_VIDEOS);
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	231	#endif
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	232
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	233	//connect(ui.pageMain->BtnExit, SIGNAL(pressed()), this, SLOT(btnExitPressed()));
8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	234	//connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	235
7553 9cfe74ee418b Simplify code a bit unc0rr parents: 7551 diff changeset	236	connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	237
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	238	connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	239	connect(ui.pageMultiplayer->teamsSelect, SIGNAL(setEnabledGameStart(bool)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	240	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	241	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	242	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	243	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	244	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	245	pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	246
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	247
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	248	connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	249	connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	250
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	251	connect(ui.pageOptions, SIGNAL(newTeamRequested()), this, SLOT(NewTeam()));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	252	connect(ui.pageOptions, SIGNAL(editTeamRequested(const QString&)), this, SLOT(EditTeam(const QString&)));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	253	connect(ui.pageOptions, SIGNAL(deleteTeamRequested(const QString&)), this, SLOT(DeleteTeam(const QString&)));
6525 6c97379c584b [GCI] backz task: unify the back button functionality, avoid using the save button m4tx parents: 6477 diff changeset	254	connect(ui.pageOptions, SIGNAL(goBack()), config, SLOT(SaveOptions()));
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	255	connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles()));
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	256
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	257	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	258	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	259	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	260	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	261	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	262	connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme()));
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	263	connect(ui.pageOptions->CBFrontendEffects, SIGNAL(toggled(bool)), this, SLOT(onFrontendEffects(bool)) );
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	264	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsChanged()), this, SLOT(UpdateWeapons()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	265
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	266	connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	267	connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	268	pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	269
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	270	connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	271
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	272	connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	273
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	274	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(setEnabledGameStart(bool)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	275	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	276	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	277	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	278	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	279	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	280	pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	281
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	282	connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	283	pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN);
187 96c3154efee5 "About" page, not yet filled with content unc0rr parents: 184 diff changeset	284
5651 a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	285	connect(ui.pageInfo->BtnSnapshots, SIGNAL(clicked()), this, SLOT(OpenSnapshotFolder()));
1312 0078e4f72d40 Create a page for rooms list unc0rr parents: 1311 diff changeset	286
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	287	connect(ui.pageGameStats, SIGNAL(saveDemoRequested()), this, SLOT(saveDemoWithCustomName()));
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	288
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	289	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	290	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	291	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnTrainPage, ID_PAGE_TRAINING);
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	292
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	293	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	294	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	295
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	296	connect(ui.pageSinglePlayer->BtnMultiplayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	297	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnMultiplayer, ID_PAGE_MULTIPLAYER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	298
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	299	connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	300	connect(ui.pageSinglePlayer->BtnDemos, SIGNAL(clicked()), this, SLOT(GoToDemos()));
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	301
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	302	connect(ui.pageTraining, SIGNAL(startMission(const QString&)), this, SLOT(startTraining(const QString&)));
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	303
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	304	connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign()));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	305	connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	306	connect(ui.pageCampaign->CBCampaign, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	307
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	308
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	309	connect(ui.pageSelectWeapon->BtnDelete, SIGNAL(clicked()),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	310	ui.pageSelectWeapon->pWeapons, SLOT(deleteWeaponsName())); // executed first
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	311	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsDeleted()),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	312	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	313	//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	314	// this, SLOT(GoBack())); // executed third
718 f93a38d2c982 delete weapon button added displacer parents: 717 diff changeset	315
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	316
8318 e2c01fbf36c0 GCI2012: Beautify Network Page dag10 parents: 8307 diff changeset	317	connect(ui.pageMain->BtnNetLocal, SIGNAL(clicked()), this, SLOT(GoToNet()));
e2c01fbf36c0 GCI2012: Beautify Network Page dag10 parents: 8307 diff changeset	318	connect(ui.pageMain->BtnNetOfficial, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer()));
1950 09ad18a1be11 Implement two buttons unc0rr parents: 1925 diff changeset	319
5147 a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	320	connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack()));
a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	321
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	322	connect(ui.pageVideos, SIGNAL(goBack()), config, SLOT(SaveVideosOptions()));
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	323
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	324	ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	325	ui.pageScheme->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	326	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	327	ui.pageOptions->SchemesName->setModel(ammoSchemeModel);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	328
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	329	wBackground = new BGWidget(this);
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	330	wBackground->setFixedSize(this->width(), this->height());
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	331	wBackground->lower();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	332	wBackground->init();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	333	wBackground->enabled = config->isFrontendEffects();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	334	wBackground->startAnimation();
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	335
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	336	//Install all eventFilters :
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	337
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	338	MouseOverFilter *filter = new MouseOverFilter();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	339	filter->setUi(&ui);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	340
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	341	QList<QWidget *> widgets;
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	342
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	343	for (int i=0; i < ui.Pages->count(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	344	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	345	widgets = ui.Pages->widget(i)->findChildren<QWidget *>();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	346
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	347	for (int i=0; i < widgets.size(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	348	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	349	widgets.at(i)->installEventFilter(filter);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	350	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	351	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	352
8569 62f4e903fddc Fix issue 537 (empty team created on startup) unc0rr parents: 8559 diff changeset	353	ui.Pages->setCurrentIndex(ID_PAGE_INFO);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	354	PagesStack.push(ID_PAGE_MAIN);
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	355	((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageEnter();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	356	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	357	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	358
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	359	#ifdef USE_XFIRE
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	360	void HWForm::updateXfire(void)
67815ee123d7 Frontend: smxx parents: 2820 diff changeset	361	{
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	362	if(hwnet && (hwnet->clientState() != HWNewNet::Disconnected))
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	363	{
8609 3f6c08223aa1 use NETGAME_DEFAULT_PORT macro across frontend sources koda parents: 8569 diff changeset	364	xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare(QString("netserver.hedgewars.org:%1").arg(NETGAME_DEFAULT_PORT)) ? "Official server" : hwnet->getHost().toAscii());
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	365	switch(hwnet->clientState())
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	366	{
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	367	case HWNewNet::Connecting: // Connecting
727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	368	case HWNewNet::Connected:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	369	xfire_setvalue(XFIRE_STATUS, "Connecting");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	370	xfire_setvalue(XFIRE_NICKNAME, "-");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	371	xfire_setvalue(XFIRE_ROOM, "-");
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	372	case HWNewNet::InLobby: // In lobby
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	373	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	374	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	375	xfire_setvalue(XFIRE_ROOM, "In game lobby");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	376	break;
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	377	case HWNewNet::InRoom: // In room
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	378	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	379	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	380	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (waiting for players)").toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	381	break;
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	382	case HWNewNet::InGame: // In game
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	383	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	384	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	385	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (playing or spectating)").toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	386	break;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	387	default:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	388	break;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	389	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	390	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	391	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	392	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	393	xfire_setvalue(XFIRE_STATUS, "Offline");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	394	xfire_setvalue(XFIRE_NICKNAME, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	395	xfire_setvalue(XFIRE_ROOM, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	396	xfire_setvalue(XFIRE_SERVER, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	397	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	398	xfire_update();
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	399	}
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	400	#endif
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	401
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	402	void HWForm::onFrontendFullscreen(bool value)
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	403	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	404	if (value)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	405	setWindowState(windowState() \| Qt::WindowFullScreen);
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	406	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	407	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	408	setWindowState(windowState() & static_cast<int>(!Qt::WindowFullScreen));
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	409	}
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	410	}
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	411
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	412	void HWForm::onFrontendEffects(bool value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	413	{
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	414	wBackground->enabled = value;
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	415	if (value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	416	wBackground->startAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	417	else
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	418	wBackground->stopAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	419	}
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	420
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	421	/*
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	422	void HWForm::keyReleaseEvent(QKeyEvent *event)
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	423	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	424	if (event->key() == Qt::Key_Escape)
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	425	this->GoBack();
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	426	}
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	427	*/
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	428
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	429	void HWForm::CustomizePalettes()
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	430	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	431	QList<QScrollBar > allSBars = findChildren<QScrollBar >();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	432	QPalette pal = palette();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	433	pal.setColor(QPalette::WindowText, QColor(0xff, 0xcc, 0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	434	pal.setColor(QPalette::Button, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	435	pal.setColor(QPalette::Base, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	436	pal.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	437
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	438	for (int i = 0; i < allSBars.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	439	allSBars.at(i)->setPalette(pal);
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	440	}
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	441
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	442	void HWForm::UpdateWeapons()
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	443	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	444	QVector<QComboBox*> combos;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	445	combos.push_back(ui.pageOptions->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	446	combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	447	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	448	combos.push_back(ui.pageSelectWeapon->selectWeaponSet);
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	449
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	450	QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	451
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	452	for(QVector<QComboBox*>::iterator it = combos.begin(); it != combos.end(); ++it)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	453	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	454	(*it)->clear();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	455
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	456	for(int i = 0; i < names.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	457	(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i]));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	458
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	459	int pos = (*it)->findText("Default");
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	460	if (pos != -1)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	461	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	462	(*it)->setCurrentIndex(pos);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	463	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	464	}
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	465	}
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	466
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	467	void HWForm::UpdateTeamsLists()
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	468	{
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	469	QStringList teamslist = config->GetTeamsList();
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	470
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	471	if(teamslist.empty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	472	{
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	473	QString currentNickName = config->value("net/nick","").toString().toUtf8();
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	474	QString teamName;
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	475
a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	476	if (currentNickName.isEmpty())
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	477	{
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	478	teamName = tr("DefaultTeam");
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	479	}
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	480	else
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	481	{
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	482	teamName = tr("%1's Team").arg(currentNickName);
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	483	}
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	484
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	485	HWTeam defaultTeam(teamName);
6015 daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw sheepluva parents: 6009 diff changeset	486	defaultTeam.saveToFile();
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	487	teamslist.push_back(teamName);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	488	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	489
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	490	ui.pageOptions->CBTeamName->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	491	ui.pageOptions->CBTeamName->addItems(teamslist);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	492	ui.pageCampaign->CBTeam->clear();
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	493	ui.pageCampaign->CBTeam->addItems(teamslist);
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	494	}
4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	495
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	496	void HWForm::GoToSelectNewWeapon()
436045756181 working save weapons to file displacer parents: 687 diff changeset	497	{
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	498	ui.pageSelectWeapon->pWeapons->newWeaponsName();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	499	GoToPage(ID_PAGE_SELECTWEAPON);
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	500	}
436045756181 working save weapons to file displacer parents: 687 diff changeset	501
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	502	void HWForm::GoToSelectWeapon()
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	503	{
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	504	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	505	GoToPage(ID_PAGE_SELECTWEAPON);
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	506	}
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	507
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	508	void HWForm::GoToSelectWeaponSet(int index)
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	509	{
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	510	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(index);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	511	GoToPage(ID_PAGE_SELECTWEAPON);
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	512	}
91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	513
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	514	void HWForm::GoToSaves()
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	515	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	516	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Save);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	517
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	518	GoToPage(ID_PAGE_DEMOS);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	519	}
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	520
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	521	void HWForm::GoToDemos()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	522	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	523	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Demo);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	524
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	525	GoToPage(ID_PAGE_DEMOS);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	526	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	527
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	528	void HWForm::GoToNet()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	529	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	530	ui.pageNet->updateServersList();
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	531
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	532	GoToPage(ID_PAGE_NET);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	533	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	534
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	535	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	536	{
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	537	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	538	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	539	}
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	540
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	541	void HWForm::GoToNewScheme()
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	542	{
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	543	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	544	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	545	}
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	546
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	547	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	548	{
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	549	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	550	GoToPage(ID_PAGE_SCHEME);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	551	}
75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	552
7353 0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	553	void HWForm::GoToVideos()
0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	554	{
0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	555	GoToPage(ID_PAGE_VIDEOS);
0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	556	}
0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	557
8353 c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	558	//TODO: maybe find a better place for this?
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	559	QString HWForm::stringifyPageId(quint32 id)
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	560	{
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	561	QString pageName;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	562	switch (id)
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	563	{
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	564	case ID_PAGE_SETUP_TEAM : pageName = "PAGE_SETUP_TEAM"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	565	case ID_PAGE_SETUP : pageName = "PAGE_SETUP"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	566	case ID_PAGE_MULTIPLAYER : pageName = "PAGE_MULTIPLAYER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	567	case ID_PAGE_DEMOS : pageName = "PAGE_DEMOS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	568	case ID_PAGE_NET : pageName = "PAGE_NET"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	569	case ID_PAGE_NETGAME : pageName = "PAGE_NETGAME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	570	case ID_PAGE_INFO : pageName = "PAGE_INFO"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	571	case ID_PAGE_MAIN : pageName = "PAGE_MAIN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	572	case ID_PAGE_GAMESTATS : pageName = "PAGE_GAMESTATS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	573	case ID_PAGE_SINGLEPLAYER : pageName = "PAGE_SINGLEPLAYER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	574	case ID_PAGE_TRAINING : pageName = "PAGE_TRAINING"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	575	case ID_PAGE_SELECTWEAPON : pageName = "PAGE_SELECTWEAPON"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	576	case ID_PAGE_NETSERVER : pageName = "PAGE_NETSERVER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	577	case ID_PAGE_INGAME : pageName = "PAGE_INGAME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	578	case ID_PAGE_ROOMSLIST : pageName = "PAGE_ROOMSLIST"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	579	case ID_PAGE_CONNECTING : pageName = "PAGE_CONNECTING"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	580	case ID_PAGE_SCHEME : pageName = "PAGE_SCHEME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	581	case ID_PAGE_ADMIN : pageName = "PAGE_ADMIN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	582	case ID_PAGE_CAMPAIGN : pageName = "PAGE_CAMPAIGN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	583	case ID_PAGE_DRAWMAP : pageName = "PAGE_DRAWMAP"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	584	case ID_PAGE_DATADOWNLOAD : pageName = "PAGE_DATADOWNLOAD"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	585	case ID_PAGE_VIDEOS : pageName = "PAGE_VIDEOS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	586	case MAX_PAGE : pageName = "MAX_PAGE"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	587	default : pageName = "UNKNOWN_PAGE"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	588	}
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	589	return pageName;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	590	}
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	591
496 00465a8ef129 merged new team from branch displacer parents: 493 diff changeset	592	void HWForm::OnPageShown(quint8 id, quint8 lastid)
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	593	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	594	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	595	updateXfire();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	596	#endif
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	597
8353 c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	598	qDebug("Leaving %s, entering %s", qPrintable(stringifyPageId(lastid)), qPrintable(stringifyPageId(id)));
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	599
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	600	// pageEnter and pageLeave events
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	601	((AbstractPage*)ui.Pages->widget(lastid))->triggerPageLeave();
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	602	((AbstractPage*)ui.Pages->widget(id))->triggerPageEnter();
a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	603
5999 dad168522e3b display a message when network is down or server is not reachable, nemo also made the page refresh at display time koda parents: 5907 diff changeset	604	if (id == ID_PAGE_DATADOWNLOAD)
dad168522e3b display a message when network is down or server is not reachable, nemo also made the page refresh at display time koda parents: 5907 diff changeset	605	{
dad168522e3b display a message when network is down or server is not reachable, nemo also made the page refresh at display time koda parents: 5907 diff changeset	606	ui.pageDataDownload->fetchList();
dad168522e3b display a message when network is down or server is not reachable, nemo also made the page refresh at display time koda parents: 5907 diff changeset	607	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	608	if (id == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	609	{
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	610	DrawMapScene * scene;
4535 301df2c84b97 The Fix unc0rr parents: 4525 diff changeset	611	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	612	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	613	else
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	614	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	615
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	616	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	617	}
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	618
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	619	if (lastid == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	620	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	621	if (id == ID_PAGE_MULTIPLAYER)
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	622	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	623	else
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	624	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	625	}
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	626
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	627	if (id == ID_PAGE_ROOMSLIST)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	628	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	629	if (hwnet && game && game->gameState == gsStarted) // abnormal exit - kick or room destruction - send kills.
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	630	{
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	631	game->netSuspend = true;
6211 ee9465c0ea82 move (prematurely) finishing game by removing all teams into engine since that's where it should happen sheepluva parents: 6205 diff changeset	632	ui.pageRoomsList->displayWarning(tr("Game aborted"));
ee9465c0ea82 move (prematurely) finishing game by removing all teams into engine since that's where it should happen sheepluva parents: 6205 diff changeset	633	game->abort();
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	634	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	635	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	636
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	637	if (id == ID_PAGE_MULTIPLAYER \|\| id == ID_PAGE_NETGAME)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	638	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	639	QStringList tmNames = config->GetTeamsList();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	640	TeamSelWidget* curTeamSelWidget;
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	641	ui.pageOptions->setTeamOptionsEnabled(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	642
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	643	if (id == ID_PAGE_MULTIPLAYER)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	644	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	645	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	646	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	647	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	648	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	649	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	650	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	651
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	652	QList<HWTeam> teamsList;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	653	for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	654	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	655	HWTeam team(*it);
6015 daffc14a518a cleaning up a little bit more, especially team class. we were leaking teams into heap memory on quick game starts btw sheepluva parents: 6009 diff changeset	656	team.loadFromFile();
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	657	teamsList.push_back(team);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	658	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	659
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	660	if (lastid == ID_PAGE_SETUP \|\| lastid == ID_PAGE_DRAWMAP) // _TEAM
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	661	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	662	if (editedTeam)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	663	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	664	curTeamSelWidget->addTeam(*editedTeam);
947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	665	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	666	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	667	else if (lastid != ID_PAGE_GAMESTATS
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	668	&& lastid != ID_PAGE_INGAME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	669	&& lastid != ID_PAGE_SCHEME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	670	&& lastid != ID_PAGE_SELECTWEAPON)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	671	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	672	curTeamSelWidget->resetPlayingTeams(teamsList);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	673	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	674	}
2845 19db164dd20d Frontend: smxx parents: 2822 diff changeset	675
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	676	if (id == ID_PAGE_MAIN)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	677	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	678	ui.pageOptions->setTeamOptionsEnabled(true);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	679	}
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	680	}
b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	681
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	682	void HWForm::GoToPage(int id)
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	683	{
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	684	bool stopAnim = false;
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	685
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	686	int lastid = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	687	PagesStack.push(ui.Pages->currentIndex());
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	688
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	689	OnPageShown(id, lastid);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	690	ui.Pages->setCurrentIndex(id);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	691
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	692
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	693	/* if (id == ID_PAGE_DRAWMAP \|\| id == ID_PAGE_GAMESTATS)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	694	stopAnim = true;
8098 4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	695	This were disabled due to broken flake animations. I believe the more general problems w/ opacity that forced its disable makes blocking these
4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	696	unnecessary.
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	697	*/
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	698
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	699
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	700	#if (QT_VERSION >= 0x040600)
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	701	if (!stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	702	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	703	/Start animation :/
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	704	int coeff = 1;
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	705	#ifdef false
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	706	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	707	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	708	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	709
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	710	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(lastid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	711	ui.Pages->widget(lastid)->setGraphicsEffect(effectLast);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	712	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	713	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	714	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	715
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	716	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	717	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	718	animationNewSlide->setDuration(duration);
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	719	animationNewSlide->setStartValue(QPoint(width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	720	animationNewSlide->setEndValue(QPoint(0, 0));
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	721	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	722
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	723	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	724	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	725	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	726	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	727	animationNewOpacity->setEndValue(1);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	728	animationNewOpacity->setEasingCurve(QEasingCurve::OutExpo);
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	729	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	730
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	731	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	732	ui.Pages->widget(lastid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	733
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	734	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(lastid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	735	animationOldSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	736	animationOldSlide->setStartValue(QPoint(0, 0));
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	737	animationOldSlide->setEndValue(QPoint(-width()/coeff, 0));
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	738	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	739
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	740	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	741	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	742	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	743	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	744	animationOldOpacity->setEndValue(0.01);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	745	animationOldOpacity->setEasingCurve(QEasingCurve::OutExpo);
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	746	#endif
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	747
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	748	// let's hide the old slide after its animation has finished
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	749	connect(animationOldSlide, SIGNAL(finished()), ui.Pages->widget(lastid), SLOT(hide()));
7826 9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	750
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	751	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	752	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	753	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	754
8098 4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	755	/* this is for the situation when the animation below is interrupted by a new animation. For some reason, finished is not being fired */
4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	756	for(int i=0;i<MAX_PAGE;i++) if (i!=id && i!=lastid) ui.Pages->widget(i)->hide();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	757	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	758	#endif
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	759	}
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	760
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	761	void HWForm::GoBack()
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	762	{
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	763	bool stopAnim = false;
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	764	int curid = ui.Pages->currentIndex();
8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	765	if (curid == ID_PAGE_MAIN)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	766	{
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	767	((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageLeave();
7353 0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	768	if (!ui.pageVideos->tryQuit(this))
0e55228e1303 When there are videos that are being encoded and user tries to quit display dialog with warning. Stepan777 <stepik-777@mail.ru> parents: 7347 diff changeset	769	return;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	770	stopAnim = true;
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	771	exit();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	772	}
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	773
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	774	int id = PagesStack.isEmpty() ? ID_PAGE_MAIN : PagesStack.pop();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	775	ui.Pages->setCurrentIndex(id);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	776	OnPageShown(id, curid);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	777
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	778	if (id == ID_PAGE_CONNECTING)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	779	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	780	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	781	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	782	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	783	if (id == ID_PAGE_NETSERVER)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	784	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	785	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	786	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	787	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	788	if ((!hwnet) && (id == ID_PAGE_ROOMSLIST))
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	789	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	790	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	791	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	792	}
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	793	/*if (curid == ID_PAGE_DRAWMAP)
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	794	stopAnim = true; */
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	795
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	796	if ((!hwnet) \|\| (!hwnet->isInRoom()))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	797	if (id == ID_PAGE_NETGAME \|\| id == ID_PAGE_NETGAME)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	798	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	799	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	800	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	801	}
1672 6a451649558c Properly handle room deletion in respect of pages switching unc0rr parents: 1671 diff changeset	802
5147 a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	803	if (curid == ID_PAGE_ROOMSLIST \|\| curid == ID_PAGE_CONNECTING) NetDisconnect();
6030 2577028cba07 fix typo that sneaked in by pressing ctrl+z one time too much I guess :D sheepluva parents: 6026 diff changeset	804	if (curid == ID_PAGE_NETGAME && hwnet && hwnet->isInRoom()) hwnet->partRoom();
4432 81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	805	// 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	806	//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	807
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	808	if (curid == ID_PAGE_SCHEME)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	809	ammoSchemeModel->Save();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	810
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	811	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	812	/Start animation :/
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	813	if (curid != 0 && !stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	814	{
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	815	int coeff = 1;
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	816	#ifdef false
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	817	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	818	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	819	effectNew->setOpacity(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	820	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	821
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	822	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(curid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	823	ui.Pages->widget(curid)->setGraphicsEffect(effectLast);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	824	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	825	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	826	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	827
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	828	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	829	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	830	animationOldSlide->setDuration(duration);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	831	animationOldSlide->setStartValue(QPoint(-width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	832	animationOldSlide->setEndValue(QPoint(0, 0));
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	833	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	834
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	835	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	836	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	837	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	838	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	839	animationOldOpacity->setEndValue(0.01);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	840	animationOldOpacity->setEasingCurve(QEasingCurve::OutExpo);
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	841	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	842	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	843	ui.Pages->widget(curid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	844
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	845	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(curid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	846	animationNewSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	847	animationNewSlide->setStartValue(QPoint(0, 0));
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	848	animationNewSlide->setEndValue(QPoint(width()/coeff, 0));
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	849	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	850
6630 f8bbfa9a1a36 Disable opacity across the board. It is screwed up in OSX and apparently also Linux. Bad artifacts and overall performance. nemo parents: 6616 diff changeset	851	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	852	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	853	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	854	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	855	animationNewOpacity->setEndValue(1);
6440 1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	856	animationNewOpacity->setEasingCurve(QEasingCurve::OutExpo);
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	857	#endif
1fa9dc94c93f disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy koda parents: 6428 diff changeset	858
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	859	// let's hide the old slide after its animation has finished
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	860	connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide()));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	861
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	862	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	863	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	864	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	865	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	866	#endif
7826 9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	867
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	868	if (stopAnim)
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	869	ui.Pages->widget(curid)->hide();
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	870
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	871	// TODO the whole pages shown and effects stuff should be moved
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	872	// out of hwform.cpp and into a subclass of QStackedLayout
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	873
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	874	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	875
5651 a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	876	void HWForm::OpenSnapshotFolder()
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	877	{
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	878	QString path = QDir::toNativeSeparators(cfgdir->absolutePath() + "/Screenshots");
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	879	QDesktopServices::openUrl(QUrl("file:///" + path));
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	880	}
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	881
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	882	void HWForm::btnExitPressed()
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	883	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	884	eggTimer.start();
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	885	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	886
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	887	void HWForm::exit()
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	888	{
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	889	// 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	890	#ifdef __APPLE__
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	891	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	892	#endif
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	893	close();
6042 8b5345758f62 some more cleanups/refactoring/blahblah, some button positions may are a bit off atm. also I added a new picture for one of the buttons sheepluva parents: 6036 diff changeset	894	// TODO reactivate egg
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	895	/* }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	896	else
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	897	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	898	QPushButton * btn = findChild<QPushButton *>("imageButt");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	899	if (btn)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	900	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	901	btn->setIcon(QIcon(":/res/bonus.png"));
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	902	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	903	} */
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	904	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	905
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	906	void HWForm::IntermediateSetup()
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	907	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	908	quint8 id=ui.Pages->currentIndex();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	909	TeamSelWidget* curTeamSelWidget;
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	910
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	911	if(id == ID_PAGE_MULTIPLAYER)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	912	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	913	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	914	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	915	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	916	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	917	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	918	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	919
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	920	QStringList tmnames;
5772 c09c50efe8b5 Replace iterators with simple declarative foreach (not tested if it works) unc0rr parents: 5763 diff changeset	921
5773 c277657854a2 Some renaming unc0rr parents: 5772 diff changeset	922	foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	923	tmnames += team.name();
5140 932307228d05 Change a few iterations over list to what is apparently a modification safe syntax, may fix issue #208 and #217 - needs testing of course. nemo parents: 5126 diff changeset	924
3757 ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	925	//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	926	UpdateTeamsLists();
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	927
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	928	GoToPage(ID_PAGE_SETUP);
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	929	}
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	930
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	931	void HWForm::NewTeam()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	932	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	933	ui.pageEditTeam->createTeam(QLineEdit::tr("unnamed"), playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	934	UpdateTeamsLists();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	935	GoToPage(ID_PAGE_SETUP_TEAM);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	936	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	937
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	938	void HWForm::EditTeam(const QString & teamName)
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	939	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	940	ui.pageEditTeam->editTeam(teamName, playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	941	GoToPage(ID_PAGE_SETUP_TEAM);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	942	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	943
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	944	void HWForm::AfterTeamEdit()
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	945	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	946	UpdateTeamsLists();
7551 c212247065e3 GoBack() here is not needed anymore unc0rr parents: 7313 diff changeset	947	//GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	948	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	949
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	950
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	951	void HWForm::DeleteTeam(const QString & teamName)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	952	{
8346 3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	953	ui.pageEditTeam->deleteTeam(teamName);
3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	954	UpdateTeamsLists();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	955	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	956
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	957	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	958	{
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	959	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	960	if (ui.pageOptions->SchemesName->currentIndex() < ammoSchemeModel->numberOfDefaultSchemes)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	961	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	962	MessageDialog::ShowErrorMessage(QMessageBox::tr("Cannot delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()), this);
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	963	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	964	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	965	{
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	966	ui.pageScheme->deleteRow();
4576 d85062310790 fixed and enabled removing of game scheme from options page Henek parents: 4560 diff changeset	967	ammoSchemeModel->Save();
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	968	}
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	969	}
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	970
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	971	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	972	{
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	973	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	974	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	975	}
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	976
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	977	void HWForm::SimpleGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	978	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	979	CreateGame(0, 0, *cDefaultAmmoStore);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	980	game->StartQuick();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	981	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	982
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	983	void HWForm::PlayDemo()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	984	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	985	QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	986	if (!curritem)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	987	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	988	MessageDialog::ShowErrorMessage(QMessageBox::tr("Please select a record from the list"), this);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	989	return;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	990	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	991	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	992	game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	993	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	994
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	995	void HWForm::PlayDemoQuick(const QString & demofilename)
ded882439548 file association for mac! koda parents: 5238 diff changeset	996	{
5255 947025eeb5dc under osx don't load a file in case a game is already running (also a little of code formatting) koda parents: 5252 diff changeset	997	GoToPage(ID_PAGE_MAIN);
8709 191bd86f97a1 fix loading files on osx too, the cause was different than other systems koda parents: 8643 diff changeset	998	//GoBack() <- don't or you'll close the socket
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	999	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	1000	game->PlayDemo(demofilename, false);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1001	}
ded882439548 file association for mac! koda parents: 5238 diff changeset	1002
8716 e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1003	void HWForm::NetConnectQuick(const QString & host, quint16 port)
e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1004	{
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1005	GoToPage(ID_PAGE_MAIN);
8716 e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1006	NetConnectServer(host, port);
e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1007	}
e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1008
666 07fa9a74a074 Abstract HWForm from custom PageNet implementation unc0rr parents: 665 diff changeset	1009	void HWForm::NetConnectServer(const QString & host, quint16 port)
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1010	{
8716 e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1011	qDebug("connecting to %s:%d", qPrintable(host), port);
4870 c02406028e02 trim net nick in frontend sheepluva parents: 4845 diff changeset	1012	_NetConnect(host, port, ui.pageOptions->editNetNick->text().trimmed());
1395 46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1013	}
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1014
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1015	void HWForm::NetConnectOfficialServer()
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1016	{
8609 3f6c08223aa1 use NETGAME_DEFAULT_PORT macro across frontend sources koda parents: 8569 diff changeset	1017	NetConnectServer("netserver.hedgewars.org", NETGAME_DEFAULT_PORT);
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1018	}
595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1019
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1020	void HWForm::NetPassword(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1021	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1022	Q_UNUSED(nick);
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1023	//Get hashes
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1024	QString hash = config->passwordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1025	QString temphash = config->tempHash();
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1026
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1027	//Check them
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1028
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1029	if (temphash.isEmpty() && hash.isEmpty()) { //If the user enters a registered nick with no password, sends a bogus hash
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1030	hwnet->SendPasswordHash("THISISNOHASH");
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1031	}
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1032	else if (temphash.isEmpty()) { //Send saved hash as default
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1033	hwnet->SendPasswordHash(hash);
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1034	}
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1035	else { //Send the hash
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1036	hwnet->SendPasswordHash(temphash);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1037	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1038
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1039	//Remove temporary hash from config
8295 6ef114ea2298 fixed minor problem with saving hash Ondrej Skopek <skopekondrej@gmail.com> parents: 8294 diff changeset	1040	config->clearTempHash();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1041	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1042
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1043	void HWForm::NetNickRegistered(const QString & nick)
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1044	{
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1045	//Get hashes
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1046	QString hash = config->passwordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1047	QString temphash = config->tempHash();
8295 6ef114ea2298 fixed minor problem with saving hash Ondrej Skopek <skopekondrej@gmail.com> parents: 8294 diff changeset	1048
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1049	if (hash.isEmpty()) {
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1050	if (temphash.isEmpty()) { //If the user enters a registered nick with no password
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1051	QString suppliedpass;
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1052	while (suppliedpass.isEmpty()) {
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1053	QInputDialog nickRegedDialog(this);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1054	nickRegedDialog.setWindowModality(Qt::WindowModal);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1055	nickRegedDialog.setInputMode(QInputDialog::TextInput);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1056	nickRegedDialog.setWindowTitle(tr("Hedgewars - Nick registered"));
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1057	nickRegedDialog.setLabelText(tr("This nick is registered, and you haven't specified a password.\n\nIf this nick isn't yours, please register your own nick at www.hedgewars.org\n\nPassword:"));
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1058	nickRegedDialog.setTextEchoMode(QLineEdit::Password);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1059	nickRegedDialog.exec();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1060
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1061	suppliedpass = nickRegedDialog.textValue();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1062
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1063	if (nickRegedDialog.result() == QDialog::Rejected) {
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1064	config->clearPasswordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1065	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1066	GoBack();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1067	return;
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1068	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1069	temphash = QCryptographicHash::hash(suppliedpass.toUtf8(), QCryptographicHash::Md5).toHex();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1070	config->setTempHash(temphash);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1071	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1072	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1073	}
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1074	NetPassword(nick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1075	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1076
8299 ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1077	void HWForm::NetNickNotRegistered(const QString & nick)
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1078	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1079	Q_UNUSED(nick);
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1080
8299 ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1081	QMessageBox noRegMsg(this);
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1082	noRegMsg.setIcon(QMessageBox::Information);
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1083	noRegMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Nick not registered"));
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1084	noRegMsg.setWindowModality(Qt::WindowModal);
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1085	noRegMsg.setText(tr("Your nickname is not registered.\nTo prevent someone else from using it,\nplease register it at www.hedgewars.org"));
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1086
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1087	if (!config->passwordHash().isEmpty())
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1088	{
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1089	config->clearPasswordHash();
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1090	noRegMsg.setText(noRegMsg.text()+tr("\n\nYour password wasn't saved either."));
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1091	}
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1092	if (!config->tempHash().isEmpty())
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1093	{
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1094	config->clearTempHash();
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1095	}
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1096	noRegMsg.exec();
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1097	}
ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1098
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1099	void HWForm::NetNickTaken(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1100	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1101	bool ok = false;
7795 ba32d3f9e567 set window modality also for custom dialogs, small text changes koda parents: 7794 diff changeset	1102	QString newNick = QInputDialog::getText(this, tr("Nickname"), tr("Someone already uses your nickname %1 on the server.\nPlease pick another nickname:").arg(nick), QLineEdit::Normal, nick, &ok);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1103
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1104	if (!ok \|\| newNick.isEmpty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1105	{
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1106	//ForcedDisconnect(tr("No nickname supplied."));
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1107	bool retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1108	GoBack();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1109	if (retry) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1110	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1111	QStringList list = hwnet->getHost().split(":");
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1112	NetConnectServer(list.at(0), list.at(1).toShort());
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1113	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1114	NetConnectOfficialServer();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1115	}
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1116	return;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1117	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1118
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1119	hwnet->NewNick(newNick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1120	config->setValue("net/nick", newNick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1121	config->updNetNick();
6227 ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1122
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1123	ui.pageRoomsList->setUser(nick);
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1124	ui.pageNetGame->setUser(nick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1125	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1126
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1127	void HWForm::NetAuthFailed()
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1128	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1129	// Set the password blank if case the user tries to join and enter his password again
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1130	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1131
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1132	//Try to login again
8296 455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1133	bool retry = RetryDialog(tr("Hedgewars - Wrong password"), tr("You entered a wrong password."));
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1134	GoBack();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1135
8297 b236e3afed0d Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog Ondrej Skopek <skopekondrej@gmail.com> parents: 8296 diff changeset	1136	config->clearPasswordHash();
b236e3afed0d Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog Ondrej Skopek <skopekondrej@gmail.com> parents: 8296 diff changeset	1137	config->clearTempHash();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1138	if (retry) {
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1139	NetConnectOfficialServer();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1140	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1141	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1142
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1143	bool HWForm::RetryDialog(const QString & title, const QString & label)
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1144	{
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1145	QMessageBox retryMsg(this);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1146	retryMsg.setIcon(QMessageBox::Warning);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1147	retryMsg.setWindowTitle(title);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1148	retryMsg.setText(label);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1149	retryMsg.setWindowModality(Qt::WindowModal);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1150
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1151	retryMsg.addButton(QMessageBox::Cancel);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1152
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1153	QPushButton *retryButton = retryMsg.addButton(QMessageBox::Ok);
8296 455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1154	retryButton->setText(tr("Try Again"));
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1155	retryButton->setFocus();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1156
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1157	retryMsg.exec();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1158
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1159	if (retryMsg.clickedButton() == retryButton) {
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1160	return true;
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1161	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1162	return false;
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1163	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1164
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1165	void HWForm::NetTeamAccepted(const QString & team)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1166	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1167	ui.pageNetGame->pNetTeamsWidget->changeTeamStatus(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1168	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1169
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1170	void HWForm::NetError(const QString & errmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1171	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1172	switch (ui.Pages->currentIndex())
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1173	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1174	case ID_PAGE_INGAME:
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1175	MessageDialog::ShowErrorMessage(errmsg, this);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1176	// no break
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1177	case ID_PAGE_NETGAME:
6180 0992fc5a4ad9 some changes to the css... display:none; works now (e.g. you can use it for user join/leave messages that are not your friends) sheepluva parents: 6167 diff changeset	1178	ui.pageNetGame->displayError(errmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1179	break;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1180	default:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1181	ui.pageRoomsList->displayError(errmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1182	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1183	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1184
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1185	void HWForm::NetWarning(const QString & wrnmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1186	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1187	if (ui.Pages->currentIndex() == ID_PAGE_NETGAME \|\| ui.Pages->currentIndex() == ID_PAGE_INGAME)
6180 0992fc5a4ad9 some changes to the css... display:none; works now (e.g. you can use it for user join/leave messages that are not your friends) sheepluva parents: 6167 diff changeset	1188	ui.pageNetGame->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1189	else
6180 0992fc5a4ad9 some changes to the css... display:none; works now (e.g. you can use it for user join/leave messages that are not your friends) sheepluva parents: 6167 diff changeset	1190	ui.pageRoomsList->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1191	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1192
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1193	void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1194	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1195	Q_UNUSED(nick);
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1196
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1197	if (hwnet) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1198	// destroy old connection
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1199	hwnet->Disconnect();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1200	delete hwnet;
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1201	hwnet = NULL;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1202	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1203
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1204	hwnet = new HWNewNet();
637 8fa7ed5e13bd Fix bad behavior when quickly click Connect button more than once unc0rr parents: 636 diff changeset	1205
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1206	GoToPage(ID_PAGE_CONNECTING);
1800 f1df2eb32a16 "connecting" page unc0rr parents: 1797 diff changeset	1207
8504 9ff55b527d1b Ehm... probably this will improve situation with desyncs unc0rr parents: 8489 diff changeset	1208	connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()), Qt::QueuedConnection);
6697 4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1209	connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1210	connect(hwnet, SIGNAL(Error(const QString&)), this, SLOT(NetError(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1211	connect(hwnet, SIGNAL(Warning(const QString&)), this, SLOT(NetWarning(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1212	connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1213	connect(hwnet, SIGNAL(LeftRoom(const QString&)), this, SLOT(NetLeftRoom(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1214	connect(hwnet, SIGNAL(AddNetTeam(const HWTeam&)), this, SLOT(AddNetTeam(const HWTeam&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1215	connect(hwnet, SIGNAL(RemoveNetTeam(const HWTeam&)), this, SLOT(RemoveNetTeam(const HWTeam&)), Qt::QueuedConnection);
8534 92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything. unc0rr parents: 8529 diff changeset	1216	connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)), Qt::QueuedConnection);
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1217	connect(hwnet, SIGNAL(NickRegistered(const QString&)), this, SLOT(NetNickRegistered(const QString&)), Qt::QueuedConnection);
8299 ef2e284255cd Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false Ondrej Skopek <skopekondrej@gmail.com> parents: 8297 diff changeset	1218	connect(hwnet, SIGNAL(NickNotRegistered(const QString&)), this, SLOT(NetNickNotRegistered(const QString&)), Qt::QueuedConnection);
6697 4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1219	connect(hwnet, SIGNAL(NickTaken(const QString&)), this, SLOT(NetNickTaken(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1220	connect(hwnet, SIGNAL(AuthFailed()), this, SLOT(NetAuthFailed()), Qt::QueuedConnection);
4392 95e27e12d0e9 Fix koda's esc key binding so leaving rooms works correctly with it nemo parents: 4232 diff changeset	1221	//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	1222
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1223	ui.pageRoomsList->chatWidget->setUsersModel(hwnet->lobbyPlayersModel());
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1224	ui.pageNetGame->chatWidget->setUsersModel(hwnet->roomPlayersModel());
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1225
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1226	// rooms list page stuff
6735 050237b1500f Setup rooms list headers unc0rr parents: 6733 diff changeset	1227	ui.pageRoomsList->setModel(hwnet->roomsListModel());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1228	connect(hwnet, SIGNAL(adminAccess(bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1229	ui.pageRoomsList, SLOT(setAdmin(bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1230	connect(hwnet, SIGNAL(adminAccess(bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1231	ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1232
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1233	connect(hwnet, SIGNAL(serverMessage(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1234	ui.pageRoomsList->chatWidget, SLOT(onServerMessage(const QString&)), Qt::QueuedConnection);
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	1235
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1236	connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1237	hwnet, SLOT(CreateRoom(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1238	connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1239	hwnet, SLOT(JoinRoom(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1240	// connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1241	// this, SLOT(NetGameMaster()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1242	// connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1243	// this, SLOT(NetGameSlave()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1244	connect(ui.pageRoomsList, SIGNAL(askForRoomList()),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1245	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	1246
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1247	// room status stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1248	connect(hwnet, SIGNAL(roomMaster(bool)),
8534 92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything. unc0rr parents: 8529 diff changeset	1249	this, SLOT(NetGameChangeStatus(bool)), Qt::QueuedConnection);
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1250
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1251	// net page stuff
8489 25cb6f4a1d1b Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522. dag10 parents: 8453 diff changeset	1252	connect(hwnet, SIGNAL(roomNameUpdated(const QString &)),
8534 92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything. unc0rr parents: 8529 diff changeset	1253	ui.pageNetGame, SLOT(setRoomName(const QString &)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1254	connect(hwnet, SIGNAL(chatStringFromNet(const QString&)),
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1255	ui.pageNetGame->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
7720 8e6b79a020f8 Show more statuses in icons. unc0rr parents: 7710 diff changeset	1256
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1257	connect(hwnet, SIGNAL(chatStringFromMe(const QString&)),
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1258	ui.pageNetGame->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1259	connect(hwnet, SIGNAL(roomMaster(bool)),
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1260	ui.pageNetGame->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection);
a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1261	connect(ui.pageNetGame->chatWidget, SIGNAL(chatLine(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1262	hwnet, SLOT(chatLineToNet(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1263	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1264	connect(hwnet, SIGNAL(setMyReadyStatus(bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1265	ui.pageNetGame, SLOT(setReadyStatus(bool)), Qt::QueuedConnection);
1577 e3e37c730dc0 - Decrease font size in chat unc0rr parents: 1576 diff changeset	1266
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1267	// chat widget actions
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1268	connect(ui.pageNetGame->chatWidget, SIGNAL(kick(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1269	hwnet, SLOT(kickPlayer(const QString&)));
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1270	connect(ui.pageNetGame->chatWidget, SIGNAL(ban(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1271	hwnet, SLOT(banPlayer(const QString&)));
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1272	connect(ui.pageNetGame->chatWidget, SIGNAL(info(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1273	hwnet, SLOT(infoPlayer(const QString&)));
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1274	connect(ui.pageNetGame->chatWidget, SIGNAL(follow(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1275	hwnet, SLOT(followPlayer(const QString&)));
8436 b89aacebb9db - Also pass unknown cmds to the server when in room unc0rr parents: 8434 diff changeset	1276	connect(ui.pageNetGame->chatWidget, SIGNAL(consoleCommand(const QString&)),
b89aacebb9db - Also pass unknown cmds to the server when in room unc0rr parents: 8434 diff changeset	1277	hwnet, SLOT(consoleCommand(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1278	connect(ui.pageRoomsList->chatWidget, SIGNAL(kick(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1279	hwnet, SLOT(kickPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1280	connect(ui.pageRoomsList->chatWidget, SIGNAL(ban(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1281	hwnet, SLOT(banPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1282	connect(ui.pageRoomsList->chatWidget, SIGNAL(info(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1283	hwnet, SLOT(infoPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1284	connect(ui.pageRoomsList->chatWidget, SIGNAL(follow(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1285	hwnet, SLOT(followPlayer(const QString&)));
8396 5123eac2f9d6 - Pass unknown chat commands to server unc0rr parents: 8385 diff changeset	1286	connect(ui.pageRoomsList->chatWidget, SIGNAL(consoleCommand(const QString&)),
5123eac2f9d6 - Pass unknown chat commands to server unc0rr parents: 8385 diff changeset	1287	hwnet, SLOT(consoleCommand(const QString&)));
1566 6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit unc0rr parents: 1531 diff changeset	1288
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1289	// chatting
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1290	connect(ui.pageRoomsList->chatWidget, SIGNAL(chatLine(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1291	hwnet, SLOT(chatLineToLobby(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1292	connect(hwnet, SIGNAL(chatStringLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1293	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
4897 11598e7aa7e6 make names in chats clickable. still color adjustments needed; and testing sheepluva parents: 4894 diff changeset	1294	connect(hwnet, SIGNAL(chatStringLobby(const QString&, const QString&)),
8451 8c7da08df048 Allow navigating backwards chat widget log while new lines are being added unc0rr parents: 8436 diff changeset	1295	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&, const QString&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1296	connect(hwnet, SIGNAL(chatStringFromMeLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1297	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
1568 15a446307993 Lobby chat should work now unc0rr parents: 1566 diff changeset	1298
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1299	// nick list stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1300	connect(hwnet, SIGNAL(nickAdded(const QString&, bool)),
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1301	ui.pageNetGame->chatWidget, SLOT(nickAdded(const QString&, bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1302	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1303	ui.pageNetGame->chatWidget, SLOT(nickRemoved(const QString&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1304	connect(hwnet, SIGNAL(nickAddedLobby(const QString&, bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1305	ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1306	connect(hwnet, SIGNAL(nickRemovedLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1307	ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&)), Qt::QueuedConnection);
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	1308
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1309	// teams selecting stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1310	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(hhogsNumChanged(const HWTeam&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1311	hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1312	connect(ui.pageNetGame->pNetTeamsWidget, SIGNAL(teamColorChanged(const HWTeam&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1313	hwnet, SLOT(onTeamColorChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1314	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	1315	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	1316	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	1317	connect(hwnet, SIGNAL(hhnumChanged(const HWTeam&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1318	ui.pageNetGame->pNetTeamsWidget, SLOT(changeHHNum(const HWTeam&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1319	connect(hwnet, SIGNAL(teamColorChanged(const HWTeam&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1320	ui.pageNetGame->pNetTeamsWidget, SLOT(changeTeamColor(const HWTeam&)), Qt::QueuedConnection);
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1321
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	1322	// admin stuff
3283 18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1323	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	1324	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	1325	connect(hwnet, SIGNAL(latestProtocolVar(int)), ui.pageAdmin, SLOT(protocol(int)));
8157 695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1326	connect(hwnet, SIGNAL(bansList(const QStringList &)), ui.pageAdmin, SLOT(setBansList(const QStringList &)));
3283 18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1327	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	1328	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	1329	connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1330	connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars()));
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	1331	connect(ui.pageAdmin, SIGNAL(clearAccountsCache()), hwnet, SLOT(clearAccountsCache()));
8157 695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1332	connect(ui.pageAdmin, SIGNAL(bansListRequest()), hwnet, SLOT(getBanList()));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1333	connect(ui.pageAdmin, SIGNAL(removeBan(QString)), hwnet, SLOT(removeBan(QString)));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1334	connect(ui.pageAdmin, SIGNAL(banIP(QString,QString,int)), hwnet, SLOT(banIP(QString,QString,int)));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1335	connect(ui.pageAdmin, SIGNAL(banNick(QString,QString,int)), hwnet, SLOT(banNick(QString,QString,int)));
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	1336
1898 f0ab0c77946d Send scheme data over net (but recieving part isn't implemented yet) unc0rr parents: 1897 diff changeset	1337	// disconnect
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	1338	connect(hwnet, SIGNAL(disconnected(const QString&)), this, SLOT(ForcedDisconnect(const QString&)), Qt::QueuedConnection);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1339
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1340	// config stuff
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1341	connect(hwnet, SIGNAL(paramChanged(const QString &, const QStringList &)), ui.pageNetGame->pGameCFG, SLOT(setParam(const QString &, const QStringList &)));
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1342	connect(ui.pageNetGame->pGameCFG, SIGNAL(paramChanged(const QString &, const QStringList &)), hwnet, SLOT(onParamChanged(const QString &, const QStringList &)));
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1343	connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig()));
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1344
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1345	//nick and pass stuff
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1346	QString nickname = config->value("net/nick", "").toString();
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1347
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1348	hwnet->m_private_game = !(hostName == "netserver.hedgewars.org" && port == NETGAME_DEFAULT_PORT);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1349	if (hwnet->m_private_game == false)
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1350	if (AskForNickAndPwd() != 0)
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1351	return;
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1352
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1353	ui.pageRoomsList->setUser(nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1354	ui.pageNetGame->setUser(nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1355
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1356	hwnet->Connect(hostName, port, nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1357	}
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1358
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1359	int HWForm::AskForNickAndPwd(void)
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1360	{
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1361	//remove temppasswordhash just in case
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1362	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1363
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1364	//initialize
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1365	QString hash = config->passwordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1366	QString temphash = config->tempHash();
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1367	QString nickname = config->value("net/nick", "").toString();
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1368	QString password;
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1369
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1370	//if something from login is missing, start dialog loop
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1371	if (nickname.isEmpty() \|\| hash.isEmpty())
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1372	{
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1373	while (nickname.isEmpty() \|\| (hash.isEmpty() && temphash.isEmpty())) //while a nickname, or both hashes are missing
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1374	{
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1375	//open dialog
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1376	HWPasswordDialog * pwDialog = new HWPasswordDialog(this);
8364 fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	1377	// make the "new account" button dialog open a browser with the registration page
fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	1378	connect(pwDialog->pbNewAccount, SIGNAL(clicked()), this, SLOT(openRegistrationPage()));
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1379	pwDialog->cbSave->setChecked(config->value("net/savepassword", true).toBool());
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1380
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1381	//if nickname is present, put it into the field
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1382	if (!nickname.isEmpty()) {
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1383	pwDialog->leNickname->setText(nickname);
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1384	pwDialog->lePassword->setFocus();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1385	}
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1386
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1387	//if dialog close, create an error message
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1388	if (pwDialog->exec() != QDialog::Accepted) {
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1389	delete pwDialog;
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1390	GoBack();
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1391	return -1;
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1392	}
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1393
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1394	//set nick and pass from the dialog
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1395	nickname = pwDialog->leNickname->text();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1396	password = pwDialog->lePassword->text();
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1397
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1398	//check the nickname variable
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1399	if (nickname.isEmpty()) {
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1400	int retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied."));
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1401	GoBack();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1402	delete pwDialog;
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1403	if (retry) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1404	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1405	QStringList list = hwnet->getHost().split(":");
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1406	NetConnectServer(list.at(0), list.at(1).toShort());
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1407	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1408	NetConnectOfficialServer();
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1409	}
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1410	return -1;
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1411	}
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1412
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1413	if (!password.isEmpty()) {
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1414	//calculate temphash and set it into config
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1415	temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1416	config->setTempHash(temphash);
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1417
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1418	//if user wants to save password
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1419	bool save = pwDialog->cbSave->isChecked();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1420	config->setValue("net/savepassword", save);
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1421	if (save) // user wants to save password
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1422	{
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1423	ui.pageOptions->CBSavePassword->setChecked(true);
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1424	config->setPasswordHash(temphash);
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1425	}
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1426	}
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1427	else {
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1428	delete pwDialog;
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1429	config->setValue("net/nick", nickname);
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1430	config->updNetNick();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1431	config->clearPasswordHash();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1432	break;
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1433	}
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1434
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1435	delete pwDialog;
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1436
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1437	//update nickname
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1438	config->setValue("net/nick", nickname);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1439	config->updNetNick();
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1440
8407 686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1441	//and all the variables
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1442	hash = config->passwordHash();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1443	temphash = config->tempHash();
686f2e716c97 Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm. dag10 <gottlieb.drew@gmail.com> parents: 8396 diff changeset	1444	nickname = config->value("net/nick", "").toString();
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1445	}
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1446	}
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1447	return 0;
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1448	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1449
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1450	void HWForm::NetConnect()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1451	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1452	HWHostPortDialog * hpd = new HWHostPortDialog(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1453	hpd->leHost->setText(*netHost);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1454	hpd->sbPort->setValue(netPort);
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	1455
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1456	if (hpd->exec() == QDialog::Accepted)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1457	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1458	config->SaveOptions();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1459	delete netHost;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1460	netHost = new QString(hpd->leHost->text());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1461	netPort = hpd->sbPort->value();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1462	NetConnectServer(*netHost, netPort);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1463	}
6907 a2f9a9a62dc5 memory leak in hwform.cpp (issue 386) Stepan777 parents: 6793 diff changeset	1464	delete hpd;
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1465	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1466
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1467	void HWForm::NetStartServer()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1468	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1469	config->SaveOptions();
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	1470
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1471	pnetserver = new HWNetServer;
7794 ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1472	if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1473	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1474	MessageDialog::ShowErrorMessage(QMessageBox::tr("Unable to start server"), this);
7794 ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1475
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1476	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1477	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1478	return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1479	}
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	1480
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1481	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	1482
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1483	pRegisterServer = new HWNetUdpServer(0,
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1484	ui.pageNetServer->leServerDescr->text(),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1485	ui.pageNetServer->sbPort->value());
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1486	}
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1487
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1488	void HWForm::AsyncNetServerStart()
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1489	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1490	NetConnectServer("localhost", pnetserver->getRunningPort());
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1491	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1492
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1493	void HWForm::NetDisconnect()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1494	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1495	if(pnetserver)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1496	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1497	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1498	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1499	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1500	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1501	}
659 5eafb20566f1 - Fix some stupid object casts unc0rr parents: 658 diff changeset	1502
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1503	pnetserver->StopServer();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1504	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1505	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1506	}
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1507
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1508	if(hwnet)
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1509	hwnet->Disconnect();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1510	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1511
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1512	void HWForm::ForcedDisconnect(const QString & reason)
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1513	{
8296 455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1514	if (reason == "Reconnected too fast") { //TODO: this is a hack, which should be remade
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1515	bool retry = RetryDialog(tr("Hedgewars - Connection error"), tr("You reconnected too fast.\nPlease wait a few seconds and try again."));
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1516	if (retry) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1517	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1518	QStringList list = hwnet->getHost().split(":");
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1519	NetConnectServer(list.at(0), list.at(1).toShort());
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1520	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1521	NetConnectOfficialServer();
8296 455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1522	}
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1523	else {
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1524	while (ui.Pages->currentIndex() != ID_PAGE_NET
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	1525	&& ui.Pages->currentIndex() != ID_PAGE_MAIN)
8296 455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1526	{
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1527	GoBack();
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1528	}
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1529	}
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1530	return;
455da122c0ad Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated Ondrej Skopek <skopekondrej@gmail.com> parents: 8295 diff changeset	1531	}
7794 ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1532	if (pnetserver)
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1533	return; // we have server - let it care of all things
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1534	if (hwnet) {
7794 ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1535	QString errorStr = QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"'));
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1536	MessageDialog::ShowErrorMessage(errorStr, this);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1537	}
7842 d1c0e4341165 - Better fix than the one from rc7f5c3bd7f8c. Now just scrolling back till net/nettype/main page. Not tested aswell. unc0rr parents: 7826 diff changeset	1538
d1c0e4341165 - Better fix than the one from rc7f5c3bd7f8c. Now just scrolling back till net/nettype/main page. Not tested aswell. unc0rr parents: 7826 diff changeset	1539	while (ui.Pages->currentIndex() != ID_PAGE_NET
d1c0e4341165 - Better fix than the one from rc7f5c3bd7f8c. Now just scrolling back till net/nettype/main page. Not tested aswell. unc0rr parents: 7826 diff changeset	1540	&& ui.Pages->currentIndex() != ID_PAGE_MAIN)
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1541	{
7842 d1c0e4341165 - Better fix than the one from rc7f5c3bd7f8c. Now just scrolling back till net/nettype/main page. Not tested aswell. unc0rr parents: 7826 diff changeset	1542	GoBack();
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1543	}
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1544	}
09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1545
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1546	void HWForm::NetConnected()
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1547	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1548	GoToPage(ID_PAGE_ROOMSLIST);
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1549	}
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1550
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1551	void HWForm::NetGameEnter()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1552	{
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1553	ui.pageNetGame->chatWidget->clear();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1554	GoToPage(ID_PAGE_NETGAME);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1555	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1556
339 7535ab6c3820 Run game message added, team and config info provided for net game displacer parents: 338 diff changeset	1557	void HWForm::AddNetTeam(const HWTeam& team)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1558	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1559	ui.pageNetGame->pNetTeamsWidget->addTeam(team);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1560	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1561
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1562	void HWForm::RemoveNetTeam(const HWTeam& team)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1563	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1564	ui.pageNetGame->pNetTeamsWidget->removeNetTeam(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1565	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1566
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1567	void HWForm::StartMPGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1568	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1569	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1570	ammo = ui.pageMultiplayer->gameCFG->WeaponsName->itemData(
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1571	ui.pageMultiplayer->gameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1572	).toString();
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1573
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1574	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1575
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1576	game->StartLocal();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1577	}
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1578
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1579	void HWForm::GameStateChanged(GameState gameState)
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1580	{
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	1581	quint8 id = ui.Pages->currentIndex();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1582	switch(gameState)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1583	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1584	case gsStarted:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1585	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1586	Music(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1587	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	1588	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	1589	ui.pageGameStats->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1590	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1591	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1592	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1593	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1594	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1595	//setVisible(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1596	setFocusPolicy(Qt::NoFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1597	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1598	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1599	case gsFinished:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1600	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1601	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1602	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	1603	if (id == ID_PAGE_INGAME) GoBack();
8226 67f07ff5b593 Removed redundant "enable"s on checkboxes and variable names. Mitchell Kember <mk12360@gmail.com> parents: 8205 diff changeset	1604	Music(ui.pageOptions->CBFrontendMusic->isChecked());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1605	if (wBackground) wBackground->startAnimation();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1606	GoToPage(ID_PAGE_GAMESTATS);
4908 99d6797b7ff4 Frontend sends ROUNDFINISHED with information about whether the round was played till end (will be needed for stats) unc0rr parents: 4902 diff changeset	1607	if (hwnet && (!game \|\| !game->netSuspend)) hwnet->gameFinished(true);
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	1608	if (game) game->netSuspend = false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1609	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1610	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1611	default:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1612	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1613	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1614	setFocusPolicy(Qt::StrongFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1615	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	1616	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	1617	// was room chief and the game was aborted
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1618	(hwnet && hwnet->isRoomChief() && hwnet->isInRoom() &&
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1619	(gameState == gsInterrupted \|\| gameState == gsStopped \|\| gameState == gsDestroyed \|\| gameState == gsHalted)))
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1620	{
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	1621	if (id == ID_PAGE_INGAME) GoBack();
8226 67f07ff5b593 Removed redundant "enable"s on checkboxes and variable names. Mitchell Kember <mk12360@gmail.com> parents: 8205 diff changeset	1622	Music(ui.pageOptions->CBFrontendMusic->isChecked());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1623	if (wBackground) wBackground->startAnimation();
4908 99d6797b7ff4 Frontend sends ROUNDFINISHED with information about whether the round was played till end (will be needed for stats) unc0rr parents: 4902 diff changeset	1624	if (hwnet) hwnet->gameFinished(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1625	}
4845 9a0f5377c529 merge latest 0.9.15 changes into head koda parents: 4831 4751 diff changeset	1626	if (gameState == gsHalted) close();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1627	};
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1628	}
307 96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1629	}
96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1630
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1631	void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo)
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1632	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1633	game = new HWGame(config, gamecfg, ammo, pTeamSelWidget);
7245 53f73f4ae203 Modified frontend so that updating campaogn progress no longer changes current index of the mission combo box belphegorr <szabibibi@gmail.com> parents: 7207 diff changeset	1634	connect(game, SIGNAL(CampStateChanged(int)), this, SLOT(UpdateCampaignPageProgress(int)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1635	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1636	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	1637	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1638	connect(game, SIGNAL(HaveRecord(RecordType, const QByteArray &)), this, SLOT(GetRecord(RecordType, const QByteArray &)));
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1639	m_lastDemo = QByteArray();
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1640	}
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1641
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1642	void HWForm::GetRecord(RecordType type, const QByteArray & record)
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1643	{
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1644	if (type != rtNeither)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1645	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1646	QString filename;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1647	QByteArray demo = record;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1648	QString recordFileName =
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1649	config->appendDateTimeToRecordName() ?
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1650	QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") :
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1651	"LastRound";
1487 b4cc59a6d50a Add an option to name records with current date and time unc0rr parents: 1427 diff changeset	1652
8613 82c649dfc7c3 split cVersionString into its three separate components (version, revision, hash) and apply the new values sensibly on the frontend (esp. title, info and feedback) koda parents: 8609 diff changeset	1653	recordFileName += "_" + cRevisionString + "-" + cHashString;
4902 45ec26ca9491 if on dev version append hg revision id to demos/saves' filenames sheepluva parents: 4897 diff changeset	1654
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1655	if (type == rtDemo)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1656	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1657	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1658	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1659	demo.replace(QByteArray("\x02TS"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1660	filename = cfgdir->absolutePath() + "/Demos/" + recordFileName + "." + *cProtoVer + ".hwd";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1661	m_lastDemo = demo;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1662	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1663	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1664	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1665	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1666	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1667	filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1668	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1669
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1670	QFile demofile(filename);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1671	if (!demofile.open(QIODevice::WriteOnly))
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1672	MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filename), this);
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1673	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1674	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1675	demofile.write(demo);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1676	demofile.close();
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1677	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1678	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1679
7392 bc3306c59a08 Correctly distinguish between game and real ticks while recording video, Stepan777 <stepik-777@mail.ru> parents: 7376 diff changeset	1680	ui.pageVideos->startEncoding(record);
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1681	}
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1682
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	1683	void HWForm::startTraining(const QString & scriptName)
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1684	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1685	CreateGame(0, 0, 0);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1686
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	1687	game->StartTraining(scriptName);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1688	}
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1689
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1690	void HWForm::StartCampaign()
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1691	{
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1692	CreateGame(0, 0, 0);
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1693
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1694	QComboBox *combo = ui.pageCampaign->CBMission;
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1695	QString camp = ui.pageCampaign->CBCampaign->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1696	unsigned int mNum = combo->count() - combo->currentIndex();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1697	QString miss = getCampaignScript(camp, mNum);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1698	QString campTeam = ui.pageCampaign->CBTeam->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1699
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1700	game->StartCampaign(camp, miss, campTeam);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1701	}
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1702
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1703	void HWForm::CreateNetGame()
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1704	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1705	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1706	ammo = ui.pageNetGame->pGameCFG->WeaponsName->itemData(
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1707	ui.pageNetGame->pGameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1708	).toString();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	1709
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1710	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo);
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1711
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1712	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	1713	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	1714	connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &)));
7916 be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1715	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)), Qt::QueuedConnection);
be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1716	connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)), Qt::QueuedConnection);
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1717
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1718	game->StartNet();
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1719	}
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1720
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1721	void HWForm::closeEvent(QCloseEvent *event)
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1722	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1723	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1724	xfire_free();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1725	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1726	config->SaveOptions();
8266 927da572bcdc will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build mk12 parents: 8226 diff changeset	1727	#if VIDEOREC
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	1728	config->SaveVideosOptions();
8266 927da572bcdc will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build mk12 parents: 8226 diff changeset	1729	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1730	event->accept();
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1731	}
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1732
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1733	void HWForm::Music(bool checked)
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1734	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1735	if (checked)
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	1736	SDLInteraction::instance().startMusic();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1737	else
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	1738	SDLInteraction::instance().stopMusic();
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1739	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1740
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1741	void HWForm::NetGameChangeStatus(bool isMaster)
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1742	{
8377 869f80966a77 GCI2012: Improve Game Configuration Widget dag10 parents: 8357 diff changeset	1743	ui.pageNetGame->pGameCFG->setMaster(isMaster);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1744	ui.pageNetGame->pNetTeamsWidget->setInteractivity(isMaster);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1745
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1746	if (isMaster)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1747	NetGameMaster();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1748	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1749	NetGameSlave();
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1750	}
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1751
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1752	void HWForm::NetGameMaster()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1753	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1754	ui.pageNetGame->setMasterMode(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1755	ui.pageNetGame->restrictJoins->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1756	ui.pageNetGame->restrictTeamAdds->setChecked(false);
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1757	ui.pageNetGame->restrictUnregistered->setChecked(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1758	ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
8377 869f80966a77 GCI2012: Improve Game Configuration Widget dag10 parents: 8357 diff changeset	1759	ui.pageNetGame->pGameCFG->setMaster(true);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1760	ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1761
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1762	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1763	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1764	// disconnect connections first to ensure their inexistance and not to connect twice
8416 e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	1765	ui.pageNetGame->BtnStart->disconnect(this);
5126 50803f3403a5 Frontend: room rename claymore parents: 5114 diff changeset	1766	ui.pageNetGame->BtnUpdate->disconnect(hwnet);
8415 02acf6b92f52 Moved room name edit box from footer to top of page. Also shows room name when in slave mode. dag10 parents: 8407 diff changeset	1767	ui.pageNetGame->leRoomName->disconnect(hwnet);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1768	ui.pageNetGame->restrictJoins->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1769	ui.pageNetGame->restrictTeamAdds->disconnect(hwnet);
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1770	ui.pageNetGame->restrictUnregistered->disconnect(hwnet);
7122 fa2d09868ac6 Fix reported in bug #327, comment #3 - untested but seems reasonable/safe. nemo parents: 7015 diff changeset	1771	ui.pageNetGame->disconnect(hwnet, SLOT(updateRoomName(const QString&)));
7710 fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin unc0rr parents: 7679 diff changeset	1772
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin unc0rr parents: 7679 diff changeset	1773	ui.pageNetGame->setRoomName(hwnet->getRoom());
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin unc0rr parents: 7679 diff changeset	1774
8416 e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	1775	connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), this, SLOT(startGame()));
7122 fa2d09868ac6 Fix reported in bug #327, comment #3 - untested but seems reasonable/safe. nemo parents: 7015 diff changeset	1776	connect(ui.pageNetGame, SIGNAL(askForUpdateRoomName(const QString &)), hwnet, SLOT(updateRoomName(const QString &)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1777	connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1778	connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds()));
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1779	connect(ui.pageNetGame->restrictUnregistered, SIGNAL(triggered()), hwnet, SLOT(toggleRegisteredOnly()));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1780	connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1781	SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1782	ui.pageNetGame->pGameCFG,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1783	SLOT(resendSchemeData())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1784	);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1785	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1786	}
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1787
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1788	void HWForm::NetGameSlave()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1789	{
8377 869f80966a77 GCI2012: Improve Game Configuration Widget dag10 parents: 8357 diff changeset	1790	ui.pageNetGame->pGameCFG->setMaster(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1791	ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1792
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1793	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1794	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1795	NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1796	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1797	ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1798
8415 02acf6b92f52 Moved room name edit box from footer to top of page. Also shows room name when in slave mode. dag10 parents: 8407 diff changeset	1799	ui.pageNetGame->setRoomName(hwnet->getRoom());
02acf6b92f52 Moved room name edit box from footer to top of page. Also shows room name when in slave mode. dag10 parents: 8407 diff changeset	1800
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1801	ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1802	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1803	this, SLOT(selectFirstNetScheme()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1804	}
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1805
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1806	ui.pageNetGame->setMasterMode(false);
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1807	}
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1808
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1809	void HWForm::selectFirstNetScheme()
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1810	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1811	ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1812	}
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1813
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1814	void HWForm::NetLeftRoom(const QString & reason)
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1815	{
4433 e0092290b7c5 do GoBack if also INGAME due to kick nemo parents: 4432 diff changeset	1816	if (ui.Pages->currentIndex() == ID_PAGE_NETGAME \|\| ui.Pages->currentIndex() == ID_PAGE_INGAME)
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1817	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1818	GoBack();
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1819	if (!reason.isEmpty())
6180 0992fc5a4ad9 some changes to the css... display:none; works now (e.g. you can use it for user join/leave messages that are not your friends) sheepluva parents: 6167 diff changeset	1820	ui.pageRoomsList->displayNotice(reason);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1821	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1822	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1823	qWarning("Left room while not in room");
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1824	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1825
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1826	void HWForm::resizeEvent(QResizeEvent * event)
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1827	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1828	int w = event->size().width();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1829	int h = event->size().height();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1830	if (wBackground)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1831	{
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1832	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	1833	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	1834	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1835	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1836
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1837	void HWForm::InitCampaignPage()
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1838	{
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1839	ui.pageCampaign->CBCampaign->clear();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1840	HWTeam team(ui.pageCampaign->CBTeam->currentText());
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1841
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1842	QStringList entries = DataManager::instance().entryList(
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1843	"Missions/Campaign",
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1844	QDir::Dirs,
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1845	QStringList("[^\\.]*")
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1846	);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1847
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1848	unsigned int n = entries.count();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1849	for(unsigned int i = 0; i < n; i++)
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1850	{
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1851	ui.pageCampaign->CBCampaign->addItem(QString(entries[i]), QString(entries[i]));
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1852	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1853	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1854
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1855
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1856	void HWForm::UpdateCampaignPage(int index)
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1857	{
4560 5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1858	Q_UNUSED(index);
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1859
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1860	HWTeam team(ui.pageCampaign->CBTeam->currentText());
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1861	ui.pageCampaign->CBMission->clear();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1862
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1863	QString campaignName = ui.pageCampaign->CBCampaign->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1864	QStringList missionEntries = getCampMissionList(campaignName);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1865	QString tName = team.name();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1866	unsigned int n = missionEntries.count();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1867	unsigned int m = getCampProgress(tName, campaignName);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1868
7636 10caa79d4a80 min -> qMin sheepluva parents: 7628 diff changeset	1869	for (unsigned int i = qMin(m + 1, n); i > 0; i--)
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1870	{
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1871	ui.pageCampaign->CBMission->addItem(QString("Mission %1: ").arg(i) + QString(missionEntries[i-1]), QString(missionEntries[i-1]));
5238 46ddaf14509d Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing. nemo parents: 5222 diff changeset	1872	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1873	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1874
7490 c422845b8d1f Fixed a typo, frontend is now working properly belphegorr <szabibibi@gmail.com> parents: 7411 diff changeset	1875	void HWForm::UpdateCampaignPageProgress(int index)
7245 53f73f4ae203 Modified frontend so that updating campaogn progress no longer changes current index of the mission combo box belphegorr <szabibibi@gmail.com> parents: 7207 diff changeset	1876	{
7679 bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1877	Q_UNUSED(index);
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1878
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1879	int missionIndex = ui.pageCampaign->CBMission->currentIndex();
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1880	UpdateCampaignPage(0);
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1881	ui.pageCampaign->CBMission->setCurrentIndex(missionIndex);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1882	}
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1883
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1884	// used for --set-everything [screen width] [screen height] [color dept] [volume] [enable music] [enable sounds] [language file] [full screen] [show FPS] [alternate damage] [timer value] [reduced quality]
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1885	QString HWForm::getDemoArguments()
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1886	{
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1887
8643 e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1888	QString prefix = "\"" + datadir->absolutePath() + "\"";
e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1889	QString userPrefix = "\"" + cfgdir->absolutePath() + "\"";
8302 a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1890	#ifdef Q_WS_WIN
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1891	prefix = prefix.replace("/","\\");
8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1892	userPrefix = userPrefix.replace("/","\\");
8302 a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1893	#endif
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1894
8354 c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1895	std::pair<QRect, QRect> resolutions = config->vid_ResolutionPair();
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1896	return QString("--prefix " + prefix
8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1897	+ " --user-prefix " + userPrefix
8354 c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1898	+ " --fullscreen-width " + QString::number(resolutions.first.width())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1899	+ " --fullscreen-height " + QString::number(resolutions.first.height())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1900	+ " --width " + QString::number(resolutions.second.width())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1901	+ " --height " + QString::number(resolutions.second.height())
8302 a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1902	+ " --volume " + QString::number(config->volume())
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1903	+ (config->isMusicEnabled() ? "" : " --nomusic")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1904	+ (config->isSoundEnabled() ? "" : " --nosound")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1905	+ " --locale " + config->language() + ".txt"
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1906	+ (config->vid_Fullscreen() ? " --fullscreen" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1907	+ (config->isShowFPSEnabled() ? " --showfps" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1908	+ (config->isAltDamageEnabled() ? " --altdmg" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1909	+ " --frame-interval " + QString::number(config->timerInterval())
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1910	+ " --raw-quality " + QString::number(config->translateQuality()));
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1911	}
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1912
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1913	void HWForm::AssociateFiles()
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1914	{
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1915	bool success = true;
5222 0922b9d816af unbreak compiling frontend under osx koda parents: 5213 diff changeset	1916	QString arguments = getDemoArguments();
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1917	#ifdef _WIN32
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1918	QSettings registry_hkcr("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
8722 2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1919
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1920	// file extension(s)
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1921	registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1922	registry_hkcr.setValue(".hws/Default", "Hedgewars.Save");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1923	registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1924	registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1925	registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1926	registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",0");
8643 e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1927	registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1");
e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1928	registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1");
8722 2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1929
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1930	// custom url scheme(s)
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1931	registry_hkcr.setValue("hwplay/Default", "\"URL:Hedgewars ServerAccess Protocol\"");
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1932	registry_hkcr.setValue("hwplay/URL Protocol", "");
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1933	registry_hkcr.setValue("hwplay/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\",0");
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	1934	registry_hkcr.setValue("hwplay/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\" %1");
4090 4b165832d232 disable file association on mac for now koda parents: 4085 diff changeset	1935	#elif defined __APPLE__
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1936	// only useful when other apps have taken precedence over our file extensions and you want to reset it
ded882439548 file association for mac! koda parents: 5238 diff changeset	1937	system("defaults write com.apple.LaunchServices LSHandlers -array-add '<dict><key>LSHandlerContentTag</key><string>hwd</string><key>LSHandlerContentTagClass</key><string>public.filename-extension</string><key>LSHandlerRoleAll</key><string>org.hedgewars.desktop</string></dict>'");
ded882439548 file association for mac! koda parents: 5238 diff changeset	1938	system("defaults write com.apple.LaunchServices LSHandlers -array-add '<dict><key>LSHandlerContentTag</key><string>hws</string><key>LSHandlerContentTagClass</key><string>public.filename-extension</string><key>LSHandlerRoleAll</key><string>org.hedgewars.desktop</string></dict>'");
ded882439548 file association for mac! koda parents: 5238 diff changeset	1939	system("/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -domain local -domain system -domain user");
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1940	#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	1941	// 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	1942	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1943	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1944	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	1945	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages");
4085 6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1946	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1947	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	1948	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	1949	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	1950	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	1951	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	1952	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	1953	if (success) success = system("xdg-mime default hwengine.desktop application/x-hedgewars-save")==0;
5238 46ddaf14509d Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing. nemo parents: 5222 diff changeset	1954	// hack to add user's settings to hwengine. might be better at this point to read in the file, append it, and write it out to its new home. This assumes no spaces in the data dir path
8639 33d29ed99faa hopefully fix bug 523, file extension association koda parents: 8613 diff changeset	1955	if (success) success = system(("sed -i 's\|^\\(Exec=.*\\) \\(%f\\)\|\\1 \\2 "+arguments+"\|' "+QDir::home().absolutePath()+"/.local/share/applications/hwengine.desktop").toLocal8Bit().constData())==0;
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1956	#endif
7794 ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1957	if (success)
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1958	{
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1959	QMessageBox infoMsg(this);
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1960	infoMsg.setIcon(QMessageBox::Information);
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1961	infoMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Success"));
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1962	infoMsg.setText(QMessageBox::tr("All file associations have been set"));
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1963	infoMsg.setWindowModality(Qt::WindowModal);
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1964	infoMsg.exec();
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1965	}
ab7b94c03bc9 QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way koda parents: 7792 diff changeset	1966	else
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1967	MessageDialog::ShowErrorMessage(QMessageBox::tr("File association failed."), this);
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1968	}
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	1969
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	1970	void HWForm::openRegistrationPage()
8364 fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	1971	{
fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	1972	QDesktopServices::openUrl(QUrl("http://www.hedgewars.org/user/register"));
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	1973	}
8364 fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	1974
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1975	void HWForm::saveDemoWithCustomName()
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1976	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1977	if(!m_lastDemo.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1978	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1979	QString fileName;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1980	bool ok = false;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1981	do
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1982	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1983	fileName = QInputDialog::getText(this, tr("Demo name"), tr("Demo name:"));
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1984
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1985	if(!fileName.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1986	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1987	QString filePath = cfgdir->absolutePath() + "/Demos/" + fileName + "." + *cProtoVer + ".hwd";
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1988	QFile demofile(filePath);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1989	ok = demofile.open(QIODevice::WriteOnly);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1990	if (!ok)
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1991	MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filePath), this);
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1992	else
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1993	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1994	ok = -1 != demofile.write(m_lastDemo);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1995	demofile.close();
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1996	}
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1997	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1998	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1999	while(!fileName.isEmpty() && !ok);
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2000	}
5746 fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	2001	}
fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	2002
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	2003
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2004	void HWForm::ShowErrorMessage(const QString & msg)
b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2005	{
b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2006	MessageDialog::ShowErrorMessage(msg, this);
b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2007	}
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2008
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2009	void HWForm::showFeedbackDialog()
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2010	{
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2011	FeedbackDialog dialog(this);
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2012	dialog.exec();
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2013	}
8416 e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2014
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2015	void HWForm::startGame()
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2016	{
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2017	QMessageBox questionMsg(this);
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2018	questionMsg.setIcon(QMessageBox::Question);
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2019	questionMsg.setWindowTitle(QMessageBox::tr("Not all players are ready"));
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2020	questionMsg.setText(QMessageBox::tr("Are you sure you want to start this game?\nNot all players are ready."));
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2021	questionMsg.setWindowModality(Qt::WindowModal);
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2022	questionMsg.addButton(QMessageBox::Yes);
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2023	questionMsg.addButton(QMessageBox::Cancel);
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2024
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2025	if (hwnet->allPlayersReady() \|\| questionMsg.exec() == QMessageBox::Yes)
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2026	hwnet->startGame();
e691acd778f5 It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server. dag10 parents: 8415 diff changeset	2027	}

author	koda
	Thu, 13 Jun 2013 22:50:33 +0200
branch	cmake_pascal
changeset 8872	89ddfe10e52b
parent 8722	2dead6b84bca
child 8759	1a4b9b9fe2b0
child 8766	ce153d705fff
permissions	-rw-r--r--