author | Wuzzy <Wuzzy2@mail.ru> |
Tue, 24 Jul 2018 18:37:52 +0200 (2018-07-24) | |
branch | 0.9.24 |
changeset 13549 | b69732d0cce5 |
parent 13335 | 3f2ee2f9b51d |
child 13491 | 4ef83bcb850b |
permissions | -rw-r--r-- |
184 | 1 |
/* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
11046 | 3 |
* Copyright (c) 2004-2015 Andrey Korotaev <unC0Rr@gmail.com> |
184 | 4 |
* |
5 |
* This program is free software; you can redistribute it and/or modify |
|
6 |
* it under the terms of the GNU General Public License as published by |
|
7 |
* the Free Software Foundation; version 2 of the License |
|
8 |
* |
|
9 |
* This program is distributed in the hope that it will be useful, |
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
12 |
* GNU General Public License for more details. |
|
13 |
* |
|
14 |
* You should have received a copy of the GNU General Public License |
|
15 |
* along with this program; if not, write to the Free Software |
|
10108
c68cf030eded
update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers
sheepluva
parents:
10017
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
184 | 17 |
*/ |
18 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
19 |
#include <QDir> |
184 | 20 |
#include <QFile> |
21 |
#include <QTextStream> |
|
407 | 22 |
#include <QMessageBox> |
502
bc178daca088
Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory)
unc0rr
parents:
496
diff
changeset
|
23 |
#include <QPushButton> |
8415
02acf6b92f52
Moved room name edit box from footer to top of page. Also shows room name when in slave mode.
dag10
parents:
8407
diff
changeset
|
24 |
#include <QSpinBox> |
502
bc178daca088
Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory)
unc0rr
parents:
496
diff
changeset
|
25 |
#include <QListWidget> |
bc178daca088
Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory)
unc0rr
parents:
496
diff
changeset
|
26 |
#include <QStackedLayout> |
bc178daca088
Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory)
unc0rr
parents:
496
diff
changeset
|
27 |
#include <QLineEdit> |
bc178daca088
Fix build with CMake & gcc 4.1.2 on my system (treating #include <QtGui> as including directory)
unc0rr
parents:
496
diff
changeset
|
28 |
#include <QLabel> |
636 | 29 |
#include <QRadioButton> |
654 | 30 |
#include <QSpinBox> |
674 | 31 |
#include <QCloseEvent> |
1235 | 32 |
#include <QCheckBox> |
1377 | 33 |
#include <QTextBrowser> |
1409
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
34 |
#include <QAction> |
1418 | 35 |
#include <QTimer> |
1419 | 36 |
#include <QScrollBar> |
1885 | 37 |
#include <QDataWidgetMapper> |
1887 | 38 |
#include <QTableView> |
2874
3c7c2bf1ba38
A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature.
nemo
parents:
2845
diff
changeset
|
39 |
#include <QCryptographicHash> |
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
40 |
#include <QSignalMapper> |
4759 | 41 |
#include <QShortcut> |
5651
a7de68f4f87f
allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon)
koda
parents:
5567
diff
changeset
|
42 |
#include <QDesktopServices> |
8328 | 43 |
#include <QDesktopWidget> |
44 |
#include <QApplication> |
|
5734 | 45 |
#include <QInputDialog> |
6428 | 46 |
#include <QPropertyAnimation> |
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
47 |
#include <QSettings> |
8891
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
48 |
#include <QSortFilterProxyModel> |
11868 | 49 |
#include <QIcon> |
50 |
#include <QImage> |
|
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
51 |
|
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
52 |
#if (QT_VERSION >= 0x040600) |
6428 | 53 |
#include <QGraphicsEffect> |
6440
1fa9dc94c93f
disable opacity effect for non-linux as it is working only there, fix a glitch that would print the page for a frame and then animate it from another position, change the animation curve to something a little more speedy
koda
parents:
6428
diff
changeset
|
54 |
#include <QParallelAnimationGroup> |
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
55 |
#endif |
184 | 56 |
|
57 |
#include "hwform.h" |
|
58 |
#include "game.h" |
|
59 |
#include "team.h" |
|
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
60 |
#include "campaign.h" |
184 | 61 |
#include "teamselect.h" |
681 | 62 |
#include "selectWeapon.h" |
184 | 63 |
#include "gameuiconfig.h" |
5204 | 64 |
#include "pageinfo.h" |
65 |
#include "pagetraining.h" |
|
66 |
#include "pagesingleplayer.h" |
|
67 |
#include "pageselectweapon.h" |
|
68 |
#include "pageadmin.h" |
|
69 |
#include "pagecampaign.h" |
|
70 |
#include "pagescheme.h" |
|
71 |
#include "pagenetgame.h" |
|
72 |
#include "pageroomslist.h" |
|
73 |
#include "pageconnecting.h" |
|
74 |
#include "pageoptions.h" |
|
75 |
#include "pageeditteam.h" |
|
76 |
#include "pagemultiplayer.h" |
|
77 |
#include "pagenet.h" |
|
78 |
#include "pagemain.h" |
|
79 |
#include "pagenetserver.h" |
|
80 |
#include "pagedrawmap.h" |
|
5205
78138ae93820
some headers cleanup and rename of stats and playrecord pages for consistency
koda
parents:
5204
diff
changeset
|
81 |
#include "pagegamestats.h" |
5567
44c9a577b082
Tiny bit of progress on download page - hooked it up to "Info" button for now.
nemo
parents:
5255
diff
changeset
|
82 |
#include "pageplayrecord.h" |
44c9a577b082
Tiny bit of progress on download page - hooked it up to "Info" button for now.
nemo
parents:
5255
diff
changeset
|
83 |
#include "pagedata.h" |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
84 |
#include "pagevideos.h" |
184 | 85 |
#include "hwconsts.h" |
314 | 86 |
#include "newnetclient.h" |
329
4c3aad46baa5
Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes
unc0rr
parents:
328
diff
changeset
|
87 |
#include "gamecfgwidget.h" |
632
5e09ae25729f
Half implement possibility for different backends of servers list
unc0rr
parents:
625
diff
changeset
|
88 |
#include "netserverslist.h" |
634 | 89 |
#include "netudpserver.h" |
461 | 90 |
#include "chatwidget.h" |
653
4f44fc06ca45
Class to ask host/port to connect to ('Specify' button on PageNet)
unc0rr
parents:
647
diff
changeset
|
91 |
#include "input_ip.h" |
6910
ea058558c68b
add a checkbox for the password field prompt (issue 316)
Stepan777
parents:
6907
diff
changeset
|
92 |
#include "input_password.h" |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
93 |
#include "gameSchemeModel.h" |
2012 | 94 |
#include "bgwidget.h" |
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4518
diff
changeset
|
95 |
#include "drawmapwidget.h" |
6477 | 96 |
#include "mouseoverfilter.h" |
6732
c906dc78091f
Start switching to rooms list model. To be continued.
unc0rr
parents:
6720
diff
changeset
|
97 |
#include "roomslistmodel.h" |
7180 | 98 |
#include "recorder.h" |
7723 | 99 |
#include "playerslistmodel.h" |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
100 |
#include "feedbackdialog.h" |
184 | 101 |
|
8383 | 102 |
#include "MessageDialog.h" |
6930 | 103 |
#include "DataManager.h" |
8284 | 104 |
#include "AutoUpdater.h" |
6160
863d3edf5690
cleaning up some more, also adding a WIP file. changes: hats in the hat selection are now sorted like this: NoHat, Reserved hats (alphabetically), All other hats (alphabeticall)
sheepluva
parents:
6151
diff
changeset
|
105 |
|
9163
67334acaaac7
port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5
koda
parents:
9100
diff
changeset
|
106 |
#ifdef Q_OS_WIN |
11808 | 107 |
#ifndef WINVER |
8328 | 108 |
#define WINVER 0x0500 |
11808 | 109 |
#endif |
8328 | 110 |
#include <windows.h> |
111 |
#else |
|
112 |
#include <unistd.h> |
|
113 |
#include <sys/types.h> |
|
114 |
#endif |
|
115 |
||
9163
67334acaaac7
port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5
koda
parents:
9100
diff
changeset
|
116 |
#ifdef Q_OS_MAC |
8328 | 117 |
#include <sys/sysctl.h> |
118 |
#endif |
|
119 |
||
2400
2422ea85d100
added a utility that warns the user to install hedgewars when it's run from the diskimage
koda
parents:
2399
diff
changeset
|
120 |
#ifdef __APPLE__ |
2422ea85d100
added a utility that warns the user to install hedgewars when it's run from the diskimage
koda
parents:
2399
diff
changeset
|
121 |
#include "M3Panel.h" |
2422ea85d100
added a utility that warns the user to install hedgewars when it's run from the diskimage
koda
parents:
2399
diff
changeset
|
122 |
#ifdef SPARKLE_ENABLED |
2261 | 123 |
#include "SparkleAutoUpdater.h" |
124 |
#endif |
|
2400
2422ea85d100
added a utility that warns the user to install hedgewars when it's run from the diskimage
koda
parents:
2399
diff
changeset
|
125 |
#endif |
2261 | 126 |
|
6561 | 127 |
|
2098
c977d7f2aa09
Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine
nemo
parents:
2080
diff
changeset
|
128 |
// I started handing this down to each place it touches, but it was getting ridiculous |
c977d7f2aa09
Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine
nemo
parents:
2080
diff
changeset
|
129 |
// and this one flag does not warrant a static class |
c977d7f2aa09
Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine
nemo
parents:
2080
diff
changeset
|
130 |
bool frontendEffects = true; |
2874
3c7c2bf1ba38
A simple hat reservation mechanism. Can be worked around with a little effort, but to make it useful, you'd have to get everyone you played with to work around it too. Quite a bit of effort for a small reward feature.
nemo
parents:
2845
diff
changeset
|
131 |
QString playerHash; |
2098
c977d7f2aa09
Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine
nemo
parents:
2080
diff
changeset
|
132 |
|
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
133 |
QIcon finishedIcon; |
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
134 |
QIcon notFinishedIcon; |
6572 | 135 |
GameUIConfig* HWForm::config = NULL; |
136 |
||
5849 | 137 |
HWForm::HWForm(QWidget *parent, QString styleSheet) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
138 |
: QMainWindow(parent) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
139 |
, game(0) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
140 |
, pnetserver(0) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
141 |
, pRegisterServer(0) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
142 |
, editedTeam(0) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
143 |
, hwnet(0) |
184 | 144 |
{ |
6166 | 145 |
// set music track |
8049 | 146 |
SDLInteraction::instance().setMusicTrack("/Music/main_theme.ogg"); |
6166 | 147 |
|
5849 | 148 |
this->setStyleSheet(styleSheet); |
11868 | 149 |
|
150 |
||
151 |
QIcon * hwIcon = new QIcon(); |
|
152 |
hwIcon->addFile(":/res/hh_small.png"); |
|
153 |
//hwIcon->addFile(":/res/hh25x25.png"); |
|
154 |
// crop-workaround for the fact that hh25x25.png is actually 25x35 |
|
155 |
QPixmap pm(":/res/hh25x25.png"); |
|
156 |
hwIcon->addPixmap(pm.copy(0,(pm.height()-25)/2,25,25)); |
|
157 |
hwIcon->addFile(":/res/teamicon.png"); |
|
158 |
hwIcon->addFile(":/res/teamicon2.png"); |
|
159 |
||
160 |
this->setWindowIcon(*hwIcon); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
161 |
ui.setupUi(this); |
8424
225ede46e3dc
On pagenetgame, when window is too small the map/game options becomes a tabbed interface to allow for a few lines of chat to always be visible.
dag10
parents:
8416
diff
changeset
|
162 |
setMinimumSize(760, 580); |
4592
b1fe47b11b99
disable fix for issue 24 in order to fix issue 123, as suggested by koda
sheepluva
parents:
4576
diff
changeset
|
163 |
//setFocusPolicy(Qt::StrongFocus); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
164 |
CustomizePalettes(); |
3697 | 165 |
|
6165
6fe3e922246e
moving and renaming SDLs.*, making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments
sheepluva
parents:
6160
diff
changeset
|
166 |
ui.pageOptions->CBResolution->addItems(SDLInteraction::instance().getResolutions()); |
1225
f882a92ef872
Play music in menu also, with fading effects when run game
unc0rr
parents:
1223
diff
changeset
|
167 |
|
8918
512753ea4b1b
Switch to 'settings.ini'. Copies old ini file if necessary on startup.
unc0rr
parents:
8901
diff
changeset
|
168 |
config = new GameUIConfig(this, DataManager::instance().settingsFileName()); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
169 |
frontendEffects = config->value("frontend/effects", true).toBool(); |
9057
903f50e85144
Default to random guest username in all places net/nick is fetched. Fixes issue #588
nemo
parents:
9033
diff
changeset
|
170 |
playerHash = QString(QCryptographicHash::hash(config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString().toUtf8(), QCryptographicHash::Md5).toHex()); |
2377 | 171 |
|
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
172 |
// Icons for finished missions |
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
173 |
finishedIcon.addFile(":/res/missionFinished.png", QSize(), QIcon::Normal, QIcon::On); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
174 |
finishedIcon.addFile(":/res/missionFinishedSelected.png", QSize(), QIcon::Selected, QIcon::On); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
175 |
|
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
176 |
// A transparent icon, used to nicely align the unfinished missions with the finished ones |
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
177 |
QPixmap emptySpace = QPixmap(15, 15); |
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
178 |
emptySpace.fill(QColor(0, 0, 0, 0)); |
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
179 |
notFinishedIcon = QIcon(emptySpace); |
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
180 |
|
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
181 |
ui.pageRoomsList->setSettings(config); |
8453
06541556df53
Reorganized layout and appearance of rooms list page.
dag10
parents:
8451
diff
changeset
|
182 |
ui.pageNetGame->setSettings(config); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
183 |
ui.pageNetGame->chatWidget->setSettings(config); |
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
184 |
ui.pageRoomsList->chatWidget->setSettings(config); |
8346 | 185 |
ui.pageOptions->setConfig(config); |
8151
25b95d6224fc
Google Code-in: Move video preferences in settings tab
Mitchell Kember <mk12360@gmail.com>
parents:
8140
diff
changeset
|
186 |
#ifdef VIDEOREC |
8196
ed5001115265
Fixed crash that occured after recording a video (pagevideos' config wasn't set).
Mitchell Kember <mk12360@gmail.com>
parents:
8183
diff
changeset
|
187 |
ui.pageVideos->init(config); |
8151
25b95d6224fc
Google Code-in: Move video preferences in settings tab
Mitchell Kember <mk12360@gmail.com>
parents:
8140
diff
changeset
|
188 |
#endif |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
189 |
|
10971 | 190 |
#if defined(__APPLE__) && defined(SPARKLE_ENABLED) |
8284 | 191 |
if (config->isAutoUpdateEnabled()) |
192 |
{ |
|
9393 | 193 |
AutoUpdater* updater = NULL; |
194 |
||
8284 | 195 |
updater = new SparkleAutoUpdater(); |
196 |
if (updater) |
|
197 |
{ |
|
198 |
updater->checkForUpdates(); |
|
199 |
delete updater; |
|
200 |
} |
|
201 |
} |
|
8287
e2a5dece221f
Fix non-osx build broken in ra874d00df4a4. Dudes... :(
unc0rr
parents:
8284
diff
changeset
|
202 |
#endif |
8284 | 203 |
|
2400
2422ea85d100
added a utility that warns the user to install hedgewars when it's run from the diskimage
koda
parents:
2399
diff
changeset
|
204 |
#ifdef __APPLE__ |
3937 | 205 |
panel = new M3Panel; |
5087
d3af455a868e
cmd+m should minimize the app as per apple human guidelines
koda
parents:
5061
diff
changeset
|
206 |
|
d3af455a868e
cmd+m should minimize the app as per apple human guidelines
koda
parents:
5061
diff
changeset
|
207 |
QShortcut *hideFrontend = new QShortcut(QKeySequence("Ctrl+M"), this); |
d3af455a868e
cmd+m should minimize the app as per apple human guidelines
koda
parents:
5061
diff
changeset
|
208 |
connect (hideFrontend, SIGNAL(activated()), this, SLOT(showMinimized())); |
4759 | 209 |
#else |
210 |
// ctrl+q closes frontend for consistency |
|
6960
822f8269e13f
map, theme & style selection won't be lost on data updata now (except the selected map/theme/style is deleted ofc). enabling F5 key to reload data :>
sheepluva
parents:
6952
diff
changeset
|
211 |
QShortcut * closeFrontend = new QShortcut(QKeySequence("Ctrl+Q"), this); |
4759 | 212 |
connect (closeFrontend, SIGNAL(activated()), this, SLOT(close())); |
7824 | 213 |
//QShortcut * updateData = new QShortcut(QKeySequence("F5"), this); |
214 |
//connect (updateData, SIGNAL(activated()), &DataManager::instance(), SLOT(reload())); |
|
2261 | 215 |
#endif |
2377 | 216 |
|
9219 | 217 |
previousCampaignName = ""; |
218 |
previousTeamName = ""; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
219 |
UpdateTeamsLists(); |
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
220 |
InitCampaignPage(); |
3760 | 221 |
UpdateCampaignPage(0); |
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
222 |
UpdateCampaignPageTeam(0); |
9286
c89b992ff5fe
fixed bug about starting campaign page with not descriptions/images and with wrong description/image mathcing
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9284
diff
changeset
|
223 |
UpdateCampaignPageMission(0); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
224 |
UpdateWeapons(); |
184 | 225 |
|
6009 | 226 |
// connect all goBack signals |
227 |
int nPages = ui.Pages->count(); |
|
228 |
||
229 |
for (int i = 0; i < nPages; i++) |
|
230 |
connect(ui.Pages->widget(i), SIGNAL(goBack()), this, SLOT(GoBack())); |
|
231 |
||
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
232 |
pageSwitchMapper = new QSignalMapper(this); |
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
233 |
connect(pageSwitchMapper, SIGNAL(mapped(int)), this, SLOT(GoToPage(int))); |
13335 | 234 |
|
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
235 |
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
|
236 |
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
|
237 |
|
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
238 |
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
|
239 |
pageSwitchMapper->setMapping(ui.pageMain->BtnSetup, ID_PAGE_SETUP); |
6561 | 240 |
|
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
241 |
connect(ui.pageMain->BtnFeedback, SIGNAL(clicked()), this, SLOT(showFeedbackDialog())); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
242 |
|
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
243 |
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
|
244 |
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
|
245 |
|
d7a887c7e2d0
Add a crappy button to encourage artists to make another one. Restore Info page.
nemo
parents:
5746
diff
changeset
|
246 |
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
|
247 |
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
|
248 |
|
7015 | 249 |
|
7617 | 250 |
#ifdef VIDEOREC |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
251 |
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
|
252 |
pageSwitchMapper->setMapping(ui.pageMain->BtnVideos, ID_PAGE_VIDEOS); |
7617 | 253 |
#endif |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
254 |
|
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
|
255 |
//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
|
256 |
//connect(ui.pageMain->BtnExit, SIGNAL(clicked()), this, SLOT(btnExitClicked())); |
184 | 257 |
|
7553 | 258 |
connect(ui.pageEditTeam, SIGNAL(goBack()), this, SLOT(AfterTeamEdit())); |
1840 | 259 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
260 |
connect(ui.pageMultiplayer->BtnStartMPGame, SIGNAL(clicked()), this, SLOT(StartMPGame())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
261 |
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
|
262 |
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
|
263 |
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
|
264 |
connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToSchemes(int)), this, SLOT(GoToScheme(int))); |
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
265 |
connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToWeapons(int)), this, SLOT(GoToWeapons(int))); |
4511 | 266 |
connect(ui.pageMultiplayer->gameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map())); |
267 |
pageSwitchMapper->setMapping(ui.pageMultiplayer->gameCFG, ID_PAGE_DRAWMAP); |
|
184 | 268 |
|
6009 | 269 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
270 |
connect(ui.pagePlayDemo->BtnPlayDemo, SIGNAL(clicked()), this, SLOT(PlayDemo())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
271 |
connect(ui.pagePlayDemo->DemosList, SIGNAL(doubleClicked (const QModelIndex &)), this, SLOT(PlayDemo())); |
184 | 272 |
|
6024 | 273 |
connect(ui.pageOptions, SIGNAL(newTeamRequested()), this, SLOT(NewTeam())); |
274 |
connect(ui.pageOptions, SIGNAL(editTeamRequested(const QString&)), this, SLOT(EditTeam(const QString&))); |
|
275 |
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
|
276 |
connect(ui.pageOptions, SIGNAL(goBack()), config, SLOT(SaveOptions())); |
3932 | 277 |
connect(ui.pageOptions->BtnAssociateFiles, SIGNAL(clicked()), this, SLOT(AssociateFiles())); |
695 | 278 |
|
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
279 |
connect(ui.pageOptions->WeaponEdit, SIGNAL(clicked()), this, SLOT(GoToEditWeapons())); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
280 |
connect(ui.pageOptions->WeaponNew, SIGNAL(clicked()), this, SLOT(GoToNewWeapons())); |
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
|
281 |
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
|
282 |
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
|
283 |
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
|
284 |
connect(ui.pageOptions->SchemeDelete, SIGNAL(clicked()), this, SLOT(DeleteScheme())); |
6574 | 285 |
connect(ui.pageOptions->CBFrontendEffects, SIGNAL(toggled(bool)), this, SLOT(onFrontendEffects(bool)) ); |
184 | 286 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
287 |
connect(ui.pageNet->BtnSpecifyServer, SIGNAL(clicked()), this, SLOT(NetConnect())); |
4518 | 288 |
connect(ui.pageNet->BtnNetSvrStart, SIGNAL(clicked()), pageSwitchMapper, SLOT(map())); |
289 |
pageSwitchMapper->setMapping(ui.pageNet->BtnNetSvrStart, ID_PAGE_NETSERVER); |
|
290 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
291 |
connect(ui.pageNet, SIGNAL(connectClicked(const QString &, quint16)), this, SLOT(NetConnectServer(const QString &, quint16))); |
2377 | 292 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
293 |
connect(ui.pageNetServer->BtnStart, SIGNAL(clicked()), this, SLOT(NetStartServer())); |
184 | 294 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
295 |
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
|
296 |
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
|
297 |
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
|
298 |
connect(ui.pageNetGame->pGameCFG, SIGNAL(goToSchemes(int)), this, SLOT(GoToScheme(int))); |
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
299 |
connect(ui.pageNetGame->pGameCFG, SIGNAL(goToWeapons(int)), this, SLOT(GoToWeapons(int))); |
4511 | 300 |
connect(ui.pageNetGame->pGameCFG, SIGNAL(goToDrawMap()), pageSwitchMapper, SLOT(map())); |
301 |
pageSwitchMapper->setMapping(ui.pageNetGame->pGameCFG, ID_PAGE_DRAWMAP); |
|
184 | 302 |
|
4518 | 303 |
connect(ui.pageRoomsList->BtnAdmin, SIGNAL(clicked()), pageSwitchMapper, SLOT(map())); |
304 |
pageSwitchMapper->setMapping(ui.pageRoomsList->BtnAdmin, ID_PAGE_ADMIN); |
|
187 | 305 |
|
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
|
306 |
connect(ui.pageInfo->BtnSnapshots, SIGNAL(clicked()), this, SLOT(OpenSnapshotFolder())); |
1312 | 307 |
|
5734 | 308 |
connect(ui.pageGameStats, SIGNAL(saveDemoRequested()), this, SLOT(saveDemoWithCustomName())); |
8901
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
309 |
connect(ui.pageGameStats, SIGNAL(restartGameRequested()), this, SLOT(restartGame())); |
306 | 310 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
311 |
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
|
312 |
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
|
313 |
pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnTrainPage, ID_PAGE_TRAINING); |
4518 | 314 |
|
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
315 |
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
|
316 |
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
|
317 |
|
4518 | 318 |
connect(ui.pageSinglePlayer->BtnMultiplayer, SIGNAL(clicked()), pageSwitchMapper, SLOT(map())); |
319 |
pageSwitchMapper->setMapping(ui.pageSinglePlayer->BtnMultiplayer, ID_PAGE_MULTIPLAYER); |
|
320 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
321 |
connect(ui.pageSinglePlayer->BtnLoad, SIGNAL(clicked()), this, SLOT(GoToSaves())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
322 |
connect(ui.pageSinglePlayer->BtnDemos, SIGNAL(clicked()), this, SLOT(GoToDemos())); |
311 | 323 |
|
11973
1de4d6b35748
Mission recategorization into trainings, challenges and scenarios.
Wuzzy <almikes@aol.com>
parents:
11964
diff
changeset
|
324 |
connect(ui.pageTraining, SIGNAL(startMission(const QString&, const QString&)), this, SLOT(startTraining(const QString&, const QString&))); |
587 | 325 |
|
3760 | 326 |
connect(ui.pageCampaign->BtnStartCampaign, SIGNAL(clicked()), this, SLOT(StartCampaign())); |
9324
98368198a75d
added slot for starting campaign by clicking the image and some events in moon mission
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9308
diff
changeset
|
327 |
connect(ui.pageCampaign->btnPreview, SIGNAL(clicked()), this, SLOT(StartCampaign())); |
3760 | 328 |
connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int))); |
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
329 |
connect(ui.pageCampaign->CBTeam, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPageTeam(int))); |
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
330 |
connect(ui.pageCampaign->CBCampaign, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPage(int))); |
9182
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
331 |
connect(ui.pageCampaign->CBMission, SIGNAL(currentIndexChanged(int)), this, SLOT(UpdateCampaignPageMission(int))); |
600 | 332 |
|
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
333 |
connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsDeleted(QString)), |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
334 |
this, SLOT(DeleteWeapons(QString))); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
335 |
connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsAdded(QString, QString)), |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
336 |
this, SLOT(AddWeapons(QString, QString))); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
337 |
connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsEdited(QString, QString, QString)), |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
338 |
this, SLOT(EditWeapons(QString, QString, QString))); |
12816
de3cbbb09915
Fix host not re-sending ammo scheme after editing an existing ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
12804
diff
changeset
|
339 |
connect(ui.pageSelectWeapon->pWeapons, SIGNAL(weaponsEdited(QString, QString, QString)), |
de3cbbb09915
Fix host not re-sending ammo scheme after editing an existing ammo scheme
Wuzzy <Wuzzy2@mail.ru>
parents:
12804
diff
changeset
|
340 |
ui.pageNetGame->pGameCFG, SLOT(resendAmmoData())); |
1887 | 341 |
|
8318 | 342 |
connect(ui.pageMain->BtnNetLocal, SIGNAL(clicked()), this, SLOT(GoToNet())); |
343 |
connect(ui.pageMain->BtnNetOfficial, SIGNAL(clicked()), this, SLOT(NetConnectOfficialServer())); |
|
1950 | 344 |
|
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
345 |
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
|
346 |
|
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
347 |
gameSchemeModel = new GameSchemeModel(this, cfgdir->absolutePath() + "/Schemes/Game"); |
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
348 |
ui.pageScheme->setModel(gameSchemeModel); |
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
349 |
ui.pageMultiplayer->gameCFG->GameSchemes->setModel(gameSchemeModel); |
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
350 |
ui.pageOptions->SchemesName->setModel(gameSchemeModel); |
1885 | 351 |
|
6574 | 352 |
wBackground = new BGWidget(this); |
353 |
wBackground->setFixedSize(this->width(), this->height()); |
|
354 |
wBackground->lower(); |
|
355 |
wBackground->init(); |
|
356 |
wBackground->enabled = config->isFrontendEffects(); |
|
357 |
wBackground->startAnimation(); |
|
2012 | 358 |
|
6477 | 359 |
//Install all eventFilters : |
360 |
||
361 |
MouseOverFilter *filter = new MouseOverFilter(); |
|
362 |
filter->setUi(&ui); |
|
363 |
||
364 |
QList<QWidget *> widgets; |
|
365 |
||
366 |
for (int i=0; i < ui.Pages->count(); i++) |
|
367 |
{ |
|
368 |
widgets = ui.Pages->widget(i)->findChildren<QWidget *>(); |
|
369 |
||
370 |
for (int i=0; i < widgets.size(); i++) |
|
371 |
{ |
|
372 |
widgets.at(i)->installEventFilter(filter); |
|
373 |
} |
|
374 |
} |
|
375 |
||
8569 | 376 |
ui.Pages->setCurrentIndex(ID_PAGE_INFO); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
377 |
PagesStack.push(ID_PAGE_MAIN); |
8384 | 378 |
((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageEnter(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
379 |
GoBack(); |
13335 | 380 |
|
381 |
connect(config, SIGNAL(frontendFullscreen(bool)), this, SLOT(onFrontendFullscreen(bool))); |
|
382 |
onFrontendFullscreen(config->isFrontendFullscreen()); |
|
184 | 383 |
} |
384 |
||
1162 | 385 |
void HWForm::onFrontendFullscreen(bool value) |
386 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
387 |
if (value) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
388 |
setWindowState(windowState() | Qt::WindowFullScreen); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
389 |
else |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
390 |
{ |
12730
1a393a59a594
Fix GCC warnings: -Wimplicit-fallthrough and -Wint-in-bool-context
Wuzzy <Wuzzy2@mail.ru>
parents:
12679
diff
changeset
|
391 |
setWindowState(windowState() & ~Qt::WindowFullScreen); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
392 |
} |
1162 | 393 |
} |
394 |
||
6574 | 395 |
void HWForm::onFrontendEffects(bool value) |
396 |
{ |
|
397 |
wBackground->enabled = value; |
|
398 |
if (value) |
|
399 |
wBackground->startAnimation(); |
|
400 |
else |
|
401 |
wBackground->stopAnimation(); |
|
402 |
} |
|
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 | 405 |
void HWForm::keyReleaseEvent(QKeyEvent *event) |
406 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
407 |
if (event->key() == Qt::Key_Escape) |
3937 | 408 |
this->GoBack(); |
409 |
} |
|
4592
b1fe47b11b99
disable fix for issue 24 in order to fix issue 123, as suggested by koda
sheepluva
parents:
4576
diff
changeset
|
410 |
*/ |
3937 | 411 |
|
1419 | 412 |
void HWForm::CustomizePalettes() |
413 |
{ |
|
12225
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
414 |
// Scroll bar widget palette |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
415 |
QList<QScrollBar *> allSBars = findChildren<QScrollBar *>(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
416 |
QPalette pal = palette(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
417 |
pal.setColor(QPalette::WindowText, QColor(0xff, 0xcc, 0x00)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
418 |
pal.setColor(QPalette::Button, QColor(0x00, 0x35, 0x1d)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
419 |
pal.setColor(QPalette::Base, QColor(0x00, 0x35, 0x1d)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
420 |
pal.setColor(QPalette::Window, QColor(0x00, 0x00, 0x00)); |
1419 | 421 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
422 |
for (int i = 0; i < allSBars.size(); ++i) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
423 |
allSBars.at(i)->setPalette(pal); |
12225
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
424 |
|
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
425 |
// Set default hyperlink color |
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
426 |
QPalette appPal = qApp->palette(); |
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
427 |
appPal.setColor(QPalette::Link, QColor(0xff, 0xff, 0x6e)); |
a7c08e4748ff
Use the same link color consistently in frontend
Wuzzy <almikes@aol.com>
parents:
12222
diff
changeset
|
428 |
qApp->setPalette(appPal); |
1419 | 429 |
} |
430 |
||
695 | 431 |
void HWForm::UpdateWeapons() |
432 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
433 |
QVector<QComboBox*> combos; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
434 |
combos.push_back(ui.pageOptions->WeaponsName); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
435 |
combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
436 |
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
|
437 |
combos.push_back(ui.pageSelectWeapon->selectWeaponSet); |
696 | 438 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
439 |
QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames(); |
1517 | 440 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
441 |
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
|
442 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
443 |
(*it)->clear(); |
1517 | 444 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
445 |
for(int i = 0; i < names.size(); ++i) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
446 |
(*it)->addItem(names[i], ui.pageSelectWeapon->pWeapons->getWeaponsString(names[i])); |
2377 | 447 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
448 |
int pos = (*it)->findText("Default"); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
449 |
if (pos != -1) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
450 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
451 |
(*it)->setCurrentIndex(pos); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
452 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
453 |
} |
695 | 454 |
} |
455 |
||
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
456 |
void HWForm::AddWeapons(QString weaponsName, QString ammo) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
457 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
458 |
QVector<QComboBox*> combos; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
459 |
combos.push_back(ui.pageOptions->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
460 |
combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
461 |
combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
462 |
combos.push_back(ui.pageSelectWeapon->selectWeaponSet); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
463 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
464 |
QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames(); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
465 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
466 |
for(QVector<QComboBox*>::iterator it = combos.begin(); it != combos.end(); ++it) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
467 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
468 |
(*it)->addItem(weaponsName, QVariant(ammo)); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
469 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
470 |
ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageSelectWeapon->selectWeaponSet->count()-1); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
471 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
472 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
473 |
void HWForm::DeleteWeapons(QString weaponsName) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
474 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
475 |
QVector<QComboBox*> combos; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
476 |
combos.push_back(ui.pageOptions->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
477 |
combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
478 |
combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
479 |
combos.push_back(ui.pageSelectWeapon->selectWeaponSet); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
480 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
481 |
QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames(); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
482 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
483 |
for(QVector<QComboBox*>::iterator it = combos.begin(); it != combos.end(); ++it) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
484 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
485 |
int pos = (*it)->findText(weaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
486 |
if (pos != -1) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
487 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
488 |
(*it)->removeItem(pos); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
489 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
490 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
491 |
ui.pageSelectWeapon->pWeapons->deletionDone(); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
492 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
493 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
494 |
void HWForm::EditWeapons(QString oldWeaponsName, QString newWeaponsName, QString ammo) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
495 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
496 |
QVector<QComboBox*> combos; |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
497 |
combos.push_back(ui.pageOptions->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
498 |
combos.push_back(ui.pageMultiplayer->gameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
499 |
combos.push_back(ui.pageNetGame->pGameCFG->WeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
500 |
combos.push_back(ui.pageSelectWeapon->selectWeaponSet); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
501 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
502 |
QStringList names = ui.pageSelectWeapon->pWeapons->getWeaponNames(); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
503 |
|
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
504 |
for(QVector<QComboBox*>::iterator it = combos.begin(); it != combos.end(); ++it) |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
505 |
{ |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
506 |
int pos = (*it)->findText(oldWeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
507 |
(*it)->setItemText(pos, newWeaponsName); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
508 |
(*it)->setItemData(pos, ammo); |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
509 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
510 |
} |
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
511 |
|
8140 | 512 |
void HWForm::UpdateTeamsLists() |
245 | 513 |
{ |
8140 | 514 |
QStringList teamslist = config->GetTeamsList(); |
245 | 515 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
516 |
if(teamslist.empty()) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
517 |
{ |
12761
7cbf26454b1f
Remove silly toUtf8 which caused bug with default team name
unc0rr
parents:
12730
diff
changeset
|
518 |
QString currentNickName = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString(); |
8136 | 519 |
QString teamName; |
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
520 |
int firstHumanTeam = 1; |
12640 | 521 |
int lastHumanTeam = 2; |
8140 | 522 |
|
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
523 |
// Default team |
8140 | 524 |
if (currentNickName.isEmpty()) |
8136 | 525 |
{ |
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
526 |
teamName = tr("Team 1"); |
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
527 |
firstHumanTeam++; |
8136 | 528 |
} |
529 |
else |
|
530 |
{ |
|
531 |
teamName = tr("%1's Team").arg(currentNickName); |
|
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
532 |
lastHumanTeam--; |
8136 | 533 |
} |
8140 | 534 |
|
8136 | 535 |
HWTeam defaultTeam(teamName); |
12301
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
536 |
// Randomize fort and grave for greater variety by default. |
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
537 |
// But we exclude DLC graves and forts to not have desyncing teams by default |
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
538 |
// TODO: Remove DLC filtering when it isn't neccessary anymore |
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
539 |
HWNamegen::teamRandomGrave(defaultTeam, false); |
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
540 |
HWNamegen::teamRandomFort(defaultTeam, false); |
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
|
541 |
defaultTeam.saveToFile(); |
8136 | 542 |
teamslist.push_back(teamName); |
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
543 |
|
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
544 |
// Add additional default teams |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
545 |
|
12639
91e55ce06ffc
Reduce number of initial teams: 4 human, 2 AI teams
Wuzzy <almikes@aol.com>
parents:
12638
diff
changeset
|
546 |
// More human teams to allow local multiplayer instantly |
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
547 |
for(int i=firstHumanTeam; i<=lastHumanTeam; i++) |
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
548 |
{ |
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
549 |
//: Default team name |
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
550 |
teamName = tr("Team %1").arg(i); |
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
551 |
HWTeam numberTeam(teamName); |
12301
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
552 |
HWNamegen::teamRandomGrave(numberTeam, false); |
62975c0a89c6
Only select from default graves and forts for new themes
Wuzzy <almikes@aol.com>
parents:
12249
diff
changeset
|
553 |
HWNamegen::teamRandomFort(numberTeam, false); |
12246
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
554 |
numberTeam.saveToFile(); |
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
555 |
teamslist.push_back(teamName); |
0b5aa545e058
Add 4 teams on first start of Hedgewars
Wuzzy <almikes@aol.com>
parents:
12225
diff
changeset
|
556 |
} |
12639
91e55ce06ffc
Reduce number of initial teams: 4 human, 2 AI teams
Wuzzy <almikes@aol.com>
parents:
12638
diff
changeset
|
557 |
// Add 2 default CPU teams |
12640 | 558 |
for(int i=1; i<=5; i=i+2) |
12638
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
559 |
{ |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
560 |
//: Default computer team name |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
561 |
teamName = tr("Computer %1").arg(i); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
562 |
HWTeam numberTeam(teamName); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
563 |
HWNamegen::teamRandomGrave(numberTeam, false); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
564 |
HWNamegen::teamRandomFort(numberTeam, false); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
565 |
numberTeam.setDifficulty(6-i); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
566 |
numberTeam.saveToFile(); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
567 |
teamslist.push_back(teamName); |
a791a08062d6
Create 5 human teams + 5 AI teams on first start
Wuzzy <almikes@aol.com>
parents:
12310
diff
changeset
|
568 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
569 |
} |
245 | 570 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
571 |
ui.pageOptions->CBTeamName->clear(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
572 |
ui.pageOptions->CBTeamName->addItems(teamslist); |
3760 | 573 |
ui.pageCampaign->CBTeam->clear(); |
11964
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
574 |
/* Only show human teams in campaign page */ |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
575 |
for(int i=0; i<teamslist.length(); i++) |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
576 |
{ |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
577 |
HWTeam testTeam = HWTeam(teamslist[i]); |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
578 |
testTeam.loadFromFile(); |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
579 |
if(testTeam.difficulty() == 0) |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
580 |
{ |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
581 |
ui.pageCampaign->CBTeam->addItem(teamslist[i]); |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
582 |
} |
3c15903256a7
Don't show AI-controlled teams in campaigns page
Wuzzy <almikes@aol.com>
parents:
11963
diff
changeset
|
583 |
} |
245 | 584 |
} |
585 |
||
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
586 |
void HWForm::GoToNewWeapons() |
694 | 587 |
{ |
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
|
588 |
ui.pageSelectWeapon->pWeapons->newWeaponsName(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
589 |
GoToPage(ID_PAGE_SELECTWEAPON); |
694 | 590 |
} |
591 |
||
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
592 |
void HWForm::GoToEditWeapons() |
600 | 593 |
{ |
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
|
594 |
ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(ui.pageOptions->WeaponsName->currentIndex()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
595 |
GoToPage(ID_PAGE_SELECTWEAPON); |
600 | 596 |
} |
597 |
||
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
598 |
void HWForm::GoToWeapons(int index) |
2009 | 599 |
{ |
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
|
600 |
ui.pageSelectWeapon->selectWeaponSet->setCurrentIndex(index); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
601 |
GoToPage(ID_PAGE_SELECTWEAPON); |
2009 | 602 |
} |
603 |
||
12670
5664ec82aed7
Rework weapon scheme handling in frontend and fix a couple of bugs
Wuzzy <almikes@aol.com>
parents:
12640
diff
changeset
|
604 |
|
579 | 605 |
void HWForm::GoToSaves() |
606 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
607 |
ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Save); |
579 | 608 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
609 |
GoToPage(ID_PAGE_DEMOS); |
579 | 610 |
} |
611 |
||
184 | 612 |
void HWForm::GoToDemos() |
613 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
614 |
ui.pagePlayDemo->FillFromDir(PagePlayDemo::RT_Demo); |
579 | 615 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
616 |
GoToPage(ID_PAGE_DEMOS); |
184 | 617 |
} |
618 |
||
619 |
void HWForm::GoToNet() |
|
620 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
621 |
ui.pageNet->updateServersList(); |
632
5e09ae25729f
Half implement possibility for different backends of servers list
unc0rr
parents:
625
diff
changeset
|
622 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
623 |
GoToPage(ID_PAGE_NET); |
184 | 624 |
} |
625 |
||
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
|
626 |
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
|
627 |
{ |
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
|
628 |
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
|
629 |
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
|
630 |
} |
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
|
631 |
|
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
|
632 |
void HWForm::GoToNewScheme() |
1885 | 633 |
{ |
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
|
634 |
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
|
635 |
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
|
636 |
} |
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
|
637 |
|
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
|
638 |
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
|
639 |
{ |
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
|
640 |
ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
641 |
GoToPage(ID_PAGE_SCHEME); |
1885 | 642 |
} |
643 |
||
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
|
644 |
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
|
645 |
{ |
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
|
646 |
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
|
647 |
} |
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
|
648 |
|
13091
8d569c7b36a2
Frontend: Lead first-time player to training page on start
Wuzzy <Wuzzy2@mail.ru>
parents:
12929
diff
changeset
|
649 |
void HWForm::GoToTraining() |
8d569c7b36a2
Frontend: Lead first-time player to training page on start
Wuzzy <Wuzzy2@mail.ru>
parents:
12929
diff
changeset
|
650 |
{ |
8d569c7b36a2
Frontend: Lead first-time player to training page on start
Wuzzy <Wuzzy2@mail.ru>
parents:
12929
diff
changeset
|
651 |
GoToPage(ID_PAGE_TRAINING); |
8d569c7b36a2
Frontend: Lead first-time player to training page on start
Wuzzy <Wuzzy2@mail.ru>
parents:
12929
diff
changeset
|
652 |
} |
8d569c7b36a2
Frontend: Lead first-time player to training page on start
Wuzzy <Wuzzy2@mail.ru>
parents:
12929
diff
changeset
|
653 |
|
8353 | 654 |
//TODO: maybe find a better place for this? |
655 |
QString HWForm::stringifyPageId(quint32 id) |
|
656 |
{ |
|
657 |
QString pageName; |
|
658 |
switch (id) |
|
659 |
{ |
|
660 |
case ID_PAGE_SETUP_TEAM : pageName = "PAGE_SETUP_TEAM"; break; |
|
661 |
case ID_PAGE_SETUP : pageName = "PAGE_SETUP"; break; |
|
662 |
case ID_PAGE_MULTIPLAYER : pageName = "PAGE_MULTIPLAYER"; break; |
|
663 |
case ID_PAGE_DEMOS : pageName = "PAGE_DEMOS"; break; |
|
664 |
case ID_PAGE_NET : pageName = "PAGE_NET"; break; |
|
665 |
case ID_PAGE_NETGAME : pageName = "PAGE_NETGAME"; break; |
|
666 |
case ID_PAGE_INFO : pageName = "PAGE_INFO"; break; |
|
667 |
case ID_PAGE_MAIN : pageName = "PAGE_MAIN"; break; |
|
668 |
case ID_PAGE_GAMESTATS : pageName = "PAGE_GAMESTATS"; break; |
|
669 |
case ID_PAGE_SINGLEPLAYER : pageName = "PAGE_SINGLEPLAYER"; break; |
|
670 |
case ID_PAGE_TRAINING : pageName = "PAGE_TRAINING"; break; |
|
671 |
case ID_PAGE_SELECTWEAPON : pageName = "PAGE_SELECTWEAPON"; break; |
|
672 |
case ID_PAGE_NETSERVER : pageName = "PAGE_NETSERVER"; break; |
|
673 |
case ID_PAGE_INGAME : pageName = "PAGE_INGAME"; break; |
|
674 |
case ID_PAGE_ROOMSLIST : pageName = "PAGE_ROOMSLIST"; break; |
|
675 |
case ID_PAGE_CONNECTING : pageName = "PAGE_CONNECTING"; break; |
|
676 |
case ID_PAGE_SCHEME : pageName = "PAGE_SCHEME"; break; |
|
677 |
case ID_PAGE_ADMIN : pageName = "PAGE_ADMIN"; break; |
|
678 |
case ID_PAGE_CAMPAIGN : pageName = "PAGE_CAMPAIGN"; break; |
|
679 |
case ID_PAGE_DRAWMAP : pageName = "PAGE_DRAWMAP"; break; |
|
680 |
case ID_PAGE_DATADOWNLOAD : pageName = "PAGE_DATADOWNLOAD"; break; |
|
681 |
case ID_PAGE_VIDEOS : pageName = "PAGE_VIDEOS"; break; |
|
682 |
case MAX_PAGE : pageName = "MAX_PAGE"; break; |
|
683 |
default : pageName = "UNKNOWN_PAGE"; break; |
|
684 |
} |
|
685 |
return pageName; |
|
686 |
} |
|
687 |
||
496 | 688 |
void HWForm::OnPageShown(quint8 id, quint8 lastid) |
311 | 689 |
{ |
9235 | 690 |
#ifdef QT_DEBUG |
8353 | 691 |
qDebug("Leaving %s, entering %s", qPrintable(stringifyPageId(lastid)), qPrintable(stringifyPageId(id))); |
9235 | 692 |
#endif |
8977 | 693 |
if (lastid == ID_PAGE_MAIN) |
694 |
{ |
|
8982 | 695 |
ui.pageMain->resetNetworkChoice(); |
8977 | 696 |
} |
8353 | 697 |
|
8384 | 698 |
// pageEnter and pageLeave events |
8434 | 699 |
((AbstractPage*)ui.Pages->widget(lastid))->triggerPageLeave(); |
8384 | 700 |
((AbstractPage*)ui.Pages->widget(id))->triggerPageEnter(); |
701 |
||
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
|
702 |
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
|
703 |
{ |
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
|
704 |
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
|
705 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
706 |
if (id == ID_PAGE_DRAWMAP) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
707 |
{ |
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4518
diff
changeset
|
708 |
DrawMapScene * scene; |
4535 | 709 |
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
|
710 |
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
|
711 |
else |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4518
diff
changeset
|
712 |
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
|
713 |
|
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4518
diff
changeset
|
714 |
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
|
715 |
} |
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
|
716 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
717 |
if (lastid == ID_PAGE_DRAWMAP) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
718 |
{ |
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
|
719 |
if (id == ID_PAGE_MULTIPLAYER) |
4525 | 720 |
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
|
721 |
else |
4525 | 722 |
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
|
723 |
} |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4518
diff
changeset
|
724 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
725 |
if (id == ID_PAGE_ROOMSLIST) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
726 |
{ |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
727 |
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
|
728 |
{ |
6190
1db2486e45f4
potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?)
sheepluva
parents:
6180
diff
changeset
|
729 |
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
|
730 |
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
|
731 |
game->abort(); |
6190
1db2486e45f4
potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?)
sheepluva
parents:
6180
diff
changeset
|
732 |
} |
1db2486e45f4
potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?)
sheepluva
parents:
6180
diff
changeset
|
733 |
} |
1db2486e45f4
potential fix for issue #217 (SigSegV while in game room in KillAllTeams - team list change?)
sheepluva
parents:
6180
diff
changeset
|
734 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
735 |
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
|
736 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
737 |
QStringList tmNames = config->GetTeamsList(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
738 |
TeamSelWidget* curTeamSelWidget; |
6024 | 739 |
ui.pageOptions->setTeamOptionsEnabled(false); |
2377 | 740 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
741 |
if (id == ID_PAGE_MULTIPLAYER) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
742 |
{ |
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
|
743 |
curTeamSelWidget = ui.pageMultiplayer->teamsSelect; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
744 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
745 |
else |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
746 |
{ |
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
|
747 |
curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
748 |
} |
2377 | 749 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
750 |
QList<HWTeam> teamsList; |
9393 | 751 |
for (QStringList::iterator it = tmNames.begin(); it != tmNames.end(); ++it) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
752 |
{ |
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
|
753 |
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
|
754 |
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
|
755 |
teamsList.push_back(team); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
756 |
} |
2377 | 757 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
758 |
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
|
759 |
{ |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
760 |
if (editedTeam) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
761 |
{ |
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
|
762 |
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
|
763 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
764 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
765 |
else if (lastid != ID_PAGE_GAMESTATS |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
766 |
&& lastid != ID_PAGE_INGAME |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
767 |
&& lastid != ID_PAGE_SCHEME |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
768 |
&& lastid != ID_PAGE_SELECTWEAPON) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
769 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
770 |
curTeamSelWidget->resetPlayingTeams(teamsList); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
771 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
772 |
} |
2845 | 773 |
|
8901
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
774 |
if (id == ID_PAGE_GAMESTATS) |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
775 |
{ |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
776 |
switch(lastGameType) { |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
777 |
case gtLocal: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
778 |
case gtQLocal: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
779 |
case gtTraining: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
780 |
case gtCampaign: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
781 |
ui.pageGameStats->restartBtnVisible(true); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
782 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
783 |
default: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
784 |
ui.pageGameStats->restartBtnVisible(false); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
785 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
786 |
} |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
787 |
} |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
788 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
789 |
if (id == ID_PAGE_MAIN) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
790 |
{ |
6024 | 791 |
ui.pageOptions->setTeamOptionsEnabled(true); |
3159 | 792 |
} |
311 | 793 |
} |
794 |
||
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
795 |
void HWForm::GoToPage(int id) |
289 | 796 |
{ |
9393 | 797 |
//bool stopAnim = false; |
6428 | 798 |
|
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
799 |
int lastid = ui.Pages->currentIndex(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
800 |
PagesStack.push(ui.Pages->currentIndex()); |
6428 | 801 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
802 |
OnPageShown(id, lastid); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
803 |
ui.Pages->setCurrentIndex(id); |
6428 | 804 |
|
7004 | 805 |
|
806 |
/* if (id == ID_PAGE_DRAWMAP || id == ID_PAGE_GAMESTATS) |
|
6428 | 807 |
stopAnim = true; |
8098 | 808 |
This were disabled due to broken flake animations. I believe the more general problems w/ opacity that forced its disable makes blocking these |
809 |
unnecessary. |
|
7004 | 810 |
*/ |
6428 | 811 |
|
8384 | 812 |
|
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
813 |
#if (QT_VERSION >= 0x040600) |
9393 | 814 |
//if (!stopAnim) |
6428 | 815 |
{ |
816 |
/**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
|
817 |
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
|
818 |
#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
|
819 |
coeff = 2; |
6428 | 820 |
QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id)); |
821 |
ui.Pages->widget(id)->setGraphicsEffect(effectNew); |
|
822 |
||
823 |
QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(lastid)); |
|
824 |
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
|
825 |
#endif |
6574 | 826 |
// no effects, means 0 effect duration :D |
827 |
int duration = config->isFrontendEffects() ? 500 : 0; |
|
6428 | 828 |
|
829 |
//New page animation |
|
830 |
animationNewSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos"); |
|
6574 | 831 |
animationNewSlide->setDuration(duration); |
7004 | 832 |
animationNewSlide->setStartValue(QPoint(width()/coeff, 0)); |
6428 | 833 |
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
|
834 |
animationNewSlide->setEasingCurve(QEasingCurve::OutExpo); |
6428 | 835 |
|
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
|
836 |
#ifdef false |
6428 | 837 |
animationNewOpacity = new QPropertyAnimation(effectNew, "opacity"); |
6574 | 838 |
animationNewOpacity->setDuration(duration); |
6428 | 839 |
animationNewOpacity->setStartValue(0.01); |
840 |
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
|
841 |
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
|
842 |
#endif |
6428 | 843 |
|
844 |
//Last page animation |
|
845 |
ui.Pages->widget(lastid)->setHidden(false); |
|
846 |
||
847 |
animationOldSlide = new QPropertyAnimation(ui.Pages->widget(lastid), "pos"); |
|
6574 | 848 |
animationOldSlide->setDuration(duration); |
6428 | 849 |
animationOldSlide->setStartValue(QPoint(0, 0)); |
7004 | 850 |
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
|
851 |
animationOldSlide->setEasingCurve(QEasingCurve::OutExpo); |
6428 | 852 |
|
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
|
853 |
#ifdef false |
6428 | 854 |
animationOldOpacity = new QPropertyAnimation(effectLast, "opacity"); |
6574 | 855 |
animationOldOpacity->setDuration(duration); |
6428 | 856 |
animationOldOpacity->setStartValue(1); |
857 |
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
|
858 |
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
|
859 |
#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
|
860 |
|
7860
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
861 |
// 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
|
862 |
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
|
863 |
|
7860
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
864 |
// start animations |
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
865 |
animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped); |
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
866 |
animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped); |
6428 | 867 |
|
8098 | 868 |
/* this is for the situation when the animation below is interrupted by a new animation. For some reason, finished is not being fired */ |
869 |
for(int i=0;i<MAX_PAGE;i++) if (i!=id && i!=lastid) ui.Pages->widget(i)->hide(); |
|
6428 | 870 |
} |
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
871 |
#endif |
289 | 872 |
} |
873 |
||
874 |
void HWForm::GoBack() |
|
875 |
{ |
|
6428 | 876 |
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
|
877 |
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
|
878 |
if (curid == ID_PAGE_MAIN) |
6428 | 879 |
{ |
8384 | 880 |
((AbstractPage*)ui.Pages->widget(ID_PAGE_MAIN))->triggerPageLeave(); |
7353
0e55228e1303
When there are videos that are being encoded and user tries to quit display dialog with warning.
Stepan777 <stepik-777@mail.ru>
parents:
7347
diff
changeset
|
881 |
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
|
882 |
return; |
6428 | 883 |
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
|
884 |
exit(); |
6428 | 885 |
} |
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
|
886 |
|
4509
816a0bff5019
Use QSignalMapper instead of GoToPage*() functions (not all calls converted yet)
unc0rr
parents:
4433
diff
changeset
|
887 |
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
|
888 |
ui.Pages->setCurrentIndex(id); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
889 |
OnPageShown(id, curid); |
2377 | 890 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
891 |
if (id == ID_PAGE_CONNECTING) |
6428 | 892 |
{ |
893 |
stopAnim = true; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
894 |
GoBack(); |
6428 | 895 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
896 |
if (id == ID_PAGE_NETSERVER) |
6428 | 897 |
{ |
898 |
stopAnim = true; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
899 |
GoBack(); |
6428 | 900 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
901 |
if ((!hwnet) && (id == ID_PAGE_ROOMSLIST)) |
6428 | 902 |
{ |
903 |
stopAnim = true; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
904 |
GoBack(); |
6428 | 905 |
} |
7004 | 906 |
/*if (curid == ID_PAGE_DRAWMAP) |
907 |
stopAnim = true; */ |
|
2377 | 908 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
909 |
if ((!hwnet) || (!hwnet->isInRoom())) |
9393 | 910 |
if (id == ID_PAGE_NETGAME) |
6428 | 911 |
{ |
912 |
stopAnim = true; |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
913 |
GoBack(); |
6428 | 914 |
} |
1672
6a451649558c
Properly handle room deletion in respect of pages switching
unc0rr
parents:
1671
diff
changeset
|
915 |
|
5147 | 916 |
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
|
917 |
if (curid == ID_PAGE_NETGAME && hwnet && hwnet->isInRoom()) hwnet->partRoom(); |
4432 | 918 |
// need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick |
919 |
//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
|
920 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
921 |
if (curid == ID_PAGE_SCHEME) |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
922 |
gameSchemeModel->Save(); |
6428 | 923 |
|
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
924 |
#if (QT_VERSION >= 0x040600) |
6428 | 925 |
/**Start animation :**/ |
6574 | 926 |
if (curid != 0 && !stopAnim) |
6428 | 927 |
{ |
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
|
928 |
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
|
929 |
#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
|
930 |
coeff = 2; |
6428 | 931 |
QGraphicsOpacityEffect *effectNew = new QGraphicsOpacityEffect(ui.Pages->widget(id)); |
932 |
effectNew->setOpacity(1); |
|
933 |
ui.Pages->widget(id)->setGraphicsEffect(effectNew); |
|
934 |
||
935 |
QGraphicsOpacityEffect *effectLast = new QGraphicsOpacityEffect(ui.Pages->widget(curid)); |
|
936 |
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
|
937 |
#endif |
6574 | 938 |
// no effects, means 0 effect duration :D |
939 |
int duration = config->isFrontendEffects() ? 500 : 0; |
|
6428 | 940 |
|
941 |
//Last page animation |
|
942 |
animationOldSlide = new QPropertyAnimation(ui.Pages->widget(id), "pos"); |
|
6574 | 943 |
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
|
944 |
animationOldSlide->setStartValue(QPoint(-width()/coeff, 0)); |
6428 | 945 |
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
|
946 |
animationOldSlide->setEasingCurve(QEasingCurve::OutExpo); |
6428 | 947 |
|
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
|
948 |
#ifdef false |
6428 | 949 |
animationOldOpacity = new QPropertyAnimation(effectLast, "opacity"); |
6574 | 950 |
animationOldOpacity->setDuration(duration); |
6428 | 951 |
animationOldOpacity->setStartValue(1); |
952 |
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
|
953 |
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
|
954 |
#endif |
6428 | 955 |
//New page animation |
956 |
ui.Pages->widget(curid)->setHidden(false); |
|
957 |
||
958 |
animationNewSlide = new QPropertyAnimation(ui.Pages->widget(curid), "pos"); |
|
6574 | 959 |
animationNewSlide->setDuration(duration); |
6428 | 960 |
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
|
961 |
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
|
962 |
animationNewSlide->setEasingCurve(QEasingCurve::OutExpo); |
6428 | 963 |
|
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
|
964 |
#ifdef false |
6428 | 965 |
animationNewOpacity = new QPropertyAnimation(effectNew, "opacity"); |
6574 | 966 |
animationNewOpacity->setDuration(duration); |
6428 | 967 |
animationNewOpacity->setStartValue(0.01); |
968 |
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
|
969 |
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
|
970 |
#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
|
971 |
|
7860
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
972 |
// 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
|
973 |
connect(animationNewSlide, SIGNAL(finished()), ui.Pages->widget(curid), SLOT(hide())); |
6428 | 974 |
|
7860
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
975 |
// start animations |
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
976 |
animationOldSlide->start(QAbstractAnimation::DeleteWhenStopped); |
a90936219ffa
let animation objects delete themselves after they are not being used anymore
sheepluva
parents:
7842
diff
changeset
|
977 |
animationNewSlide->start(QAbstractAnimation::DeleteWhenStopped); |
6428 | 978 |
} |
6604
9cc612a24b43
this should lower compatibility with qt4.5 again, but i have no way to test it
koda
parents:
6574
diff
changeset
|
979 |
#endif |
7826
9f529722d61e
fix for the root cause of issue 434 (previous pages being visible in the background)
sheepluva
parents:
7824
diff
changeset
|
980 |
|
9f529722d61e
fix for the root cause of issue 434 (previous pages being visible in the background)
sheepluva
parents:
7824
diff
changeset
|
981 |
if (stopAnim) |
9f529722d61e
fix for the root cause of issue 434 (previous pages being visible in the background)
sheepluva
parents:
7824
diff
changeset
|
982 |
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
|
983 |
|
9f529722d61e
fix for the root cause of issue 434 (previous pages being visible in the background)
sheepluva
parents:
7824
diff
changeset
|
984 |
// 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
|
985 |
// 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
|
986 |
|
184 | 987 |
} |
988 |
||
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
|
989 |
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
|
990 |
{ |
a7de68f4f87f
allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon)
koda
parents:
5567
diff
changeset
|
991 |
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
|
992 |
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
|
993 |
} |
a7de68f4f87f
allow accessing the snapshot folder from the about page in the frontend (button could use a nicer icon)
koda
parents:
5567
diff
changeset
|
994 |
|
530 | 995 |
void HWForm::btnExitPressed() |
996 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
997 |
eggTimer.start(); |
530 | 998 |
} |
999 |
||
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
|
1000 |
void HWForm::exit() |
530 | 1001 |
{ |
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
|
1002 |
// 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
|
1003 |
#ifdef __APPLE__ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1004 |
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
|
1005 |
#endif |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1006 |
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
|
1007 |
// TODO reactivate egg |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1008 |
/* } |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1009 |
else |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1010 |
{ |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1011 |
QPushButton * btn = findChild<QPushButton *>("imageButt"); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1012 |
if (btn) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1013 |
{ |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1014 |
btn->setIcon(QIcon(":/res/bonus.png")); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1015 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1016 |
} */ |
530 | 1017 |
} |
1018 |
||
535
a14eaf35cf4b
"Setup" button instead of "New team", exclude playing teams from setup
displacer
parents:
533
diff
changeset
|
1019 |
void HWForm::IntermediateSetup() |
a14eaf35cf4b
"Setup" button instead of "New team", exclude playing teams from setup
displacer
parents:
533
diff
changeset
|
1020 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1021 |
quint8 id=ui.Pages->currentIndex(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1022 |
TeamSelWidget* curTeamSelWidget; |
2377 | 1023 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1024 |
if(id == ID_PAGE_MULTIPLAYER) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1025 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1026 |
curTeamSelWidget = ui.pageMultiplayer->teamsSelect; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1027 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1028 |
else |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1029 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1030 |
curTeamSelWidget = ui.pageNetGame->pNetTeamsWidget; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1031 |
} |
2377 | 1032 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1033 |
QStringList tmnames; |
5772
c09c50efe8b5
Replace iterators with simple declarative foreach (not tested if it works)
unc0rr
parents:
5763
diff
changeset
|
1034 |
|
5773 | 1035 |
foreach(HWTeam team, curTeamSelWidget->getNotPlayingTeams()) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1036 |
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
|
1037 |
|
3757 | 1038 |
//UpdateTeamsLists(&tmnames); // FIXME: still need more work if teamname is updated while configuring |
1039 |
UpdateTeamsLists(); |
|
535
a14eaf35cf4b
"Setup" button instead of "New team", exclude playing teams from setup
displacer
parents:
533
diff
changeset
|
1040 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1041 |
GoToPage(ID_PAGE_SETUP); |
535
a14eaf35cf4b
"Setup" button instead of "New team", exclude playing teams from setup
displacer
parents:
533
diff
changeset
|
1042 |
} |
a14eaf35cf4b
"Setup" button instead of "New team", exclude playing teams from setup
displacer
parents:
533
diff
changeset
|
1043 |
|
184 | 1044 |
void HWForm::NewTeam() |
1045 |
{ |
|
12672
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1046 |
QString teamName = QLineEdit::tr("unnamed"); |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1047 |
QStringList teamslist = config->GetTeamsList(); |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1048 |
if(teamslist.contains(teamName)) |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1049 |
{ |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1050 |
//name already used -> look for an appropriate name: |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1051 |
int i=2; |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1052 |
while(teamslist.contains(teamName = QLineEdit::tr("unnamed (%1)").arg(i++))); |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1053 |
} |
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1054 |
|
2e0a38566178
Make sure new teams start with an unique name
Wuzzy <almikes@aol.com>
parents:
12670
diff
changeset
|
1055 |
ui.pageEditTeam->createTeam(teamName, playerHash); |
6024 | 1056 |
UpdateTeamsLists(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1057 |
GoToPage(ID_PAGE_SETUP_TEAM); |
184 | 1058 |
} |
1059 |
||
6024 | 1060 |
void HWForm::EditTeam(const QString & teamName) |
3159 | 1061 |
{ |
6024 | 1062 |
ui.pageEditTeam->editTeam(teamName, playerHash); |
1063 |
GoToPage(ID_PAGE_SETUP_TEAM); |
|
3159 | 1064 |
} |
1065 |
||
6024 | 1066 |
void HWForm::AfterTeamEdit() |
1840 | 1067 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1068 |
UpdateTeamsLists(); |
7551 | 1069 |
//GoBack(); |
184 | 1070 |
} |
1071 |
||
6024 | 1072 |
|
1073 |
void HWForm::DeleteTeam(const QString & teamName) |
|
184 | 1074 |
{ |
8346 | 1075 |
ui.pageEditTeam->deleteTeam(teamName); |
1076 |
UpdateTeamsLists(); |
|
184 | 1077 |
} |
1078 |
||
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
|
1079 |
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
|
1080 |
{ |
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
|
1081 |
ui.pageScheme->selectScheme->setCurrentIndex(ui.pageOptions->SchemesName->currentIndex()); |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
1082 |
if (ui.pageOptions->SchemesName->currentIndex() < gameSchemeModel->numberOfDefaultSchemes) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1083 |
{ |
8383 | 1084 |
MessageDialog::ShowErrorMessage(QMessageBox::tr("Cannot delete default scheme '%1'!").arg(ui.pageOptions->SchemesName->currentText()), this); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1085 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1086 |
else |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1087 |
{ |
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
|
1088 |
ui.pageScheme->deleteRow(); |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
1089 |
gameSchemeModel->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
|
1090 |
} |
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
|
1091 |
} |
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
|
1092 |
|
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
|
1093 |
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
|
1094 |
{ |
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
|
1095 |
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
|
1096 |
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
|
1097 |
} |
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
|
1098 |
|
184 | 1099 |
void HWForm::SimpleGame() |
1100 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1101 |
CreateGame(0, 0, *cDefaultAmmoStore); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1102 |
game->StartQuick(); |
184 | 1103 |
} |
1104 |
||
1105 |
void HWForm::PlayDemo() |
|
1106 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1107 |
QListWidgetItem * curritem = ui.pagePlayDemo->DemosList->currentItem(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1108 |
if (!curritem) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1109 |
{ |
8383 | 1110 |
MessageDialog::ShowErrorMessage(QMessageBox::tr("Please select a record from the list"), this); |
5252 | 1111 |
return; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1112 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1113 |
CreateGame(0, 0, 0); |
5865 | 1114 |
game->PlayDemo(curritem->data(Qt::UserRole).toString(), ui.pagePlayDemo->isSave()); |
184 | 1115 |
} |
1116 |
||
5252 | 1117 |
void HWForm::PlayDemoQuick(const QString & demofilename) |
1118 |
{ |
|
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
|
1119 |
GoToPage(ID_PAGE_MAIN); |
8709
191bd86f97a1
fix loading files on osx too, the cause was different than other systems
koda
parents:
8643
diff
changeset
|
1120 |
//GoBack() <- don't or you'll close the socket |
5252 | 1121 |
CreateGame(0, 0, 0); |
5865 | 1122 |
game->PlayDemo(demofilename, false); |
5252 | 1123 |
} |
1124 |
||
8716
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1125 |
void HWForm::NetConnectQuick(const QString & host, quint16 port) |
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1126 |
{ |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1127 |
GoToPage(ID_PAGE_MAIN); |
8716
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1128 |
NetConnectServer(host, port); |
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1129 |
} |
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1130 |
|
666 | 1131 |
void HWForm::NetConnectServer(const QString & host, quint16 port) |
416 | 1132 |
{ |
8716
e09633d10f16
hit hwplay://server:port and automatically join an unofficial server (on osx right now)
koda
parents:
8709
diff
changeset
|
1133 |
qDebug("connecting to %s:%d", qPrintable(host), port); |
4870 | 1134 |
_NetConnect(host, port, ui.pageOptions->editNetNick->text().trimmed()); |
1395 | 1135 |
} |
1136 |
||
1137 |
void HWForm::NetConnectOfficialServer() |
|
1138 |
{ |
|
8803 | 1139 |
NetConnectServer(NETGAME_DEFAULT_SERVER, NETGAME_DEFAULT_PORT); |
416 | 1140 |
} |
1141 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1142 |
void HWForm::NetPassword(const QString & nick) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1143 |
{ |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
1144 |
Q_UNUSED(nick); |
8181 | 1145 |
//Get hashes |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1146 |
QString hash = config->passwordHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1147 |
QString temphash = config->tempHash(); |
8181 | 1148 |
|
1149 |
//Check them |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1150 |
|
8181 | 1151 |
if (temphash.isEmpty() && hash.isEmpty()) { //If the user enters a registered nick with no password, sends a bogus hash |
1152 |
hwnet->SendPasswordHash("THISISNOHASH"); |
|
1153 |
} |
|
1154 |
else if (temphash.isEmpty()) { //Send saved hash as default |
|
1155 |
hwnet->SendPasswordHash(hash); |
|
1156 |
} |
|
1157 |
else { //Send the hash |
|
1158 |
hwnet->SendPasswordHash(temphash); |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1159 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1160 |
|
8181 | 1161 |
//Remove temporary hash from config |
8295
6ef114ea2298
fixed minor problem with saving hash
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8294
diff
changeset
|
1162 |
config->clearTempHash(); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1163 |
} |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1164 |
|
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1165 |
void HWForm::NetNickRegistered(const QString & nick) |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1166 |
{ |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1167 |
//Get hashes |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1168 |
QString hash = config->passwordHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1169 |
QString temphash = config->tempHash(); |
8295
6ef114ea2298
fixed minor problem with saving hash
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8294
diff
changeset
|
1170 |
|
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1171 |
if (hash.isEmpty()) { |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1172 |
if (temphash.isEmpty()) { //If the user enters a registered nick with no password |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1173 |
QString suppliedpass; |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1174 |
while (suppliedpass.isEmpty()) { |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1175 |
QInputDialog nickRegedDialog(this); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1176 |
nickRegedDialog.setWindowModality(Qt::WindowModal); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1177 |
nickRegedDialog.setInputMode(QInputDialog::TextInput); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1178 |
nickRegedDialog.setWindowTitle(tr("Hedgewars - Nick registered")); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1179 |
nickRegedDialog.setLabelText(tr("This nick is registered, and you haven't specified a password.\n\nIf this nick isn't yours, please register your own nick at www.hedgewars.org\n\nPassword:")); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1180 |
nickRegedDialog.setTextEchoMode(QLineEdit::Password); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1181 |
nickRegedDialog.exec(); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1182 |
|
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1183 |
suppliedpass = nickRegedDialog.textValue(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1184 |
|
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1185 |
if (nickRegedDialog.result() == QDialog::Rejected) { |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1186 |
config->clearPasswordHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1187 |
config->clearTempHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1188 |
GoBack(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1189 |
return; |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1190 |
} |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1191 |
temphash = QCryptographicHash::hash(suppliedpass.toUtf8(), QCryptographicHash::Md5).toHex(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1192 |
config->setTempHash(temphash); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1193 |
} |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1194 |
} |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1195 |
} |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1196 |
NetPassword(nick); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1197 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1198 |
|
8299
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1199 |
void HWForm::NetNickNotRegistered(const QString & nick) |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1200 |
{ |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
1201 |
Q_UNUSED(nick); |
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
1202 |
|
8299
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1203 |
QMessageBox noRegMsg(this); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1204 |
noRegMsg.setIcon(QMessageBox::Information); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1205 |
noRegMsg.setWindowTitle(QMessageBox::tr("Hedgewars - Nick not registered")); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1206 |
noRegMsg.setWindowModality(Qt::WindowModal); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1207 |
noRegMsg.setText(tr("Your nickname is not registered.\nTo prevent someone else from using it,\nplease register it at www.hedgewars.org")); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1208 |
|
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1209 |
if (!config->passwordHash().isEmpty()) |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1210 |
{ |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1211 |
config->clearPasswordHash(); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1212 |
noRegMsg.setText(noRegMsg.text()+tr("\n\nYour password wasn't saved either.")); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1213 |
} |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1214 |
if (!config->tempHash().isEmpty()) |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1215 |
{ |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1216 |
config->clearTempHash(); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1217 |
} |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1218 |
noRegMsg.exec(); |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1219 |
} |
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1220 |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1221 |
void HWForm::NetNickTaken(const QString & nick) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1222 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1223 |
bool ok = false; |
7795
ba32d3f9e567
set window modality also for custom dialogs, small text changes
koda
parents:
7794
diff
changeset
|
1224 |
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
|
1225 |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1226 |
if (!ok || newNick.isEmpty()) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1227 |
{ |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1228 |
//ForcedDisconnect(tr("No nickname supplied.")); |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1229 |
bool retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied.")); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1230 |
GoBack(); |
9549 | 1231 |
if (retry && hwnet) { |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1232 |
if (hwnet->m_private_game) { |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1233 |
QStringList list = hwnet->getHost().split(":"); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1234 |
NetConnectServer(list.at(0), list.at(1).toShort()); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1235 |
} else |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1236 |
NetConnectOfficialServer(); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1237 |
} |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1238 |
return; |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1239 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1240 |
|
9549 | 1241 |
if(hwnet) |
1242 |
hwnet->NewNick(newNick); |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1243 |
config->setValue("net/nick", newNick); |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1244 |
config->updNetNick(); |
6227
ce60b734fff1
update name autocompletion after nick change (since own nick isn't suggested)
sheepluva
parents:
6225
diff
changeset
|
1245 |
|
ce60b734fff1
update name autocompletion after nick change (since own nick isn't suggested)
sheepluva
parents:
6225
diff
changeset
|
1246 |
ui.pageRoomsList->setUser(nick); |
ce60b734fff1
update name autocompletion after nick change (since own nick isn't suggested)
sheepluva
parents:
6225
diff
changeset
|
1247 |
ui.pageNetGame->setUser(nick); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1248 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1249 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1250 |
void HWForm::NetAuthFailed() |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1251 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1252 |
// Set the password blank if case the user tries to join and enter his password again |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1253 |
config->clearTempHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1254 |
|
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1255 |
//Try to login again |
8296
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1256 |
bool retry = RetryDialog(tr("Hedgewars - Wrong password"), tr("You entered a wrong password.")); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1257 |
GoBack(); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1258 |
|
8297
b236e3afed0d
Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8296
diff
changeset
|
1259 |
config->clearPasswordHash(); |
b236e3afed0d
Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8296
diff
changeset
|
1260 |
config->clearTempHash(); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1261 |
if (retry) { |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1262 |
NetConnectOfficialServer(); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1263 |
} |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1264 |
} |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1265 |
|
9549 | 1266 |
void HWForm::askRoomPassword() |
1267 |
{ |
|
1268 |
QString password = QInputDialog::getText(this, tr("Room password"), tr("The room is protected with password.\nPlease, enter the password:")); |
|
1269 |
if(hwnet && !password.isEmpty()) |
|
1270 |
hwnet->roomPasswordEntered(password); |
|
1271 |
} |
|
1272 |
||
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1273 |
bool HWForm::RetryDialog(const QString & title, const QString & label) |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1274 |
{ |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1275 |
QMessageBox retryMsg(this); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1276 |
retryMsg.setIcon(QMessageBox::Warning); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1277 |
retryMsg.setWindowTitle(title); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1278 |
retryMsg.setText(label); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1279 |
retryMsg.setWindowModality(Qt::WindowModal); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1280 |
|
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1281 |
retryMsg.addButton(QMessageBox::Cancel); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1282 |
|
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1283 |
QPushButton *retryButton = retryMsg.addButton(QMessageBox::Ok); |
8296
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1284 |
retryButton->setText(tr("Try Again")); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1285 |
retryButton->setFocus(); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1286 |
|
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1287 |
retryMsg.exec(); |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1288 |
|
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1289 |
if (retryMsg.clickedButton() == retryButton) { |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1290 |
return true; |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1291 |
} |
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1292 |
return false; |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1293 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1294 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1295 |
void HWForm::NetTeamAccepted(const QString & team) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1296 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1297 |
ui.pageNetGame->pNetTeamsWidget->changeTeamStatus(team); |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1298 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1299 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1300 |
void HWForm::NetError(const QString & errmsg) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1301 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1302 |
switch (ui.Pages->currentIndex()) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1303 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1304 |
case ID_PAGE_INGAME: |
8383 | 1305 |
MessageDialog::ShowErrorMessage(errmsg, this); |
12730
1a393a59a594
Fix GCC warnings: -Wimplicit-fallthrough and -Wint-in-bool-context
Wuzzy <Wuzzy2@mail.ru>
parents:
12679
diff
changeset
|
1306 |
/* fallthrough */ |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1307 |
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
|
1308 |
ui.pageNetGame->displayError(errmsg); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1309 |
break; |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1310 |
default: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1311 |
ui.pageRoomsList->displayError(errmsg); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1312 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1313 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1314 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1315 |
void HWForm::NetWarning(const QString & wrnmsg) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1316 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1317 |
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
|
1318 |
ui.pageNetGame->displayWarning(wrnmsg); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1319 |
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
|
1320 |
ui.pageRoomsList->displayWarning(wrnmsg); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1321 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1322 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1323 |
void HWForm::_NetConnect(const QString & hostName, quint16 port, QString nick) |
184 | 1324 |
{ |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
1325 |
Q_UNUSED(nick); |
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
1326 |
|
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1327 |
if (hwnet) { |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1328 |
// destroy old connection |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1329 |
hwnet->Disconnect(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1330 |
delete hwnet; |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1331 |
hwnet = NULL; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1332 |
} |
2377 | 1333 |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1334 |
hwnet = new HWNewNet(); |
637
8fa7ed5e13bd
Fix bad behavior when quickly click Connect button more than once
unc0rr
parents:
636
diff
changeset
|
1335 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1336 |
GoToPage(ID_PAGE_CONNECTING); |
1800 | 1337 |
|
8504
9ff55b527d1b
Ehm... probably this will improve situation with desyncs
unc0rr
parents:
8489
diff
changeset
|
1338 |
connect(hwnet, SIGNAL(AskForRunGame()), this, SLOT(CreateNetGame()), Qt::QueuedConnection); |
6697
4a04c02bc8c3
Use queued signal-slot connections with HWNet class
unc0rr
parents:
6677
diff
changeset
|
1339 |
connect(hwnet, SIGNAL(connected()), this, SLOT(NetConnected()), Qt::QueuedConnection); |
4a04c02bc8c3
Use queued signal-slot connections with HWNet class
unc0rr
parents:
6677
diff
changeset
|
1340 |
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
|
1341 |
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
|
1342 |
connect(hwnet, SIGNAL(EnteredGame()), this, SLOT(NetGameEnter()), Qt::QueuedConnection); |
4a04c02bc8c3
Use queued signal-slot connections with HWNet class
unc0rr
parents:
6677
diff
changeset
|
1343 |
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
|
1344 |
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
|
1345 |
connect(hwnet, SIGNAL(RemoveNetTeam(const HWTeam&)), this, SLOT(RemoveNetTeam(const HWTeam&)), Qt::QueuedConnection); |
8534
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8529
diff
changeset
|
1346 |
connect(hwnet, SIGNAL(TeamAccepted(const QString&)), this, SLOT(NetTeamAccepted(const QString&)), Qt::QueuedConnection); |
8291
e4a0d980d1e2
Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8287
diff
changeset
|
1347 |
connect(hwnet, SIGNAL(NickRegistered(const QString&)), this, SLOT(NetNickRegistered(const QString&)), Qt::QueuedConnection); |
8299
ef2e284255cd
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8297
diff
changeset
|
1348 |
connect(hwnet, SIGNAL(NickNotRegistered(const QString&)), this, SLOT(NetNickNotRegistered(const QString&)), Qt::QueuedConnection); |
6697
4a04c02bc8c3
Use queued signal-slot connections with HWNet class
unc0rr
parents:
6677
diff
changeset
|
1349 |
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
|
1350 |
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
|
1351 |
//connect(ui.pageNetGame->BtnBack, SIGNAL(clicked()), hwnet, SLOT(partRoom())); |
9549 | 1352 |
connect(hwnet, SIGNAL(askForRoomPassword()), this, SLOT(askRoomPassword()), Qt::QueuedConnection); |
329
4c3aad46baa5
Send game parameters by net... Currently it leads to infinite loop, flooding traffic with messages about changes
unc0rr
parents:
328
diff
changeset
|
1353 |
|
7723 | 1354 |
ui.pageRoomsList->chatWidget->setUsersModel(hwnet->lobbyPlayersModel()); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1355 |
ui.pageNetGame->chatWidget->setUsersModel(hwnet->roomPlayersModel()); |
7723 | 1356 |
|
1874 | 1357 |
// rooms list page stuff |
6735 | 1358 |
ui.pageRoomsList->setModel(hwnet->roomsListModel()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1359 |
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
|
1360 |
ui.pageRoomsList, SLOT(setAdmin(bool)), Qt::QueuedConnection); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1361 |
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
|
1362 |
ui.pageRoomsList->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection); |
2377 | 1363 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1364 |
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
|
1365 |
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
|
1366 |
|
9541
312bb4384f33
- Frontend finally learns how to create passworded room
unc0rr
parents:
9393
diff
changeset
|
1367 |
connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &, const QString &)), |
312bb4384f33
- Frontend finally learns how to create passworded room
unc0rr
parents:
9393
diff
changeset
|
1368 |
hwnet, SLOT(CreateRoom(const QString&, const QString &))); |
9549 | 1369 |
connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &, const QString &)), |
1370 |
hwnet, SLOT(JoinRoom(const QString&, const QString &))); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1371 |
// connect(ui.pageRoomsList, SIGNAL(askForCreateRoom(const QString &)), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1372 |
// this, SLOT(NetGameMaster())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1373 |
// connect(ui.pageRoomsList, SIGNAL(askForJoinRoom(const QString &)), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1374 |
// this, SLOT(NetGameSlave())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1375 |
connect(ui.pageRoomsList, SIGNAL(askForRoomList()), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1376 |
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
|
1377 |
|
2345
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1378 |
// room status stuff |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1379 |
connect(hwnet, SIGNAL(roomMaster(bool)), |
8893
8f92e94d0b32
Don't set Default scheme/ammo when switching script if not room admin. Prevents game config desync.
unc0rr
parents:
8891
diff
changeset
|
1380 |
this, SLOT(NetGameChangeStatus(bool))); |
2345
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1381 |
|
1874 | 1382 |
// net page stuff |
8489
25cb6f4a1d1b
Implements protocol message JOINING on frontend, so client in a room always displays correct room name, even when room name changes. Fixes issue 522.
dag10
parents:
8453
diff
changeset
|
1383 |
connect(hwnet, SIGNAL(roomNameUpdated(const QString &)), |
8534
92da587691c9
Workaround queued signals problem in netclient instead. Should fix everything.
unc0rr
parents:
8529
diff
changeset
|
1384 |
ui.pageNetGame, SLOT(setRoomName(const QString &)), Qt::QueuedConnection); |
8759 | 1385 |
connect(hwnet, SIGNAL(roomChatAction(const QString&, const QString&)), |
1386 |
ui.pageNetGame->chatWidget, SLOT(onChatAction(const QString&, const QString&)), Qt::QueuedConnection); |
|
1387 |
connect(hwnet, SIGNAL(roomChatMessage(const QString&, const QString&)), |
|
1388 |
ui.pageNetGame->chatWidget, SLOT(onChatMessage(const QString&, const QString&)), Qt::QueuedConnection); |
|
7720 | 1389 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1390 |
connect(hwnet, SIGNAL(roomMaster(bool)), |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1391 |
ui.pageNetGame->chatWidget, SLOT(adminAccess(bool)), Qt::QueuedConnection); |
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1392 |
connect(ui.pageNetGame->chatWidget, SIGNAL(chatLine(const QString&)), |
8765
688062f1db59
fix/hack so that (own) messages sent in frontend are also visible in the game chat
sheepluva
parents:
8762
diff
changeset
|
1393 |
hwnet, SLOT(chatLineToNetWithEcho(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1394 |
connect(ui.pageNetGame->BtnGo, SIGNAL(clicked()), hwnet, SLOT(ToggleReady())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1395 |
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
|
1396 |
ui.pageNetGame, SLOT(setReadyStatus(bool)), Qt::QueuedConnection); |
1577 | 1397 |
|
1874 | 1398 |
// chat widget actions |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1399 |
connect(ui.pageNetGame->chatWidget, SIGNAL(kick(const QString&)), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1400 |
hwnet, SLOT(kickPlayer(const QString&))); |
11870
047be82b6f67
fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents:
11868
diff
changeset
|
1401 |
connect(ui.pageNetGame->chatWidget, SIGNAL(delegate(const QString&)), |
047be82b6f67
fix for Bug 91 - Make DELEGATE action available in frontend
sheepluva
parents:
11868
diff
changeset
|
1402 |
hwnet, SLOT(delegateToPlayer(const QString&))); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1403 |
connect(ui.pageNetGame->chatWidget, SIGNAL(ban(const QString&)), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1404 |
hwnet, SLOT(banPlayer(const QString&))); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1405 |
connect(ui.pageNetGame->chatWidget, SIGNAL(info(const QString&)), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1406 |
hwnet, SLOT(infoPlayer(const QString&))); |
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1407 |
connect(ui.pageNetGame->chatWidget, SIGNAL(follow(const QString&)), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1408 |
hwnet, SLOT(followPlayer(const QString&))); |
8436
b89aacebb9db
- Also pass unknown cmds to the server when in room
unc0rr
parents:
8434
diff
changeset
|
1409 |
connect(ui.pageNetGame->chatWidget, SIGNAL(consoleCommand(const QString&)), |
b89aacebb9db
- Also pass unknown cmds to the server when in room
unc0rr
parents:
8434
diff
changeset
|
1410 |
hwnet, SLOT(consoleCommand(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1411 |
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
|
1412 |
hwnet, SLOT(kickPlayer(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1413 |
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
|
1414 |
hwnet, SLOT(banPlayer(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1415 |
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
|
1416 |
hwnet, SLOT(infoPlayer(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1417 |
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
|
1418 |
hwnet, SLOT(followPlayer(const QString&))); |
8396 | 1419 |
connect(ui.pageRoomsList->chatWidget, SIGNAL(consoleCommand(const QString&)), |
1420 |
hwnet, SLOT(consoleCommand(const QString&))); |
|
1566
6b63c75fdc68
Start work on lobby: add/remove nick from the list on join/quit
unc0rr
parents:
1531
diff
changeset
|
1421 |
|
8762 | 1422 |
// player info |
1423 |
connect(hwnet, SIGNAL(playerInfo(const QString&, const QString&, const QString&, const QString&)), |
|
1424 |
ui.pageRoomsList->chatWidget, SLOT(onPlayerInfo(const QString&, const QString&, const QString&, const QString&)), Qt::QueuedConnection); |
|
1425 |
connect(hwnet, SIGNAL(playerInfo(const QString&, const QString&, const QString&, const QString&)), |
|
1426 |
ui.pageNetGame->chatWidget, SLOT(onPlayerInfo(const QString&, const QString&, const QString&, const QString&)), Qt::QueuedConnection); |
|
1427 |
||
1874 | 1428 |
// chatting |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1429 |
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
|
1430 |
hwnet, SLOT(chatLineToLobby(const QString&))); |
8759 | 1431 |
connect(hwnet, SIGNAL(lobbyChatAction(const QString&,const QString&)), |
1432 |
ui.pageRoomsList->chatWidget, SLOT(onChatAction(const QString&,const QString&)), Qt::QueuedConnection); |
|
1433 |
connect(hwnet, SIGNAL(lobbyChatMessage(const QString&, const QString&)), |
|
1434 |
ui.pageRoomsList->chatWidget, SLOT(onChatMessage(const QString&, const QString&)), Qt::QueuedConnection); |
|
1568 | 1435 |
|
1874 | 1436 |
// nick list stuff |
8891
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1437 |
{ |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1438 |
QSortFilterProxyModel * playersSortFilterModel = qobject_cast<QSortFilterProxyModel *>(hwnet->lobbyPlayersModel()); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1439 |
if(playersSortFilterModel) |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1440 |
{ |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1441 |
PlayersListModel * players = qobject_cast<PlayersListModel *>(playersSortFilterModel->sourceModel()); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1442 |
connect(players, SIGNAL(nickAdded(const QString&, bool)), |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1443 |
ui.pageNetGame->chatWidget, SLOT(nickAdded(const QString&, bool))); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1444 |
connect(players, SIGNAL(nickRemoved(const QString&)), |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1445 |
ui.pageNetGame->chatWidget, SLOT(nickRemoved(const QString&))); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1446 |
connect(players, SIGNAL(nickAddedLobby(const QString&, bool)), |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1447 |
ui.pageRoomsList->chatWidget, SLOT(nickAdded(const QString&, bool))); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1448 |
connect(players, SIGNAL(nickRemovedLobby(const QString&)), |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1449 |
ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&))); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1450 |
connect(players, SIGNAL(nickRemovedLobby(const QString&, const QString&)), |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1451 |
ui.pageRoomsList->chatWidget, SLOT(nickRemoved(const QString&, const QString&))); |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1452 |
} |
bf67b4d7d7b4
- Better fix to friends joins/quits highlighting problem
unc0rr
parents:
8887
diff
changeset
|
1453 |
} |
461 | 1454 |
|
1874 | 1455 |
// teams selecting stuff |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1456 |
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
|
1457 |
hwnet, SLOT(onHedgehogsNumChanged(const HWTeam&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1458 |
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
|
1459 |
hwnet, SLOT(onTeamColorChanged(const HWTeam&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1460 |
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
|
1461 |
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
|
1462 |
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
|
1463 |
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
|
1464 |
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
|
1465 |
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
|
1466 |
ui.pageNetGame->pNetTeamsWidget, SLOT(changeTeamColor(const HWTeam&)), Qt::QueuedConnection); |
1874 | 1467 |
|
1924 | 1468 |
// admin stuff |
3283 | 1469 |
connect(hwnet, SIGNAL(serverMessageNew(const QString&)), ui.pageAdmin, SLOT(serverMessageNew(const QString &))); |
1470 |
connect(hwnet, SIGNAL(serverMessageOld(const QString&)), ui.pageAdmin, SLOT(serverMessageOld(const QString &))); |
|
1471 |
connect(hwnet, SIGNAL(latestProtocolVar(int)), ui.pageAdmin, SLOT(protocol(int))); |
|
8157 | 1472 |
connect(hwnet, SIGNAL(bansList(const QStringList &)), ui.pageAdmin, SLOT(setBansList(const QStringList &))); |
3283 | 1473 |
connect(ui.pageAdmin, SIGNAL(setServerMessageNew(const QString&)), hwnet, SLOT(setServerMessageNew(const QString &))); |
1474 |
connect(ui.pageAdmin, SIGNAL(setServerMessageOld(const QString&)), hwnet, SLOT(setServerMessageOld(const QString &))); |
|
1475 |
connect(ui.pageAdmin, SIGNAL(setProtocol(int)), hwnet, SLOT(setLatestProtocolVar(int))); |
|
1476 |
connect(ui.pageAdmin, SIGNAL(askServerVars()), hwnet, SLOT(askServerVars())); |
|
6009 | 1477 |
connect(ui.pageAdmin, SIGNAL(clearAccountsCache()), hwnet, SLOT(clearAccountsCache())); |
8157 | 1478 |
connect(ui.pageAdmin, SIGNAL(bansListRequest()), hwnet, SLOT(getBanList())); |
1479 |
connect(ui.pageAdmin, SIGNAL(removeBan(QString)), hwnet, SLOT(removeBan(QString))); |
|
1480 |
connect(ui.pageAdmin, SIGNAL(banIP(QString,QString,int)), hwnet, SLOT(banIP(QString,QString,int))); |
|
1481 |
connect(ui.pageAdmin, SIGNAL(banNick(QString,QString,int)), hwnet, SLOT(banNick(QString,QString,int))); |
|
1924 | 1482 |
|
1898
f0ab0c77946d
Send scheme data over net (but recieving part isn't implemented yet)
unc0rr
parents:
1897
diff
changeset
|
1483 |
// disconnect |
6036 | 1484 |
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
|
1485 |
|
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1486 |
// config stuff |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1487 |
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
|
1488 |
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
|
1489 |
connect(hwnet, SIGNAL(configAsked()), ui.pageNetGame->pGameCFG, SLOT(fullNetConfig())); |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1490 |
|
9100 | 1491 |
// using proxy slot to prevent loss of game messages when they're sent to not yet connected slot of game object |
1492 |
connect(hwnet, SIGNAL(FromNet(const QByteArray &)), this, SLOT(FromNetProxySlot(const QByteArray &)), Qt::QueuedConnection); |
|
1493 |
||
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1494 |
//nick and pass stuff |
8986 | 1495 |
hwnet->m_private_game = !(hostName == NETGAME_DEFAULT_SERVER && port == NETGAME_DEFAULT_PORT); |
1496 |
if (hwnet->m_private_game == false && AskForNickAndPwd() != 0) |
|
1497 |
return; |
|
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1498 |
|
9057
903f50e85144
Default to random guest username in all places net/nick is fetched. Fixes issue #588
nemo
parents:
9033
diff
changeset
|
1499 |
QString nickname = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString(); |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1500 |
ui.pageRoomsList->setUser(nickname); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1501 |
ui.pageNetGame->setUser(nickname); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1502 |
|
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1503 |
hwnet->Connect(hostName, port, nickname); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1504 |
} |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1505 |
|
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1506 |
int HWForm::AskForNickAndPwd(void) |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1507 |
{ |
8181 | 1508 |
//remove temppasswordhash just in case |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1509 |
config->clearTempHash(); |
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1510 |
|
8181 | 1511 |
//initialize |
8986 | 1512 |
QString hash; |
1513 |
QString temphash; |
|
1514 |
QString nickname; |
|
8181 | 1515 |
QString password; |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1516 |
|
8986 | 1517 |
do { |
9057
903f50e85144
Default to random guest username in all places net/nick is fetched. Fixes issue #588
nemo
parents:
9033
diff
changeset
|
1518 |
nickname = config->value("net/nick",tr("Guest")+QString("%1").arg(rand())).toString(); |
8986 | 1519 |
hash = config->passwordHash(); |
1520 |
temphash = config->tempHash(); |
|
1521 |
||
1522 |
//if something from login is missing, start dialog loop |
|
1523 |
if (nickname.isEmpty() || hash.isEmpty()) { |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1524 |
//open dialog |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1525 |
HWPasswordDialog * pwDialog = new HWPasswordDialog(this); |
8364
fbc9bcc6c39d
Added "New account" button when connectiong to the official server
vitiv <nikita.utiu@gmail.com>
parents:
8357
diff
changeset
|
1526 |
// make the "new account" button dialog open a browser with the registration page |
fbc9bcc6c39d
Added "New account" button when connectiong to the official server
vitiv <nikita.utiu@gmail.com>
parents:
8357
diff
changeset
|
1527 |
connect(pwDialog->pbNewAccount, SIGNAL(clicked()), this, SLOT(openRegistrationPage())); |
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1528 |
pwDialog->cbSave->setChecked(config->value("net/savepassword", true).toBool()); |
8181 | 1529 |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1530 |
//if nickname is present, put it into the field |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1531 |
if (!nickname.isEmpty()) { |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1532 |
pwDialog->leNickname->setText(nickname); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1533 |
pwDialog->lePassword->setFocus(); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1534 |
} |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1535 |
|
12804
e6af1eb9e8ce
Fix broken cancel button on the login window (bug 373)
Wuzzy <Wuzzy2@mail.ru>
parents:
12761
diff
changeset
|
1536 |
//if dialog aborted, return failure |
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1537 |
if (pwDialog->exec() != QDialog::Accepted) { |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1538 |
delete pwDialog; |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1539 |
GoBack(); |
12804
e6af1eb9e8ce
Fix broken cancel button on the login window (bug 373)
Wuzzy <Wuzzy2@mail.ru>
parents:
12761
diff
changeset
|
1540 |
return 1; |
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1541 |
} |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1542 |
|
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1543 |
//set nick and pass from the dialog |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1544 |
nickname = pwDialog->leNickname->text(); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1545 |
password = pwDialog->lePassword->text(); |
8986 | 1546 |
bool save = pwDialog->cbSave->isChecked(); |
1547 |
//clean up |
|
1548 |
delete pwDialog; |
|
8181 | 1549 |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1550 |
//check the nickname variable |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1551 |
if (nickname.isEmpty()) { |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1552 |
int retry = RetryDialog(tr("Hedgewars - Empty nickname"), tr("No nickname supplied.")); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1553 |
GoBack(); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1554 |
if (retry) { |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1555 |
if (hwnet->m_private_game) { |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1556 |
QStringList list = hwnet->getHost().split(":"); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1557 |
NetConnectServer(list.at(0), list.at(1).toShort()); |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1558 |
} else |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1559 |
NetConnectOfficialServer(); |
8986 | 1560 |
} |
1561 |
break; //loop restart |
|
1562 |
} else { |
|
1563 |
//update nickname if it's fine |
|
1564 |
config->setValue("net/nick", nickname); |
|
1565 |
config->updNetNick(); |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1566 |
} |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1567 |
|
8986 | 1568 |
//check the password variable |
1569 |
if (password.isEmpty()) { |
|
1570 |
config->clearPasswordHash(); |
|
1571 |
break; |
|
1572 |
} else { |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1573 |
//calculate temphash and set it into config |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1574 |
temphash = QCryptographicHash::hash(password.toUtf8(), QCryptographicHash::Md5).toHex(); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1575 |
config->setTempHash(temphash); |
8181 | 1576 |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1577 |
//if user wants to save password |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1578 |
config->setValue("net/savepassword", save); |
8986 | 1579 |
if (save) { |
1580 |
// user wants to save password |
|
8407
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1581 |
ui.pageOptions->CBSavePassword->setChecked(true); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1582 |
config->setPasswordHash(temphash); |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1583 |
} |
686f2e716c97
Fixes password not actually saving when "save password" is checked in the HWPasswordDialog called by HWForm.
dag10 <gottlieb.drew@gmail.com>
parents:
8396
diff
changeset
|
1584 |
} |
8986 | 1585 |
} |
1586 |
} while (nickname.isEmpty() || (hash.isEmpty() && temphash.isEmpty())); //while a nickname, or both hashes are missing |
|
8294
0e5782b0dd54
Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8293
diff
changeset
|
1587 |
|
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1588 |
return 0; |
184 | 1589 |
} |
1590 |
||
314 | 1591 |
void HWForm::NetConnect() |
1592 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1593 |
HWHostPortDialog * hpd = new HWHostPortDialog(this); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1594 |
hpd->leHost->setText(*netHost); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1595 |
hpd->sbPort->setValue(netPort); |
653
4f44fc06ca45
Class to ask host/port to connect to ('Specify' button on PageNet)
unc0rr
parents:
647
diff
changeset
|
1596 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1597 |
if (hpd->exec() == QDialog::Accepted) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1598 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1599 |
config->SaveOptions(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1600 |
delete netHost; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1601 |
netHost = new QString(hpd->leHost->text()); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1602 |
netPort = hpd->sbPort->value(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1603 |
NetConnectServer(*netHost, netPort); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1604 |
} |
6907 | 1605 |
delete hpd; |
314 | 1606 |
} |
1607 |
||
1608 |
void HWForm::NetStartServer() |
|
1609 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1610 |
config->SaveOptions(); |
636 | 1611 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1612 |
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
|
1613 |
if (!pnetserver->StartServer(ui.pageNetServer->sbPort->value())) |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1614 |
{ |
8383 | 1615 |
MessageDialog::ShowErrorMessage(QMessageBox::tr("Unable to start server"), this); |
7794
ab7b94c03bc9
QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way
koda
parents:
7792
diff
changeset
|
1616 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1617 |
delete pnetserver; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1618 |
pnetserver = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1619 |
return; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1620 |
} |
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
|
1621 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1622 |
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
|
1623 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1624 |
pRegisterServer = new HWNetUdpServer(0, |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1625 |
ui.pageNetServer->leServerDescr->text(), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1626 |
ui.pageNetServer->sbPort->value()); |
1418 | 1627 |
} |
1628 |
||
1629 |
void HWForm::AsyncNetServerStart() |
|
1630 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1631 |
NetConnectServer("localhost", pnetserver->getRunningPort()); |
314 | 1632 |
} |
1633 |
||
184 | 1634 |
void HWForm::NetDisconnect() |
1635 |
{ |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1636 |
if(pnetserver) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1637 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1638 |
if (pRegisterServer) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1639 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1640 |
pRegisterServer->unregister(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1641 |
pRegisterServer = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1642 |
} |
659 | 1643 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1644 |
pnetserver->StopServer(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1645 |
delete pnetserver; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1646 |
pnetserver = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1647 |
} |
6225
505643d4c23d
disconnect when going back from lobby page (regression fix)
sheepluva
parents:
6223
diff
changeset
|
1648 |
|
505643d4c23d
disconnect when going back from lobby page (regression fix)
sheepluva
parents:
6223
diff
changeset
|
1649 |
if(hwnet) |
505643d4c23d
disconnect when going back from lobby page (regression fix)
sheepluva
parents:
6223
diff
changeset
|
1650 |
hwnet->Disconnect(); |
184 | 1651 |
} |
1652 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1653 |
void HWForm::ForcedDisconnect(const QString & reason) |
383 | 1654 |
{ |
8296
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1655 |
if (reason == "Reconnected too fast") { //TODO: this is a hack, which should be remade |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1656 |
bool retry = RetryDialog(tr("Hedgewars - Connection error"), tr("You reconnected too fast.\nPlease wait a few seconds and try again.")); |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1657 |
if (retry) { |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1658 |
if (hwnet->m_private_game) { |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1659 |
QStringList list = hwnet->getHost().split(":"); |
9063
5cab446e1341
Fix "try again" button in "reconnected to fast" dialog trying to connect to port 0
unc0rr
parents:
9057
diff
changeset
|
1660 |
NetConnectServer(list.at(0), list.at(1).toUInt()); |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1661 |
} else |
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1662 |
NetConnectOfficialServer(); |
8296
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1663 |
} |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1664 |
else { |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1665 |
while (ui.Pages->currentIndex() != ID_PAGE_NET |
8434 | 1666 |
&& ui.Pages->currentIndex() != ID_PAGE_MAIN) |
8296
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1667 |
{ |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1668 |
GoBack(); |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1669 |
} |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1670 |
} |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1671 |
return; |
455da122c0ad
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com>
parents:
8295
diff
changeset
|
1672 |
} |
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
|
1673 |
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
|
1674 |
return; // we have server - let it care of all things |
8720
5603527f9803
this should prevent the password prompt from appearing on local games (issue 548)
koda
parents:
8716
diff
changeset
|
1675 |
if (hwnet) { |
7794
ab7b94c03bc9
QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way
koda
parents:
7792
diff
changeset
|
1676 |
QString errorStr = QMessageBox::tr("Connection to server is lost") + (reason.isEmpty()?"":("\n\n" + HWNewNet::tr("Quit reason: ") + '"' + reason +'"')); |
8383 | 1677 |
MessageDialog::ShowErrorMessage(errorStr, this); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1678 |
} |
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
|
1679 |
|
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
|
1680 |
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
|
1681 |
&& ui.Pages->currentIndex() != ID_PAGE_MAIN) |
7803 | 1682 |
{ |
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
|
1683 |
GoBack(); |
7803 | 1684 |
} |
383 | 1685 |
} |
1686 |
||
1311 | 1687 |
void HWForm::NetConnected() |
1688 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1689 |
GoToPage(ID_PAGE_ROOMSLIST); |
1311 | 1690 |
} |
1691 |
||
184 | 1692 |
void HWForm::NetGameEnter() |
1693 |
{ |
|
8179
a1ffcb559f99
Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file
unc0rr
parents:
8157
diff
changeset
|
1694 |
ui.pageNetGame->chatWidget->clear(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1695 |
GoToPage(ID_PAGE_NETGAME); |
184 | 1696 |
} |
1697 |
||
339
7535ab6c3820
Run game message added, team and config info provided for net game
displacer
parents:
338
diff
changeset
|
1698 |
void HWForm::AddNetTeam(const HWTeam& team) |
184 | 1699 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1700 |
ui.pageNetGame->pNetTeamsWidget->addTeam(team); |
184 | 1701 |
} |
1702 |
||
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1703 |
void HWForm::RemoveNetTeam(const HWTeam& team) |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1704 |
{ |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1705 |
ui.pageNetGame->pNetTeamsWidget->removeNetTeam(team); |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1706 |
} |
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1707 |
|
184 | 1708 |
void HWForm::StartMPGame() |
1709 |
{ |
|
12222
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1710 |
int numHogs = ui.pageMultiplayer->teamsSelect->getNumHedgehogs(); |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1711 |
/* Don't allow to start game with >48 hogs. |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1712 |
TODO: Remove this as soon the engine supports more hogs. */ |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1713 |
if(numHogs > 48) |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1714 |
{ |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1715 |
MessageDialog::ShowErrorMessage(QMessageBox::tr("Sorry, Hedgewars can't be played with more than 48 hedgehogs. Please try again with fewer hedgehogs.\n\nCurrent number of hedgehogs: %1").arg(numHogs), this); |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1716 |
return; |
a6cd48b8ef61
Prevent frontend from starting game w/ >48 hogs
Wuzzy <almikes@aol.com>
parents:
11983
diff
changeset
|
1717 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1718 |
QString ammo; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1719 |
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
|
1720 |
ui.pageMultiplayer->gameCFG->WeaponsName->currentIndex() |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1721 |
).toString(); |
696 | 1722 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1723 |
CreateGame(ui.pageMultiplayer->gameCFG, ui.pageMultiplayer->teamsSelect, ammo); |
306 | 1724 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1725 |
game->StartLocal(); |
184 | 1726 |
} |
306 | 1727 |
|
1728 |
void HWForm::GameStateChanged(GameState gameState) |
|
1729 |
{ |
|
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
|
1730 |
quint8 id = ui.Pages->currentIndex(); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1731 |
switch(gameState) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1732 |
{ |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1733 |
case gsStarted: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1734 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1735 |
Music(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1736 |
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
|
1737 |
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
|
1738 |
ui.pageGameStats->clear(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1739 |
if (pRegisterServer) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1740 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1741 |
pRegisterServer->unregister(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1742 |
pRegisterServer = 0; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1743 |
} |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1744 |
//setVisible(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1745 |
setFocusPolicy(Qt::NoFocus); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1746 |
break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1747 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1748 |
case gsFinished: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1749 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1750 |
//setVisible(true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1751 |
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
|
1752 |
if (id == ID_PAGE_INGAME) GoBack(); |
8226
67f07ff5b593
Removed redundant "enable"s on checkboxes and variable names.
Mitchell Kember <mk12360@gmail.com>
parents:
8205
diff
changeset
|
1753 |
Music(ui.pageOptions->CBFrontendMusic->isChecked()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1754 |
if (wBackground) wBackground->startAnimation(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1755 |
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
|
1756 |
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
|
1757 |
if (game) game->netSuspend = false; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1758 |
break; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1759 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1760 |
default: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1761 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1762 |
//setVisible(true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1763 |
setFocusPolicy(Qt::StrongFocus); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1764 |
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
|
1765 |
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
|
1766 |
// 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
|
1767 |
(hwnet && hwnet->isRoomChief() && hwnet->isInRoom() && |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1768 |
(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
|
1769 |
{ |
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
|
1770 |
if (id == ID_PAGE_INGAME) GoBack(); |
8226
67f07ff5b593
Removed redundant "enable"s on checkboxes and variable names.
Mitchell Kember <mk12360@gmail.com>
parents:
8205
diff
changeset
|
1771 |
Music(ui.pageOptions->CBFrontendMusic->isChecked()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1772 |
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
|
1773 |
if (hwnet) hwnet->gameFinished(false); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1774 |
} |
4845 | 1775 |
if (gameState == gsHalted) close(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1776 |
}; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1777 |
} |
307 | 1778 |
} |
1779 |
||
696 | 1780 |
void HWForm::CreateGame(GameCFGWidget * gamecfg, TeamSelWidget* pTeamSelWidget, QString ammo) |
306 | 1781 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1782 |
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
|
1783 |
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
|
1784 |
connect(game, SIGNAL(GameStateChanged(GameState)), this, SLOT(GameStateChanged(GameState))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1785 |
connect(game, SIGNAL(GameStats(char, const QString &)), ui.pageGameStats, SLOT(GameStats(char, const QString &))); |
10307
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10108
diff
changeset
|
1786 |
connect(game, SIGNAL(ErrorMessage(const QString &)), this, SLOT(ShowFatalErrorMessage(const QString &)), Qt::QueuedConnection); |
7180 | 1787 |
connect(game, SIGNAL(HaveRecord(RecordType, const QByteArray &)), this, SLOT(GetRecord(RecordType, const QByteArray &))); |
5734 | 1788 |
m_lastDemo = QByteArray(); |
306 | 1789 |
} |
425 | 1790 |
|
7180 | 1791 |
void HWForm::GetRecord(RecordType type, const QByteArray & record) |
533 | 1792 |
{ |
7180 | 1793 |
if (type != rtNeither) |
1794 |
{ |
|
1795 |
QString filename; |
|
1796 |
QByteArray demo = record; |
|
1797 |
QString recordFileName = |
|
1798 |
config->appendDateTimeToRecordName() ? |
|
1799 |
QDateTime::currentDateTime().toString("yyyy-MM-dd_hh-mm") : |
|
1800 |
"LastRound"; |
|
1487
b4cc59a6d50a
Add an option to name records with current date and time
unc0rr
parents:
1427
diff
changeset
|
1801 |
|
8613
82c649dfc7c3
split cVersionString into its three separate components (version, revision, hash) and apply the new values sensibly on the frontend (esp. title, info and feedback)
koda
parents:
8609
diff
changeset
|
1802 |
recordFileName += "_" + *cRevisionString + "-" + *cHashString; |
4902
45ec26ca9491
if on dev version append hg revision id to demos/saves' filenames
sheepluva
parents:
4897
diff
changeset
|
1803 |
|
7180 | 1804 |
if (type == rtDemo) |
1805 |
{ |
|
1806 |
demo.replace(QByteArray("\x02TL"), QByteArray("\x02TD")); |
|
1807 |
demo.replace(QByteArray("\x02TN"), QByteArray("\x02TD")); |
|
1808 |
demo.replace(QByteArray("\x02TS"), QByteArray("\x02TD")); |
|
1809 |
filename = cfgdir->absolutePath() + "/Demos/" + recordFileName + "." + *cProtoVer + ".hwd"; |
|
1810 |
m_lastDemo = demo; |
|
1811 |
} |
|
1812 |
else |
|
1813 |
{ |
|
1814 |
demo.replace(QByteArray("\x02TL"), QByteArray("\x02TS")); |
|
1815 |
demo.replace(QByteArray("\x02TN"), QByteArray("\x02TS")); |
|
1816 |
filename = cfgdir->absolutePath() + "/Saves/" + recordFileName + "." + *cProtoVer + ".hws"; |
|
1817 |
} |
|
1818 |
||
1819 |
QFile demofile(filename); |
|
1820 |
if (!demofile.open(QIODevice::WriteOnly)) |
|
8383 | 1821 |
MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filename), this); |
7180 | 1822 |
else |
1823 |
{ |
|
1824 |
demofile.write(demo); |
|
1825 |
demofile.close(); |
|
1826 |
} |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1827 |
} |
533 | 1828 |
|
7392
bc3306c59a08
Correctly distinguish between game and real ticks while recording video,
Stepan777 <stepik-777@mail.ru>
parents:
7376
diff
changeset
|
1829 |
ui.pageVideos->startEncoding(record); |
533 | 1830 |
} |
587 | 1831 |
|
11973
1de4d6b35748
Mission recategorization into trainings, challenges and scenarios.
Wuzzy <almikes@aol.com>
parents:
11964
diff
changeset
|
1832 |
void HWForm::startTraining(const QString & scriptName, const QString & subFolder) |
587 | 1833 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1834 |
CreateGame(0, 0, 0); |
587 | 1835 |
|
11973
1de4d6b35748
Mission recategorization into trainings, challenges and scenarios.
Wuzzy <almikes@aol.com>
parents:
11964
diff
changeset
|
1836 |
game->StartTraining(scriptName, subFolder); |
3760 | 1837 |
} |
1838 |
||
1839 |
void HWForm::StartCampaign() |
|
1840 |
{ |
|
1841 |
CreateGame(0, 0, 0); |
|
11962 | 1842 |
QString camp = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString(); |
9290
478aa681e702
this seems to work ok, but I have to clean up the code
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9288
diff
changeset
|
1843 |
QString miss = campaignMissionInfo[ui.pageCampaign->CBMission->currentIndex()].script; |
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1844 |
QString campTeam = ui.pageCampaign->CBTeam->currentText(); |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1845 |
game->StartCampaign(camp, miss, campTeam); |
587 | 1846 |
} |
660 | 1847 |
|
1848 |
void HWForm::CreateNetGame() |
|
1849 |
{ |
|
9100 | 1850 |
// go back in pages to prevent user from being stuck on certain pages |
1851 |
if(ui.Pages->currentIndex() == ID_PAGE_GAMESTATS || |
|
1852 |
ui.Pages->currentIndex() == ID_PAGE_INGAME) |
|
1853 |
GoBack(); |
|
1854 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1855 |
QString ammo; |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1856 |
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
|
1857 |
ui.pageNetGame->pGameCFG->WeaponsName->currentIndex() |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1858 |
).toString(); |
1517 | 1859 |
|
6225
505643d4c23d
disconnect when going back from lobby page (regression fix)
sheepluva
parents:
6223
diff
changeset
|
1860 |
CreateGame(ui.pageNetGame->pGameCFG, ui.pageNetGame->pNetTeamsWidget, ammo); |
660 | 1861 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1862 |
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
|
1863 |
connect(game, SIGNAL(SendChat(const QString &)), hwnet, SLOT(chatLineToNet(const QString &))); |
10392 | 1864 |
connect(game, SIGNAL(SendConsoleCommand(const QString&)), hwnet, SLOT(consoleCommand(const QString&))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1865 |
connect(game, SIGNAL(SendTeamMessage(const QString &)), hwnet, SLOT(SendTeamMessage(const QString &))); |
7916 | 1866 |
connect(hwnet, SIGNAL(chatStringFromNet(const QString &)), game, SLOT(FromNetChat(const QString &)), Qt::QueuedConnection); |
660 | 1867 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1868 |
game->StartNet(); |
660 | 1869 |
} |
674 | 1870 |
|
1871 |
void HWForm::closeEvent(QCloseEvent *event) |
|
1872 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1873 |
config->SaveOptions(); |
11857 | 1874 |
#ifdef VIDEOREC |
7235
baa69bd025d9
1. Implement new page in frontend with options for video recording.
Stepan777 <stepik-777@mail.ru>
parents:
7180
diff
changeset
|
1875 |
config->SaveVideosOptions(); |
8266
927da572bcdc
will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build
mk12
parents:
8226
diff
changeset
|
1876 |
#endif |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1877 |
event->accept(); |
674 | 1878 |
} |
1235 | 1879 |
|
1880 |
void HWForm::Music(bool checked) |
|
1881 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1882 |
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
|
1883 |
SDLInteraction::instance().startMusic(); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1884 |
else |
6165
6fe3e922246e
moving and renaming SDLs.*, making it a singleton; cleaning up class responsibilties wrt SDLInteraction; some comments
sheepluva
parents:
6160
diff
changeset
|
1885 |
SDLInteraction::instance().stopMusic(); |
1235 | 1886 |
} |
1409
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1887 |
|
2345
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1888 |
void HWForm::NetGameChangeStatus(bool isMaster) |
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1889 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1890 |
if (isMaster) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1891 |
NetGameMaster(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1892 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1893 |
NetGameSlave(); |
2345
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1894 |
} |
daf1785f2337
- Frontend: reorganize code controlling widgets state, fix problems getting room admin status
unc0rr
parents:
2261
diff
changeset
|
1895 |
|
1409
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1896 |
void HWForm::NetGameMaster() |
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1897 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1898 |
ui.pageNetGame->setMasterMode(true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1899 |
ui.pageNetGame->restrictJoins->setChecked(false); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1900 |
ui.pageNetGame->restrictTeamAdds->setChecked(false); |
8559 | 1901 |
ui.pageNetGame->restrictUnregistered->setChecked(false); |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
1902 |
ui.pageNetGame->pGameCFG->GameSchemes->setModel(gameSchemeModel); |
8377 | 1903 |
ui.pageNetGame->pGameCFG->setMaster(true); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1904 |
ui.pageNetGame->pNetTeamsWidget->setInteractivity(true); |
2377 | 1905 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1906 |
if (hwnet) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1907 |
{ |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1908 |
// disconnect connections first to ensure their inexistance and not to connect twice |
8416
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
1909 |
ui.pageNetGame->BtnStart->disconnect(this); |
5126 | 1910 |
ui.pageNetGame->BtnUpdate->disconnect(hwnet); |
8415
02acf6b92f52
Moved room name edit box from footer to top of page. Also shows room name when in slave mode.
dag10
parents:
8407
diff
changeset
|
1911 |
ui.pageNetGame->leRoomName->disconnect(hwnet); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1912 |
ui.pageNetGame->restrictJoins->disconnect(hwnet); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1913 |
ui.pageNetGame->restrictTeamAdds->disconnect(hwnet); |
8559 | 1914 |
ui.pageNetGame->restrictUnregistered->disconnect(hwnet); |
7122
fa2d09868ac6
Fix reported in bug #327, comment #3 - untested but seems reasonable/safe.
nemo
parents:
7015
diff
changeset
|
1915 |
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
|
1916 |
|
fd5bcbd698a5
- Keep track of room name so correct name is displayed when you become room admin
unc0rr
parents:
7679
diff
changeset
|
1917 |
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
|
1918 |
|
8416
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
1919 |
connect(ui.pageNetGame->BtnStart, SIGNAL(clicked()), this, SLOT(startGame())); |
7122
fa2d09868ac6
Fix reported in bug #327, comment #3 - untested but seems reasonable/safe.
nemo
parents:
7015
diff
changeset
|
1920 |
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
|
1921 |
connect(ui.pageNetGame->restrictJoins, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictJoins())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1922 |
connect(ui.pageNetGame->restrictTeamAdds, SIGNAL(triggered()), hwnet, SLOT(toggleRestrictTeamAdds())); |
8559 | 1923 |
connect(ui.pageNetGame->restrictUnregistered, SIGNAL(triggered()), hwnet, SLOT(toggleRegisteredOnly())); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1924 |
connect(ui.pageNetGame->pGameCFG->GameSchemes->model(), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1925 |
SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1926 |
ui.pageNetGame->pGameCFG, |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1927 |
SLOT(resendSchemeData()) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1928 |
); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1929 |
} |
1409
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1930 |
} |
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1931 |
|
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1932 |
void HWForm::NetGameSlave() |
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1933 |
{ |
8377 | 1934 |
ui.pageNetGame->pGameCFG->setMaster(false); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1935 |
ui.pageNetGame->pNetTeamsWidget->setInteractivity(false); |
2377 | 1936 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1937 |
if (hwnet) |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1938 |
{ |
13202
0bc5f618ca7c
Rename the misleadingly-named AmmoSchemeModel to GameSchemeModel
Wuzzy <Wuzzy2@mail.ru>
parents:
13091
diff
changeset
|
1939 |
NetGameSchemeModel * netAmmo = new NetGameSchemeModel(hwnet); |
10721
9b789de8e5df
Workaround bug (each time losing room master status, even when joining mutliple rooms, new instance of NetAmmoSchemeModel created, receiving schemeConfig and modifying its 43rd member, thus the last model which accepts this signal has the string cut down several times, workaround creates copy of qstringlist to avoid modifying shared message instance. Proper fix would delete unneeded instances of NetAmmoSchemeModel, but who cares)
unc0rr
parents:
10392
diff
changeset
|
1940 |
connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), netAmmo, SLOT(setNetSchemeConfig(QStringList))); |
8893
8f92e94d0b32
Don't set Default scheme/ammo when switching script if not room admin. Prevents game config desync.
unc0rr
parents:
8891
diff
changeset
|
1941 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1942 |
ui.pageNetGame->pGameCFG->GameSchemes->setModel(netAmmo); |
1899
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1943 |
|
8415
02acf6b92f52
Moved room name edit box from footer to top of page. Also shows room name when in slave mode.
dag10
parents:
8407
diff
changeset
|
1944 |
ui.pageNetGame->setRoomName(hwnet->getRoom()); |
02acf6b92f52
Moved room name edit box from footer to top of page. Also shows room name when in slave mode.
dag10
parents:
8407
diff
changeset
|
1945 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1946 |
ui.pageNetGame->pGameCFG->GameSchemes->view()->disconnect(hwnet); |
10801 | 1947 |
connect(hwnet, SIGNAL(netSchemeConfig(QStringList)), |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1948 |
this, SLOT(selectFirstNetScheme())); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1949 |
} |
1899
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1950 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1951 |
ui.pageNetGame->setMasterMode(false); |
1409
d1cbe4a57ebf
Add button for controlling room options (no usefull yet)
unc0rr
parents:
1405
diff
changeset
|
1952 |
} |
1600 | 1953 |
|
9100 | 1954 |
void HWForm::FromNetProxySlot(const QByteArray & msg) |
1955 |
{ |
|
1956 |
if(game) |
|
1957 |
game->FromNet(msg); |
|
1958 |
||
1959 |
} |
|
1960 |
||
1899
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1961 |
void HWForm::selectFirstNetScheme() |
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1962 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1963 |
ui.pageNetGame->pGameCFG->GameSchemes->setCurrentIndex(0); |
1899
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1964 |
} |
5763f46d7486
Sync schemes config over net should work now (untested)
unc0rr
parents:
1898
diff
changeset
|
1965 |
|
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1966 |
void HWForm::NetLeftRoom(const QString & reason) |
1600 | 1967 |
{ |
4433 | 1968 |
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
|
1969 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1970 |
GoBack(); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1971 |
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
|
1972 |
ui.pageRoomsList->displayNotice(reason); |
5998
e8f44e9433f0
many many netclient/frondent changes (just the beginning though):
sheepluva
parents:
5907
diff
changeset
|
1973 |
} |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1974 |
else |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1975 |
qWarning("Left room while not in room"); |
1600 | 1976 |
} |
2012 | 1977 |
|
1978 |
void HWForm::resizeEvent(QResizeEvent * event) |
|
1979 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1980 |
int w = event->size().width(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2874
diff
changeset
|
1981 |
int h = event->size().height(); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1982 |
if (wBackground) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
1983 |
{ |
2098
c977d7f2aa09
Toggle for stars ("frontend effects") - also turns off optimisations for stars that were causing problems onone machine
nemo
parents:
2080
diff
changeset
|
1984 |
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
|
1985 |
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
|
1986 |
} |
2012 | 1987 |
} |
3760 | 1988 |
|
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1989 |
void HWForm::InitCampaignPage() |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1990 |
{ |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1991 |
ui.pageCampaign->CBCampaign->clear(); |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1992 |
HWTeam team(ui.pageCampaign->CBTeam->currentText()); |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1993 |
|
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1994 |
QStringList entries = DataManager::instance().entryList( |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1995 |
"Missions/Campaign", |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1996 |
QDir::Dirs, |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1997 |
QStringList("[^\\.]*") |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1998 |
); |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
1999 |
|
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
2000 |
unsigned int n = entries.count(); |
11953
6da9bb4b3449
Show check marks for campaigns with Won=true
Wuzzy <almikes@aol.com>
parents:
11870
diff
changeset
|
2001 |
|
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
2002 |
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
|
2003 |
{ |
12310 | 2004 |
const QString & campaignName = entries[i]; |
11953
6da9bb4b3449
Show check marks for campaigns with Won=true
Wuzzy <almikes@aol.com>
parents:
11870
diff
changeset
|
2005 |
QString tName = team.name(); |
11962 | 2006 |
ui.pageCampaign->CBCampaign->addItem(getRealCampName(campaignName), campaignName); |
7201
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
2007 |
} |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
2008 |
} |
dc17ffdf0702
The first campaign commit with a lot of changes...
belphegorr <szabibibi@gmail.com>
parents:
7122
diff
changeset
|
2009 |
|
3760 | 2010 |
void HWForm::UpdateCampaignPage(int index) |
2011 |
{ |
|
4560
5d6c7f88db73
- Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents:
4536
diff
changeset
|
2012 |
Q_UNUSED(index); |
3760 | 2013 |
HWTeam team(ui.pageCampaign->CBTeam->currentText()); |
11962 | 2014 |
QString campaignName = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString(); |
10017 | 2015 |
QString tName = team.name(); |
2016 |
||
2017 |
campaignMissionInfo = getCampMissionList(campaignName,tName); |
|
2018 |
ui.pageCampaign->CBMission->clear(); |
|
2019 |
||
9292
187ce630dddc
y! code clean up :)
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9290
diff
changeset
|
2020 |
for(int i=0;i<campaignMissionInfo.size();i++) |
9182
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
2021 |
{ |
11963
de66192866d3
Make campaign mission names translatable
Wuzzy <almikes@aol.com>
parents:
11962
diff
changeset
|
2022 |
ui.pageCampaign->CBMission->addItem(QString(campaignMissionInfo[i].realName), QString(campaignMissionInfo[i].name)); |
11956
b05db9ca6e1c
Add support for storing and displaying success of campaign missions
Wuzzy <almikes@aol.com>
parents:
11955
diff
changeset
|
2023 |
if(isMissionWon(campaignName, i, tName)) |
b05db9ca6e1c
Add support for storing and displaying success of campaign missions
Wuzzy <almikes@aol.com>
parents:
11955
diff
changeset
|
2024 |
ui.pageCampaign->CBMission->setItemIcon(i, finishedIcon); |
b05db9ca6e1c
Add support for storing and displaying success of campaign missions
Wuzzy <almikes@aol.com>
parents:
11955
diff
changeset
|
2025 |
else |
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
2026 |
ui.pageCampaign->CBMission->setItemIcon(i, notFinishedIcon); |
10017 | 2027 |
} |
9182
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
2028 |
} |
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
2029 |
|
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2030 |
void HWForm::UpdateCampaignPageTeam(int index) |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2031 |
{ |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2032 |
Q_UNUSED(index); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2033 |
HWTeam team(ui.pageCampaign->CBTeam->currentText()); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2034 |
QString tName = team.name(); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2035 |
|
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2036 |
QStringList entries = DataManager::instance().entryList( |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2037 |
"Missions/Campaign", |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2038 |
QDir::Dirs, |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2039 |
QStringList("[^\\.]*") |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2040 |
); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2041 |
|
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2042 |
unsigned int n = entries.count(); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2043 |
|
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2044 |
for(unsigned int i = 0; i < n; i++) |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2045 |
{ |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2046 |
QString campaignName = QString(entries[i]).replace(QString(" "),QString("_")); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2047 |
if(isCampWon(campaignName, tName)) |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2048 |
ui.pageCampaign->CBCampaign->setItemIcon(i, finishedIcon); |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2049 |
else |
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
2050 |
ui.pageCampaign->CBCampaign->setItemIcon(i, notFinishedIcon); |
11955
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2051 |
} |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2052 |
} |
3792a9f9fa9c
Update campaign victory status when changing selection
Wuzzy <almikes@aol.com>
parents:
11953
diff
changeset
|
2053 |
|
9219 | 2054 |
void HWForm::UpdateCampaignPageMission(int index) |
2055 |
{ |
|
9292
187ce630dddc
y! code clean up :)
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9290
diff
changeset
|
2056 |
// update thumbnail and description |
11962 | 2057 |
QString campaignName = ui.pageCampaign->CBCampaign->itemData(ui.pageCampaign->CBCampaign->currentIndex()).toString(); |
9182
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
2058 |
// when campaign changes the UpdateCampaignPageMission is triggered with wrong values |
f92e205bc167
issue 562, image and description for the campaign page
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9163
diff
changeset
|
2059 |
// this will cause segfault. This check prevents illegal memory reads |
9292
187ce630dddc
y! code clean up :)
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9290
diff
changeset
|
2060 |
if(index > -1 && index < campaignMissionInfo.count()) { |
9219 | 2061 |
ui.pageCampaign->lbltitle->setText("<h2>"+ui.pageCampaign->CBMission->currentText()+"</h2>"); |
9290
478aa681e702
this seems to work ok, but I have to clean up the code
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9288
diff
changeset
|
2062 |
ui.pageCampaign->lbldescription->setText(campaignMissionInfo[index].description); |
10017 | 2063 |
ui.pageCampaign->btnPreview->setIcon(QIcon(campaignMissionInfo[index].image)); |
9219 | 2064 |
} |
3760 | 2065 |
} |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
2066 |
|
7490
c422845b8d1f
Fixed a typo, frontend is now working properly
belphegorr <szabibibi@gmail.com>
parents:
7411
diff
changeset
|
2067 |
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
|
2068 |
{ |
7679 | 2069 |
Q_UNUSED(index); |
2070 |
||
9641
b08c8bde57e3
fixes bug that doesn't display mission name in drop down list
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9482
diff
changeset
|
2071 |
QString missionTitle = ui.pageCampaign->CBMission->currentText(); |
7679 | 2072 |
UpdateCampaignPage(0); |
9641
b08c8bde57e3
fixes bug that doesn't display mission name in drop down list
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9482
diff
changeset
|
2073 |
for(int i=0;i<ui.pageCampaign->CBMission->count();i++) |
b08c8bde57e3
fixes bug that doesn't display mission name in drop down list
Periklis Ntanasis <pntanasis@gmail.com>
parents:
9482
diff
changeset
|
2074 |
{ |
11963
de66192866d3
Make campaign mission names translatable
Wuzzy <almikes@aol.com>
parents:
11962
diff
changeset
|
2075 |
if (ui.pageCampaign->CBMission->itemData(i)==missionTitle) |
10017 | 2076 |
{ |
2077 |
ui.pageCampaign->CBMission->setCurrentIndex(i); |
|
2078 |
break; |
|
2079 |
} |
|
2080 |
} |
|
11960
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2081 |
int i = ui.pageCampaign->CBCampaign->currentIndex(); |
11962 | 2082 |
QString campaignName = ui.pageCampaign->CBCampaign->itemData(i).toString(); |
11960
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2083 |
HWTeam team(ui.pageCampaign->CBTeam->currentText()); |
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2084 |
QString tName = team.name(); |
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2085 |
if(isCampWon(campaignName, tName)) |
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2086 |
ui.pageCampaign->CBCampaign->setItemIcon(i, finishedIcon); |
d72a177dbaea
Update campaign drop-down list after campaign victory
Wuzzy <almikes@aol.com>
parents:
11956
diff
changeset
|
2087 |
else |
11983
4a2da00bbedc
Align drop-down text of unfinished campaign missions with finished icons
Wuzzy <almikes@aol.com>
parents:
11973
diff
changeset
|
2088 |
ui.pageCampaign->CBCampaign->setItemIcon(i, notFinishedIcon); |
3760 | 2089 |
} |
3932 | 2090 |
|
5213
a86768368309
make the associate button use the user's settings for loading demos/saves
nemo
parents:
5205
diff
changeset
|
2091 |
// 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
|
2092 |
QString HWForm::getDemoArguments() |
a86768368309
make the associate button use the user's settings for loading demos/saves
nemo
parents:
5205
diff
changeset
|
2093 |
{ |
8307 | 2094 |
|
8643 | 2095 |
QString prefix = "\"" + datadir->absolutePath() + "\""; |
2096 |
QString userPrefix = "\"" + cfgdir->absolutePath() + "\""; |
|
9163
67334acaaac7
port all Q_WS_* to Q_OS_* so that we are forward compatible with Qt5
koda
parents:
9100
diff
changeset
|
2097 |
#ifdef Q_OS_WIN |
8307 | 2098 |
prefix = prefix.replace("/","\\"); |
2099 |
userPrefix = userPrefix.replace("/","\\"); |
|
8302
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2100 |
#endif |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2101 |
|
8354
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8346
diff
changeset
|
2102 |
std::pair<QRect, QRect> resolutions = config->vid_ResolutionPair(); |
8307 | 2103 |
return QString("--prefix " + prefix |
2104 |
+ " --user-prefix " + userPrefix |
|
8354
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8346
diff
changeset
|
2105 |
+ " --fullscreen-width " + QString::number(resolutions.first.width()) |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8346
diff
changeset
|
2106 |
+ " --fullscreen-height " + QString::number(resolutions.first.height()) |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8346
diff
changeset
|
2107 |
+ " --width " + QString::number(resolutions.second.width()) |
c25bee85d6f8
Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com>
parents:
8346
diff
changeset
|
2108 |
+ " --height " + QString::number(resolutions.second.height()) |
8302
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2109 |
+ " --volume " + QString::number(config->volume()) |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2110 |
+ (config->isMusicEnabled() ? "" : " --nomusic") |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2111 |
+ (config->isSoundEnabled() ? "" : " --nosound") |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2112 |
+ " --locale " + config->language() + ".txt" |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2113 |
+ (config->vid_Fullscreen() ? " --fullscreen" : "") |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2114 |
+ (config->isShowFPSEnabled() ? " --showfps" : "") |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2115 |
+ (config->isAltDamageEnabled() ? " --altdmg" : "") |
a7934cd12469
improve engine cmd line parsing and its documentation
RowanD
parents:
8299
diff
changeset
|
2116 |
+ " --frame-interval " + QString::number(config->timerInterval()) |
9249 | 2117 |
+ " --raw-quality " + QString::number(config->translateQuality())) |
2118 |
+ (!config->Form->ui.pageOptions->CBTeamTag->isChecked() ? " --no-teamtag" : "") |
|
2119 |
+ (!config->Form->ui.pageOptions->CBHogTag->isChecked() ? " --no-hogtag" : "") |
|
2120 |
+ (!config->Form->ui.pageOptions->CBHealthTag->isChecked() ? " --no-healthtag" : "") |
|
2121 |
+ (config->Form->ui.pageOptions->CBTagOpacity->isChecked() ? " --translucent-tags" : ""); |
|
5213
a86768368309
make the associate button use the user's settings for loading demos/saves
nemo
parents:
5205
diff
changeset
|
2122 |
} |
a86768368309
make the associate button use the user's settings for loading demos/saves
nemo
parents:
5205
diff
changeset
|
2123 |
|
3932 | 2124 |
void HWForm::AssociateFiles() |
2125 |
{ |
|
4084
0d0bf0533eee
Add opendesktop association of files for non-windows. NEEDS TESTING.
nemo
parents:
3940
diff
changeset
|
2126 |
bool success = true; |
5222 | 2127 |
QString arguments = getDemoArguments(); |
4084
0d0bf0533eee
Add opendesktop association of files for non-windows. NEEDS TESTING.
nemo
parents:
3940
diff
changeset
|
2128 |
#ifdef _WIN32 |
3932 | 2129 |
QSettings registry_hkcr("HKEY_CLASSES_ROOT", QSettings::NativeFormat); |
8722
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2130 |
|
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2131 |
// file extension(s) |
3932 | 2132 |
registry_hkcr.setValue(".hwd/Default", "Hedgewars.Demo"); |
2133 |
registry_hkcr.setValue(".hws/Default", "Hedgewars.Save"); |
|
2134 |
registry_hkcr.setValue("Hedgewars.Demo/Default", tr("Hedgewars Demo File", "File Types")); |
|
2135 |
registry_hkcr.setValue("Hedgewars.Save/Default", tr("Hedgewars Save File", "File Types")); |
|
2136 |
registry_hkcr.setValue("Hedgewars.Demo/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwdfile.ico\",0"); |
|
2137 |
registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",0"); |
|
8643 | 2138 |
registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1"); |
2139 |
registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" " + arguments + " %1"); |
|
8722
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2140 |
|
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2141 |
// custom url scheme(s) |
8766
ce153d705fff
scheme association for linux (although it stops during connection)
koda
parents:
8722
diff
changeset
|
2142 |
registry_hkcr.setValue("hwplay/Default", "\"URL:Hedgewars ServerAccess Scheme\""); |
8722
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2143 |
registry_hkcr.setValue("hwplay/URL Protocol", ""); |
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2144 |
registry_hkcr.setValue("hwplay/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\",0"); |
2dead6b84bca
this should supposedly add hwplay:// schemes to windows, after user presses file association
koda
parents:
8720
diff
changeset
|
2145 |
registry_hkcr.setValue("hwplay/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hedgewars.exe\" %1"); |
4090 | 2146 |
#elif defined __APPLE__ |
5252 | 2147 |
// only useful when other apps have taken precedence over our file extensions and you want to reset it |
2148 |
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>'"); |
|
2149 |
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>'"); |
|
2150 |
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
|
2151 |
#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
|
2152 |
// 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 | 2153 |
if (success) success = checkForDir(QDir::home().absolutePath() + "/.local"); |
2154 |
if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share"); |
|
2155 |
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
|
2156 |
if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share/mime/packages"); |
4085 | 2157 |
if (success) success = checkForDir(QDir::home().absolutePath() + "/.local"); |
2158 |
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
|
2159 |
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
|
2160 |
if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars-mimeinfo.xml "+QDir::home().absolutePath()+"/.local/share/mime/packages").toLocal8Bit().constData())==0; |
8766
ce153d705fff
scheme association for linux (although it stops during connection)
koda
parents:
8722
diff
changeset
|
2161 |
if (success) success = system(("cp "+datadir->absolutePath()+"/misc/hedgewars.desktop "+QDir::home().absolutePath()+"/.local/share/applications").toLocal8Bit().constData())==0; |
4084
0d0bf0533eee
Add opendesktop association of files for non-windows. NEEDS TESTING.
nemo
parents:
3940
diff
changeset
|
2162 |
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
|
2163 |
if (success) success = system(("update-mime-database "+QDir::home().absolutePath()+"/.local/share/mime").toLocal8Bit().constData())==0; |
8766
ce153d705fff
scheme association for linux (although it stops during connection)
koda
parents:
8722
diff
changeset
|
2164 |
if (success) success = system("xdg-mime default hedgewars.desktop x-scheme-handler/hwplay")==0; |
4091
f89b8d0afbe1
set as default type, add icon. going to assume the icon was installed already. should happen in most packaging out there.
nemo
parents:
4090
diff
changeset
|
2165 |
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
|
2166 |
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
|
2167 |
// hack to add user's settings to hwengine. might be better at this point to read in the file, append it, and write it out to its new home. This assumes no spaces in the data dir path |
8639 | 2168 |
if (success) success = system(("sed -i 's|^\\(Exec=.*\\) \\(%f\\)|\\1 \\2 "+arguments+"|' "+QDir::home().absolutePath()+"/.local/share/applications/hwengine.desktop").toLocal8Bit().constData())==0; |
4084
0d0bf0533eee
Add opendesktop association of files for non-windows. NEEDS TESTING.
nemo
parents:
3940
diff
changeset
|
2169 |
#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
|
2170 |
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
|
2171 |
{ |
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
|
2172 |
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
|
2173 |
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
|
2174 |
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
|
2175 |
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
|
2176 |
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
|
2177 |
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
|
2178 |
} |
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
|
2179 |
else |
8383 | 2180 |
MessageDialog::ShowErrorMessage(QMessageBox::tr("File association failed."), this); |
3932 | 2181 |
} |
3937 | 2182 |
|
8434 | 2183 |
void HWForm::openRegistrationPage() |
8364
fbc9bcc6c39d
Added "New account" button when connectiong to the official server
vitiv <nikita.utiu@gmail.com>
parents:
8357
diff
changeset
|
2184 |
{ |
11835 | 2185 |
QDesktopServices::openUrl(QUrl("https://www.hedgewars.org/user/register")); |
8434 | 2186 |
} |
8364
fbc9bcc6c39d
Added "New account" button when connectiong to the official server
vitiv <nikita.utiu@gmail.com>
parents:
8357
diff
changeset
|
2187 |
|
5734 | 2188 |
void HWForm::saveDemoWithCustomName() |
2189 |
{ |
|
2190 |
if(!m_lastDemo.isEmpty()) |
|
2191 |
{ |
|
2192 |
QString fileName; |
|
2193 |
bool ok = false; |
|
2194 |
do |
|
2195 |
{ |
|
2196 |
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
|
2197 |
|
5734 | 2198 |
if(!fileName.isEmpty()) |
2199 |
{ |
|
2200 |
QString filePath = cfgdir->absolutePath() + "/Demos/" + fileName + "." + *cProtoVer + ".hwd"; |
|
2201 |
QFile demofile(filePath); |
|
2202 |
ok = demofile.open(QIODevice::WriteOnly); |
|
2203 |
if (!ok) |
|
8383 | 2204 |
MessageDialog::ShowErrorMessage(tr("Cannot save record to file %1").arg(filePath), this); |
5734 | 2205 |
else |
2206 |
{ |
|
2207 |
ok = -1 != demofile.write(m_lastDemo); |
|
2208 |
demofile.close(); |
|
2209 |
} |
|
2210 |
} |
|
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
2211 |
} |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6604
diff
changeset
|
2212 |
while(!fileName.isEmpty() && !ok); |
5734 | 2213 |
} |
5746
fbc52bb92cad
Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself)
unc0rr
parents:
5734
diff
changeset
|
2214 |
} |
fbc52bb92cad
Use QTextBrowser instead of WebKit for downloadable contents page (currently only shows the page itself)
unc0rr
parents:
5734
diff
changeset
|
2215 |
|
8901
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2216 |
void HWForm::restartGame() |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2217 |
{ |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2218 |
// get rid off old game stats page |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2219 |
if(ui.Pages->currentIndex() == ID_PAGE_GAMESTATS) |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2220 |
GoBack(); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2221 |
|
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2222 |
CreateGame(lastGameCfg, lastGameTeamSel, lastGameAmmo); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2223 |
|
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2224 |
switch(lastGameType) { |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2225 |
case gtTraining: |
11973
1de4d6b35748
Mission recategorization into trainings, challenges and scenarios.
Wuzzy <almikes@aol.com>
parents:
11964
diff
changeset
|
2226 |
game->StartTraining(lastGameStartArgs.at(0).toString(), lastTrainingSubFolder); |
8901
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2227 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2228 |
case gtQLocal: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2229 |
game->StartQuick(); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2230 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2231 |
case gtCampaign: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2232 |
game->StartCampaign(lastGameStartArgs.at(0).toString(), lastGameStartArgs.at(1).toString(), lastGameStartArgs.at(2).toString()); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2233 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2234 |
case gtLocal: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2235 |
game->StartLocal(); |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2236 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2237 |
default: |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2238 |
break; |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2239 |
} |
505307b9735d
implementation of a restart-game button. location and appearance is not final :P
thunderstruck
parents:
8893
diff
changeset
|
2240 |
} |
6561 | 2241 |
|
10307
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10108
diff
changeset
|
2242 |
void HWForm::ShowFatalErrorMessage(const QString & msg) |
8383 | 2243 |
{ |
10307
e13d3147f15b
do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...
sheepluva
parents:
10108
diff
changeset
|
2244 |
MessageDialog::ShowFatalMessage(msg, this); |
8383 | 2245 |
} |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
2246 |
|
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
2247 |
void HWForm::showFeedbackDialog() |
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
2248 |
{ |
11835 | 2249 |
QNetworkRequest newRequest(QUrl("https://www.hedgewars.org")); |
8878 | 2250 |
|
2251 |
QNetworkAccessManager *manager = new QNetworkAccessManager(this); |
|
2252 |
QNetworkReply *reply = manager->get(newRequest); |
|
2253 |
connect(reply, SIGNAL(finished()), this, SLOT(showFeedbackDialogNetChecked())); |
|
2254 |
} |
|
2255 |
||
2256 |
void HWForm::showFeedbackDialogNetChecked() |
|
2257 |
{ |
|
2258 |
QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); |
|
2259 |
||
12679
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2260 |
if (reply) { |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2261 |
switch (reply->error()) { |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2262 |
case QNetworkReply::NoError: |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2263 |
{ |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2264 |
FeedbackDialog dialog(this); |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2265 |
dialog.exec(); |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2266 |
} |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2267 |
break; |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2268 |
case QNetworkReply::UnknownNetworkError: |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2269 |
MessageDialog::ShowFatalMessage( |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2270 |
tr("Unknown network error (possibly missing SSL library)."), this); |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2271 |
break; |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2272 |
default: |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2273 |
MessageDialog::ShowFatalMessage( |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2274 |
QString(tr("This feature requires an Internet connection, but you don't appear to be online (error code: %1).")).arg(reply->error()), this); |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2275 |
break; |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2276 |
} |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2277 |
} |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2278 |
else { |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2279 |
MessageDialog::ShowFatalMessage(tr("Internal error: Reply object is invalid."), this); |
8d266b2d0f9c
Improve error messages when feedback or DLC fail to reach Internet
alfadur
parents:
12672
diff
changeset
|
2280 |
} |
8385
9e8924ff9813
Convert feedback page to dialog (+some fixes from unC0Rr)
dag10
parents:
8384
diff
changeset
|
2281 |
} |
8416
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2282 |
|
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2283 |
void HWForm::startGame() |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2284 |
{ |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2285 |
QMessageBox questionMsg(this); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2286 |
questionMsg.setIcon(QMessageBox::Question); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2287 |
questionMsg.setWindowTitle(QMessageBox::tr("Not all players are ready")); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2288 |
questionMsg.setText(QMessageBox::tr("Are you sure you want to start this game?\nNot all players are ready.")); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2289 |
questionMsg.setWindowModality(Qt::WindowModal); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2290 |
questionMsg.addButton(QMessageBox::Yes); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2291 |
questionMsg.addButton(QMessageBox::Cancel); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2292 |
|
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2293 |
if (hwnet->allPlayersReady() || questionMsg.exec() == QMessageBox::Yes) |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2294 |
hwnet->startGame(); |
e691acd778f5
It is now possible to start a game even if not all players are "ready"; a confirmation prompt is shown. This commit updates the server.
dag10
parents:
8415
diff
changeset
|
2295 |
} |