hedgewars: QTfrontend/hwform.cpp@ccab0d396a7f (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
11046 47a8c19ecb60 more copyright fixes sheepluva parents: 10971 diff changeset	3	* Copyright (c) 2004-2015 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
10108 c68cf030eded update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers sheepluva parents: 10017 diff changeset	16	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
184 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>
8891 bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	48	#include <QSortFilterProxyModel>
11863 35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	49	#include <QIcon>
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	50	#include <QImage>
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	51
9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	52	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	53	#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	54	#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	55	#endif
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	56
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	57	#include "hwform.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	58	#include "game.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	59	#include "team.h"
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	60	#include "campaign.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	61	#include "teamselect.h"
681 7a20c50988ec working weapons select displacer parents: 674 diff changeset	62	#include "selectWeapon.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	63	#include "gameuiconfig.h"
5204 e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	64	#include "pageinfo.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	65	#include "pagetraining.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	66	#include "pagesingleplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	67	#include "pageselectweapon.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	68	#include "pageadmin.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	69	#include "pagecampaign.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	70	#include "pagescheme.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	71	#include "pagenetgame.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	72	#include "pageroomslist.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	73	#include "pageconnecting.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	74	#include "pageoptions.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	75	#include "pageeditteam.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	76	#include "pagemultiplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	77	#include "pagenet.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	78	#include "pagemain.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	79	#include "pagenetserver.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	80	#include "pagedrawmap.h"
5205 78138ae93820 some headers cleanup and rename of stats and playrecord pages for consistency koda parents: 5204 diff changeset	81	#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	82	#include "pageplayrecord.h"
44c9a577b082 Tiny bit of progress on download page - hooked it up to "Info" button for now. nemo parents: 5255 diff changeset	83	#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	84	#include "pagevideos.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	85	#include "hwconsts.h"
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	86	#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	87	#include "gamecfgwidget.h"
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	88	#include "netserverslist.h"
634 b9db5ff5cfdb Fix some bugs unc0rr parents: 632 diff changeset	89	#include "netudpserver.h"
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	90	#include "chatwidget.h"
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	91	#include "input_ip.h"
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	92	#include "input_password.h"
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	93	#include "ammoSchemeModel.h"
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	94	#include "bgwidget.h"
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	95	#include "drawmapwidget.h"
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	96	#include "mouseoverfilter.h"
6732 c906dc78091f Start switching to rooms list model. To be continued. unc0rr parents: 6720 diff changeset	97	#include "roomslistmodel.h"
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	98	#include "recorder.h"
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	99	#include "playerslistmodel.h"
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	100	#include "feedbackdialog.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	101
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	102	#include "MessageDialog.h"
6930 d187ea93fc4f renaming HWDataManager -> DataManager sheepluva parents: 6911 diff changeset	103	#include "DataManager.h"
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	104	#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	105
9163 67334acaaac7 port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5 koda parents: 9100 diff changeset	106	#ifdef Q_OS_WIN
11803 d85d273cb3aa Fix some warnings unC0Rr parents: 11046 diff changeset	107	#ifndef WINVER
8328 03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	108	#define WINVER 0x0500
11803 d85d273cb3aa Fix some warnings unC0Rr parents: 11046 diff changeset	109	#endif
8328 03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	110	#include <windows.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	111	#else
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	112	#include <unistd.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	113	#include <sys/types.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	114	#endif
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	115
9163 67334acaaac7 port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5 koda parents: 9100 diff changeset	116	#ifdef Q_OS_MAC
8328 03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	117	#include <sys/sysctl.h>
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	118	#endif
03684c667664 GCI2012: Feedback Redo dag10 parents: 8318 diff changeset	119
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	120	#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	121	#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	122	#ifdef SPARKLE_ENABLED
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	123	#include "SparkleAutoUpdater.h"
57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	124	#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	125	#endif
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	126
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	127
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	// 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	129	// 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	130	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	131	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	132
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	133	QIcon finishedIcon;
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	134	QIcon notFinishedIcon;
6572 0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	135	GameUIConfig* HWForm::config = NULL;
0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	136
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	137	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	138	: QMainWindow(parent)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	139	, game(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	140	, pnetserver(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	141	, pRegisterServer(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	142	, editedTeam(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	143	, hwnet(0)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	144	{
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	145	// set music track
8049 133e22b5c410 Get rid of DataManager::findFileForRead unc0rr parents: 7933 diff changeset	146	SDLInteraction::instance().setMusicTrack("/Music/main_theme.ogg");
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	147
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	148	this->setStyleSheet(styleSheet);
11863 35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	149
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	150
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	151	QIcon * hwIcon = new QIcon();
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	152	hwIcon->addFile(":/res/hh_small.png");
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	153	//hwIcon->addFile(":/res/hh25x25.png");
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	154	// crop-workaround for the fact that hh25x25.png is actually 25x35
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	155	QPixmap pm(":/res/hh25x25.png");
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	156	hwIcon->addPixmap(pm.copy(0,(pm.height()-25)/2,25,25));
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	157	hwIcon->addFile(":/res/teamicon.png");
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	158	hwIcon->addFile(":/res/teamicon2.png");
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	159
35208f442daf Bug 115 - Application icon is missing sheepluva parents: 11852 diff changeset	160	this->setWindowIcon(*hwIcon);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	161	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	162	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	163	//setFocusPolicy(Qt::StrongFocus);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	164	CustomizePalettes();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	165
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	166	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	167
8918 512753ea4b1b Switch to 'settings.ini'. Copies old ini file if necessary on startup. unc0rr parents: 8901 diff changeset	168	config = new GameUIConfig(this, DataManager::instance().settingsFileName());
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	169	frontendEffects = config->value("frontend/effects", true).toBool();
9057 903f50e85144 Default to random guest username in all places net/nick is fetched. Fixes issue #588 nemo parents: 9033 diff changeset	170	playerHash = QString(QCryptographicHash::hash(config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString().toUtf8(), QCryptographicHash::Md5).toHex());
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	171
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	172	// Icons for finished missions
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	173	finishedIcon.addFile(":/res/missionFinished.png", QSize(), QIcon::Normal, QIcon::On);
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	174	finishedIcon.addFile(":/res/missionFinishedSelected.png", QSize(), QIcon::Selected, QIcon::On);
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	175
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	176	// A transparent icon, used to nicely align the unfinished missions with the finished ones
4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	177	QPixmap emptySpace = QPixmap(15, 15);
4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	178	emptySpace.fill(QColor(0, 0, 0, 0));
4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	179	notFinishedIcon = QIcon(emptySpace);
4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	180
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	181	ui.pageRoomsList->setSettings(config);
8453 06541556df53 Reorganized layout and appearance of rooms list page. dag10 parents: 8451 diff changeset	182	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	183	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	184	ui.pageRoomsList->chatWidget->setSettings(config);
8346 3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	185	ui.pageOptions->setConfig(config);
8151 25b95d6224fc Google Code-in: Move video preferences in settings tab Mitchell Kember <mk12360@gmail.com> parents: 8140 diff changeset	186	#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	187	ui.pageVideos->init(config);
8151 25b95d6224fc Google Code-in: Move video preferences in settings tab Mitchell Kember <mk12360@gmail.com> parents: 8140 diff changeset	188	#endif
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	189
10971 0e122b87ffbc Fix building on OSX when autoupdate is disabled koda parents: 10803 diff changeset	190	#if defined(__APPLE__) && defined(SPARKLE_ENABLED)
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	191	if (config->isAutoUpdateEnabled())
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	192	{
9393 094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	193	AutoUpdater* updater = NULL;
094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	194
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	195	updater = new SparkleAutoUpdater();
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	196	if (updater)
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	197	{
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	198	updater->checkForUpdates();
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	199	delete updater;
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	200	}
a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	201	}
8287 e2a5dece221f Fix non-osx build broken in ra874d00df4a4. Dudes... :( unc0rr parents: 8284 diff changeset	202	#endif
8284 a874d00df4a4 GCI2012: Autoupdate Button in Settings Drew Gottlieb parents: 8268 diff changeset	203
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	204	#ifdef __APPLE__
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	205	panel = new M3Panel;
5087 d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	206
d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	207	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	208	connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized()));
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	209	#else
4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	210	// 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	211	QShortcut * closeFrontend = new QShortcut(QKeySequence("Ctrl+Q"), this);
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	212	connect (closeFrontend, SIGNAL(activated()), this, SLOT(close()));
7824 3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	213	//QShortcut * updateData = new QShortcut(QKeySequence("F5"), this);
3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	214	//connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload()));
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	215	#endif
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	216
9219 0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	217	previousCampaignName = "";
0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	218	previousTeamName = "";
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	219	UpdateTeamsLists();
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	220	InitCampaignPage();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	221	UpdateCampaignPage(0);
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	222	UpdateCampaignPageTeam(0);
9286 c89b992ff5fe fixed bug about starting campaign page with not descriptions/images and with wrong description/image mathcing Periklis Ntanasis <pntanasis@gmail.com> parents: 9284 diff changeset	223	UpdateCampaignPageMission(0);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	224	UpdateWeapons();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	225
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	226	// connect all goBack signals
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	227	int nPages = ui.Pages->count();
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	228
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	229	for (int i = 0; i < nPages; i++)
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	230	connect(ui.Pages->widget(i), SIGNAL(goBack()), this, SLOT(GoBack()));
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	231
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	232	pageSwitchMapper = new QSignalMapper(this);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	233	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	234
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	235	connect(config, SIGNAL(frontendFullscreen(bool)), this, SLOT(onFrontendFullscreen(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	236	onFrontendFullscreen(config->isFrontendFullscreen());
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	237
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	238	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	239	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	240
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	241	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	242	pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	243
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	244	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	245
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	246	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	247	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	248
d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	249	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	250	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	251
7015 08642c7da4a3 add DLC button to net game room sheepluva parents: 7004 diff changeset	252
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	253	#ifdef VIDEOREC
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	254	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	255	pageSwitchMapper->setMapping(ui.pageMain->BtnVideos, ID_PAGE_VIDEOS);
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	256	#endif
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	257
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	258	//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	259	//connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	260
7553 9cfe74ee418b Simplify code a bit unc0rr parents: 7551 diff changeset	261	connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	262
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	263	connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	264	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	265	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	266	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	267	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	268	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	269	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	270	pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	271
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	272
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	273	connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	274	connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	275
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	276	connect(ui.pageOptions, SIGNAL(newTeamRequested()), this, SLOT(NewTeam()));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	277	connect(ui.pageOptions, SIGNAL(editTeamRequested(const QString&)), this, SLOT(EditTeam(const QString&)));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	278	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	279	connect(ui.pageOptions, SIGNAL(goBack()), config, SLOT(SaveOptions()));
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	280	connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles()));
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	281
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	282	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	283	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	284	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	285	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	286	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	287	connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme()));
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	288	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	289	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsChanged()), this, SLOT(UpdateWeapons()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	290
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	291	connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	292	connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	293	pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	294
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	295	connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	296
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	297	connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	298
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	299	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	300	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	301	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	302	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	303	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	304	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	305	pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	306
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	307	connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	308	pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN);
187 96c3154efee5 "About" page, not yet filled with content unc0rr parents: 184 diff changeset	309
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	310	connect(ui.pageInfo->BtnSnapshots, SIGNAL(clicked()), this, SLOT(OpenSnapshotFolder()));
1312 0078e4f72d40 Create a page for rooms list unc0rr parents: 1311 diff changeset	311
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	312	connect(ui.pageGameStats, SIGNAL(saveDemoRequested()), this, SLOT(saveDemoWithCustomName()));
8901 505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	313	connect(ui.pageGameStats, SIGNAL(restartGameRequested()), this, SLOT(restartGame()));
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	314
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	315	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	316	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	317	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnTrainPage, ID_PAGE_TRAINING);
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	318
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	319	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	320	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	321
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	322	connect(ui.pageSinglePlayer->BtnMultiplayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	323	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnMultiplayer, ID_PAGE_MULTIPLAYER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	324
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	325	connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	326	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	327
11968 1de4d6b35748 Mission recategorization into trainings, challenges and scenarios. Wuzzy <almikes@aol.com> parents: 11959 diff changeset	328	connect(ui.pageTraining, SIGNAL(startMission(const QString&, const QString&)), this, SLOT(startTraining(const QString&, const QString&)));
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	329
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	330	connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign()));
9324 98368198a75d added slot for starting campaign by clicking the image and some events in moon mission Periklis Ntanasis <pntanasis@gmail.com> parents: 9308 diff changeset	331	connect(ui.pageCampaign->btnPreview, SIGNAL(clicked()), this, SLOT(StartCampaign()));
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	332	connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	333	connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPageTeam(int)));
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	334	connect(ui.pageCampaign->CBCampaign, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
9182 f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	335	connect(ui.pageCampaign->CBMission, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPageMission(int)));
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	336
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	337	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	338	ui.pageSelectWeapon->pWeapons, SLOT(deleteWeaponsName())); // executed first
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	339	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	340	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	341	//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	342	// this, SLOT(GoBack())); // executed third
718 f93a38d2c982 delete weapon button added displacer parents: 717 diff changeset	343
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	344
8318 e2c01fbf36c0 GCI2012: Beautify Network Page dag10 parents: 8307 diff changeset	345	connect(ui.pageMain->BtnNetLocal, SIGNAL(clicked()), this, SLOT(GoToNet()));
e2c01fbf36c0 GCI2012: Beautify Network Page dag10 parents: 8307 diff changeset	346	connect(ui.pageMain->BtnNetOfficial, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer()));
1950 09ad18a1be11 Implement two buttons unc0rr parents: 1925 diff changeset	347
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	348	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	349
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	350	ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	351	ui.pageScheme->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	352	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	353	ui.pageOptions->SchemesName->setModel(ammoSchemeModel);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	354
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	355	wBackground = new BGWidget(this);
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	356	wBackground->setFixedSize(this->width(), this->height());
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	357	wBackground->lower();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	358	wBackground->init();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	359	wBackground->enabled = config->isFrontendEffects();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	360	wBackground->startAnimation();
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	361
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	362	//Install all eventFilters :
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	363
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	364	MouseOverFilter *filter = new MouseOverFilter();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	365	filter->setUi(&ui);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	366
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	367	QList<QWidget *> widgets;
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	368
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	369	for (int i=0; i < ui.Pages->count(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	370	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	371	widgets = ui.Pages->widget(i)->findChildren<QWidget *>();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	372
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	373	for (int i=0; i < widgets.size(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	374	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	375	widgets.at(i)->installEventFilter(filter);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	376	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	377	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	378
8569 62f4e903fddc Fix issue 537 (empty team created on startup) unc0rr parents: 8559 diff changeset	379	ui.Pages->setCurrentIndex(ID_PAGE_INFO);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	380	PagesStack.push(ID_PAGE_MAIN);
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	381	((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageEnter();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	382	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	383	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	384
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	385	void HWForm::onFrontendFullscreen(bool value)
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	386	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	387	if (value)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	388	setWindowState(windowState() \| Qt::WindowFullScreen);
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	389	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	390	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	391	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	392	}
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	393	}
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	394
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	395	void HWForm::onFrontendEffects(bool value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	396	{
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	397	wBackground->enabled = value;
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	398	if (value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	399	wBackground->startAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	400	else
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	401	wBackground->stopAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	402	}
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	403
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	404	/*
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	405	void HWForm::keyReleaseEvent(QKeyEvent *event)
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	406	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	407	if (event->key() == Qt::Key_Escape)
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	408	this->GoBack();
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	409	}
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	410	*/
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	411
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	412	void HWForm::CustomizePalettes()
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	413	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	414	QList<QScrollBar > allSBars = findChildren<QScrollBar >();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	415	QPalette pal = palette();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	416	pal.setColor(QPalette::WindowText, QColor(0xff, 0xcc, 0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	417	pal.setColor(QPalette::Button, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	418	pal.setColor(QPalette::Base, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	419	pal.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	420
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	421	for (int i = 0; i < allSBars.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	422	allSBars.at(i)->setPalette(pal);
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	423	}
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	424
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	425	void HWForm::UpdateWeapons()
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	426	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	427	QVector<QComboBox*> combos;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	428	combos.push_back(ui.pageOptions->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	429	combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	430	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	431	combos.push_back(ui.pageSelectWeapon->selectWeaponSet);
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	432
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	433	QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	434
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	435	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	436	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	437	(*it)->clear();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	438
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	439	for(int i = 0; i < names.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	440	(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i]));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	441
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	442	int pos = (*it)->findText("Default");
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	443	if (pos != -1)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	444	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	445	(*it)->setCurrentIndex(pos);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	446	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	447	}
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	448	}
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	449
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	450	void HWForm::UpdateTeamsLists()
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	451	{
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	452	QStringList teamslist = config->GetTeamsList();
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	453
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	454	if(teamslist.empty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	455	{
9057 903f50e85144 Default to random guest username in all places net/nick is fetched. Fixes issue #588 nemo parents: 9033 diff changeset	456	QString currentNickName = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString().toUtf8();
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	457	QString teamName;
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	458
a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	459	if (currentNickName.isEmpty())
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	460	{
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	461	teamName = tr("DefaultTeam");
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	462	}
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	463	else
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	464	{
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	465	teamName = tr("%1's Team").arg(currentNickName);
c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	466	}
8140 a098374b847b A bit of refactoring unc0rr parents: 8136 diff changeset	467
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	468	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	469	defaultTeam.saveToFile();
8136 c2196b1dccb4 GCI: use player's name for the default team zero579911 parents: 8098 diff changeset	470	teamslist.push_back(teamName);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	471	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	472
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	473	ui.pageOptions->CBTeamName->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	474	ui.pageOptions->CBTeamName->addItems(teamslist);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	475	ui.pageCampaign->CBTeam->clear();
11959 3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	476	/* Only show human teams in campaign page */
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	477	for(int i=0; i<teamslist.length(); i++)
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	478	{
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	479	HWTeam testTeam = HWTeam(teamslist[i]);
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	480	testTeam.loadFromFile();
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	481	if(testTeam.difficulty() == 0)
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	482	{
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	483	ui.pageCampaign->CBTeam->addItem(teamslist[i]);
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	484	}
3c15903256a7 Don't show AI-controlled teams in campaigns page Wuzzy <almikes@aol.com> parents: 11958 diff changeset	485	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	486	}
4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	487
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	488	void HWForm::GoToSelectNewWeapon()
436045756181 working save weapons to file displacer parents: 687 diff changeset	489	{
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	490	ui.pageSelectWeapon->pWeapons->newWeaponsName();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	491	GoToPage(ID_PAGE_SELECTWEAPON);
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	492	}
436045756181 working save weapons to file displacer parents: 687 diff changeset	493
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	494	void HWForm::GoToSelectWeapon()
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	495	{
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	496	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	497	GoToPage(ID_PAGE_SELECTWEAPON);
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	498	}
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	499
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	500	void HWForm::GoToSelectWeaponSet(int index)
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	501	{
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	502	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(index);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	503	GoToPage(ID_PAGE_SELECTWEAPON);
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	504	}
91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	505
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	506	void HWForm::GoToSaves()
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	507	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	508	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Save);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	509
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	510	GoToPage(ID_PAGE_DEMOS);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	511	}
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	512
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	513	void HWForm::GoToDemos()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	514	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	515	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Demo);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	516
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	517	GoToPage(ID_PAGE_DEMOS);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	518	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	519
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	520	void HWForm::GoToNet()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	521	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	522	ui.pageNet->updateServersList();
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	523
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	524	GoToPage(ID_PAGE_NET);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	525	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	526
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	527	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	528	{
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	529	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	530	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	531	}
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	532
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	533	void HWForm::GoToNewScheme()
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 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	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	536	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	537	}
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
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	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	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	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	542	GoToPage(ID_PAGE_SCHEME);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	543	}
75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	544
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	545	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	546	{
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	547	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	548	}
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	549
8353 c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	550	//TODO: maybe find a better place for this?
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	551	QString HWForm::stringifyPageId(quint32 id)
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	552	{
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	553	QString pageName;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	554	switch (id)
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	555	{
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	556	case ID_PAGE_SETUP_TEAM : pageName = "PAGE_SETUP_TEAM"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	557	case ID_PAGE_SETUP : pageName = "PAGE_SETUP"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	558	case ID_PAGE_MULTIPLAYER : pageName = "PAGE_MULTIPLAYER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	559	case ID_PAGE_DEMOS : pageName = "PAGE_DEMOS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	560	case ID_PAGE_NET : pageName = "PAGE_NET"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	561	case ID_PAGE_NETGAME : pageName = "PAGE_NETGAME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	562	case ID_PAGE_INFO : pageName = "PAGE_INFO"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	563	case ID_PAGE_MAIN : pageName = "PAGE_MAIN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	564	case ID_PAGE_GAMESTATS : pageName = "PAGE_GAMESTATS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	565	case ID_PAGE_SINGLEPLAYER : pageName = "PAGE_SINGLEPLAYER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	566	case ID_PAGE_TRAINING : pageName = "PAGE_TRAINING"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	567	case ID_PAGE_SELECTWEAPON : pageName = "PAGE_SELECTWEAPON"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	568	case ID_PAGE_NETSERVER : pageName = "PAGE_NETSERVER"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	569	case ID_PAGE_INGAME : pageName = "PAGE_INGAME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	570	case ID_PAGE_ROOMSLIST : pageName = "PAGE_ROOMSLIST"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	571	case ID_PAGE_CONNECTING : pageName = "PAGE_CONNECTING"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	572	case ID_PAGE_SCHEME : pageName = "PAGE_SCHEME"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	573	case ID_PAGE_ADMIN : pageName = "PAGE_ADMIN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	574	case ID_PAGE_CAMPAIGN : pageName = "PAGE_CAMPAIGN"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	575	case ID_PAGE_DRAWMAP : pageName = "PAGE_DRAWMAP"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	576	case ID_PAGE_DATADOWNLOAD : pageName = "PAGE_DATADOWNLOAD"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	577	case ID_PAGE_VIDEOS : pageName = "PAGE_VIDEOS"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	578	case MAX_PAGE : pageName = "MAX_PAGE"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	579	default : pageName = "UNKNOWN_PAGE"; break;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	580	}
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	581	return pageName;
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	582	}
c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	583
496 00465a8ef129 merged new team from branch displacer parents: 493 diff changeset	584	void HWForm::OnPageShown(quint8 id, quint8 lastid)
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	585	{
9235 1c1580c37876 issue 672, frontend less spammy koda parents: 9219 diff changeset	586	#ifdef QT_DEBUG
8353 c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	587	qDebug("Leaving %s, entering %s", qPrintable(stringifyPageId(lastid)), qPrintable(stringifyPageId(id)));
9235 1c1580c37876 issue 672, frontend less spammy koda parents: 9219 diff changeset	588	#endif
8977 d424c7f8b342 Change net button back on leaving main page. nemo parents: 8918 diff changeset	589	if (lastid == ID_PAGE_MAIN)
d424c7f8b342 Change net button back on leaving main page. nemo parents: 8918 diff changeset	590	{
8982 0c0141cf851a Needs to reset net button, not toggle it. nemo parents: 8977 diff changeset	591	ui.pageMain->resetNetworkChoice();
8977 d424c7f8b342 Change net button back on leaving main page. nemo parents: 8918 diff changeset	592	}
8353 c23bd7ee9a5e simplify entering/leaving pages debug koda parents: 8346 diff changeset	593
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	594	// pageEnter and pageLeave events
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	595	((AbstractPage*)ui.Pages->widget(lastid))->triggerPageLeave();
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	596	((AbstractPage*)ui.Pages->widget(id))->triggerPageEnter();
a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	597
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	598	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	599	{
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	600	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	601	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	602	if (id == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	603	{
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	604	DrawMapScene * scene;
4535 301df2c84b97 The Fix unc0rr parents: 4525 diff changeset	605	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	606	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	607	else
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	608	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	609
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	610	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	611	}
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	612
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	613	if (lastid == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	614	{
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	615	if (id == ID_PAGE_MULTIPLAYER)
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	616	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	617	else
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	618	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	619	}
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	620
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	621	if (id == ID_PAGE_ROOMSLIST)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	622	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	623	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	624	{
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	625	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	626	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	627	game->abort();
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	628	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	629	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	630
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	631	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	632	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	633	QStringList tmNames = config->GetTeamsList();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	634	TeamSelWidget* curTeamSelWidget;
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	635	ui.pageOptions->setTeamOptionsEnabled(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 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)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	638	{
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	639	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	640	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	641	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	642	{
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	643	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	644	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	645
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	646	QList<HWTeam> teamsList;
9393 094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	647	for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); ++it)
6616 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	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	650	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	651	teamsList.push_back(team);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	652	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	653
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	654	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	655	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	656	if (editedTeam)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	657	{
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	658	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	659	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	660	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	661	else if (lastid != ID_PAGE_GAMESTATS
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	662	&& lastid != ID_PAGE_INGAME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	663	&& lastid != ID_PAGE_SCHEME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	664	&& lastid != ID_PAGE_SELECTWEAPON)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	665	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	666	curTeamSelWidget->resetPlayingTeams(teamsList);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	667	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	668	}
2845 19db164dd20d Frontend: smxx parents: 2822 diff changeset	669
8901 505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	670	if (id == ID_PAGE_GAMESTATS)
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	671	{
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	672	switch(lastGameType) {
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	673	case gtLocal:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	674	case gtQLocal:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	675	case gtTraining:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	676	case gtCampaign:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	677	ui.pageGameStats->restartBtnVisible(true);
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	678	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	679	default:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	680	ui.pageGameStats->restartBtnVisible(false);
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	681	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	682	}
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	683	}
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	684
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	685	if (id == ID_PAGE_MAIN)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	686	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	687	ui.pageOptions->setTeamOptionsEnabled(true);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	688	}
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	689	}
b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	690
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	691	void HWForm::GoToPage(int id)
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	692	{
9393 094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	693	//bool stopAnim = false;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	694
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	695	int lastid = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	696	PagesStack.push(ui.Pages->currentIndex());
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	697
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	698	OnPageShown(id, lastid);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	699	ui.Pages->setCurrentIndex(id);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	700
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	701
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	702	/* if (id == ID_PAGE_DRAWMAP \|\| id == ID_PAGE_GAMESTATS)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	703	stopAnim = true;
8098 4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	704	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	705	unnecessary.
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	706	*/
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	707
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	708
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	709	#if (QT_VERSION >= 0x040600)
9393 094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	710	//if (!stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	711	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	712	/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	713	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	714	#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	715	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	716	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	717	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	718
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	719	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(lastid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	720	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	721	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	722	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	723	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	724
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	725	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	726	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	727	animationNewSlide->setDuration(duration);
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	728	animationNewSlide->setStartValue(QPoint(width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	729	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	730	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	731
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	732	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	733	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	734	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	735	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	736	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	737	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	738	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	739
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	740	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	741	ui.Pages->widget(lastid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	742
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	743	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(lastid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	744	animationOldSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	745	animationOldSlide->setStartValue(QPoint(0, 0));
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	746	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	747	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	748
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	749	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	750	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	751	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	752	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	753	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	754	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	755	#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	756
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	757	// 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	758	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	759
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	760	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	761	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	762	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	763
8098 4efee370e2de - Fix saving .ini files unc0rr parents: 8057 diff changeset	764	/* 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	765	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	766	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	767	#endif
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	768	}
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	769
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	770	void HWForm::GoBack()
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	771	{
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	772	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	773	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	774	if (curid == ID_PAGE_MAIN)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	775	{
8384 a6e7a95f3b2e GCI2012: Abstract Page Load dag10 parents: 8383 diff changeset	776	((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	777	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	778	return;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	779	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	780	exit();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	781	}
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	782
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	783	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	784	ui.Pages->setCurrentIndex(id);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	785	OnPageShown(id, curid);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	786
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	787	if (id == ID_PAGE_CONNECTING)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	788	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	789	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	790	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	791	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	792	if (id == ID_PAGE_NETSERVER)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	793	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	794	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	795	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	796	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	797	if ((!hwnet) && (id == ID_PAGE_ROOMSLIST))
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	}
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	802	/*if (curid == ID_PAGE_DRAWMAP)
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	803	stopAnim = true; */
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	804
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	805	if ((!hwnet) \|\| (!hwnet->isInRoom()))
9393 094a176dd623 Take care of some warnings from issue 688 unc0rr parents: 9306 diff changeset	806	if (id == ID_PAGE_NETGAME)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	807	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	808	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	809	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	810	}
1672 6a451649558c Properly handle room deletion in respect of pages switching unc0rr parents: 1671 diff changeset	811
5147 a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	812	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	813	if (curid == ID_PAGE_NETGAME && hwnet && hwnet->isInRoom()) hwnet->partRoom();
4432 81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	814	// 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	815	//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	816
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	817	if (curid == ID_PAGE_SCHEME)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	818	ammoSchemeModel->Save();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	819
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	820	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	821	/Start animation :/
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	822	if (curid != 0 && !stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	823	{
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	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	825	#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	826	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	827	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	828	effectNew->setOpacity(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	829	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	830
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	831	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(curid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	832	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	833	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	834	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	835	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	836
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	837	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	838	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	839	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	840	animationOldSlide->setStartValue(QPoint(-width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	841	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	842	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	843
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	844	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	845	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	846	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	847	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	848	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	849	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	850	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	851	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	852	ui.Pages->widget(curid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	853
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	854	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(curid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	855	animationNewSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	856	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	857	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	858	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	859
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	860	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	861	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	862	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	863	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	864	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	865	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	866	#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	867
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	868	// 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	869	connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide()));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	870
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	871	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	872	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	873	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	874	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	875	#endif
7826 9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	876
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	877	if (stopAnim)
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	878	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	879
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	880	// 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	881	// 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	882
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	883	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	884
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	885	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	886	{
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	887	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	888	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	889	}
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	890
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	891	void HWForm::btnExitPressed()
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	892	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	893	eggTimer.start();
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	894	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	895
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	896	void HWForm::exit()
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	897	{
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	898	// 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	899	#ifdef __APPLE__
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	900	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	901	#endif
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	902	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	903	// TODO reactivate egg
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	904	/* }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	905	else
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	906	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	907	QPushButton * btn = findChild<QPushButton *>("imageButt");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	908	if (btn)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	909	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	910	btn->setIcon(QIcon(":/res/bonus.png"));
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	911	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	912	} */
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	913	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	914
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	915	void HWForm::IntermediateSetup()
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	916	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	917	quint8 id=ui.Pages->currentIndex();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	918	TeamSelWidget* curTeamSelWidget;
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	919
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	920	if(id == ID_PAGE_MULTIPLAYER)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	921	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	922	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	923	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	924	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	925	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	926	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	927	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	928
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	929	QStringList tmnames;
5772 c09c50efe8b5 Replace iterators with simple declarative foreach (not tested if it works) unc0rr parents: 5763 diff changeset	930
5773 c277657854a2 Some renaming unc0rr parents: 5772 diff changeset	931	foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	932	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	933
3757 ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	934	//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	935	UpdateTeamsLists();
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	936
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	937	GoToPage(ID_PAGE_SETUP);
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	938	}
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	939
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	940	void HWForm::NewTeam()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	941	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	942	ui.pageEditTeam->createTeam(QLineEdit::tr("unnamed"), playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	943	UpdateTeamsLists();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	944	GoToPage(ID_PAGE_SETUP_TEAM);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	945	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	946
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	947	void HWForm::EditTeam(const QString & teamName)
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	948	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	949	ui.pageEditTeam->editTeam(teamName, playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	950	GoToPage(ID_PAGE_SETUP_TEAM);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	951	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	952
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	953	void HWForm::AfterTeamEdit()
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	954	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	955	UpdateTeamsLists();
7551 c212247065e3 GoBack() here is not needed anymore unc0rr parents: 7313 diff changeset	956	//GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	957	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	958
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	959
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	960	void HWForm::DeleteTeam(const QString & teamName)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	961	{
8346 3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	962	ui.pageEditTeam->deleteTeam(teamName);
3443e0de2c9d GCI2012: Advanced Keyboard Configuration dag10 parents: 8328 diff changeset	963	UpdateTeamsLists();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	964	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 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	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	967	{
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	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	969	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	970	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	971	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	972	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	973	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	974	{
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	975	ui.pageScheme->deleteRow();
4576 d85062310790 fixed and enabled removing of game scheme from options page Henek parents: 4560 diff changeset	976	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	977	}
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	978	}
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	979
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	980	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	981	{
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	982	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	983	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	984	}
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	985
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	986	void HWForm::SimpleGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	987	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	988	CreateGame(0, 0, *cDefaultAmmoStore);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	989	game->StartQuick();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	990	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	991
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	992	void HWForm::PlayDemo()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	993	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	994	QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	995	if (!curritem)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	996	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	997	MessageDialog::ShowErrorMessage(QMessageBox::tr("Please select a record from the list"), this);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	998	return;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	999	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1000	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	1001	game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1002	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1003
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1004	void HWForm::PlayDemoQuick(const QString & demofilename)
ded882439548 file association for mac! koda parents: 5238 diff changeset	1005	{
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	1006	GoToPage(ID_PAGE_MAIN);
8709 191bd86f97a1 fix loading files on osx too, the cause was different than other systems koda parents: 8643 diff changeset	1007	//GoBack() <- don't or you'll close the socket
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1008	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	1009	game->PlayDemo(demofilename, false);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1010	}
ded882439548 file association for mac! koda parents: 5238 diff changeset	1011
8716 e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1012	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	1013	{
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1014	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	1015	NetConnectServer(host, port);
e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1016	}
e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1017
666 07fa9a74a074 Abstract HWForm from custom PageNet implementation unc0rr parents: 665 diff changeset	1018	void HWForm::NetConnectServer(const QString & host, quint16 port)
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1019	{
8716 e09633d10f16 hit hwplay://server:port and automatically join an unofficial server (on osx right now) koda parents: 8709 diff changeset	1020	qDebug("connecting to %s:%d", qPrintable(host), port);
4870 c02406028e02 trim net nick in frontend sheepluva parents: 4845 diff changeset	1021	_NetConnect(host, port, ui.pageOptions->editNetNick->text().trimmed());
1395 46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1022	}
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1023
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1024	void HWForm::NetConnectOfficialServer()
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	1025	{
8803 b3f37e7f9ff4 define NETGAME_DEFAULT_SERVER koda parents: 8766 diff changeset	1026	NetConnectServer(NETGAME_DEFAULT_SERVER, NETGAME_DEFAULT_PORT);
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1027	}
595d8663254d update button for udp servers list displacer parents: 412 diff changeset	1028
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1029	void HWForm::NetPassword(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1030	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1031	Q_UNUSED(nick);
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1032	//Get hashes
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1033	QString hash = config->passwordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1034	QString temphash = config->tempHash();
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1035
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1036	//Check them
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1037
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1038	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	1039	hwnet->SendPasswordHash("THISISNOHASH");
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1040	}
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1041	else if (temphash.isEmpty()) { //Send saved hash as default
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1042	hwnet->SendPasswordHash(hash);
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1043	}
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1044	else { //Send the hash
70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1045	hwnet->SendPasswordHash(temphash);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1046	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1047
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1048	//Remove temporary hash from config
8295 6ef114ea2298 fixed minor problem with saving hash Ondrej Skopek <skopekondrej@gmail.com> parents: 8294 diff changeset	1049	config->clearTempHash();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1050	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1051
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1052	void HWForm::NetNickRegistered(const QString & nick)
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1053	{
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1054	//Get hashes
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1055	QString hash = config->passwordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1056	QString temphash = config->tempHash();
8295 6ef114ea2298 fixed minor problem with saving hash Ondrej Skopek <skopekondrej@gmail.com> parents: 8294 diff changeset	1057
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1058	if (hash.isEmpty()) {
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1059	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	1060	QString suppliedpass;
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1061	while (suppliedpass.isEmpty()) {
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1062	QInputDialog nickRegedDialog(this);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1063	nickRegedDialog.setWindowModality(Qt::WindowModal);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1064	nickRegedDialog.setInputMode(QInputDialog::TextInput);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1065	nickRegedDialog.setWindowTitle(tr("Hedgewars - Nick registered"));
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1066	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	1067	nickRegedDialog.setTextEchoMode(QLineEdit::Password);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1068	nickRegedDialog.exec();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1069
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1070	suppliedpass = nickRegedDialog.textValue();
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	if (nickRegedDialog.result() == QDialog::Rejected) {
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1073	config->clearPasswordHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1074	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1075	GoBack();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1076	return;
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1077	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1078	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	1079	config->setTempHash(temphash);
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1080	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1081	}
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1082	}
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1083	NetPassword(nick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1084	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1085
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	1086	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	1087	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1088	Q_UNUSED(nick);
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1089
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	1090	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	1091	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	1092	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	1093	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	1094	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	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	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	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	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	1099	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	1100	}
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	1101	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	1102	{
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	1103	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	1104	}
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	1105	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	1106	}
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	1107
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1108	void HWForm::NetNickTaken(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1109	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1110	bool ok = false;
7795 ba32d3f9e567 set window modality also for custom dialogs, small text changes koda parents: 7794 diff changeset	1111	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	1112
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1113	if (!ok \|\| newNick.isEmpty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1114	{
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1115	//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	1116	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	1117	GoBack();
9549 ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1118	if (retry && hwnet) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1119	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1120	QStringList list = hwnet->getHost().split(":");
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1121	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	1122	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1123	NetConnectOfficialServer();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1124	}
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1125	return;
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
9549 ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1128	if(hwnet)
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1129	hwnet->NewNick(newNick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1130	config->setValue("net/nick", newNick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1131	config->updNetNick();
6227 ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1132
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1133	ui.pageRoomsList->setUser(nick);
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1134	ui.pageNetGame->setUser(nick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1135	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1136
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1137	void HWForm::NetAuthFailed()
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1138	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1139	// 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	1140	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1141
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1142	//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	1143	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	1144	GoBack();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1145
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	1146	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	1147	config->clearTempHash();
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1148	if (retry) {
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1149	NetConnectOfficialServer();
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	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1152
9549 ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1153	void HWForm::askRoomPassword()
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1154	{
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1155	QString password = QInputDialog::getText(this, tr("Room password"), tr("The room is protected with password.\nPlease, enter the password:"));
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1156	if(hwnet && !password.isEmpty())
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1157	hwnet->roomPasswordEntered(password);
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1158	}
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1159
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1160	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	1161	{
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1162	QMessageBox retryMsg(this);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1163	retryMsg.setIcon(QMessageBox::Warning);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1164	retryMsg.setWindowTitle(title);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1165	retryMsg.setText(label);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1166	retryMsg.setWindowModality(Qt::WindowModal);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1167
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1168	retryMsg.addButton(QMessageBox::Cancel);
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1169
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1170	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	1171	retryButton->setText(tr("Try Again"));
8291 e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1172	retryButton->setFocus();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1173
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1174	retryMsg.exec();
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1175
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1176	if (retryMsg.clickedButton() == retryButton) {
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1177	return true;
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1178	}
e4a0d980d1e2 Patched login dialog bugs, added retry dialogs Ondrej Skopek <skopekondrej@gmail.com> parents: 8287 diff changeset	1179	return false;
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1180	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1181
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1182	void HWForm::NetTeamAccepted(const QString & team)
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	ui.pageNetGame->pNetTeamsWidget->changeTeamStatus(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1185	}
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	void HWForm::NetError(const QString & errmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1188	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1189	switch (ui.Pages->currentIndex())
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1190	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1191	case ID_PAGE_INGAME:
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1192	MessageDialog::ShowErrorMessage(errmsg, this);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1193	// no break
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1194	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	1195	ui.pageNetGame->displayError(errmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1196	break;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1197	default:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1198	ui.pageRoomsList->displayError(errmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1199	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1200	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1201
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1202	void HWForm::NetWarning(const QString & wrnmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1203	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1204	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	1205	ui.pageNetGame->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1206	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	1207	ui.pageRoomsList->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1208	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1209
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1210	void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1211	{
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1212	Q_UNUSED(nick);
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	1213
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1214	if (hwnet) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1215	// destroy old connection
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1216	hwnet->Disconnect();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1217	delete hwnet;
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1218	hwnet = NULL;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1219	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1220
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1221	hwnet = new HWNewNet();
637 8fa7ed5e13bd Fix bad behavior when quickly click Connect button more than once unc0rr parents: 636 diff changeset	1222
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1223	GoToPage(ID_PAGE_CONNECTING);
1800 f1df2eb32a16 "connecting" page unc0rr parents: 1797 diff changeset	1224
8504 9ff55b527d1b Ehm... probably this will improve situation with desyncs unc0rr parents: 8489 diff changeset	1225	connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()), Qt::QueuedConnection);
6697 4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1226	connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1227	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	1228	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	1229	connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1230	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	1231	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	1232	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	1233	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	1234	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	1235	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	1236	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	1237	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	1238	//connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), hwnet, SLOT(partRoom()));
9549 ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1239	connect(hwnet, SIGNAL(askForRoomPassword()), this, SLOT(askRoomPassword()), Qt::QueuedConnection);
329 4c3aad46baa5 Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes unc0rr parents: 328 diff changeset	1240
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1241	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	1242	ui.pageNetGame->chatWidget->setUsersModel(hwnet->roomPlayersModel());
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1243
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1244	// rooms list page stuff
6735 050237b1500f Setup rooms list headers unc0rr parents: 6733 diff changeset	1245	ui.pageRoomsList->setModel(hwnet->roomsListModel());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1246	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	1247	ui.pageRoomsList, SLOT(setAdmin(bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1248	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	1249	ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1250
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1251	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	1252	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	1253
9541 312bb4384f33 - Frontend finally learns how to create passworded room unc0rr parents: 9393 diff changeset	1254	connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &, const QString &)),
312bb4384f33 - Frontend finally learns how to create passworded room unc0rr parents: 9393 diff changeset	1255	hwnet, SLOT(CreateRoom(const QString&, const QString &)));
9549 ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1256	connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &, const QString &)),
ac5c1f691ce2 Allow user to enter password for the room he joins unc0rr parents: 9541 diff changeset	1257	hwnet, SLOT(JoinRoom(const QString&, const QString &)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1258	// connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1259	// this, SLOT(NetGameMaster()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1260	// connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1261	// this, SLOT(NetGameSlave()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1262	connect(ui.pageRoomsList, SIGNAL(askForRoomList()),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1263	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	1264
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1265	// room status stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1266	connect(hwnet, SIGNAL(roomMaster(bool)),
8893 8f92e94d0b32 Don't set Default scheme/ammo when switching script if not room admin. Prevents game config desync. unc0rr parents: 8891 diff changeset	1267	this, SLOT(NetGameChangeStatus(bool)));
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1268
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1269	// 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	1270	connect(hwnet, SIGNAL(roomNameUpdated(const QString &)),
8534 92da587691c9 Workaround queued signals problem in netclient instead. Should fix everything. unc0rr parents: 8529 diff changeset	1271	ui.pageNetGame, SLOT(setRoomName(const QString &)), Qt::QueuedConnection);
8759 1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1272	connect(hwnet, SIGNAL(roomChatAction(const QString&, const QString&)),
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1273	ui.pageNetGame->chatWidget, SLOT(onChatAction(const QString&, const QString&)), Qt::QueuedConnection);
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1274	connect(hwnet, SIGNAL(roomChatMessage(const QString&, const QString&)),
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1275	ui.pageNetGame->chatWidget, SLOT(onChatMessage(const QString&, const QString&)), Qt::QueuedConnection);
7720 8e6b79a020f8 Show more statuses in icons. unc0rr parents: 7710 diff changeset	1276
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1277	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	1278	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	1279	connect(ui.pageNetGame->chatWidget, SIGNAL(chatLine(const QString&)),
8765 688062f1db59 fix/hack so that (own) messages sent in frontend are also visible in the game chat sheepluva parents: 8762 diff changeset	1280	hwnet, SLOT(chatLineToNetWithEcho(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1281	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1282	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	1283	ui.pageNetGame, SLOT(setReadyStatus(bool)), Qt::QueuedConnection);
1577 e3e37c730dc0 - Decrease font size in chat unc0rr parents: 1576 diff changeset	1284
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1285	// chat widget actions
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1286	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	1287	hwnet, SLOT(kickPlayer(const QString&)));
11865 047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend sheepluva parents: 11863 diff changeset	1288	connect(ui.pageNetGame->chatWidget, SIGNAL(delegate(const QString&)),
047be82b6f67 fix for Bug 91 - Make DELEGATE action available in frontend sheepluva parents: 11863 diff changeset	1289	hwnet, SLOT(delegateToPlayer(const QString&)));
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1290	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	1291	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	1292	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	1293	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	1294	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	1295	hwnet, SLOT(followPlayer(const QString&)));
8436 b89aacebb9db - Also pass unknown cmds to the server when in room unc0rr parents: 8434 diff changeset	1296	connect(ui.pageNetGame->chatWidget, SIGNAL(consoleCommand(const QString&)),
b89aacebb9db - Also pass unknown cmds to the server when in room unc0rr parents: 8434 diff changeset	1297	hwnet, SLOT(consoleCommand(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1298	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	1299	hwnet, SLOT(kickPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1300	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	1301	hwnet, SLOT(banPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1302	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	1303	hwnet, SLOT(infoPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1304	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	1305	hwnet, SLOT(followPlayer(const QString&)));
8396 5123eac2f9d6 - Pass unknown chat commands to server unc0rr parents: 8385 diff changeset	1306	connect(ui.pageRoomsList->chatWidget, SIGNAL(consoleCommand(const QString&)),
5123eac2f9d6 - Pass unknown chat commands to server unc0rr parents: 8385 diff changeset	1307	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	1308
8762 388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1309	// player info
388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1310	connect(hwnet, SIGNAL(playerInfo(const QString&, const QString&, const QString&, const QString&)),
388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1311	ui.pageRoomsList->chatWidget, SLOT(onPlayerInfo(const QString&, const QString&, const QString&, const QString&)), Qt::QueuedConnection);
388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1312	connect(hwnet, SIGNAL(playerInfo(const QString&, const QString&, const QString&, const QString&)),
388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1313	ui.pageNetGame->chatWidget, SLOT(onPlayerInfo(const QString&, const QString&, const QString&, const QString&)), Qt::QueuedConnection);
388d2bf73ff9 fix player info sheepluva parents: 8759 diff changeset	1314
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1315	// chatting
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1316	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	1317	hwnet, SLOT(chatLineToLobby(const QString&)));
8759 1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1318	connect(hwnet, SIGNAL(lobbyChatAction(const QString&,const QString&)),
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1319	ui.pageRoomsList->chatWidget, SLOT(onChatAction(const QString&,const QString&)), Qt::QueuedConnection);
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1320	connect(hwnet, SIGNAL(lobbyChatMessage(const QString&, const QString&)),
1a4b9b9fe2b0 add lobby chat features to room chat sheepluva parents: 8722 diff changeset	1321	ui.pageRoomsList->chatWidget, SLOT(onChatMessage(const QString&, const QString&)), Qt::QueuedConnection);
1568 15a446307993 Lobby chat should work now unc0rr parents: 1566 diff changeset	1322
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1323	// nick list stuff
8891 bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1324	{
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1325	QSortFilterProxyModel * playersSortFilterModel = qobject_cast<QSortFilterProxyModel *>(hwnet->lobbyPlayersModel());
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1326	if(playersSortFilterModel)
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1327	{
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1328	PlayersListModel * players = qobject_cast<PlayersListModel *>(playersSortFilterModel->sourceModel());
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1329	connect(players, SIGNAL(nickAdded(const QString&, bool)),
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1330	ui.pageNetGame->chatWidget, SLOT(nickAdded(const QString&, bool)));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1331	connect(players, SIGNAL(nickRemoved(const QString&)),
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1332	ui.pageNetGame->chatWidget, SLOT(nickRemoved(const QString&)));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1333	connect(players, SIGNAL(nickAddedLobby(const QString&, bool)),
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1334	ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool)));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1335	connect(players, SIGNAL(nickRemovedLobby(const QString&)),
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1336	ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&)));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1337	connect(players, SIGNAL(nickRemovedLobby(const QString&, const QString&)),
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1338	ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&, const QString&)));
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1339	}
bf67b4d7d7b4 - Better fix to friends joins/quits highlighting problem unc0rr parents: 8887 diff changeset	1340	}
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	1341
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1342	// teams selecting stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1343	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	1344	hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1345	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	1346	hwnet, SLOT(onTeamColorChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1347	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	1348	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	1349	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	1350	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	1351	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	1352	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	1353	ui.pageNetGame->pNetTeamsWidget, SLOT(changeTeamColor(const HWTeam&)), Qt::QueuedConnection);
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1354
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	1355	// admin stuff
3283 18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1356	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	1357	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	1358	connect(hwnet, SIGNAL(latestProtocolVar(int)), ui.pageAdmin, SLOT(protocol(int)));
8157 695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1359	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	1360	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	1361	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	1362	connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1363	connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars()));
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	1364	connect(ui.pageAdmin, SIGNAL(clearAccountsCache()), hwnet, SLOT(clearAccountsCache()));
8157 695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1365	connect(ui.pageAdmin, SIGNAL(bansListRequest()), hwnet, SLOT(getBanList()));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1366	connect(ui.pageAdmin, SIGNAL(removeBan(QString)), hwnet, SLOT(removeBan(QString)));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1367	connect(ui.pageAdmin, SIGNAL(banIP(QString,QString,int)), hwnet, SLOT(banIP(QString,QString,int)));
695f1eef72c8 Bans manager unc0rr parents: 8140 diff changeset	1368	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	1369
1898 f0ab0c77946d Send scheme data over net (but recieving part isn't implemented yet) unc0rr parents: 1897 diff changeset	1370	// disconnect
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	1371	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	1372
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1373	// config stuff
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1374	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	1375	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	1376	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	1377
9100 3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1378	// using proxy slot to prevent loss of game messages when they're sent to not yet connected slot of game object
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1379	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), this, SLOT(FromNetProxySlot(const QByteArray &)), Qt::QueuedConnection);
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1380
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1381	//nick and pass stuff
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1382	hwnet->m_private_game = !(hostName == NETGAME_DEFAULT_SERVER && port == NETGAME_DEFAULT_PORT);
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1383	if (hwnet->m_private_game == false && AskForNickAndPwd() != 0)
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1384	return;
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1385
9057 903f50e85144 Default to random guest username in all places net/nick is fetched. Fixes issue #588 nemo parents: 9033 diff changeset	1386	QString nickname = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString();
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1387	ui.pageRoomsList->setUser(nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1388	ui.pageNetGame->setUser(nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1389
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1390	hwnet->Connect(hostName, port, nickname);
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1391	}
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1392
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1393	int HWForm::AskForNickAndPwd(void)
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1394	{
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1395	//remove temppasswordhash just in case
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1396	config->clearTempHash();
0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1397
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1398	//initialize
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1399	QString hash;
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1400	QString temphash;
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1401	QString nickname;
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1402	QString password;
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1403
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1404	do {
9057 903f50e85144 Default to random guest username in all places net/nick is fetched. Fixes issue #588 nemo parents: 9033 diff changeset	1405	nickname = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString();
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1406	hash = config->passwordHash();
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1407	temphash = config->tempHash();
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1408
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1409	//if something from login is missing, start dialog loop
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1410	if (nickname.isEmpty() \|\| hash.isEmpty()) {
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	//open dialog
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1412	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	1413	// 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	1414	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	1415	pwDialog->cbSave->setChecked(config->value("net/savepassword", true).toBool());
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1416
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	1417	//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	1418	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	1419	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	1420	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	1421	}
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	//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	1424	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	1425	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	1426	GoBack();
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1427	break;
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	1428	}
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
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	//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	1431	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	1432	password = pwDialog->lePassword->text();
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1433	bool save = pwDialog->cbSave->isChecked();
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1434	//clean up
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1435	delete pwDialog;
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 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	//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	1438	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	1439	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	1440	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	1441	if (retry) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1442	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1443	QStringList list = hwnet->getHost().split(":");
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1444	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	1445	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1446	NetConnectOfficialServer();
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1447	}
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1448	break; //loop restart
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1449	} else {
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1450	//update nickname if it's fine
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1451	config->setValue("net/nick", nickname);
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1452	config->updNetNick();
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	1453	}
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	1454
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1455	//check the password variable
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1456	if (password.isEmpty()) {
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1457	config->clearPasswordHash();
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1458	break;
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1459	} else {
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	1460	//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	1461	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	1462	config->setTempHash(temphash);
8181 70e980278080 GCI2012: User/Pass Single Prompt Ondrej parents: 8179 diff changeset	1463
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	1464	//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	1465	config->setValue("net/savepassword", save);
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1466	if (save) {
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1467	// user wants to save password
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	1468	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	1469	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	1470	}
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	1471	}
8986 f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1472	}
f7bb323a6934 fix issue 590, load nick after asking for it... koda parents: 8982 diff changeset	1473	} while (nickname.isEmpty() \|\| (hash.isEmpty() && temphash.isEmpty())); //while a nickname, or both hashes are missing
8294 0e5782b0dd54 Removed whitespaces, refactored hash setting getting and clearing Ondrej Skopek <skopekondrej@gmail.com> parents: 8293 diff changeset	1474
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1475	return 0;
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1476	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1477
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1478	void HWForm::NetConnect()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1479	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1480	HWHostPortDialog * hpd = new HWHostPortDialog(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1481	hpd->leHost->setText(*netHost);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1482	hpd->sbPort->setValue(netPort);
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	1483
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1484	if (hpd->exec() == QDialog::Accepted)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1485	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1486	config->SaveOptions();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1487	delete netHost;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1488	netHost = new QString(hpd->leHost->text());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1489	netPort = hpd->sbPort->value();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1490	NetConnectServer(*netHost, netPort);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1491	}
6907 a2f9a9a62dc5 memory leak in hwform.cpp (issue 386) Stepan777 parents: 6793 diff changeset	1492	delete hpd;
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1493	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1494
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1495	void HWForm::NetStartServer()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1496	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1497	config->SaveOptions();
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	1498
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1499	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	1500	if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1501	{
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1502	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	1503
2948 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	return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1507	}
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	1508
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1509	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	1510
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1511	pRegisterServer = new HWNetUdpServer(0,
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1512	ui.pageNetServer->leServerDescr->text(),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1513	ui.pageNetServer->sbPort->value());
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1514	}
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1515
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1516	void HWForm::AsyncNetServerStart()
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1517	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1518	NetConnectServer("localhost", pnetserver->getRunningPort());
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1519	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1520
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1521	void HWForm::NetDisconnect()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1522	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1523	if(pnetserver)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1524	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1525	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1526	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1527	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1528	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1529	}
659 5eafb20566f1 - Fix some stupid object casts unc0rr parents: 658 diff changeset	1530
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1531	pnetserver->StopServer();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1532	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1533	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1534	}
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1535
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1536	if(hwnet)
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1537	hwnet->Disconnect();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1538	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1539
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1540	void HWForm::ForcedDisconnect(const QString & reason)
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1541	{
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	1542	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	1543	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	1544	if (retry) {
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1545	if (hwnet->m_private_game) {
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1546	QStringList list = hwnet->getHost().split(":");
9063 5cab446e1341 Fix "try again" button in "reconnected to fast" dialog trying to connect to port 0 unc0rr parents: 9057 diff changeset	1547	NetConnectServer(list.at(0), list.at(1).toUInt());
8720 5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1548	} else
5603527f9803 this should prevent the password prompt from appearing on local games (issue 548) koda parents: 8716 diff changeset	1549	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	1550	}
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	1551	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	1552	while (ui.Pages->currentIndex() != ID_PAGE_NET
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	1553	&& 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	1554	{
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	1555	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	1556	}
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	1557	}
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	1558	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	1559	}
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	1560	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	1561	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	1562	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	1563	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	1564	MessageDialog::ShowErrorMessage(errorStr, this);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1565	}
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	1566
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	1567	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	1568	&& ui.Pages->currentIndex() != ID_PAGE_MAIN)
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1569	{
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	1570	GoBack();
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1571	}
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1572	}
09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1573
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1574	void HWForm::NetConnected()
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1575	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1576	GoToPage(ID_PAGE_ROOMSLIST);
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1577	}
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1578
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1579	void HWForm::NetGameEnter()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1580	{
8179 a1ffcb559f99 Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file unc0rr parents: 8157 diff changeset	1581	ui.pageNetGame->chatWidget->clear();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1582	GoToPage(ID_PAGE_NETGAME);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1583	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1584
339 7535ab6c3820 Run game message added, team and config info provided for net game displacer parents: 338 diff changeset	1585	void HWForm::AddNetTeam(const HWTeam& team)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1586	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1587	ui.pageNetGame->pNetTeamsWidget->addTeam(team);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1588	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1589
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1590	void HWForm::RemoveNetTeam(const HWTeam& team)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1591	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1592	ui.pageNetGame->pNetTeamsWidget->removeNetTeam(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1593	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1594
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1595	void HWForm::StartMPGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1596	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1597	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1598	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	1599	ui.pageMultiplayer->gameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1600	).toString();
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1601
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1602	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1603
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1604	game->StartLocal();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1605	}
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1606
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1607	void HWForm::GameStateChanged(GameState gameState)
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1608	{
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	1609	quint8 id = ui.Pages->currentIndex();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1610	switch(gameState)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1611	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1612	case gsStarted:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1613	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1614	Music(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1615	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	1616	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	1617	ui.pageGameStats->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1618	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1619	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1620	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1621	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1622	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1623	//setVisible(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1624	setFocusPolicy(Qt::NoFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1625	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1626	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1627	case gsFinished:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1628	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1629	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1630	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	1631	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	1632	Music(ui.pageOptions->CBFrontendMusic->isChecked());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1633	if (wBackground) wBackground->startAnimation();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1634	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	1635	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	1636	if (game) game->netSuspend = false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1637	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1638	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1639	default:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1640	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1641	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1642	setFocusPolicy(Qt::StrongFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1643	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	1644	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	1645	// 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	1646	(hwnet && hwnet->isRoomChief() && hwnet->isInRoom() &&
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1647	(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	1648	{
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	1649	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	1650	Music(ui.pageOptions->CBFrontendMusic->isChecked());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1651	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	1652	if (hwnet) hwnet->gameFinished(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1653	}
4845 9a0f5377c529 merge latest 0.9.15 changes into head koda parents: 4831 4751 diff changeset	1654	if (gameState == gsHalted) close();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1655	};
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1656	}
307 96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1657	}
96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1658
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1659	void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo)
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1660	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1661	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	1662	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	1663	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1664	connect(game, SIGNAL(GameStats(char, const QString &)), ui.pageGameStats, SLOT(GameStats(char, const QString &)));
10307 e13d3147f15b do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too... sheepluva parents: 10108 diff changeset	1665	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowFatalErrorMessage(const QString &)), Qt::QueuedConnection);
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1666	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	1667	m_lastDemo = QByteArray();
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1668	}
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1669
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1670	void HWForm::GetRecord(RecordType type, const QByteArray & record)
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1671	{
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1672	if (type != rtNeither)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1673	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1674	QString filename;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1675	QByteArray demo = record;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1676	QString recordFileName =
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1677	config->appendDateTimeToRecordName() ?
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1678	QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") :
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1679	"LastRound";
1487 b4cc59a6d50a Add an option to name records with current date and time unc0rr parents: 1427 diff changeset	1680
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	1681	recordFileName += "_" + cRevisionString + "-" + cHashString;
4902 45ec26ca9491 if on dev version append hg revision id to demos/saves' filenames sheepluva parents: 4897 diff changeset	1682
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1683	if (type == rtDemo)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1684	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1685	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1686	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1687	demo.replace(QByteArray("\x02TS"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1688	filename = cfgdir->absolutePath() + "/Demos/" + recordFileName + "." + *cProtoVer + ".hwd";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1689	m_lastDemo = demo;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1690	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1691	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1692	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1693	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1694	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1695	filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1696	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1697
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1698	QFile demofile(filename);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1699	if (!demofile.open(QIODevice::WriteOnly))
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	1700	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	1701	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1702	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1703	demofile.write(demo);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1704	demofile.close();
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1705	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1706	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1707
7392 bc3306c59a08 Correctly distinguish between game and real ticks while recording video, Stepan777 <stepik-777@mail.ru> parents: 7376 diff changeset	1708	ui.pageVideos->startEncoding(record);
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1709	}
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1710
11968 1de4d6b35748 Mission recategorization into trainings, challenges and scenarios. Wuzzy <almikes@aol.com> parents: 11959 diff changeset	1711	void HWForm::startTraining(const QString & scriptName, const QString & subFolder)
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1712	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1713	CreateGame(0, 0, 0);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1714
11968 1de4d6b35748 Mission recategorization into trainings, challenges and scenarios. Wuzzy <almikes@aol.com> parents: 11959 diff changeset	1715	game->StartTraining(scriptName, subFolder);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1716	}
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1717
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1718	void HWForm::StartCampaign()
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1719	{
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1720	CreateGame(0, 0, 0);
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1721	QString camp = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString();
9290 478aa681e702 this seems to work ok, but I have to clean up the code Periklis Ntanasis <pntanasis@gmail.com> parents: 9288 diff changeset	1722	QString miss = campaignMissionInfo[ui.pageCampaign->CBMission->currentIndex()].script;
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1723	QString campTeam = ui.pageCampaign->CBTeam->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1724	game->StartCampaign(camp, miss, campTeam);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1725	}
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1726
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1727	void HWForm::CreateNetGame()
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1728	{
9100 3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1729	// go back in pages to prevent user from being stuck on certain pages
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1730	if(ui.Pages->currentIndex() == ID_PAGE_GAMESTATS \|\|
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1731	ui.Pages->currentIndex() == ID_PAGE_INGAME)
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1732	GoBack();
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1733
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1734	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1735	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	1736	ui.pageNetGame->pGameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1737	).toString();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	1738
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1739	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo);
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1740
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1741	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	1742	connect(game, SIGNAL(SendChat(const QString &)), hwnet, SLOT(chatLineToNet(const QString &)));
10392 5012e1f9e893 - Support for pausing multiplayer games alfadur parents: 10307 diff changeset	1743	connect(game, SIGNAL(SendConsoleCommand(const QString&)), hwnet, SLOT(consoleCommand(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1744	connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &)));
7916 be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1745	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	1746
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1747	game->StartNet();
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1748	}
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1749
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1750	void HWForm::closeEvent(QCloseEvent *event)
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1751	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1752	config->SaveOptions();
11852 d7227dc3b397 fix build sheepluva parents: 11851 diff changeset	1753	#ifdef VIDEOREC
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	1754	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	1755	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1756	event->accept();
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1757	}
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1758
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1759	void HWForm::Music(bool checked)
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1760	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1761	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	1762	SDLInteraction::instance().startMusic();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1763	else
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	1764	SDLInteraction::instance().stopMusic();
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1765	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1766
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1767	void HWForm::NetGameChangeStatus(bool isMaster)
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1768	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1769	if (isMaster)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1770	NetGameMaster();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1771	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1772	NetGameSlave();
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1773	}
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1774
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1775	void HWForm::NetGameMaster()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1776	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1777	ui.pageNetGame->setMasterMode(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1778	ui.pageNetGame->restrictJoins->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1779	ui.pageNetGame->restrictTeamAdds->setChecked(false);
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1780	ui.pageNetGame->restrictUnregistered->setChecked(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1781	ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
8377 869f80966a77 GCI2012: Improve Game Configuration Widget dag10 parents: 8357 diff changeset	1782	ui.pageNetGame->pGameCFG->setMaster(true);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1783	ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1784
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1785	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1786	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1787	// 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	1788	ui.pageNetGame->BtnStart->disconnect(this);
5126 50803f3403a5 Frontend: room rename claymore parents: 5114 diff changeset	1789	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	1790	ui.pageNetGame->leRoomName->disconnect(hwnet);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1791	ui.pageNetGame->restrictJoins->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1792	ui.pageNetGame->restrictTeamAdds->disconnect(hwnet);
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1793	ui.pageNetGame->restrictUnregistered->disconnect(hwnet);
7122 fa2d09868ac6 Fix reported in bug #327, comment #3 - untested but seems reasonable/safe. nemo parents: 7015 diff changeset	1794	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	1795
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin unc0rr parents: 7679 diff changeset	1796	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	1797
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	1798	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	1799	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	1800	connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1801	connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds()));
8559 29e420194558 Support 'registered only' room flag in frontend unc0rr parents: 8534 diff changeset	1802	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	1803	connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1804	SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1805	ui.pageNetGame->pGameCFG,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1806	SLOT(resendSchemeData())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1807	);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1808	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1809	}
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1810
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1811	void HWForm::NetGameSlave()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1812	{
8377 869f80966a77 GCI2012: Improve Game Configuration Widget dag10 parents: 8357 diff changeset	1813	ui.pageNetGame->pGameCFG->setMaster(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1814	ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1815
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1816	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1817	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1818	NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
10721 9b789de8e5df Workaround bug (each time losing room master status, even when joining mutliple rooms, new instance of NetAmmoSchemeModel created, receiving schemeConfig and modifying its 43rd member, thus the last model which accepts this signal has the string cut down several times, workaround creates copy of qstringlist to avoid modifying shared message instance. Proper fix would delete unneeded instances of NetAmmoSchemeModel, but who cares) unc0rr parents: 10392 diff changeset	1819	connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList)));
8893 8f92e94d0b32 Don't set Default scheme/ammo when switching script if not room admin. Prevents game config desync. unc0rr parents: 8891 diff changeset	1820
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1821	ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1822
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	1823	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	1824
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1825	ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
10801 50bc2c75eee7 Fix here too unc0rr parents: 10721 diff changeset	1826	connect(hwnet, SIGNAL(netSchemeConfig(QStringList)),
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1827	this, SLOT(selectFirstNetScheme()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1828	}
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1829
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1830	ui.pageNetGame->setMasterMode(false);
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1831	}
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1832
9100 3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1833	void HWForm::FromNetProxySlot(const QByteArray & msg)
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1834	{
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1835	if(game)
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1836	game->FromNet(msg);
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1837
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1838	}
3f5e0280db4d Fix issue 652 and fix issue 645 unc0rr parents: 9080 diff changeset	1839
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1840	void HWForm::selectFirstNetScheme()
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1841	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1842	ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1843	}
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1844
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1845	void HWForm::NetLeftRoom(const QString & reason)
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1846	{
4433 e0092290b7c5 do GoBack if also INGAME due to kick nemo parents: 4432 diff changeset	1847	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	1848	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1849	GoBack();
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1850	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	1851	ui.pageRoomsList->displayNotice(reason);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1852	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1853	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1854	qWarning("Left room while not in room");
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1855	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1856
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1857	void HWForm::resizeEvent(QResizeEvent * event)
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1858	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1859	int w = event->size().width();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1860	int h = event->size().height();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1861	if (wBackground)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1862	{
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1863	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	1864	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	1865	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1866	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1867
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1868	void HWForm::InitCampaignPage()
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1869	{
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1870	ui.pageCampaign->CBCampaign->clear();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1871	HWTeam team(ui.pageCampaign->CBTeam->currentText());
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1872
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1873	QStringList entries = DataManager::instance().entryList(
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1874	"Missions/Campaign",
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1875	QDir::Dirs,
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1876	QStringList("[^\\.]*")
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1877	);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1878
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1879	unsigned int n = entries.count();
11948 6da9bb4b3449 Show check marks for campaigns with Won=true Wuzzy <almikes@aol.com> parents: 11865 diff changeset	1880
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1881	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	1882	{
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1883	QString campaignName = QString(entries[i]);
11948 6da9bb4b3449 Show check marks for campaigns with Won=true Wuzzy <almikes@aol.com> parents: 11865 diff changeset	1884	QString tName = team.name();
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1885	ui.pageCampaign->CBCampaign->addItem(getRealCampName(campaignName), campaignName);
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1886	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1887	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1888
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1889	void HWForm::UpdateCampaignPage(int index)
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1890	{
4560 5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1891	Q_UNUSED(index);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1892	HWTeam team(ui.pageCampaign->CBTeam->currentText());
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1893	QString campaignName = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString();
10017 de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1894	QString tName = team.name();
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1895
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1896	campaignMissionInfo = getCampMissionList(campaignName,tName);
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1897	ui.pageCampaign->CBMission->clear();
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1898
9292 187ce630dddc y! code clean up :) Periklis Ntanasis <pntanasis@gmail.com> parents: 9290 diff changeset	1899	for(int i=0;i<campaignMissionInfo.size();i++)
9182 f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	1900	{
11958 de66192866d3 Make campaign mission names translatable Wuzzy <almikes@aol.com> parents: 11957 diff changeset	1901	ui.pageCampaign->CBMission->addItem(QString(campaignMissionInfo[i].realName), QString(campaignMissionInfo[i].name));
11951 b05db9ca6e1c Add support for storing and displaying success of campaign missions Wuzzy <almikes@aol.com> parents: 11950 diff changeset	1902	if(isMissionWon(campaignName, i, tName))
b05db9ca6e1c Add support for storing and displaying success of campaign missions Wuzzy <almikes@aol.com> parents: 11950 diff changeset	1903	ui.pageCampaign->CBMission->setItemIcon(i, finishedIcon);
b05db9ca6e1c Add support for storing and displaying success of campaign missions Wuzzy <almikes@aol.com> parents: 11950 diff changeset	1904	else
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	1905	ui.pageCampaign->CBMission->setItemIcon(i, notFinishedIcon);
10017 de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1906	}
9182 f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	1907	}
f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	1908
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1909	void HWForm::UpdateCampaignPageTeam(int index)
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1910	{
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1911	Q_UNUSED(index);
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1912	HWTeam team(ui.pageCampaign->CBTeam->currentText());
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1913	QString tName = team.name();
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1914
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1915	QStringList entries = DataManager::instance().entryList(
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1916	"Missions/Campaign",
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1917	QDir::Dirs,
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1918	QStringList("[^\\.]*")
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1919	);
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1920
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1921	unsigned int n = entries.count();
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1922
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1923	for(unsigned int i = 0; i < n; i++)
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1924	{
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1925	QString campaignName = QString(entries[i]).replace(QString(" "),QString("_"));
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1926	if(isCampWon(campaignName, tName))
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1927	ui.pageCampaign->CBCampaign->setItemIcon(i, finishedIcon);
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1928	else
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	1929	ui.pageCampaign->CBCampaign->setItemIcon(i, notFinishedIcon);
11950 3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1930	}
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1931	}
3792a9f9fa9c Update campaign victory status when changing selection Wuzzy <almikes@aol.com> parents: 11948 diff changeset	1932
9219 0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	1933	void HWForm::UpdateCampaignPageMission(int index)
0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	1934	{
9292 187ce630dddc y! code clean up :) Periklis Ntanasis <pntanasis@gmail.com> parents: 9290 diff changeset	1935	// update thumbnail and description
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1936	QString campaignName = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString();
9182 f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	1937	// when campaign changes the UpdateCampaignPageMission is triggered with wrong values
f92e205bc167 issue 562, image and description for the campaign page Periklis Ntanasis <pntanasis@gmail.com> parents: 9163 diff changeset	1938	// this will cause segfault. This check prevents illegal memory reads
9292 187ce630dddc y! code clean up :) Periklis Ntanasis <pntanasis@gmail.com> parents: 9290 diff changeset	1939	if(index > -1 && index < campaignMissionInfo.count()) {
9219 0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	1940	ui.pageCampaign->lbltitle->setText("<h2>"+ui.pageCampaign->CBMission->currentText()+"</h2>");
9290 478aa681e702 this seems to work ok, but I have to clean up the code Periklis Ntanasis <pntanasis@gmail.com> parents: 9288 diff changeset	1941	ui.pageCampaign->lbldescription->setText(campaignMissionInfo[index].description);
10017 de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1942	ui.pageCampaign->btnPreview->setIcon(QIcon(campaignMissionInfo[index].image));
9219 0a4b6bb69f99 bring windows fixes from main repo koda parents: 9184 diff changeset	1943	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1944	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1945
7490 c422845b8d1f Fixed a typo, frontend is now working properly belphegorr <szabibibi@gmail.com> parents: 7411 diff changeset	1946	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	1947	{
7679 bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1948	Q_UNUSED(index);
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1949
9641 b08c8bde57e3 fixes bug that doesn't display mission name in drop down list Periklis Ntanasis <pntanasis@gmail.com> parents: 9482 diff changeset	1950	QString missionTitle = ui.pageCampaign->CBMission->currentText();
7679 bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1951	UpdateCampaignPage(0);
9641 b08c8bde57e3 fixes bug that doesn't display mission name in drop down list Periklis Ntanasis <pntanasis@gmail.com> parents: 9482 diff changeset	1952	for(int i=0;i<ui.pageCampaign->CBMission->count();i++)
b08c8bde57e3 fixes bug that doesn't display mission name in drop down list Periklis Ntanasis <pntanasis@gmail.com> parents: 9482 diff changeset	1953	{
11958 de66192866d3 Make campaign mission names translatable Wuzzy <almikes@aol.com> parents: 11957 diff changeset	1954	if (ui.pageCampaign->CBMission->itemData(i)==missionTitle)
10017 de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1955	{
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1956	ui.pageCampaign->CBMission->setCurrentIndex(i);
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1957	break;
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1958	}
de822cd3df3a fixwhitespace and dos2unix koda parents: 10015 diff changeset	1959	}
11955 d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1960	int i = ui.pageCampaign->CBCampaign->currentIndex();
11957 1201fc039e24 Make campaign names translatable Wuzzy <almikes@aol.com> parents: 11955 diff changeset	1961	QString campaignName = ui.pageCampaign->CBCampaign->itemData(i).toString();
11955 d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1962	HWTeam team(ui.pageCampaign->CBTeam->currentText());
d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1963	QString tName = team.name();
d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1964	if(isCampWon(campaignName, tName))
d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1965	ui.pageCampaign->CBCampaign->setItemIcon(i, finishedIcon);
d72a177dbaea Update campaign drop-down list after campaign victory Wuzzy <almikes@aol.com> parents: 11951 diff changeset	1966	else
11978 4a2da00bbedc Align drop-down text of unfinished campaign missions with finished icons Wuzzy <almikes@aol.com> parents: 11968 diff changeset	1967	ui.pageCampaign->CBCampaign->setItemIcon(i, notFinishedIcon);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1968	}
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1969
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1970	// 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	1971	QString HWForm::getDemoArguments()
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1972	{
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1973
8643 e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1974	QString prefix = "\"" + datadir->absolutePath() + "\"";
e4d1c21f8db0 fix file association on windows too koda parents: 8639 diff changeset	1975	QString userPrefix = "\"" + cfgdir->absolutePath() + "\"";
9163 67334acaaac7 port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5 koda parents: 9100 diff changeset	1976	#ifdef Q_OS_WIN
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1977	prefix = prefix.replace("/","\\");
8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1978	userPrefix = userPrefix.replace("/","\\");
8302 a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1979	#endif
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1980
8354 c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1981	std::pair<QRect, QRect> resolutions = config->vid_ResolutionPair();
8307 8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1982	return QString("--prefix " + prefix
8d7c52b24e28 GCI2012: Optional Second Argument RowanD parents: 8302 diff changeset	1983	+ " --user-prefix " + userPrefix
8354 c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1984	+ " --fullscreen-width " + QString::number(resolutions.first.width())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1985	+ " --fullscreen-height " + QString::number(resolutions.first.height())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1986	+ " --width " + QString::number(resolutions.second.width())
c25bee85d6f8 Separated fullscreen and windowed hwengine resolution parameters. vitiv <nikita.utiu@gmail.com> parents: 8346 diff changeset	1987	+ " --height " + QString::number(resolutions.second.height())
8302 a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1988	+ " --volume " + QString::number(config->volume())
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1989	+ (config->isMusicEnabled() ? "" : " --nomusic")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1990	+ (config->isSoundEnabled() ? "" : " --nosound")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1991	+ " --locale " + config->language() + ".txt"
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1992	+ (config->vid_Fullscreen() ? " --fullscreen" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1993	+ (config->isShowFPSEnabled() ? " --showfps" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1994	+ (config->isAltDamageEnabled() ? " --altdmg" : "")
a7934cd12469 improve engine cmd line parsing and its documentation RowanD parents: 8299 diff changeset	1995	+ " --frame-interval " + QString::number(config->timerInterval())
9249 7b8c82785145 Configuration for tag display default nemo parents: 9235 diff changeset	1996	+ " --raw-quality " + QString::number(config->translateQuality()))
7b8c82785145 Configuration for tag display default nemo parents: 9235 diff changeset	1997	+ (!config->Form->ui.pageOptions->CBTeamTag->isChecked() ? " --no-teamtag" : "")
7b8c82785145 Configuration for tag display default nemo parents: 9235 diff changeset	1998	+ (!config->Form->ui.pageOptions->CBHogTag->isChecked() ? " --no-hogtag" : "")
7b8c82785145 Configuration for tag display default nemo parents: 9235 diff changeset	1999	+ (!config->Form->ui.pageOptions->CBHealthTag->isChecked() ? " --no-healthtag" : "")
7b8c82785145 Configuration for tag display default nemo parents: 9235 diff changeset	2000	+ (config->Form->ui.pageOptions->CBTagOpacity->isChecked() ? " --translucent-tags" : "");
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	2001	}
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	2002
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2003	void HWForm::AssociateFiles()
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2004	{
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	2005	bool success = true;
5222 0922b9d816af unbreak compiling frontend under osx koda parents: 5213 diff changeset	2006	QString arguments = getDemoArguments();
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	2007	#ifdef _WIN32
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2008	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	2009
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	2010	// file extension(s)
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2011	registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2012	registry_hkcr.setValue(".hws/Default", "Hedgewars.Save");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2013	registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2014	registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2015	registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2016	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	2017	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	2018	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	2019
2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	2020	// custom url scheme(s)
8766 ce153d705fff scheme association for linux (although it stops during connection) koda parents: 8722 diff changeset	2021	registry_hkcr.setValue("hwplay/Default", "\"URL:Hedgewars ServerAccess Scheme\"");
8722 2dead6b84bca this should supposedly add hwplay:// schemes to windows, after user presses file association koda parents: 8720 diff changeset	2022	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	2023	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	2024	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	2025	#elif defined __APPLE__
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	2026	// 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	2027	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	2028	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	2029	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	2030	#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	2031	// 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	2032	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	2033	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	2034	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	2035	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages");
4085 6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	2036	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	2037	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	2038	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	2039	if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars-mimeinfo.xml "+QDir::home().absolutePath()+"/.local/share/mime/packages").toLocal8Bit().constData())==0;
8766 ce153d705fff scheme association for linux (although it stops during connection) koda parents: 8722 diff changeset	2040	if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars.desktop "+QDir::home().absolutePath()+"/.local/share/applications").toLocal8Bit().constData())==0;
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	2041	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	2042	if (success) success = system(("update-mime-database "+QDir::home().absolutePath()+"/.local/share/mime").toLocal8Bit().constData())==0;
8766 ce153d705fff scheme association for linux (although it stops during connection) koda parents: 8722 diff changeset	2043	if (success) success = system("xdg-mime default hedgewars.desktop x-scheme-handler/hwplay")==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	2044	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	2045	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	2046	// 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	2047	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	2048	#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	2049	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	2050	{
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	2051	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	2052	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	2053	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	2054	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	2055	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	2056	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	2057	}
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	2058	else
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2059	MessageDialog::ShowErrorMessage(QMessageBox::tr("File association failed."), this);
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	2060	}
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	2061
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	2062	void HWForm::openRegistrationPage()
8364 fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	2063	{
11830 6078cf0e4944 http → https nemo parents: 11803 diff changeset	2064	QDesktopServices::openUrl(QUrl("https://www.hedgewars.org/user/register"));
8434 4821897a0f10 big indentation/whitespaces cleanup sheepluva parents: 8424 diff changeset	2065	}
8364 fbc9bcc6c39d Added "New account" button when connectiong to the official server vitiv <nikita.utiu@gmail.com> parents: 8357 diff changeset	2066
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2067	void HWForm::saveDemoWithCustomName()
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2068	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2069	if(!m_lastDemo.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2070	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2071	QString fileName;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2072	bool ok = false;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2073	do
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2074	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2075	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	2076
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2077	if(!fileName.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2078	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2079	QString filePath = cfgdir->absolutePath() + "/Demos/" + fileName + "." + *cProtoVer + ".hwd";
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2080	QFile demofile(filePath);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2081	ok = demofile.open(QIODevice::WriteOnly);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2082	if (!ok)
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2083	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	2084	else
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2085	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2086	ok = -1 != demofile.write(m_lastDemo);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2087	demofile.close();
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2088	}
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2089	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	2090	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	2091	while(!fileName.isEmpty() && !ok);
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	2092	}
5746 fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	2093	}
fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	2094
8901 505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2095	void HWForm::restartGame()
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2096	{
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2097	// get rid off old game stats page
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2098	if(ui.Pages->currentIndex() == ID_PAGE_GAMESTATS)
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2099	GoBack();
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2100
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2101	CreateGame(lastGameCfg, lastGameTeamSel, lastGameAmmo);
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2102
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2103	switch(lastGameType) {
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2104	case gtTraining:
11968 1de4d6b35748 Mission recategorization into trainings, challenges and scenarios. Wuzzy <almikes@aol.com> parents: 11959 diff changeset	2105	game->StartTraining(lastGameStartArgs.at(0).toString(), lastTrainingSubFolder);
8901 505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2106	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2107	case gtQLocal:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2108	game->StartQuick();
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2109	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2110	case gtCampaign:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2111	game->StartCampaign(lastGameStartArgs.at(0).toString(), lastGameStartArgs.at(1).toString(), lastGameStartArgs.at(2).toString());
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2112	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2113	case gtLocal:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2114	game->StartLocal();
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2115	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2116	default:
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2117	break;
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2118	}
505307b9735d implementation of a restart-game button. location and appearance is not final :P thunderstruck parents: 8893 diff changeset	2119	}
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	2120
10307 e13d3147f15b do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too... sheepluva parents: 10108 diff changeset	2121	void HWForm::ShowFatalErrorMessage(const QString & msg)
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2122	{
10307 e13d3147f15b do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too... sheepluva parents: 10108 diff changeset	2123	MessageDialog::ShowFatalMessage(msg, this);
8383 b557c73a7593 GCI2012: Abstract Hedgewars Dialogs dag10 parents: 8380 diff changeset	2124	}
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2125
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2126	void HWForm::showFeedbackDialog()
9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2127	{
11830 6078cf0e4944 http → https nemo parents: 11803 diff changeset	2128	QNetworkRequest newRequest(QUrl("https://www.hedgewars.org"));
8878 b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2129
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2130	QNetworkAccessManager *manager = new QNetworkAccessManager(this);
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2131	QNetworkReply *reply = manager->get(newRequest);
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2132	connect(reply, SIGNAL(finished()), this, SLOT(showFeedbackDialogNetChecked()));
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2133	}
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2134
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2135	void HWForm::showFeedbackDialogNetChecked()
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2136	{
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2137	QNetworkReply reply = qobject_cast<QNetworkReply >(sender());
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2138
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2139	if (reply && (reply->error() == QNetworkReply::NoError)) {
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2140	FeedbackDialog dialog(this);
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2141	dialog.exec();
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2142	} else
b03dc99f2f2e check for network for feedback dialog too koda parents: 8803 diff changeset	2143	MessageDialog::ShowErrorMessage(tr("This page requires an internet connection."), this);
8385 9e8924ff9813 Convert feedback page to dialog (+some fixes from unC0Rr) dag10 parents: 8384 diff changeset	2144	}
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	2145
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	2146	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	2147	{
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	2148	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	2149	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	2150	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	2151	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	2152	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	2153	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	2154	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	2155
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	2156	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	2157	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	2158	}

author	Wuzzy <almikes@aol.com>
	Sat, 26 Nov 2016 22:16:45 +0100
changeset 12084	ccab0d396a7f
parent 11978	4a2da00bbedc
child 12217	a6cd48b8ef61
permissions	-rw-r--r--