hedgewars: QTfrontend/hwform.cpp@e14daa2508fc (annotated)

184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1	/*
1066 1f1b3686a2b0 Update copyright headers a bit unc0rr parents: 989 diff changeset	2	* Hedgewars, a free turn based strategy game
6952 7f70f37bbf08 license header year range adjustments sheepluva parents: 6944 diff changeset	3	* Copyright (c) 2004-2012 Andrey Korotaev <unC0Rr@gmail.com>
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	4	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	5	* This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	6	* it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	7	* the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	8	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	9	* This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	10	* but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	11	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	12	* GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	13	*
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	14	* You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	15	* along with this program; if not, write to the Free Software
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	16	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	17	*/
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	18
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	19	#include <QDir>
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	20	#include <QFile>
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	21	#include <QTextStream>
407 c7890ba9ed6e lost connection to server warning message displacer parents: 383 diff changeset	22	#include <QMessageBox>
502 bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	23	#include <QPushButton>
bc178daca088 Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory) unc0rr parents: 496 diff changeset	24	#include <QListWidget>
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 <QStackedLayout>
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 <QLineEdit>
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 <QLabel>
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	28	#include <QRadioButton>
654 1019b8fa8638 Finish asking host/port dialog implementation unc0rr parents: 653 diff changeset	29	#include <QSpinBox>
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	30	#include <QCloseEvent>
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	31	#include <QCheckBox>
1377 a9e768739345 - Customize QTextBrowser look unc0rr parents: 1376 diff changeset	32	#include <QTextBrowser>
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	33	#include <QAction>
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	34	#include <QTimer>
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	35	#include <QScrollBar>
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	36	#include <QDataWidgetMapper>
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	37	#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	38	#include <QCryptographicHash>
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	39	#include <QSignalMapper>
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	40	#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	41	#include <QDesktopServices>
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	42	#include <QInputDialog>
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	43	#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	44	#include <QSettings>
9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	45
9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	46	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	47	#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	48	#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	49	#endif
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	50
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	51	#include "hwform.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	52	#include "game.h"
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	53	#include "team.h"
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	54	#include "campaign.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	55	#include "teamselect.h"
681 7a20c50988ec working weapons select displacer parents: 674 diff changeset	56	#include "selectWeapon.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	57	#include "gameuiconfig.h"
5204 e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	58	#include "pageinfo.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	59	#include "pagetraining.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	60	#include "pagesingleplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	61	#include "pageselectweapon.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	62	#include "pageadmin.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	63	#include "pagecampaign.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	64	#include "pagescheme.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	65	#include "pagenetgame.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	66	#include "pageroomslist.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	67	#include "pageconnecting.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	68	#include "pageoptions.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	69	#include "pageeditteam.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	70	#include "pagemultiplayer.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	71	#include "pagenet.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	72	#include "pagemain.h"
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	73	#include "pagefeedback.h"
5204 e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	74	#include "pagenetserver.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	75	#include "pagedrawmap.h"
e1a5f4d5d86a split pages.h into several header files koda parents: 5147 diff changeset	76	#include "pagenettype.h"
5205 78138ae93820 some headers cleanup and rename of stats and playrecord pages for consistency koda parents: 5204 diff changeset	77	#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	78	#include "pageplayrecord.h"
44c9a577b082 Tiny bit of progress on download page - hooked it up to "Info" button for now. nemo parents: 5255 diff changeset	79	#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	80	#include "pagevideos.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	81	#include "hwconsts.h"
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	82	#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	83	#include "gamecfgwidget.h"
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	84	#include "netserverslist.h"
634 b9db5ff5cfdb Fix some bugs unc0rr parents: 632 diff changeset	85	#include "netudpserver.h"
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	86	#include "chatwidget.h"
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	87	#include "input_ip.h"
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	88	#include "input_password.h"
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	89	#include "ammoSchemeModel.h"
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	90	#include "bgwidget.h"
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	91	#include "xfire.h"
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	92	#include "drawmapwidget.h"
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	93	#include "mouseoverfilter.h"
6732 c906dc78091f Start switching to rooms list model. To be continued. unc0rr parents: 6720 diff changeset	94	#include "roomslistmodel.h"
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	95	#include "recorder.h"
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	96	#include "playerslistmodel.h"
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	97
6930 d187ea93fc4f renaming HWDataManager -> DataManager sheepluva parents: 6911 diff changeset	98	#include "DataManager.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	99
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	100	#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	101	#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	102	#ifdef SPARKLE_ENABLED
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	103	#include "SparkleAutoUpdater.h"
57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	104	#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	105	#endif
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	106
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	107
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	108	// 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	109	// 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	110	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	111	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	112
6572 0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	113	GameUIConfig* HWForm::config = NULL;
0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	114	QSettings* HWForm::gameSettings = NULL;
0d0af531c1c7 GCI task: ping bovi parents: 6561 diff changeset	115
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	116	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	117	: QMainWindow(parent)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	118	, game(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	119	, pnetserver(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	120	, pRegisterServer(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	121	, editedTeam(0)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	122	, hwnet(0)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	123	{
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	124	// set music track
6167 728cabee2c9f simplified some stuff I wrote sheepluva parents: 6166 diff changeset	125	SDLInteraction::instance().setMusicTrack(
6930 d187ea93fc4f renaming HWDataManager -> DataManager sheepluva parents: 6911 diff changeset	126	DataManager::instance().findFileForRead("Music/main_theme.ogg")
6167 728cabee2c9f simplified some stuff I wrote sheepluva parents: 6166 diff changeset	127	);
6166 701c5b8fac56 finishing SDLInterface cleanup (wrt audio) sheepluva parents: 6165 diff changeset	128
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	129	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	130	xfire_init();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	131	#endif
2773 e94f240a8a41 Have game beep when someone joins lobby/room. Controlled by Sound option nemo parents: 2742 diff changeset	132	gameSettings = new QSettings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat);
3019 d6e19f35d98d Frontend: smxx parents: 2948 diff changeset	133	frontendEffects = gameSettings->value("frontend/effects", true).toBool();
7313 162bc562335b Use toUtf8 instead TODO - find out 'sactly what the website is using for hashes. nemo parents: 7122 diff changeset	134	playerHash = QString(QCryptographicHash::hash(gameSettings->value("net/nick","").toString().toUtf8(), QCryptographicHash::Md5).toHex());
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	135
5849 b84b41aba275 fix for issue #269 sheepluva parents: 5773 diff changeset	136	this->setStyleSheet(styleSheet);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	137	ui.setupUi(this);
3284 7ffd0e20ad08 Palewolf: sheepluva parents: 3283 diff changeset	138	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	139	//setFocusPolicy(Qt::StrongFocus);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	140	CustomizePalettes();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	141
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	142	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	143
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	144	config = new GameUIConfig(this, cfgdir->absolutePath() + "/hedgewars.ini");
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	145
7392 bc3306c59a08 Correctly distinguish between game and real ticks while recording video, Stepan777 <stepik-777@mail.ru> parents: 7376 diff changeset	146	ui.pageVideos->init(config);
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	147
2400 2422ea85d100 added a utility that warns the user to install hedgewars when it's run from the diskimage koda parents: 2399 diff changeset	148	#ifdef __APPLE__
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	149	panel = new M3Panel;
5087 d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	150
2395 d01d3bf3e1de makes the updater optional at compile time koda parents: 2392 diff changeset	151	#ifdef SPARKLE_ENABLED
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	152	AutoUpdater* updater;
5095 15dd764b728c fix autorelease pools not being set (issue 209) and format code a little koda parents: 5087 diff changeset	153
7933 223b3a195474 many osx sparkle fixes koda parents: 7927 diff changeset	154	updater = new SparkleAutoUpdater();
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	155	if (updater && config->isAutoUpdateEnabled())
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	156	updater->checkForUpdates();
3697 d5b30d6373fc remove trailing spaces from end of line koda parents: 3324 diff changeset	157	#endif
5087 d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	158
d3af455a868e cmd+m should minimize the app as per apple human guidelines koda parents: 5061 diff changeset	159	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	160	connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized()));
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	161	#else
4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	162	// 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	163	QShortcut * closeFrontend = new QShortcut(QKeySequence("Ctrl+Q"), this);
4759 4fa0c3da81f8 ctrl+q closes frontend also on linux and windows koda parents: 4751 diff changeset	164	connect (closeFrontend, SIGNAL(activated()), this, SLOT(close()));
7824 3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	165	//QShortcut * updateData = new QShortcut(QKeySequence("F5"), this);
3df73ec7fcf2 disable F5 key and data refresh sheepluva parents: 7823 diff changeset	166	//connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload()));
2261 57e99c908e7c a lot of stuff: koda parents: 2155 diff changeset	167	#endif
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	168
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	169	UpdateTeamsLists();
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	170	InitCampaignPage();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	171	UpdateCampaignPage(0);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	172	UpdateWeapons();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	173
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	174	// connect all goBack signals
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	175	int nPages = ui.Pages->count();
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	176
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	177	for (int i = 0; i < nPages; i++)
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	178	connect(ui.Pages->widget(i), SIGNAL(goBack()), this, SLOT(GoBack()));
14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	179
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	180	pageSwitchMapper = new QSignalMapper(this);
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	181	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	182
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	183	connect(config, SIGNAL(frontendFullscreen(bool)), this, SLOT(onFrontendFullscreen(bool)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	184	onFrontendFullscreen(config->isFrontendFullscreen());
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	185
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	186	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	187	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	188
816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	189	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	190	pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP);
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	191
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	192	connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	193	pageSwitchMapper->setMapping(ui.pageMain->BtnFeedback, ID_PAGE_FEEDBACK);
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	194
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	195	connect(ui.pageMain->BtnNet, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	196	pageSwitchMapper->setMapping(ui.pageMain->BtnNet, ID_PAGE_NETTYPE);
5763 d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	197
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	198	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	199	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	200
d7a887c7e2d0 Add a crappy button to encourage artists to make another one. Restore Info page. nemo parents: 5746 diff changeset	201	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	202	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	203
7015 08642c7da4a3 add DLC button to net game room sheepluva parents: 7004 diff changeset	204
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	205	#ifdef VIDEOREC
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	206	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	207	pageSwitchMapper->setMapping(ui.pageMain->BtnVideos, ID_PAGE_VIDEOS);
7617 0ac281e1b58b Make ffmpeg optional for frontend unc0rr parents: 7565 diff changeset	208	#endif
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	209
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	210	//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	211	//connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	212
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	213	connect(ui.pageFeedback->BtnSend, SIGNAL(clicked()), this, SLOT(SendFeedback()));
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	214
7553 9cfe74ee418b Simplify code a bit unc0rr parents: 7551 diff changeset	215	connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit()));
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	216
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	217	connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	218	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	219	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	220	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	221	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	222	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	223	connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	224	pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	225
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	226
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	227	connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	228	connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	229
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	230	connect(ui.pageOptions, SIGNAL(newTeamRequested()), this, SLOT(NewTeam()));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	231	connect(ui.pageOptions, SIGNAL(editTeamRequested(const QString&)), this, SLOT(EditTeam(const QString&)));
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	232	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	233	connect(ui.pageOptions, SIGNAL(goBack()), config, SLOT(SaveOptions()));
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	234	connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles()));
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	235
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	236	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	237	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	238	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	239	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	240	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	241	connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme()));
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	242	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	243	connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsChanged()), this, SLOT(UpdateWeapons()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	244
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	245	connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect()));
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	246	connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	247	pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	248
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	249	connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16)));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	250
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	251	connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer()));
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	252
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	253	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	254	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	255	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	256	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	257	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	258	connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map()));
df827e70ae63 Pretension to switch to draw map page unc0rr parents: 4509 diff changeset	259	pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	260
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	261	connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	262	pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN);
187 96c3154efee5 "About" page, not yet filled with content unc0rr parents: 184 diff changeset	263
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	264	connect(ui.pageInfo->BtnSnapshots, SIGNAL(clicked()), this, SLOT(OpenSnapshotFolder()));
1312 0078e4f72d40 Create a page for rooms list unc0rr parents: 1311 diff changeset	265
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	266	connect(ui.pageGameStats, SIGNAL(saveDemoRequested()), this, SLOT(saveDemoWithCustomName()));
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	267
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	268	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	269	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	270	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnTrainPage, ID_PAGE_TRAINING);
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	271
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	272	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	273	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	274
4518 ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	275	connect(ui.pageSinglePlayer->BtnMultiplayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map()));
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	276	pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnMultiplayer, ID_PAGE_MULTIPLAYER);
ce95df0398fb Use pageSwitchMapper in some more places unc0rr parents: 4511 diff changeset	277
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	278	connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	279	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	280
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	281	connect(ui.pageTraining, SIGNAL(startMission(const QString&)), this, SLOT(startTraining(const QString&)));
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	282
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	283	connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign()));
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	284	connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	285	connect(ui.pageCampaign->CBCampaign, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int)));
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	286
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	287
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	288	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	289	ui.pageSelectWeapon->pWeapons, SLOT(deleteWeaponsName())); // executed first
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	290	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	291	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	292	//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	293	// this, SLOT(GoBack())); // executed third
718 f93a38d2c982 delete weapon button added displacer parents: 717 diff changeset	294
1887 d68939b3f7f0 - Share model between test table and widgets unc0rr parents: 1885 diff changeset	295
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	296	connect(ui.pageNetType->BtnLAN, SIGNAL(clicked()), this, SLOT(GoToNet()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	297	connect(ui.pageNetType->BtnOfficialServer, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer()));
1950 09ad18a1be11 Implement two buttons unc0rr parents: 1925 diff changeset	298
5147 a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	299	connect(ui.pageConnecting, SIGNAL(cancelConnection()), this, SLOT(GoBack()));
a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	300
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	301	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	302
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	303	ammoSchemeModel = new AmmoSchemeModel(this, cfgdir->absolutePath() + "/schemes.ini");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	304	ui.pageScheme->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	305	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	306	ui.pageOptions->SchemesName->setModel(ammoSchemeModel);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	307
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	308	wBackground = new BGWidget(this);
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	309	wBackground->setFixedSize(this->width(), this->height());
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	310	wBackground->lower();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	311	wBackground->init();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	312	wBackground->enabled = config->isFrontendEffects();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	313	wBackground->startAnimation();
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	314
6477 ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	315	//Install all eventFilters :
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	316
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	317	MouseOverFilter *filter = new MouseOverFilter();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	318	filter->setUi(&ui);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	319
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	320	QList<QWidget *> widgets;
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	321
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	322	for (int i=0; i < ui.Pages->count(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	323	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	324	widgets = ui.Pages->widget(i)->findChildren<QWidget *>();
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	325
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	326	for (int i=0; i < widgets.size(); i++)
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	327	{
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	328	widgets.at(i)->installEventFilter(filter);
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	329	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	330	}
ad5741c252b9 GCI task: describez Oranger parents: 6476 diff changeset	331
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	332	PagesStack.push(ID_PAGE_MAIN);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	333	GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	334	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	335
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	336	#ifdef USE_XFIRE
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	337	void HWForm::updateXfire(void)
67815ee123d7 Frontend: smxx parents: 2820 diff changeset	338	{
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	339	if(hwnet && (hwnet->clientState() != HWNewNet::Disconnected))
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	340	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	341	xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare("netserver.hedgewars.org:46631") ? "Official server" : hwnet->getHost().toAscii());
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	342	switch(hwnet->clientState())
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	343	{
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	344	case HWNewNet::Connecting: // Connecting
727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	345	case HWNewNet::Connected:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	346	xfire_setvalue(XFIRE_STATUS, "Connecting");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	347	xfire_setvalue(XFIRE_NICKNAME, "-");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	348	xfire_setvalue(XFIRE_ROOM, "-");
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	349	case HWNewNet::InLobby: // In lobby
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	350	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	351	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	352	xfire_setvalue(XFIRE_ROOM, "In game lobby");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	353	break;
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	354	case HWNewNet::InRoom: // In room
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	355	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	356	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	357	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (waiting for players)").toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	358	break;
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	359	case HWNewNet::InGame: // In game
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	360	xfire_setvalue(XFIRE_STATUS, "Online");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	361	xfire_setvalue(XFIRE_NICKNAME, hwnet->getNick().toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	362	xfire_setvalue(XFIRE_ROOM, (hwnet->getRoom() + " (playing or spectating)").toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	363	break;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	364	default:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	365	break;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	366	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	367	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	368	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	369	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	370	xfire_setvalue(XFIRE_STATUS, "Offline");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	371	xfire_setvalue(XFIRE_NICKNAME, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	372	xfire_setvalue(XFIRE_ROOM, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	373	xfire_setvalue(XFIRE_SERVER, "-");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	374	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	375	xfire_update();
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	376	}
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	377	#endif
2821 67815ee123d7 Frontend: smxx parents: 2820 diff changeset	378
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	379	void HWForm::onFrontendFullscreen(bool value)
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	380	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	381	if (value)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	382	setWindowState(windowState() \| Qt::WindowFullScreen);
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	383	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	384	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	385	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	386	}
1162 91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	387	}
91bf5e3e558d Frontend Fullscreen mode added displacer parents: 1150 diff changeset	388
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	389	void HWForm::onFrontendEffects(bool value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	390	{
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	391	wBackground->enabled = value;
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	392	if (value)
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	393	wBackground->startAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	394	else
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	395	wBackground->stopAnimation();
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	396	}
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	397
4592 b1fe47b11b99 disable fix for issue 24 in order to fix issue 123, as suggested by koda sheepluva parents: 4576 diff changeset	398	/*
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	399	void HWForm::keyReleaseEvent(QKeyEvent *event)
494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	400	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	401	if (event->key() == Qt::Key_Escape)
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	402	this->GoBack();
494221b5950e fix issue 24 and issue 81 koda parents: 3932 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
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	406	void HWForm::CustomizePalettes()
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	407	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	408	QList<QScrollBar > allSBars = findChildren<QScrollBar >();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	409	QPalette pal = palette();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	410	pal.setColor(QPalette::WindowText, QColor(0xff, 0xcc, 0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	411	pal.setColor(QPalette::Button, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	412	pal.setColor(QPalette::Base, QColor(0x00, 0x35, 0x1d));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	413	pal.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00));
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	414
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	415	for (int i = 0; i < allSBars.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	416	allSBars.at(i)->setPalette(pal);
1419 8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	417	}
8650a8f55006 Set custom palette to scrollbars unc0rr parents: 1418 diff changeset	418
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	419	void HWForm::UpdateWeapons()
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	420	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	421	QVector<QComboBox*> combos;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	422	combos.push_back(ui.pageOptions->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	423	combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	424	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	425	combos.push_back(ui.pageSelectWeapon->selectWeaponSet);
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	426
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	427	QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	428
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	429	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	430	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	431	(*it)->clear();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	432
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	433	for(int i = 0; i < names.size(); ++i)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	434	(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i]));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	435
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	436	int pos = (*it)->findText("Default");
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	437	if (pos != -1)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	438	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	439	(*it)->setCurrentIndex(pos);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	440	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	441	}
695 34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	442	}
34a93d123712 update weapons combo fixed displacer parents: 694 diff changeset	443
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	444	void HWForm::UpdateTeamsLists(const QStringList* editable_teams)
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	445	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	446	QStringList teamslist;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	447	if(editable_teams)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	448	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	449	teamslist =* editable_teams;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	450	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	451	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	452	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	453	teamslist = config->GetTeamsList();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	454	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	455
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	456	if(teamslist.empty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	457	{
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	458	HWTeam defaultTeam(tr("DefaultTeam"));
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	459	defaultTeam.saveToFile();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	460	teamslist.push_back(tr("DefaultTeam"));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	461	}
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	462
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	463	ui.pageOptions->CBTeamName->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	464	ui.pageOptions->CBTeamName->addItems(teamslist);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	465	ui.pageCampaign->CBTeam->clear();
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	466	ui.pageCampaign->CBTeam->addItems(teamslist);
245 4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	467	}
4f6b53b7a567 Make teams config file name be team name unc0rr parents: 233 diff changeset	468
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	469	void HWForm::GoToSelectNewWeapon()
436045756181 working save weapons to file displacer parents: 687 diff changeset	470	{
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	471	ui.pageSelectWeapon->pWeapons->newWeaponsName();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	472	GoToPage(ID_PAGE_SELECTWEAPON);
694 436045756181 working save weapons to file displacer parents: 687 diff changeset	473	}
436045756181 working save weapons to file displacer parents: 687 diff changeset	474
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	475	void HWForm::GoToSelectWeapon()
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	476	{
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	477	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	478	GoToPage(ID_PAGE_SELECTWEAPON);
600 f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	479	}
f6e5f4e122db Select weapon scheme page unc0rr parents: 597 diff changeset	480
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	481	void HWForm::GoToSelectWeaponSet(int index)
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	482	{
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	483	ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(index);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	484	GoToPage(ID_PAGE_SELECTWEAPON);
2009 91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	485	}
91f461c218ab TheXception's patch: unc0rr parents: 1998 diff changeset	486
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	487	void HWForm::GoToSaves()
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	488	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	489	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Save);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	490
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	491	GoToPage(ID_PAGE_DEMOS);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	492	}
94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	493
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	494	void HWForm::GoToDemos()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	495	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	496	ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Demo);
579 94db15de0392 - Some changes to make build process clear unc0rr parents: 541 diff changeset	497
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	498	GoToPage(ID_PAGE_DEMOS);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	499	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	500
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	501	void HWForm::GoToNet()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	502	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	503	ui.pageNet->updateServersList();
632 5e09ae25729f Half implement possibility for different backends of servers list unc0rr parents: 625 diff changeset	504
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	505	GoToPage(ID_PAGE_NET);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	506	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	507
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	508	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	509	{
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	510	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	511	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	512	}
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	513
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	514	void HWForm::GoToNewScheme()
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	515	{
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	516	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	517	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	518	}
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	519
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	520	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	521	{
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	522	ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	523	GoToPage(ID_PAGE_SCHEME);
1885 75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	524	}
75489216b5b0 Continue work on new schemes unc0rr parents: 1875 diff changeset	525
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	526	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	527	{
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	528	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	529	}
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	530
496 00465a8ef129 merged new team from branch displacer parents: 493 diff changeset	531	void HWForm::OnPageShown(quint8 id, quint8 lastid)
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	532	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	533	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	534	updateXfire();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	535	#endif
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	536	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	537	{
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	538	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	539	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	540	if (id == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	541	{
4520 e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	542	DrawMapScene * scene;
4535 301df2c84b97 The Fix unc0rr parents: 4525 diff changeset	543	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	544	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	545	else
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	546	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	547
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	548	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	549	}
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	550
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	551	if (lastid == ID_PAGE_DRAWMAP)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	552	{
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	553	if (id == ID_PAGE_MULTIPLAYER)
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	554	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	555	else
4525 0a81be113e21 Try to send drawn map data to net server unc0rr parents: 4524 diff changeset	556	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	557	}
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix) unc0rr parents: 4518 diff changeset	558
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	559	if (id == ID_PAGE_ROOMSLIST)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	560	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	561	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	562	{
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	563	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	564	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	565	game->abort();
6190 1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	566	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	567	}
1db2486e45f4 potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?) sheepluva parents: 6180 diff changeset	568
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	569	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	570	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	571	QStringList tmNames = config->GetTeamsList();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	572	TeamSelWidget* curTeamSelWidget;
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	573	ui.pageOptions->setTeamOptionsEnabled(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	574
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	575	if (id == ID_PAGE_MULTIPLAYER)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	576	{
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	577	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	578	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	579	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	580	{
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	581	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	582	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	583
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	584	QList<HWTeam> teamsList;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	585	for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); it++)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	586	{
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	587	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	588	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	589	teamsList.push_back(team);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	590	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	591
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	592	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	593	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	594	if (editedTeam)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	595	{
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	596	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	597	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	598	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	599	else if (lastid != ID_PAGE_GAMESTATS
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	600	&& lastid != ID_PAGE_INGAME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	601	&& lastid != ID_PAGE_SCHEME
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	602	&& lastid != ID_PAGE_SELECTWEAPON)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	603	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	604	curTeamSelWidget->resetPlayingTeams(teamsList);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	605	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	606	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	607	else if (id == ID_PAGE_GAMESTATS)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	608	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	609	ui.pageGameStats->renderStats();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	610	}
2845 19db164dd20d Frontend: smxx parents: 2822 diff changeset	611
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	612	if (id == ID_PAGE_MAIN)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	613	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	614	ui.pageOptions->setTeamOptionsEnabled(true);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	615	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	616
6911 1cda333286e0 added savepassword checkbox to options page, which now reloads values at every acces koda parents: 6910 diff changeset	617	if (id == ID_PAGE_SETUP)
1cda333286e0 added savepassword checkbox to options page, which now reloads values at every acces koda parents: 6910 diff changeset	618	{
1cda333286e0 added savepassword checkbox to options page, which now reloads values at every acces koda parents: 6910 diff changeset	619	config->reloadValues();
1cda333286e0 added savepassword checkbox to options page, which now reloads values at every acces koda parents: 6910 diff changeset	620	}
1cda333286e0 added savepassword checkbox to options page, which now reloads values at every acces koda parents: 6910 diff changeset	621
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	622	if (id == ID_PAGE_VIDEOS )
baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	623	{
baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	624	config->reloadVideosValues();
baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	625	}
311 b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	626	}
b8905423f19f - Limit list of teams in game with 200 px unc0rr parents: 307 diff changeset	627
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	628	void HWForm::GoToPage(int id)
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	629	{
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	630	bool stopAnim = false;
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	631
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	632	int lastid = ui.Pages->currentIndex();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	633	PagesStack.push(ui.Pages->currentIndex());
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	634
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	635	OnPageShown(id, lastid);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	636	ui.Pages->setCurrentIndex(id);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	637
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	638
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	639	/* if (id == ID_PAGE_DRAWMAP \|\| id == ID_PAGE_GAMESTATS)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	640	stopAnim = true;
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	641	This were disabled due to broken flake animations. I believe the more general problems w/ opacity that forced its disable makes blocking these
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	642	unnecessary.
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	643	*/
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	644
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	645	#if (QT_VERSION >= 0x040600)
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	646	if (!stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	647	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	648	/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	649	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	650	#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	651	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	652	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	653	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	654
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	655	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(lastid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	656	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	657	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	658	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	659	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	660
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	661	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	662	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	663	animationNewSlide->setDuration(duration);
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	664	animationNewSlide->setStartValue(QPoint(width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	665	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	666	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	667
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	668	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	669	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	670	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	671	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	672	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	673	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	674	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	675
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	676	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	677	ui.Pages->widget(lastid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	678
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	679	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(lastid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	680	animationOldSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	681	animationOldSlide->setStartValue(QPoint(0, 0));
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	682	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	683	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	684
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	685	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	686	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	687	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	688	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	689	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	690	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	691	#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	692
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	693	// 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	694	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	695
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	696	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	697	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	698	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	699
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	700	/* this is for the situation when the animation below is interrupted by a new animation. For some reason, finished is not being fired */
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	701	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	702	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	703	#endif
289 604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	704	}
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	705
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	706	void HWForm::GoBack()
604c4a779c20 Stacked walking trough pages unc0rr parents: 271 diff changeset	707	{
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	708	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	709	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	710	if (curid == ID_PAGE_MAIN)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	711	{
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	712	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	713	return;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	714	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	715	exit();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	716	}
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	717
4509 816a0bff5019 Use QSignalMapper instead of GoToPage() functions (not all calls converted yet) unc0rr* parents: 4433 diff changeset	718	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	719	ui.Pages->setCurrentIndex(id);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	720	OnPageShown(id, curid);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	721
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	722	if (id == ID_PAGE_CONNECTING)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	723	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	724	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	725	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	726	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	727	if (id == ID_PAGE_NETSERVER)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	728	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	729	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	730	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	731	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	732	if ((!hwnet) && (id == ID_PAGE_ROOMSLIST))
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	733	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	734	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	735	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	736	}
7004 45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	737	/*if (curid == ID_PAGE_DRAWMAP)
45d43f372107 Workaround for stuck pages. nemo parents: 6960 diff changeset	738	stopAnim = true; */
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	739
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	740	if ((!hwnet) \|\| (!hwnet->isInRoom()))
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	741	if (id == ID_PAGE_NETGAME \|\| id == ID_PAGE_NETGAME)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	742	{
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	743	stopAnim = true;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	744	GoBack();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	745	}
1672 6a451649558c Properly handle room deletion in respect of pages switching unc0rr parents: 1671 diff changeset	746
5147 a2ae7702bb75 Add 'Cancel connection' button. Fixes issue #162 unc0rr parents: 5140 diff changeset	747	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	748	if (curid == ID_PAGE_NETGAME && hwnet && hwnet->isInRoom()) hwnet->partRoom();
4432 81f52117085d disable last commit w/ comment nemo parents: 4431 diff changeset	749	// 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	750	//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	751
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	752	if (curid == ID_PAGE_SCHEME)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	753	ammoSchemeModel->Save();
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	754
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	755	#if (QT_VERSION >= 0x040600)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	756	/Start animation :/
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	757	if (curid != 0 && !stopAnim)
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	758	{
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	759	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	760	#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	761	coeff = 2;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	762	QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	763	effectNew->setOpacity(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	764	ui.Pages->widget(id)->setGraphicsEffect(effectNew);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	765
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	766	QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(curid));
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	767	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	768	#endif
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	769	// no effects, means 0 effect duration :D
ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	770	int duration = config->isFrontendEffects() ? 500 : 0;
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	771
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	772	//Last page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	773	animationOldSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	774	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	775	animationOldSlide->setStartValue(QPoint(-width()/coeff, 0));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	776	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	777	animationOldSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	778
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	779	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	780	animationOldOpacity = new QPropertyAnimation(effectLast, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	781	animationOldOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	782	animationOldOpacity->setStartValue(1);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	783	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	784	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	785	#endif
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	786	//New page animation
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	787	ui.Pages->widget(curid)->setHidden(false);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	788
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	789	animationNewSlide = new QPropertyAnimation(ui.Pages->widget(curid), "pos");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	790	animationNewSlide->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	791	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	792	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	793	animationNewSlide->setEasingCurve(QEasingCurve::OutExpo);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	794
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	795	#ifdef false
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	796	animationNewOpacity = new QPropertyAnimation(effectNew, "opacity");
6574 ec059b55aa72 GCI task: stars bovi parents: 6572 diff changeset	797	animationNewOpacity->setDuration(duration);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	798	animationNewOpacity->setStartValue(0.01);
2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	799	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	800	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	801	#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	802
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	803	// 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	804	connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide()));
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	805
7860 a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	806	// start animations
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	807	animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped);
a90936219ffa let animation objects delete themselves after they are not being used anymore sheepluva parents: 7842 diff changeset	808	animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped);
6428 2d2b5e3c59a7 eyecandy Oranger parents: 6227 diff changeset	809	}
6604 9cc612a24b43 this should lower compatibility with qt4.5 again, but i have no way to test it koda parents: 6574 diff changeset	810	#endif
7826 9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	811
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	812	if (stopAnim)
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	813	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	814
9f529722d61e fix for the root cause of issue 434 (previous pages being visible in the background) sheepluva parents: 7824 diff changeset	815	// 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	816	// 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	817
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	818	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	819
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	820	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	821	{
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	822	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	823	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	824	}
a7de68f4f87f allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon) koda parents: 5567 diff changeset	825
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	826	void HWForm::btnExitPressed()
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	827	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	828	eggTimer.start();
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	829	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	830
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	831	void HWForm::exit()
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	832	{
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	833	// 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	834	#ifdef __APPLE__
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	835	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	836	#endif
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	837	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	838	// TODO reactivate egg
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	839	/* }
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	840	else
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	841	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	842	QPushButton * btn = findChild<QPushButton *>("imageButt");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	843	if (btn)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	844	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	845	btn->setIcon(QIcon(":/res/bonus.png"));
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	846	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	847	} */
530 f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	848	}
f0b962214436 Easter egg (with stub image, will paint later) unc0rr parents: 502 diff changeset	849
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	850	void HWForm::IntermediateSetup()
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	851	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	852	quint8 id=ui.Pages->currentIndex();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	853	TeamSelWidget* curTeamSelWidget;
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	854
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	855	if(id == ID_PAGE_MULTIPLAYER)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	856	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	857	curTeamSelWidget = ui.pageMultiplayer->teamsSelect;
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	858	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	859	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	860	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	861	curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	862	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	863
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	864	QStringList tmnames;
5772 c09c50efe8b5 Replace iterators with simple declarative foreach (not tested if it works) unc0rr parents: 5763 diff changeset	865
5773 c277657854a2 Some renaming unc0rr parents: 5772 diff changeset	866	foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	867	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	868
3757 ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	869	//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring
ad2f669c8435 Frontend: smaxx parents: 3697 diff changeset	870	UpdateTeamsLists();
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	871
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	872	GoToPage(ID_PAGE_SETUP);
535 a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	873	}
a14eaf35cf4b "Setup" button instead of "New team", exclude playing teams from setup displacer parents: 533 diff changeset	874
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	875	void HWForm::NewTeam()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	876	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	877	ui.pageEditTeam->createTeam(QLineEdit::tr("unnamed"), playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	878	UpdateTeamsLists();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	879	GoToPage(ID_PAGE_SETUP_TEAM);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	880	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	881
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	882	void HWForm::EditTeam(const QString & teamName)
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	883	{
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	884	ui.pageEditTeam->editTeam(teamName, playerHash);
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	885	GoToPage(ID_PAGE_SETUP_TEAM);
3159 e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	886	}
e5eff81d7635 Frontend: smxx parents: 3019 diff changeset	887
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	888	void HWForm::AfterTeamEdit()
1840 4747f0232b88 ttsmj2's random teams patch unc0rr parents: 1828 diff changeset	889	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	890	UpdateTeamsLists();
7551 c212247065e3 GoBack() here is not needed anymore unc0rr parents: 7313 diff changeset	891	//GoBack();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	892	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	893
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	894
d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	895	void HWForm::DeleteTeam(const QString & teamName)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	896	{
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	897	QMessageBox reallyDeleteMsg(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	898	reallyDeleteMsg.setIcon(QMessageBox::Question);
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	899	reallyDeleteMsg.setWindowTitle(QMessageBox::tr("Teams - Are you sure?"));
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	900	reallyDeleteMsg.setText(QMessageBox::tr("Do you really want to delete the team '%1'?").arg(teamName));
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	901	reallyDeleteMsg.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	902	reallyDeleteMsg.setStandardButtons(QMessageBox::Ok \| QMessageBox::Cancel);
6024 d38da7c19e43 some more cleanups and refactoring. sheepluva parents: 6015 diff changeset	903
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	904	if (reallyDeleteMsg.exec() == QMessageBox::Ok)
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	905	{
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	906	ui.pageEditTeam->deleteTeam(teamName);
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	907	UpdateTeamsLists();
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	908	}
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	909	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	910
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	911	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	912	{
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	913	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	914	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	915	{
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	916	ShowErrorMessage(QMessageBox::tr("Cannot delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()));
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	917	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	918	else
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	919	{
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	920	ui.pageScheme->deleteRow();
4576 d85062310790 fixed and enabled removing of game scheme from options page Henek parents: 4560 diff changeset	921	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	922	}
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	923	}
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	924
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	925	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	926	{
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	927	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	928	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	929	}
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	930
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	931	void HWForm::SimpleGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	932	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	933	CreateGame(0, 0, *cDefaultAmmoStore);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	934	game->StartQuick();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	935	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	936
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	937	void HWForm::PlayDemo()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	938	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	939	QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	940	if (!curritem)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	941	{
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	942	ShowErrorMessage(QMessageBox::tr("Please select a record from the list"));
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	943	return;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	944	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	945	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	946	game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave());
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	947	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	948
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	949	void HWForm::PlayDemoQuick(const QString & demofilename)
ded882439548 file association for mac! koda parents: 5238 diff changeset	950	{
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	951	if (game && game->gameState == gsStarted) return;
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	952	GoBack(); //needed to cleanly disconnect from netgame
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	953	GoToPage(ID_PAGE_MAIN);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	954	CreateGame(0, 0, 0);
5865 35387d27f73a Save demo when loaded from save game finishes unc0rr parents: 5849 diff changeset	955	game->PlayDemo(demofilename, false);
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	956	}
ded882439548 file association for mac! koda parents: 5238 diff changeset	957
666 07fa9a74a074 Abstract HWForm from custom PageNet implementation unc0rr parents: 665 diff changeset	958	void HWForm::NetConnectServer(const QString & host, quint16 port)
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	959	{
4870 c02406028e02 trim net nick in frontend sheepluva parents: 4845 diff changeset	960	_NetConnect(host, port, ui.pageOptions->editNetNick->text().trimmed());
1395 46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	961	}
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	962
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	963	void HWForm::NetConnectOfficialServer()
46fd70de89e2 Add "Join official server" button unc0rr parents: 1391 diff changeset	964	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	965	NetConnectServer("netserver.hedgewars.org", 46631);
416 595d8663254d update button for udp servers list displacer parents: 412 diff changeset	966	}
595d8663254d update button for udp servers list displacer parents: 412 diff changeset	967
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	968	void HWForm::NetPassword(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	969	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	970	int passLength = config->value("net/passwordlength", 0).toInt();
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	971	QString hash = config->value("net/passwordhash", "").toString();
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	972
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	973	// If the password is blank, ask the user to enter one in
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	974	if (passLength == 0)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	975	{
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	976	HWPasswordDialog * hpd = new HWPasswordDialog(this, tr("Your nickname %1 is\nregistered on Hedgewars.org\nPlease provide your password below\nor pick another nickname in game config:").arg(nick));
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	977	hpd->cbSave->setChecked(config->value("net/savepassword", true).toBool());
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	978	if (hpd->exec() != QDialog::Accepted)
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	979	{
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	980	ForcedDisconnect(tr("No password supplied."));
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	981	delete hpd;
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	982	return;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	983	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	984
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	985	QString password = hpd->lePassword->text();
7313 162bc562335b Use toUtf8 instead TODO - find out 'sactly what the website is using for hashes. nemo parents: 7122 diff changeset	986	hash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex();
6910 ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	987
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	988	bool save = hpd->cbSave->isChecked();
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	989	config->setValue("net/savepassword", save);
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	990	if (save) // user wants to save password
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	991	{
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	992	config->setValue("net/passwordhash", hash);
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	993	config->setValue("net/passwordlength", password.size());
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	994	config->setNetPasswordLength(password.size());
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	995	}
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	996
ea058558c68b add a checkbox for the password field prompt (issue 316) Stepan777 parents: 6907 diff changeset	997	delete hpd;
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	998	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	999
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1000	hwnet->SendPasswordHash(hash);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1001	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1002
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1003	void HWForm::NetNickTaken(const QString & nick)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1004	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1005	bool ok = false;
7795 ba32d3f9e567 set window modality also for custom dialogs, small text changes koda parents: 7794 diff changeset	1006	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	1007
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1008	if (!ok \|\| newNick.isEmpty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1009	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1010	ForcedDisconnect(tr("No nickname supplied."));
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1011	return;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1012	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1013
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1014	hwnet->NewNick(newNick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1015	config->setValue("net/nick", newNick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1016	config->updNetNick();
6227 ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1017
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1018	ui.pageRoomsList->setUser(nick);
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1019	ui.pageNetGame->setUser(nick);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1020	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1021
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1022	void HWForm::NetAuthFailed()
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1023	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1024	// Set the password blank if case the user tries to join and enter his password again
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1025	config->setValue("net/passwordlength", 0);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1026	config->setNetPasswordLength(0);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1027	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1028
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1029	void HWForm::NetTeamAccepted(const QString & team)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1030	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1031	ui.pageNetGame->pNetTeamsWidget->changeTeamStatus(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1032	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1033
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1034	void HWForm::NetError(const QString & errmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1035	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1036	switch (ui.Pages->currentIndex())
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1037	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1038	case ID_PAGE_INGAME:
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1039	ShowErrorMessage(errmsg);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1040	// no break
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1041	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	1042	ui.pageNetGame->displayError(errmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1043	break;
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1044	default:
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1045	ui.pageRoomsList->displayError(errmsg);
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	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1048
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1049	void HWForm::NetWarning(const QString & wrnmsg)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1050	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1051	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	1052	ui.pageNetGame->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1053	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	1054	ui.pageRoomsList->displayWarning(wrnmsg);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1055	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1056
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1057	void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1058	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1059	if(hwnet)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1060	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1061	hwnet->Disconnect();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1062	delete hwnet;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1063	hwnet=0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1064	}
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1065
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1066	hwnet = new HWNewNet();
637 8fa7ed5e13bd Fix bad behavior when quickly click Connect button more than once unc0rr parents: 636 diff changeset	1067
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1068	GoToPage(ID_PAGE_CONNECTING);
1800 f1df2eb32a16 "connecting" page unc0rr parents: 1797 diff changeset	1069
7916 be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1070	connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()));
6697 4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1071	connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1072	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	1073	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	1074	connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1075	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	1076	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	1077	connect(hwnet, SIGNAL(RemoveNetTeam(const HWTeam&)), this, SLOT(RemoveNetTeam(const HWTeam&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1078	connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1079	connect(hwnet, SIGNAL(AskForPassword(const QString&)), this, SLOT(NetPassword(const QString&)), Qt::QueuedConnection);
4a04c02bc8c3 Use queued signal-slot connections with HWNet class unc0rr parents: 6677 diff changeset	1080	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	1081	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	1082	//connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), hwnet, SLOT(partRoom()));
329 4c3aad46baa5 Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes unc0rr parents: 328 diff changeset	1083
7723 ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1084	ui.pageRoomsList->chatWidget->setUsersModel(hwnet->lobbyPlayersModel());
ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1085	ui.pageNetGame->pChatWidget->setUsersModel(hwnet->roomPlayersModel());
ca05b576ec74 Start moving to players list model. unc0rr parents: 7720 diff changeset	1086
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1087	// rooms list page stuff
6735 050237b1500f Setup rooms list headers unc0rr parents: 6733 diff changeset	1088	ui.pageRoomsList->setModel(hwnet->roomsListModel());
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1089	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	1090	ui.pageRoomsList, SLOT(setAdmin(bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1091	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	1092	ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1093
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1094	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	1095	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	1096
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1097	connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1098	hwnet, SLOT(CreateRoom(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1099	connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1100	hwnet, SLOT(JoinRoom(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1101	// connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1102	// this, SLOT(NetGameMaster()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1103	// connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1104	// this, SLOT(NetGameSlave()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1105	connect(ui.pageRoomsList, SIGNAL(askForRoomList()),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1106	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	1107
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1108	// room status stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1109	connect(hwnet, SIGNAL(roomMaster(bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1110	this, SLOT(NetGameChangeStatus(bool)), Qt::QueuedConnection);
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1111
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1112	// net page stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1113	connect(hwnet, SIGNAL(chatStringFromNet(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1114	ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
7720 8e6b79a020f8 Show more statuses in icons. unc0rr parents: 7710 diff changeset	1115
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1116	connect(hwnet, SIGNAL(chatStringFromMe(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1117	ui.pageNetGame->pChatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1118	connect(hwnet, SIGNAL(roomMaster(bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1119	ui.pageNetGame->pChatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1120	connect(ui.pageNetGame->pChatWidget, SIGNAL(chatLine(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1121	hwnet, SLOT(chatLineToNet(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1122	connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1123	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	1124	ui.pageNetGame, SLOT(setReadyStatus(bool)), Qt::QueuedConnection);
1577 e3e37c730dc0 - Decrease font size in chat unc0rr parents: 1576 diff changeset	1125
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1126	// chat widget actions
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1127	connect(ui.pageNetGame->pChatWidget, SIGNAL(kick(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1128	hwnet, SLOT(kickPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1129	connect(ui.pageNetGame->pChatWidget, SIGNAL(ban(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1130	hwnet, SLOT(banPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1131	connect(ui.pageNetGame->pChatWidget, SIGNAL(info(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1132	hwnet, SLOT(infoPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1133	connect(ui.pageNetGame->pChatWidget, SIGNAL(follow(const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1134	hwnet, SLOT(followPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1135	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	1136	hwnet, SLOT(kickPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1137	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	1138	hwnet, SLOT(banPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1139	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	1140	hwnet, SLOT(infoPlayer(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1141	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	1142	hwnet, SLOT(followPlayer(const QString&)));
1566 6b63c75fdc68 Start work on lobby: add/remove nick from the list on join/quit unc0rr parents: 1531 diff changeset	1143
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1144	// chatting
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1145	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	1146	hwnet, SLOT(chatLineToLobby(const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1147	connect(hwnet, SIGNAL(chatStringLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1148	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
4897 11598e7aa7e6 make names in chats clickable. still color adjustments needed; and testing sheepluva parents: 4894 diff changeset	1149	connect(hwnet, SIGNAL(chatStringLobby(const QString&, const QString&)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1150	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&, const QString&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1151	connect(hwnet, SIGNAL(chatStringFromMeLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1152	ui.pageRoomsList->chatWidget, SLOT(onChatString(const QString&)), Qt::QueuedConnection);
1568 15a446307993 Lobby chat should work now unc0rr parents: 1566 diff changeset	1153
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1154	// nick list stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1155	connect(hwnet, SIGNAL(nickAdded(const QString&, bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1156	ui.pageNetGame->pChatWidget, SLOT(nickAdded(const QString&, bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1157	connect(hwnet, SIGNAL(nickRemoved(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1158	ui.pageNetGame->pChatWidget, SLOT(nickRemoved(const QString&)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1159	connect(hwnet, SIGNAL(nickAddedLobby(const QString&, bool)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1160	ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool)), Qt::QueuedConnection);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1161	connect(hwnet, SIGNAL(nickRemovedLobby(const QString&)),
6720 84261c3408a6 Make all signals from HWNet queued, this should fix issues with teams and chat widgets unc0rr parents: 6700 diff changeset	1162	ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&)), Qt::QueuedConnection);
461 105af110b0e6 chatWidget with layout displacer parents: 453 diff changeset	1163
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1164	// teams selecting stuff
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1165	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	1166	hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1167	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	1168	hwnet, SLOT(onTeamColorChanged(const HWTeam&)));
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1169	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	1170	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	1171	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	1172	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	1173	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	1174	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	1175	ui.pageNetGame->pNetTeamsWidget, SLOT(changeTeamColor(const HWTeam&)), Qt::QueuedConnection);
1874 1b145e099b75 - Fix a bug in map widget unc0rr parents: 1873 diff changeset	1176
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	1177	// admin stuff
3283 18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1178	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	1179	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	1180	connect(hwnet, SIGNAL(latestProtocolVar(int)), ui.pageAdmin, SLOT(protocol(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1181	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	1182	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	1183	connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int)));
18ee933a5864 Some stuff for game server administration task unc0rr parents: 3236 diff changeset	1184	connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars()));
6009 14f6fc9869f2 code cleanup/etc sheepluva parents: 5998 diff changeset	1185	connect(ui.pageAdmin, SIGNAL(clearAccountsCache()), hwnet, SLOT(clearAccountsCache()));
1924 8f8fe856ce9d Prepare to add ability for admin to set MOTD unc0rr parents: 1907 diff changeset	1186
1898 f0ab0c77946d Send scheme data over net (but recieving part isn't implemented yet) unc0rr parents: 1897 diff changeset	1187	// disconnect
6036 727d13409891 small cleanup: enum instead of magic numbers sheepluva parents: 6030 diff changeset	1188	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	1189
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1190	// config stuff
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1191	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	1192	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	1193	connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig()));
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1194
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1195	while (nick.isEmpty())
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1196	{
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1197	nick = QInputDialog::getText(this,
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1198	QObject::tr("Nickname"),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1199	QObject::tr("Please enter your nickname"),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1200	QLineEdit::Normal,
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1201	QDir::home().dirName());
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1202	config->setValue("net/nick",nick);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1203	config->updNetNick();
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1204	}
6227 ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1205
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1206	ui.pageRoomsList->setUser(nick);
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1207	ui.pageNetGame->setUser(nick);
ce60b734fff1 update name autocompletion after nick change (since own nick isn't suggested) sheepluva parents: 6225 diff changeset	1208
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1209	hwnet->Connect(hostName, port, nick);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1210	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1211
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1212	void HWForm::NetConnect()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1213	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1214	HWHostPortDialog * hpd = new HWHostPortDialog(this);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1215	hpd->leHost->setText(*netHost);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1216	hpd->sbPort->setValue(netPort);
653 4f44fc06ca45 Class to ask host/port to connect to ('Specify' button on PageNet) unc0rr parents: 647 diff changeset	1217
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1218	if (hpd->exec() == QDialog::Accepted)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1219	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1220	config->SaveOptions();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1221	delete netHost;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1222	netHost = new QString(hpd->leHost->text());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1223	netPort = hpd->sbPort->value();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1224	NetConnectServer(*netHost, netPort);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1225	}
6907 a2f9a9a62dc5 memory leak in hwform.cpp (issue 386) Stepan777 parents: 6793 diff changeset	1226	delete hpd;
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1227	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1228
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1229	void HWForm::NetStartServer()
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1230	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1231	config->SaveOptions();
636 dc93ac775bb9 - Switch between local and internet game unc0rr parents: 635 diff changeset	1232
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1233	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	1234	if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value()))
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1235	{
7795 ba32d3f9e567 set window modality also for custom dialogs, small text changes koda parents: 7794 diff changeset	1236	ShowErrorMessage(QMessageBox::tr("Unable to start server"));
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	1237
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1238	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1239	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1240	return;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1241	}
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	1242
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1243	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	1244
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1245	pRegisterServer = new HWNetUdpServer(0,
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1246	ui.pageNetServer->leServerDescr->text(),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1247	ui.pageNetServer->sbPort->value());
1418 69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1248	}
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1249
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1250	void HWForm::AsyncNetServerStart()
69df8f2a7cba Delay for 250 msec before connect to local server unc0rr parents: 1413 diff changeset	1251	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1252	NetConnectServer("localhost", pnetserver->getRunningPort());
314 83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1253	}
83773ccf4f09 client/server net pre-alpha displacer parents: 312 diff changeset	1254
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1255	void HWForm::NetDisconnect()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1256	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1257	if(pnetserver)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1258	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1259	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1260	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1261	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1262	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1263	}
659 5eafb20566f1 - Fix some stupid object casts unc0rr parents: 658 diff changeset	1264
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1265	pnetserver->StopServer();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1266	delete pnetserver;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1267	pnetserver = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1268	}
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1269
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1270	if(hwnet)
505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1271	hwnet->Disconnect();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1272	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1273
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1274	void HWForm::ForcedDisconnect(const QString & reason)
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1275	{
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	1276	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	1277	return; // we have server - let it care of all things
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1278	if (hwnet)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1279	{
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	1280	QString errorStr = QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"'));
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	1281	ShowErrorMessage(errorStr);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1282	}
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	1283
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	1284	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	1285	&& ui.Pages->currentIndex() != ID_PAGE_NETTYPE
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	1286	&& ui.Pages->currentIndex() != ID_PAGE_MAIN)
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1287	{
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	1288	GoBack();
7803 7c4d83f8ac23 better? nemo parents: 7802 diff changeset	1289	}
383 09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1290	}
09a8795105a4 some disconnect and remove teams bugfixes displacer parents: 373 diff changeset	1291
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1292	void HWForm::NetConnected()
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1293	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1294	GoToPage(ID_PAGE_ROOMSLIST);
1311 49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1295	}
49beb1221c0b - Add stub page for rooms list unc0rr parents: 1310 diff changeset	1296
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1297	void HWForm::NetGameEnter()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1298	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1299	ui.pageNetGame->pChatWidget->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1300	GoToPage(ID_PAGE_NETGAME);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1301	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1302
339 7535ab6c3820 Run game message added, team and config info provided for net game displacer parents: 338 diff changeset	1303	void HWForm::AddNetTeam(const HWTeam& team)
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1304	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1305	ui.pageNetGame->pNetTeamsWidget->addTeam(team);
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1306	}
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1307
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1308	void HWForm::RemoveNetTeam(const HWTeam& team)
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1309	{
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1310	ui.pageNetGame->pNetTeamsWidget->removeNetTeam(team);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1311	}
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1312
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1313	void HWForm::StartMPGame()
f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1314	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1315	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1316	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	1317	ui.pageMultiplayer->gameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1318	).toString();
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1319
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1320	CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo);
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1321
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1322	game->StartLocal();
184 f97a7a3dc8f6 - Update more headers unc0rr parents: 183 diff changeset	1323	}
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1324
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1325	void HWForm::GameStateChanged(GameState gameState)
7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1326	{
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	1327	quint8 id = ui.Pages->currentIndex();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1328	switch(gameState)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1329	{
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1330	case gsStarted:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1331	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1332	Music(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1333	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	1334	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	1335	ui.pageGameStats->clear();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1336	if (pRegisterServer)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1337	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1338	pRegisterServer->unregister();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1339	pRegisterServer = 0;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1340	}
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1341	//setVisible(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1342	setFocusPolicy(Qt::NoFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1343	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1344	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1345	case gsFinished:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1346	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1347	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1348	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	1349	if (id == ID_PAGE_INGAME) GoBack();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1350	Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1351	if (wBackground) wBackground->startAnimation();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1352	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	1353	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	1354	if (game) game->netSuspend = false;
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1355	break;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1356	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1357	default:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1358	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1359	//setVisible(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1360	setFocusPolicy(Qt::StrongFocus);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1361	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	1362	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	1363	// 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	1364	(hwnet && hwnet->isRoomChief() && hwnet->isInRoom() &&
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1365	(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	1366	{
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	1367	if (id == ID_PAGE_INGAME) GoBack();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1368	Music(ui.pageOptions->CBEnableFrontendMusic->isChecked());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1369	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	1370	if (hwnet) hwnet->gameFinished(false);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1371	}
4845 9a0f5377c529 merge latest 0.9.15 changes into head koda parents: 4831 4751 diff changeset	1372	if (gameState == gsHalted) close();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1373	};
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1374	}
307 96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1375	}
96b428ac11f2 More statistics unc0rr parents: 306 diff changeset	1376
696 d6f32ed6edc8 working multiplayer weapons combo displacer parents: 695 diff changeset	1377	void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo)
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1378	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1379	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	1380	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	1381	connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1382	connect(game, SIGNAL(GameStats(char, const QString &)), ui.pageGameStats, SLOT(GameStats(char, const QString &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1383	connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowErrorMessage(const QString &)), Qt::QueuedConnection);
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1384	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	1385	m_lastDemo = QByteArray();
306 7b61834edcf6 - Better blowtorch unc0rr parents: 301 diff changeset	1386	}
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1387
a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1388	void HWForm::ShowErrorMessage(const QString & msg)
a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1389	{
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	1390	QMessageBox msgMsg(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	1391	msgMsg.setIcon(QMessageBox::Warning);
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	1392	msgMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Error"));
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	1393	msgMsg.setText(msg);
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	1394	msgMsg.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	1395	msgMsg.exec();
425 a7e1dabc8fb7 - Better AI thinking behavior unc0rr parents: 418 diff changeset	1396	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1397
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1398	void HWForm::GetRecord(RecordType type, const QByteArray & record)
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1399	{
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1400	if (type != rtNeither)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1401	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1402	QString filename;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1403	QByteArray demo = record;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1404	QString recordFileName =
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1405	config->appendDateTimeToRecordName() ?
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1406	QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") :
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1407	"LastRound";
1487 b4cc59a6d50a Add an option to name records with current date and time unc0rr parents: 1427 diff changeset	1408
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1409	QStringList versionParts = cVersionString->split('-');
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1410	if ( (versionParts.size() == 2) && (!versionParts[1].isEmpty()) && (versionParts[1].contains(':')) )
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1411	recordFileName = recordFileName + "_" + versionParts[1].replace(':','-');
4902 45ec26ca9491 if on dev version append hg revision id to demos/saves' filenames sheepluva parents: 4897 diff changeset	1412
7180 53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1413	if (type == rtDemo)
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1414	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1415	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1416	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1417	demo.replace(QByteArray("\x02TS"), QByteArray("\x02TD"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1418	filename = cfgdir->absolutePath() + "/Demos/" + recordFileName + "." + *cProtoVer + ".hwd";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1419	m_lastDemo = demo;
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1420	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1421	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1422	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1423	demo.replace(QByteArray("\x02TL"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1424	demo.replace(QByteArray("\x02TN"), QByteArray("\x02TS"));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1425	filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws";
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1426	}
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1427
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1428	QFile demofile(filename);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1429	if (!demofile.open(QIODevice::WriteOnly))
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1430	ShowErrorMessage(tr("Cannot save record to file %1").arg(filename));
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1431	else
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1432	{
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1433	demofile.write(demo);
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1434	demofile.close();
53ffc8853008 here it is Stepan777 <stepik-777@mail.ru> parents: 7122 diff changeset	1435	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1436	}
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1437
7392 bc3306c59a08 Correctly distinguish between game and real ticks while recording video, Stepan777 <stepik-777@mail.ru> parents: 7376 diff changeset	1438	ui.pageVideos->startEncoding(record);
533 eebb7684ac22 Save saves in Save directory unc0rr parents: 530 diff changeset	1439	}
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1440
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	1441	void HWForm::startTraining(const QString & scriptName)
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1442	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1443	CreateGame(0, 0, 0);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1444
6048 ae213ef7030a PIMP'ed up training screen. special thanks to mikade for supplying the pics <3 sheepluva parents: 6042 diff changeset	1445	game->StartTraining(scriptName);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1446	}
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1447
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1448	void HWForm::StartCampaign()
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1449	{
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1450	CreateGame(0, 0, 0);
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1451
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1452	QComboBox *combo = ui.pageCampaign->CBMission;
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1453	QString camp = ui.pageCampaign->CBCampaign->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1454	unsigned int mNum = combo->count() - combo->currentIndex();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1455	QString miss = getCampaignScript(camp, mNum);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1456	QString campTeam = ui.pageCampaign->CBTeam->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1457
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1458	game->StartCampaign(camp, miss, campTeam);
587 74db4115064a More work on Training mode unc0rr parents: 586 diff changeset	1459	}
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1460
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1461	void HWForm::CreateNetGame()
7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1462	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1463	QString ammo;
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1464	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	1465	ui.pageNetGame->pGameCFG->WeaponsName->currentIndex()
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1466	).toString();
1517 27caa8c6e73a Store ammo info directly in combobox unc0rr parents: 1512 diff changeset	1467
6225 505643d4c23d disconnect when going back from lobby page (regression fix) sheepluva parents: 6223 diff changeset	1468	CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo);
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1469
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1470	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	1471	connect(game, SIGNAL(SendChat(const QString &)), hwnet, SLOT(chatLineToNet(const QString &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1472	connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &)));
7916 be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1473	connect(hwnet, SIGNAL(FromNet(const QByteArray &)), game, SLOT(FromNet(const QByteArray &)), Qt::QueuedConnection);
be11c26a3a0b Fix 0.9.18 desync: unc0rr parents: 7902 diff changeset	1474	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	1475
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1476	game->StartNet();
660 7c155e849602 - Simplify net game objects relationship unc0rr parents: 659 diff changeset	1477	}
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1478
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1479	void HWForm::closeEvent(QCloseEvent *event)
a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1480	{
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1481	#ifdef USE_XFIRE
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1482	xfire_free();
2822 0533562bc3a4 Engine: smxx parents: 2821 diff changeset	1483	#endif
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1484	config->SaveOptions();
7235 baa69bd025d9 1. Implement new page in frontend with options for video recording. Stepan777 <stepik-777@mail.ru> parents: 7180 diff changeset	1485	config->SaveVideosOptions();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1486	event->accept();
674 a15c8e3c69b3 Save and restore window size unc0rr parents: 672 diff changeset	1487	}
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1488
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1489	void HWForm::Music(bool checked)
070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1490	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1491	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	1492	SDLInteraction::instance().startMusic();
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1493	else
6165 6fe3e922246e moving and renaming SDLs., making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments sheepluva* parents: 6160 diff changeset	1494	SDLInteraction::instance().stopMusic();
1235 070629f3902d - Set frontend's music volume level to 50% unc0rr parents: 1225 diff changeset	1495	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1496
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1497	void HWForm::NetGameChangeStatus(bool isMaster)
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1498	{
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1499	ui.pageNetGame->pGameCFG->setEnabled(isMaster);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1500	ui.pageNetGame->pNetTeamsWidget->setInteractivity(isMaster);
e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1501
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1502	if (isMaster)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1503	NetGameMaster();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1504	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1505	NetGameSlave();
2345 daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1506	}
daf1785f2337 - Frontend: reorganize code controlling widgets state, fix problems getting room admin status unc0rr parents: 2261 diff changeset	1507
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1508	void HWForm::NetGameMaster()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1509	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1510	ui.pageNetGame->setMasterMode(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1511	ui.pageNetGame->restrictJoins->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1512	ui.pageNetGame->restrictTeamAdds->setChecked(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1513	ui.pageNetGame->pGameCFG->GameSchemes->setModel(ammoSchemeModel);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1514	ui.pageNetGame->pGameCFG->setEnabled(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1515	ui.pageNetGame->pNetTeamsWidget->setInteractivity(true);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1516
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1517	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1518	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1519	// disconnect connections first to ensure their inexistance and not to connect twice
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1520	ui.pageNetGame->BtnStart->disconnect(hwnet);
5126 50803f3403a5 Frontend: room rename claymore parents: 5114 diff changeset	1521	ui.pageNetGame->BtnUpdate->disconnect(hwnet);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1522	ui.pageNetGame->restrictJoins->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1523	ui.pageNetGame->restrictTeamAdds->disconnect(hwnet);
7122 fa2d09868ac6 Fix reported in bug #327, comment #3 - untested but seems reasonable/safe. nemo parents: 7015 diff changeset	1524	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	1525
fd5bcbd698a5 - Keep track of room name so correct name is displayed when you become room admin unc0rr parents: 7679 diff changeset	1526	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	1527
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1528	connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), hwnet, SLOT(startGame()));
7122 fa2d09868ac6 Fix reported in bug #327, comment #3 - untested but seems reasonable/safe. nemo parents: 7015 diff changeset	1529	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	1530	connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1531	connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1532	connect(ui.pageNetGame->pGameCFG->GameSchemes->model(),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1533	SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1534	ui.pageNetGame->pGameCFG,
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1535	SLOT(resendSchemeData())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1536	);
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1537	}
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1538	}
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1539
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1540	void HWForm::NetGameSlave()
d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1541	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1542	ui.pageNetGame->pGameCFG->setEnabled(false);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1543	ui.pageNetGame->pNetTeamsWidget->setInteractivity(false);
2377 f3fab2b09e0c And in frontend nemo parents: 2368 diff changeset	1544
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1545	if (hwnet)
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1546	{
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1547	NetAmmoSchemeModel * netAmmo = new NetAmmoSchemeModel(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1548	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)), netAmmo, SLOT(setNetSchemeConfig(QStringList &)));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1549	ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1550
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1551	ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1552	connect(hwnet, SIGNAL(netSchemeConfig(QStringList &)),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1553	this, SLOT(selectFirstNetScheme()));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1554	}
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1555
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1556	ui.pageNetGame->setMasterMode(false);
1409 d1cbe4a57ebf Add button for controlling room options (no usefull yet) unc0rr parents: 1405 diff changeset	1557	}
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1558
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1559	void HWForm::selectFirstNetScheme()
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1560	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1561	ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0);
1899 5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1562	}
5763f46d7486 Sync schemes config over net should work now (untested) unc0rr parents: 1898 diff changeset	1563
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1564	void HWForm::NetLeftRoom(const QString & reason)
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1565	{
4433 e0092290b7c5 do GoBack if also INGAME due to kick nemo parents: 4432 diff changeset	1566	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	1567	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1568	GoBack();
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1569	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	1570	ui.pageRoomsList->displayNotice(reason);
5998 e8f44e9433f0 many many netclient/frondent changes (just the beginning though): sheepluva parents: 5907 diff changeset	1571	}
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1572	else
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1573	qWarning("Left room while not in room");
1600 305e13c5f327 Go page back when room is abandoned by its admin unc0rr parents: 1598 diff changeset	1574	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1575
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1576	void HWForm::resizeEvent(QResizeEvent * event)
76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1577	{
2948 3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1578	int w = event->size().width();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command unc0rr parents: 2874 diff changeset	1579	int h = event->size().height();
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1580	if (wBackground)
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1581	{
2098 c977d7f2aa09 Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine nemo parents: 2080 diff changeset	1582	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	1583	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	1584	}
2012 76fff564246b TheXception's patch: unc0rr parents: 2010 diff changeset	1585	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1586
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1587	void HWForm::InitCampaignPage()
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1588	{
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1589	ui.pageCampaign->CBCampaign->clear();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1590	HWTeam team(ui.pageCampaign->CBTeam->currentText());
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1591
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1592	QStringList entries = DataManager::instance().entryList(
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1593	"Missions/Campaign",
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1594	QDir::Dirs,
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1595	QStringList("[^\\.]*")
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1596	);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1597
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1598	unsigned int n = entries.count();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1599	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	1600	{
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1601	ui.pageCampaign->CBCampaign->addItem(QString(entries[i]), QString(entries[i]));
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1602	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1603	}
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1604
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1605
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1606	void HWForm::UpdateCampaignPage(int index)
d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1607	{
4560 5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1608	Q_UNUSED(index);
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations unc0rr parents: 4536 diff changeset	1609
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1610	HWTeam team(ui.pageCampaign->CBTeam->currentText());
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1611	ui.pageCampaign->CBMission->clear();
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1612
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1613	QString campaignName = ui.pageCampaign->CBCampaign->currentText();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1614	QStringList missionEntries = getCampMissionList(campaignName);
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1615	QString tName = team.name();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1616	unsigned int n = missionEntries.count();
dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1617	unsigned int m = getCampProgress(tName, campaignName);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1618
7636 10caa79d4a80 min -> qMin sheepluva parents: 7628 diff changeset	1619	for (unsigned int i = qMin(m + 1, n); i > 0; i--)
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1620	{
7201 dc17ffdf0702 The first campaign commit with a lot of changes... belphegorr <szabibibi@gmail.com> parents: 7122 diff changeset	1621	ui.pageCampaign->CBMission->addItem(QString("Mission %1: ").arg(i) + QString(missionEntries[i-1]), QString(missionEntries[i-1]));
5238 46ddaf14509d Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing. nemo parents: 5222 diff changeset	1622	}
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1623	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1624
7490 c422845b8d1f Fixed a typo, frontend is now working properly belphegorr <szabibibi@gmail.com> parents: 7411 diff changeset	1625	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	1626	{
7679 bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1627	Q_UNUSED(index);
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1628
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1629	int missionIndex = ui.pageCampaign->CBMission->currentIndex();
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1630	UpdateCampaignPage(0);
bfa26daad684 - Fix some warnings in frontend unc0rr parents: 7636 diff changeset	1631	ui.pageCampaign->CBMission->setCurrentIndex(missionIndex);
3760 d30f1ba768d7 Frontend: smaxx parents: 3757 diff changeset	1632	}
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1633
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1634	// 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	1635	QString HWForm::getDemoArguments()
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1636	{
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1637	QRect resolution = config->vid_Resolution();
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1638	return QString(QString::number(resolution.width()) + " "
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1639	+ QString::number(resolution.height()) + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1640	+ QString::number(config->bitDepth()) + " " // bpp
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1641	+ QString::number(config->volume()) + " " // sound volume
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1642	+ (config->isMusicEnabled() ? "1" : "0") + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1643	+ (config->isSoundEnabled() ? "1" : "0") + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1644	+ config->language() + ".txt "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1645	+ (config->vid_Fullscreen() ? "1" : "0") + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1646	+ (config->isShowFPSEnabled() ? "1" : "0") + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1647	+ (config->isAltDamageEnabled() ? "1" : "0") + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1648	+ QString::number(config->timerInterval()) + " "
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1649	+ QString::number(config->translateQuality()));
5213 a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1650	}
a86768368309 make the associate button use the user's settings for loading demos/saves nemo parents: 5205 diff changeset	1651
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1652	void HWForm::AssociateFiles()
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1653	{
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1654	bool success = true;
5222 0922b9d816af unbreak compiling frontend under osx koda parents: 5213 diff changeset	1655	QString arguments = getDemoArguments();
4084 0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1656	#ifdef _WIN32
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1657	QSettings registry_hkcr("HKEY_CLASSES_ROOT", QSettings::NativeFormat);
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1658	registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1659	registry_hkcr.setValue(".hws/Default", "Hedgewars.Save");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1660	registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1661	registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types"));
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1662	registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0");
2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1663	registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",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	1664	registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + cfgdir->absolutePath().replace("/","\\") + "\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\" --set-everything "+arguments);
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	1665	registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + cfgdir->absolutePath().replace("/","\\") + "\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\" --set-everything "+arguments);
4090 4b165832d232 disable file association on mac for now koda parents: 4085 diff changeset	1666	#elif defined __APPLE__
5252 ded882439548 file association for mac! koda parents: 5238 diff changeset	1667	// 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	1668	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	1669	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	1670	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	1671	#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	1672	// 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	1673	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1674	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1675	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	1676	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages");
4085 6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1677	if (success) success = checkForDir(QDir::home().absolutePath() + "/.local");
6bbc5a167a21 check for subs first nemo parents: 4084 diff changeset	1678	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	1679	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	1680	if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars-mimeinfo.xml "+QDir::home().absolutePath()+"/.local/share/mime/packages").toLocal8Bit().constData())==0;
0d0bf0533eee Add opendesktop association of files for non-windows. NEEDS TESTING. nemo parents: 3940 diff changeset	1681	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	1682	if (success) success = system(("update-mime-database "+QDir::home().absolutePath()+"/.local/share/mime").toLocal8Bit().constData())==0;
4091 f89b8d0afbe1 set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there. nemo parents: 4090 diff changeset	1683	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	1684	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	1685	// 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
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	1686	if (success) success = system(("sed -i 's/^\\(Exec=.\\) \\([^ ] %f\\)/\\1 "+cfgdir->absolutePath().replace(" ","\\\\ ").replace("/","\\/")+" \\2 --set-everything "+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	1687	#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	1688	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	1689	{
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	1690	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	1691	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	1692	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	1693	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	1694	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	1695	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	1696	}
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	1697	else
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	1698	ShowErrorMessage(QMessageBox::tr("File association failed."));
3932 2fc211f60015 Engine: smaxx parents: 3760 diff changeset	1699	}
3937 494221b5950e fix issue 24 and issue 81 koda parents: 3932 diff changeset	1700
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1701	void HWForm::saveDemoWithCustomName()
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1702	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1703	if(!m_lastDemo.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1704	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1705	QString fileName;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1706	bool ok = false;
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1707	do
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1708	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1709	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	1710
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1711	if(!fileName.isEmpty())
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1712	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1713	QString filePath = cfgdir->absolutePath() + "/Demos/" + fileName + "." + *cProtoVer + ".hwd";
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1714	QFile demofile(filePath);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1715	ok = demofile.open(QIODevice::WriteOnly);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1716	if (!ok)
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1717	ShowErrorMessage(tr("Cannot save record to file %1").arg(filePath));
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1718	else
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1719	{
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1720	ok = -1 != demofile.write(m_lastDemo);
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1721	demofile.close();
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1722	}
d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1723	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1724	}
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1725	while(!fileName.isEmpty() && !ok);
5734 d710db47a1ef Implement save button on game statistics page. unc0rr parents: 5651 diff changeset	1726	}
5746 fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	1727	}
fbc52bb92cad Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself) unc0rr parents: 5734 diff changeset	1728
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1729	void HWForm::SendFeedback()
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1730	{
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1731	//Create Xml representation of google code issue first
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1732	if (!CreateIssueXml())
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1733	{
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	1734	ShowErrorMessage(QMessageBox::tr("Please fill out all fields"));
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1735	return;
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1736	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1737
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1738	//Google login using fake account (feedback.hedgewars@gmail.com)
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1739	nam = new QNetworkAccessManager(this);
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1740	connect(nam, SIGNAL(finished(QNetworkReply*)),
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1741	this, SLOT(finishedSlot(QNetworkReply*)));
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1742
6677 6b7560b37eef Remove STL dependency (again), fix qmake build unc0rr parents: 6630 diff changeset	1743	QUrl url(QString("https://www.google.com/accounts/ClientLogin?"
6b7560b37eef Remove STL dependency (again), fix qmake build unc0rr parents: 6630 diff changeset	1744	"accountType=GOOGLE&Email=feedback.hedgewars@gmail.com&Passwd=hwfeedback&service=code&source=HedgewarsFoundation-Hedgewars-")
6b7560b37eef Remove STL dependency (again), fix qmake build unc0rr parents: 6630 diff changeset	1745	+ (cVersionString?(*cVersionString):QString("")));
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1746	nam->get(QNetworkRequest(url));
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1747
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1748	}
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1749
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1750	bool HWForm::CreateIssueXml()
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1751	{
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1752	QString summary = ui.pageFeedback->summary->text();
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1753	QString description = ui.pageFeedback->description->toPlainText();
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1754
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1755	//Check if all necessary information is entered
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1756	if (summary.isEmpty() \|\| description.isEmpty())
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1757	return false;
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1758
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1759	issueXml =
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1760	"<?xml version='1.0' encoding='UTF-8'?>"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1761	"<entry xmlns='http://www.w3.org/2005/Atom' xmlns:issues='http://code.google.com/p/hedgewars/issues/list'>"
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1762	"<title>";
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1763	issueXml.append(summary);
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1764	issueXml.append("</title><content type='html'>");
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1765	issueXml.append(description);
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1766	issueXml.append("</content><author><name>feedback.hedgewars</name></author></entry>");
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1767
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1768	return true;
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1769	}
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1770
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1771	void HWForm::finishedSlot(QNetworkReply* reply)
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1772	{
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1773	if (reply && reply->error() == QNetworkReply::NoError)
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1774	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1775	QByteArray array = reply->readAll();
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1776	QString str(array);
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1777
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1778	if (authToken.length() != 0)
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1779	{
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	1780
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	1781	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	1782	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	1783	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	1784	infoMsg.setText(QMessageBox::tr("Successfully posted the issue on hedgewars.googlecode.com"));
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	1785	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	1786	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	1787
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1788	ui.pageFeedback->summary->clear();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1789	ui.pageFeedback->description->clear();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1790	authToken = "";
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1791	return;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1792	}
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1793
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	1794	if (!getAuthToken(str))
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1795	{
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	1796	ShowErrorMessage(QMessageBox::tr("Error during authentication at google.com"));
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1797	return;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1798	}
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1799
6677 6b7560b37eef Remove STL dependency (again), fix qmake build unc0rr parents: 6630 diff changeset	1800	QByteArray body(issueXml.toUtf8());
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1801	QNetworkRequest header(QUrl("https://code.google.com/feeds/issues/p/hedgewars/issues/full"));
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1802	header.setRawHeader("Content-Length", QString::number(issueXml.length()).toAscii());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1803	header.setRawHeader("Content-Type", "application/atom+xml");
6677 6b7560b37eef Remove STL dependency (again), fix qmake build unc0rr parents: 6630 diff changeset	1804	header.setRawHeader("Authorization", QString("GoogleLogin auth=%1").arg(authToken).toUtf8());
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1805	nam->post(header, body);
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1806
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1807	}
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1808	else if (authToken.length() == 0)
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	1809	ShowErrorMessage(QMessageBox::tr("Error during authentication at google.com"));
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1810	else
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1811	{
7902 a82b1bf2eca1 - Fix for little mistakes (applied to every hedgewars_.ts file). inu* parents: 7860 diff changeset	1812	ShowErrorMessage(QMessageBox::tr("Error reporting the issue, please try again later (or visit hedgewars.googlecode.com directly)"));
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1813	authToken = "";
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1814	}
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1815
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1816	}
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1817
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1818	bool HWForm::getAuthToken(QString str)
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1819	{
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1820	QRegExp ex("Auth=(.+)");
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1821
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1822	if (-1 == ex.indexIn(str))
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1823	return false;
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1824
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1825	authToken = ex.cap(1);
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1826	authToken.remove(QChar('\n'));
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1827
6616 f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/.cpp" "QTfrontend/.h" nemo parents: 6604 diff changeset	1828	return true;
6561 b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1829	}
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1830
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1831
b2165583cdf5 GCI task: feedback is important valnut parents: 6525 diff changeset	1832

author	koda
	Fri, 16 Nov 2012 06:14:18 +0100
changeset 8048	e14daa2508fc
parent 7933	223b3a195474
child 8057	93e16240f178
permissions	-rw-r--r--