author | Wuzzy <Wuzzy2@mail.ru> |
Sun, 19 May 2019 23:52:13 +0200 | |
changeset 15016 | bea068dd9356 |
parent 15015 | 5d8068ee16fc |
child 15165 | 4c13bc464c61 |
permissions | -rw-r--r-- |
184 | 1 |
/* |
1066 | 2 |
* Hedgewars, a free turn based strategy game |
6700 | 3 |
* Copyright (c) 2006-2012 Igor Ulyanov <iulyanov@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:
9745
diff
changeset
|
16 |
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
184 | 17 |
*/ |
18 |
||
10462
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
19 |
#include <QBitmap> |
184 | 20 |
#include <QBuffer> |
21 |
#include <QColor> |
|
8377 | 22 |
#include <QDebug> |
23 |
#include <QFile> |
|
24 |
#include <QFileDialog> |
|
10462
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
25 |
#include <QIcon> |
8377 | 26 |
#include <QInputDialog> |
10462
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
27 |
#include <QLabel> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
28 |
#include <QLinearGradient> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
29 |
#include <QLineEdit> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
30 |
#include <QListView> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
31 |
#include <QListWidget> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
32 |
#include <QListWidgetItem> |
8377 | 33 |
#include <QMessageBox> |
10462
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
34 |
#include <QPainter> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
35 |
#include <QPushButton> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
36 |
#include <QSlider> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
37 |
#include <QStringListModel> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
38 |
#include <QTextStream> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
39 |
#include <QUuid> |
dd3cf0c91cc9
A slider for controlling things like bumpiness of map and tunnel sizes.
nemo
parents:
10394
diff
changeset
|
40 |
#include <QVBoxLayout> |
249 | 41 |
|
42 |
#include "hwconsts.h" |
|
788
00720357601f
- Get rid of PageSimpleGame, now pressing 'quick game' just starts round
unc0rr
parents:
682
diff
changeset
|
43 |
#include "mapContainer.h" |
8377 | 44 |
#include "themeprompt.h" |
45 |
#include "seedprompt.h" |
|
1209 | 46 |
#include "igbox.h" |
5252 | 47 |
#include "HWApplication.h" |
7258 | 48 |
#include "ThemeModel.h" |
184 | 49 |
|
8377 | 50 |
|
51 |
||
184 | 52 |
HWMapContainer::HWMapContainer(QWidget * parent) : |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
53 |
QWidget(parent), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
54 |
mainLayout(this), |
3133 | 55 |
pMap(0), |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
56 |
mapgen(MAPGEN_REGULAR), |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
57 |
m_previewSize(256, 128) |
184 | 58 |
{ |
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
59 |
// don't show preview anything until first show event |
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
60 |
m_previewEnabled = false; |
9744 | 61 |
m_missionsViewSetup = false; |
62 |
m_staticViewSetup = false; |
|
10159 | 63 |
m_script = QString(); |
10477
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
64 |
m_prevMapFeatureSize = 12; |
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
65 |
m_mapFeatureSize = 12; |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
66 |
m_withoutDLC = false; |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
67 |
m_missingMap = false; |
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
68 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
69 |
hhSmall.load(":/res/hh_small.png"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
70 |
hhLimit = 18; |
1797 | 71 |
templateFilter = 0; |
8377 | 72 |
m_master = true; |
2377 | 73 |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
74 |
linearGradNormal = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
75 |
linearGradNormal.setColorAt(1, QColor(0, 0, 192)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
76 |
linearGradNormal.setColorAt(0, QColor(66, 115, 225)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
77 |
|
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
78 |
linearGradLoading = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
79 |
linearGradLoading.setColorAt(1, QColor(58, 58, 137)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
80 |
linearGradLoading.setColorAt(0, QColor(90, 109, 153)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
81 |
|
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
82 |
linearGradMapError = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
83 |
linearGradMapError.setColorAt(1, QColor(255, 1, 0)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
84 |
linearGradMapError.setColorAt(0, QColor(255, 119, 0)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
85 |
|
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
86 |
linearGradNoPreview = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
87 |
linearGradNoPreview.setColorAt(1, QColor(15, 9, 72)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
88 |
linearGradNoPreview.setColorAt(0, QColor(15, 9, 72)); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
89 |
|
5252 | 90 |
mainLayout.setContentsMargins(HWApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin), |
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:
8401
diff
changeset
|
91 |
10, |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
92 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
93 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); |
2377 | 94 |
|
8377 | 95 |
m_staticMapModel = DataManager::instance().staticMapModel(); |
96 |
m_missionMapModel = DataManager::instance().missionMapModel(); |
|
97 |
m_themeModel = DataManager::instance().themeModel(); |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
98 |
|
8377 | 99 |
/* Layouts */ |
249 | 100 |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
101 |
QWidget * topWidget = new QWidget(); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
102 |
QHBoxLayout * topLayout = new QHBoxLayout(topWidget); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
103 |
topWidget->setContentsMargins(0, 0, 0, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
104 |
topLayout->setContentsMargins(0, 0, 0, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
105 |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
106 |
twoColumnLayout = new QHBoxLayout(); |
8377 | 107 |
QVBoxLayout * leftLayout = new QVBoxLayout(); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
108 |
leftLayout->setAlignment(Qt::AlignLeft); |
8377 | 109 |
QVBoxLayout * rightLayout = new QVBoxLayout(); |
110 |
twoColumnLayout->addLayout(leftLayout, 0); |
|
111 |
twoColumnLayout->addLayout(rightLayout, 0); |
|
112 |
QVBoxLayout * drawnControls = new QVBoxLayout(); |
|
113 |
||
13233
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
114 |
/* Map type label */ |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
115 |
|
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
116 |
QLabel* lblMapType = new QLabel(tr("Map type:")); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
117 |
topLayout->setSpacing(10); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
118 |
topLayout->addWidget(lblMapType, 0); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
119 |
m_childWidgets << lblMapType; |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
120 |
|
8377 | 121 |
/* Map type combobox */ |
4487 | 122 |
|
8377 | 123 |
cType = new QComboBox(this); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
124 |
topLayout->addWidget(cType, 1); |
8377 | 125 |
cType->insertItem(0, tr("Image map"), MapModel::StaticMap); |
126 |
cType->insertItem(1, tr("Mission map"), MapModel::MissionMap); |
|
127 |
cType->insertItem(2, tr("Hand-drawn"), MapModel::HandDrawnMap); |
|
128 |
cType->insertItem(3, tr("Randomly generated"), MapModel::GeneratedMap); |
|
129 |
cType->insertItem(4, tr("Random maze"), MapModel::GeneratedMaze); |
|
10391 | 130 |
cType->insertItem(5, tr("Random perlin"), MapModel::GeneratedPerlin); |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
131 |
cType->insertItem(6, tr("Forts"), MapModel::FortsMap); |
8377 | 132 |
connect(cType, SIGNAL(currentIndexChanged(int)), this, SLOT(mapTypeChanged(int))); |
133 |
m_childWidgets << cType; |
|
249 | 134 |
|
8377 | 135 |
/* Randomize button */ |
1802 | 136 |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
137 |
topLayout->addStretch(1); |
8377 | 138 |
const QIcon& lp = QIcon(":/res/dice.png"); |
139 |
QSize sz = lp.actualSize(QSize(65535, 65535)); |
|
140 |
btnRandomize = new QPushButton(); |
|
141 |
btnRandomize->setText(tr("Random")); |
|
142 |
btnRandomize->setIcon(lp); |
|
143 |
btnRandomize->setFixedHeight(30); |
|
144 |
btnRandomize->setIconSize(sz); |
|
145 |
btnRandomize->setFlat(true); |
|
146 |
btnRandomize->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
|
147 |
connect(btnRandomize, SIGNAL(clicked()), this, SLOT(setRandomMap())); |
|
11790 | 148 |
|
8377 | 149 |
m_childWidgets << btnRandomize; |
150 |
btnRandomize->setStyleSheet("padding: 5px;"); |
|
151 |
btnRandomize->setFixedHeight(cType->height()); |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
152 |
topLayout->addWidget(btnRandomize, 1); |
1802 | 153 |
|
8377 | 154 |
/* Seed button */ |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
155 |
|
8377 | 156 |
btnSeed = new QPushButton(parentWidget()->parentWidget()); |
13681
05fde8e30041
Add a few translator comments for frontend strings
Wuzzy <Wuzzy2@mail.ru>
parents:
13271
diff
changeset
|
157 |
//: Refers to the "random seed"; the source of randomness in the game |
8377 | 158 |
btnSeed->setText(tr("Seed")); |
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
159 |
btnSeed->setWhatsThis(tr("View and edit the seed, the source of randomness in the game")); |
8377 | 160 |
btnSeed->setStyleSheet("padding: 5px;"); |
161 |
btnSeed->setFixedHeight(cType->height()); |
|
162 |
connect(btnSeed, SIGNAL(clicked()), this, SLOT(showSeedPrompt())); |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
163 |
topLayout->addWidget(btnSeed, 0); |
1802 | 164 |
|
8377 | 165 |
/* Map preview label */ |
166 |
||
167 |
QLabel * lblMapPreviewText = new QLabel(this); |
|
168 |
lblMapPreviewText->setText(tr("Map preview:")); |
|
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:
8401
diff
changeset
|
169 |
leftLayout->addWidget(lblMapPreviewText, 0); |
13233
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
170 |
m_childWidgets << lblMapPreviewText; |
8377 | 171 |
|
172 |
/* Map Preview */ |
|
4562 | 173 |
|
8467 | 174 |
mapPreview = new QPushButton(this); |
8377 | 175 |
mapPreview->setObjectName("mapPreview"); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
176 |
mapPreview->setFlat(true); |
10161 | 177 |
mapPreview->setFixedSize(256 + 6, 128 + 6); |
8467 | 178 |
mapPreview->setContentsMargins(0, 0, 0, 0); |
8377 | 179 |
leftLayout->addWidget(mapPreview, 0); |
8467 | 180 |
connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked())); |
13233
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
181 |
m_childWidgets << mapPreview; |
8377 | 182 |
|
183 |
/* Bottom-Left layout */ |
|
3133 | 184 |
|
8377 | 185 |
QVBoxLayout * bottomLeftLayout = new QVBoxLayout(); |
186 |
leftLayout->addLayout(bottomLeftLayout, 1); |
|
187 |
||
188 |
/* Map list label */ |
|
189 |
||
10394 | 190 |
lblMapList = new QLabel(this); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
191 |
lblMapList->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
192 |
lblMapList->setAlignment(Qt::AlignTop | Qt::AlignLeft); |
8377 | 193 |
rightLayout->addWidget(lblMapList, 0); |
13233
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
194 |
m_childWidgets << lblMapList; |
8377 | 195 |
|
196 |
/* Static maps list */ |
|
1248 | 197 |
|
10394 | 198 |
staticMapList = new QListView(this); |
8377 | 199 |
rightLayout->addWidget(staticMapList, 1); |
200 |
m_childWidgets << staticMapList; |
|
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
201 |
|
8377 | 202 |
/* Mission maps list */ |
1802 | 203 |
|
9744 | 204 |
missionMapList = new QListView(this); |
8377 | 205 |
rightLayout->addWidget(missionMapList, 1); |
206 |
m_childWidgets << missionMapList; |
|
207 |
||
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
208 |
/* Map name (when not room master) */ |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
209 |
/* We use a QTextEdit instead of QLabel because it is able |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
210 |
to wrap at any character. */ |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
211 |
teMapName = new QTextEdit(this); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
212 |
teMapName->setObjectName("mapName"); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
213 |
teMapName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
214 |
teMapName->setAlignment(Qt::AlignTop | Qt::AlignLeft); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
215 |
|
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
216 |
/* Boilerplate to emulate a QLabel */ |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
217 |
teMapName->setReadOnly(true); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
218 |
teMapName->setAcceptRichText(false); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
219 |
teMapName->setFrameStyle(QFrame::NoFrame); |
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
220 |
teMapName->setStyleSheet("background-color: transparent"); |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
221 |
|
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
222 |
teMapName->setLineWrapMode(QTextEdit::WidgetWidth); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
223 |
teMapName->setWordWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
224 |
|
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
225 |
rightLayout->addWidget(teMapName, 1); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
226 |
m_childWidgets << teMapName; |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
227 |
|
8377 | 228 |
/* Map load and edit buttons */ |
229 |
||
230 |
drawnControls->addStretch(1); |
|
2377 | 231 |
|
14671
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
232 |
QPixmap pmLoad(":/res/Load.png"); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
233 |
QIcon iconLoad = QIcon(pmLoad); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
234 |
sz = iconLoad.actualSize(QSize(48, 48)); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
235 |
|
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
236 |
btnLoadMap = new QPushButton(tr("Load")); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
237 |
btnLoadMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
238 |
btnLoadMap->setWhatsThis(tr("Load map drawing")); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
239 |
btnLoadMap->setStyleSheet("padding: 5px;"); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
240 |
btnLoadMap->setFixedHeight(50); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
241 |
btnLoadMap->setIcon(iconLoad); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
242 |
btnLoadMap->setIconSize(sz); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
243 |
btnLoadMap->setFlat(true); |
8377 | 244 |
drawnControls->addWidget(btnLoadMap, 0); |
245 |
m_childWidgets << btnLoadMap; |
|
246 |
connect(btnLoadMap, SIGNAL(clicked()), this, SLOT(loadDrawing())); |
|
247 |
||
14671
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
248 |
QPixmap pmEdit(":/res/edit.png"); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
249 |
QIcon iconEdit = QIcon(pmEdit); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
250 |
sz = iconEdit.actualSize(QSize(48, 48)); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
251 |
|
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
252 |
btnEditMap = new QPushButton(tr("Edit")); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
253 |
btnEditMap->setWhatsThis(tr("Edit map drawing")); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
254 |
btnEditMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
255 |
btnEditMap->setStyleSheet("padding: 5px;"); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
256 |
btnEditMap->setFixedHeight(50); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
257 |
btnEditMap->setIcon(iconEdit); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
258 |
btnEditMap->setIconSize(sz); |
95b1b9ea505a
Shorten text of buttons to load/edit drawn map and make them look nicer
Wuzzy <Wuzzy2@mail.ru>
parents:
14465
diff
changeset
|
259 |
btnEditMap->setFlat(true); |
8377 | 260 |
drawnControls->addWidget(btnEditMap, 0); |
261 |
m_childWidgets << btnEditMap; |
|
262 |
connect(btnEditMap, SIGNAL(clicked()), this, SIGNAL(drawMapRequested())); |
|
263 |
||
264 |
drawnControls->addStretch(1); |
|
265 |
||
266 |
rightLayout->addLayout(drawnControls); |
|
267 |
||
268 |
/* Generator style list */ |
|
2377 | 269 |
|
10394 | 270 |
generationStyles = new QListWidget(this); |
8377 | 271 |
new QListWidgetItem(tr("All"), generationStyles); |
272 |
new QListWidgetItem(tr("Small"), generationStyles); |
|
273 |
new QListWidgetItem(tr("Medium"), generationStyles); |
|
274 |
new QListWidgetItem(tr("Large"), generationStyles); |
|
275 |
new QListWidgetItem(tr("Cavern"), generationStyles); |
|
276 |
new QListWidgetItem(tr("Wacky"), generationStyles); |
|
277 |
connect(generationStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setTemplateFilter(int))); |
|
278 |
m_childWidgets << generationStyles; |
|
279 |
rightLayout->addWidget(generationStyles, 1); |
|
280 |
||
281 |
/* Maze style list */ |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
282 |
|
10394 | 283 |
mazeStyles = new QListWidget(this); |
8377 | 284 |
new QListWidgetItem(tr("Small tunnels"), mazeStyles); |
285 |
new QListWidgetItem(tr("Medium tunnels"), mazeStyles); |
|
8695 | 286 |
new QListWidgetItem(tr("Large tunnels"), mazeStyles); |
8377 | 287 |
new QListWidgetItem(tr("Small islands"), mazeStyles); |
288 |
new QListWidgetItem(tr("Medium islands"), mazeStyles); |
|
289 |
new QListWidgetItem(tr("Large islands"), mazeStyles); |
|
290 |
connect(mazeStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setMazeSize(int))); |
|
291 |
m_childWidgets << mazeStyles; |
|
292 |
rightLayout->addWidget(mazeStyles, 1); |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
293 |
|
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
294 |
mapFeatureSize = new QSlider(Qt::Horizontal, this); |
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
295 |
mapFeatureSize->setObjectName("mapFeatureSize"); |
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
296 |
//mapFeatureSize->setTickPosition(QSlider::TicksBelow); |
10477
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
297 |
mapFeatureSize->setMaximum(25); |
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
298 |
mapFeatureSize->setMinimum(1); |
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
299 |
//mapFeatureSize->setFixedWidth(259); |
10472
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
300 |
mapFeatureSize->setValue(m_mapFeatureSize); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
301 |
mapFeatureSize->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); |
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
302 |
bottomLeftLayout->addWidget(mapFeatureSize, 0); |
10480 | 303 |
connect(mapFeatureSize, SIGNAL(valueChanged(int)), this, SLOT(setFeatureSize(int))); |
10521 | 304 |
m_childWidgets << mapFeatureSize; |
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
305 |
|
8377 | 306 |
/* Mission description */ |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
307 |
|
8377 | 308 |
lblDesc = new QLabel(); |
309 |
lblDesc->setWordWrap(true); |
|
310 |
lblDesc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
311 |
lblDesc->setAlignment(Qt::AlignBottom | Qt::AlignLeft); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
312 |
lblDesc->setStyleSheet("font: 10px;"); |
8467 | 313 |
bottomLeftLayout->addWidget(lblDesc, 100); |
8377 | 314 |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
315 |
/* Add stretch above theme button */ |
8377 | 316 |
|
317 |
bottomLeftLayout->addStretch(1); |
|
318 |
||
319 |
/* Theme chooser */ |
|
11915
245163aa3674
Fix Qt warnings about QLayout (Fixes #127)
Wuzzy <almikes@aol.com>
parents:
11869
diff
changeset
|
320 |
QHBoxLayout * themeHBox = new QHBoxLayout(); |
11790 | 321 |
|
322 |
btnRandTheme = new QPushButton(); |
|
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
323 |
btnRandTheme->setWhatsThis(tr("Randomize the theme")); |
11790 | 324 |
btnRandTheme->setIcon(lp); |
325 |
btnRandTheme->setIconSize(QSize(24, 24)); |
|
326 |
btnRandTheme->setFixedHeight(30); |
|
327 |
btnRandTheme->setFixedWidth(30); |
|
328 |
connect(btnRandTheme, SIGNAL(clicked()), this, SLOT(setRandomTheme())); |
|
11869
bff919afc63f
fix a typo back from may that apparently completely broke online-multiplayer due to causing a frontend crash on joining somebody else's room
sheepluva
parents:
11816
diff
changeset
|
329 |
m_childWidgets << btnRandTheme; |
11790 | 330 |
themeHBox->addWidget(btnRandTheme, 0); |
1215 | 331 |
|
10394 | 332 |
btnTheme = new QPushButton(this); |
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
333 |
btnTheme->setWhatsThis(tr("Choose a theme")); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
334 |
btnTheme->setFlat(true); |
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
335 |
btnTheme->setIconSize(QSize(30, 30)); |
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
336 |
btnTheme->setFixedHeight(30); |
11790 | 337 |
btnTheme->setMaximumWidth(222); |
8377 | 338 |
connect(btnTheme, SIGNAL(clicked()), this, SLOT(showThemePrompt())); |
339 |
m_childWidgets << btnTheme; |
|
11790 | 340 |
themeHBox->addWidget(btnTheme, 1); |
341 |
||
342 |
bottomLeftLayout->addLayout(themeHBox); |
|
4699 | 343 |
|
8377 | 344 |
/* Add everything to main layout */ |
345 |
||
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
346 |
mainLayout.addWidget(topWidget, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
347 |
mainLayout.addLayout(twoColumnLayout, 1); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
348 |
|
8377 | 349 |
/* Set defaults */ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
350 |
|
8377 | 351 |
setRandomSeed(); |
352 |
setMazeSize(0); |
|
353 |
setTemplateFilter(0); |
|
354 |
staticMapChanged(m_staticMapModel->index(0, 0)); |
|
355 |
missionMapChanged(m_missionMapModel->index(0, 0)); |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
356 |
changeMapType(MapModel::GeneratedMap); |
184 | 357 |
} |
358 |
||
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
359 |
void HWMapContainer::onImageReceived(const QPixmap &newImage) |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
360 |
{ |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
361 |
// When image received from the engine. |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
362 |
switch (m_mapInfo.type) |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
363 |
{ |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
364 |
case MapModel::GeneratedMap: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
365 |
case MapModel::GeneratedMaze: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
366 |
case MapModel::GeneratedPerlin: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
367 |
case MapModel::HandDrawnMap: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
368 |
case MapModel::FortsMap: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
369 |
setImage(newImage); |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
370 |
break; |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
371 |
// Throw away image if we have switched the map mode in the meantime |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
372 |
default: |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
373 |
return; |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
374 |
} |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
375 |
} |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
376 |
|
10161 | 377 |
void HWMapContainer::setImage(const QPixmap &newImage) |
184 | 378 |
{ |
10161 | 379 |
addInfoToPreview(newImage); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
380 |
pMap = 0; |
8377 | 381 |
|
382 |
cType->setEnabled(isMaster()); |
|
249 | 383 |
} |
384 |
||
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
385 |
void HWMapContainer::setImage(const QPixmap &newImage, const QLinearGradient &linearGrad, bool showHHLimit) |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
386 |
{ |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
387 |
addInfoToPreview(newImage, linearGrad, showHHLimit); |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
388 |
|
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
389 |
pMap = 0; |
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
390 |
|
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
391 |
cType->setEnabled(isMaster()); |
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
392 |
} |
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
393 |
|
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
394 |
|
1790 | 395 |
void HWMapContainer::setHHLimit(int newHHLimit) |
396 |
{ |
|
397 |
hhLimit = newHHLimit; |
|
398 |
} |
|
399 |
||
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
400 |
void HWMapContainer::addInfoToPreview(const QPixmap &image) |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
401 |
{ |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
402 |
addInfoToPreview(image, linearGradNormal, true); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
403 |
} |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
404 |
|
1790 | 405 |
// Should this add text to identify map size? |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
406 |
void HWMapContainer::addInfoToPreview(const QPixmap &image, const QLinearGradient &linearGrad, bool drawHHLimit) |
1790 | 407 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
408 |
QPixmap finalImage = QPixmap(image.size()); |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
409 |
QPainter p(&finalImage); |
2377 | 410 |
|
10161 | 411 |
p.fillRect(finalImage.rect(), linearGrad); |
412 |
p.drawPixmap(finalImage.rect(), image); |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
413 |
|
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
414 |
if (drawHHLimit) |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
415 |
{ |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
416 |
p.setPen(QColor(0xff,0xcc,0x00)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
417 |
p.setBrush(QColor(0, 0, 0)); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
418 |
p.setFont(QFont("MS Shell Dlg", 10)); |
1790 | 419 |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
420 |
p.drawRect(finalImage.rect().width() - hhSmall.rect().width() - 28, 3, 40, 20); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
421 |
|
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
422 |
QString text = (hhLimit > 0) ? QString::number(hhLimit) : "?"; |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
423 |
p.drawText(finalImage.rect().width() - hhSmall.rect().width() - 14 - (hhLimit > 9 ? 10 : 0), 18, text); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
424 |
p.drawPixmap(finalImage.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
425 |
} |
8467 | 426 |
|
13233
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
427 |
// Set the map preview image. Make sure it is always colored the same, |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
428 |
// no matter if disabled or not. |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
429 |
QIcon mapPreviewIcon = QIcon(); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
430 |
mapPreviewIcon.addPixmap(finalImage, QIcon::Normal); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
431 |
mapPreviewIcon.addPixmap(finalImage, QIcon::Disabled); |
d23742ccf92b
Frontend: Properly “gray out” most disabled widgets (a lot of them weren't)
Wuzzy <Wuzzy2@mail.ru>
parents:
13217
diff
changeset
|
432 |
mapPreview->setIcon(mapPreviewIcon); |
10161 | 433 |
mapPreview->setIconSize(finalImage.size()); |
184 | 434 |
} |
435 |
||
4562 | 436 |
void HWMapContainer::askForGeneratedPreview() |
184 | 437 |
{ |
8070
66bc20d089fc
Okay, remove previous request only if it has same parent
unc0rr
parents:
8049
diff
changeset
|
438 |
pMap = new HWMap(this); |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
439 |
connect(pMap, SIGNAL(ImageReceived(QPixmap)), this, SLOT(onImageReceived(const QPixmap))); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
440 |
connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
441 |
connect(pMap, SIGNAL(destroyed(QObject *)), this, SLOT(onPreviewMapDestroyed(QObject *))); |
4562 | 442 |
pMap->getImage(m_seed, |
443 |
getTemplateFilter(), |
|
444 |
get_mapgen(), |
|
4941 | 445 |
getMazeSize(), |
10150
fa5c83fd0ad9
Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.
nemo
parents:
10108
diff
changeset
|
446 |
getDrawnMapData(), |
10472
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
447 |
m_script, |
10959
1225f42f61e2
Pass ScriptParams to preview to support techracer. Proof of concept for techracer, generate a preview for m=4
nemo
parents:
10521
diff
changeset
|
448 |
m_scriptparam, |
14465
3897da404301
if a script is set, feature size can generate different maps
nemo
parents:
14421
diff
changeset
|
449 |
m_mapFeatureSize |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
450 |
); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
451 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
452 |
setHHLimit(0); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
453 |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
454 |
QPixmap waitImage(m_previewSize); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
455 |
waitImage.fill(Qt::transparent); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
456 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
457 |
QPainter p(&waitImage); |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
458 |
const QPixmap waitIcon(":/res/iconTime.png"); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
459 |
int x = (waitImage.width() - waitIcon.width()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
460 |
int y = (waitImage.height() - waitIcon.height()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
461 |
p.drawPixmap(QPoint(x, y), waitIcon); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
462 |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
463 |
setImage(waitImage, linearGradLoading, false); |
184 | 464 |
|
8377 | 465 |
cType->setEnabled(false); |
1215 | 466 |
} |
467 |
||
8467 | 468 |
void HWMapContainer::previewClicked() |
469 |
{ |
|
9452 | 470 |
if (isMaster()) // should only perform these if master, but disabling the button when not, causes an unattractive preview. |
471 |
switch (m_mapInfo.type) |
|
472 |
{ |
|
473 |
case MapModel::HandDrawnMap: |
|
474 |
emit drawMapRequested(); |
|
475 |
break; |
|
476 |
default: |
|
477 |
setRandomMap(); |
|
478 |
break; |
|
479 |
} |
|
8467 | 480 |
} |
481 |
||
184 | 482 |
QString HWMapContainer::getCurrentSeed() const |
483 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
484 |
return m_seed; |
184 | 485 |
} |
486 |
||
249 | 487 |
QString HWMapContainer::getCurrentMap() const |
488 |
{ |
|
8377 | 489 |
switch (m_mapInfo.type) |
490 |
{ |
|
491 |
case MapModel::StaticMap: |
|
492 |
case MapModel::MissionMap: |
|
493 |
return m_curMap; |
|
494 |
default: |
|
495 |
return QString(); |
|
496 |
} |
|
249 | 497 |
} |
498 |
||
499 |
QString HWMapContainer::getCurrentTheme() const |
|
500 |
{ |
|
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
501 |
return(m_theme); |
3008 | 502 |
} |
503 |
||
504 |
bool HWMapContainer::getCurrentIsMission() const |
|
505 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
506 |
return(m_mapInfo.type == MapModel::MissionMap); |
1790 | 507 |
} |
508 |
||
509 |
int HWMapContainer::getCurrentHHLimit() const |
|
510 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
511 |
return hhLimit; |
249 | 512 |
} |
513 |
||
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
514 |
QString HWMapContainer::getCurrentScheme() const |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
515 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
516 |
return(m_mapInfo.scheme); |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
517 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
518 |
|
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
519 |
QString HWMapContainer::getCurrentWeapons() const |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
520 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
521 |
return(m_mapInfo.weapons); |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
522 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
523 |
|
1802 | 524 |
quint32 HWMapContainer::getTemplateFilter() const |
525 |
{ |
|
8377 | 526 |
return generationStyles->currentRow(); |
1802 | 527 |
} |
528 |
||
10472
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
529 |
quint32 HWMapContainer::getFeatureSize() const |
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
530 |
{ |
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
531 |
return m_mapFeatureSize; |
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
532 |
} |
8d04cebedb16
Partially hook up feature size so horrorcat has something to test.
nemo
parents:
10471
diff
changeset
|
533 |
|
184 | 534 |
void HWMapContainer::resizeEvent ( QResizeEvent * event ) |
535 |
{ |
|
4560
5d6c7f88db73
- Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents:
4557
diff
changeset
|
536 |
Q_UNUSED(event); |
184 | 537 |
} |
320 | 538 |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
539 |
void HWMapContainer::intSetSeed(const QString & seed) |
320 | 540 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
541 |
m_seed = seed; |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
542 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
543 |
|
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
544 |
void HWMapContainer::setSeed(const QString & seed) |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
545 |
{ |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
546 |
intSetSeed(seed); |
10391 | 547 |
if ((m_mapInfo.type == MapModel::GeneratedMap) |
548 |
|| (m_mapInfo.type == MapModel::GeneratedMaze) |
|
549 |
|| (m_mapInfo.type == MapModel::GeneratedPerlin)) |
|
4562 | 550 |
updatePreview(); |
320 | 551 |
} |
552 |
||
10959
1225f42f61e2
Pass ScriptParams to preview to support techracer. Proof of concept for techracer, generate a preview for m=4
nemo
parents:
10521
diff
changeset
|
553 |
void HWMapContainer::setScript(const QString & script, const QString & scriptparam) |
10150
fa5c83fd0ad9
Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.
nemo
parents:
10108
diff
changeset
|
554 |
{ |
fa5c83fd0ad9
Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.
nemo
parents:
10108
diff
changeset
|
555 |
m_script = script; |
10959
1225f42f61e2
Pass ScriptParams to preview to support techracer. Proof of concept for techracer, generate a preview for m=4
nemo
parents:
10521
diff
changeset
|
556 |
m_scriptparam = scriptparam; |
10391 | 557 |
if ((m_mapInfo.type == MapModel::GeneratedMap) |
558 |
|| (m_mapInfo.type == MapModel::GeneratedMaze) |
|
559 |
|| (m_mapInfo.type == MapModel::GeneratedPerlin) |
|
560 |
|| (m_mapInfo.type == MapModel::HandDrawnMap)) |
|
10171
00f41ff0bf2d
Script might well override a static map, but can't risk it not doing it, and preview completely failing. Better to just not try it for static maps. Some script cfg might help. Could also avoid unnnecessary preview regenerations even if the script was doing nothing at all.
nemo
parents:
10169
diff
changeset
|
561 |
updatePreview(); |
10150
fa5c83fd0ad9
Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.
nemo
parents:
10108
diff
changeset
|
562 |
} |
fa5c83fd0ad9
Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.
nemo
parents:
10108
diff
changeset
|
563 |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
564 |
void HWMapContainer::intSetMap(const QString & map) |
320 | 565 |
{ |
8377 | 566 |
if (map == "+rnd+") |
567 |
{ |
|
10336 | 568 |
//changeMapType(MapModel::GeneratedMap); |
8377 | 569 |
} |
570 |
else if (map == "+maze+") |
|
571 |
{ |
|
10336 | 572 |
//changeMapType(MapModel::GeneratedMaze); |
8377 | 573 |
} |
10391 | 574 |
else if (map == "+perlin+") |
575 |
{ |
|
576 |
//changeMapType(MapModel::GeneratedPerlin); |
|
577 |
} |
|
8377 | 578 |
else if (map == "+drawn+") |
579 |
{ |
|
10336 | 580 |
//changeMapType(MapModel::HandDrawnMap); |
8377 | 581 |
} |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
582 |
else if (map == "+forts+") |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
583 |
{ |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
584 |
//nuffin |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
585 |
} |
8377 | 586 |
else if (m_staticMapModel->mapExists(map)) |
587 |
{ |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
588 |
m_missingMap = false; |
8377 | 589 |
changeMapType(MapModel::StaticMap, m_staticMapModel->index(m_staticMapModel->findMap(map), 0)); |
590 |
} |
|
591 |
else if (m_missionMapModel->mapExists(map)) |
|
592 |
{ |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
593 |
m_missingMap = false; |
8377 | 594 |
changeMapType(MapModel::MissionMap, m_missionMapModel->index(m_missionMapModel->findMap(map), 0)); |
595 |
} else |
|
596 |
{ |
|
597 |
qDebug() << "HWMapContainer::intSetMap: Map doesn't exist: " << map; |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
598 |
m_missingMap = true; |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
599 |
m_curMap = map; |
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
600 |
m_mapInfo.name = map; |
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
601 |
setMapNameLabel(map, false); |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
602 |
if (m_mapInfo.type == MapModel::StaticMap) |
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
603 |
setupStaticMapsView(m_curMap); |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
604 |
else if (m_mapInfo.type == MapModel::MissionMap) |
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
605 |
setupMissionMapsView(m_curMap); |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
606 |
else |
13255
0cc068e8a391
Fix some map preview properly problems when host switches to image map mode w/ you missing the map
Wuzzy <Wuzzy2@mail.ru>
parents:
13254
diff
changeset
|
607 |
{ |
0cc068e8a391
Fix some map preview properly problems when host switches to image map mode w/ you missing the map
Wuzzy <Wuzzy2@mail.ru>
parents:
13254
diff
changeset
|
608 |
m_mapInfo.type = MapModel::StaticMap; |
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
609 |
setupStaticMapsView(m_curMap); |
13263
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
610 |
changeMapType(m_mapInfo.type, QModelIndex()); |
13255
0cc068e8a391
Fix some map preview properly problems when host switches to image map mode w/ you missing the map
Wuzzy <Wuzzy2@mail.ru>
parents:
13254
diff
changeset
|
611 |
} |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
612 |
updatePreview(); |
8377 | 613 |
} |
320 | 614 |
} |
615 |
||
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
616 |
void HWMapContainer::setMap(const QString & map) |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
617 |
{ |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
618 |
if ((m_mapInfo.type == MapModel::Invalid) || (map != m_mapInfo.name) || m_missingMap) |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
619 |
intSetMap(map); |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
620 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
621 |
|
320 | 622 |
void HWMapContainer::setTheme(const QString & theme) |
623 |
{ |
|
8475
f605bc59c603
Initial theme selection is now random. Theme prompt now has a search input and no longer uses FlowLayout. (Resolves issue 520)
dag10
parents:
8467
diff
changeset
|
624 |
QModelIndexList mdl = m_themeModel->match(m_themeModel->index(0), ThemeModel::ActualNameRole, theme); |
5289
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
625 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
626 |
if(mdl.size()) |
8377 | 627 |
updateTheme(mdl.at(0)); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
628 |
else |
13254
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
629 |
setMissingTheme(theme); |
320 | 630 |
} |
4562 | 631 |
|
4337 | 632 |
void HWMapContainer::setRandomMap() |
633 |
{ |
|
8619
253750e192e7
Made pressing the button in mapContainer only randomize things if client is master. Fixes issue 545. Also synchronized themes. Fixes issue 547.
dag10
parents:
8475
diff
changeset
|
634 |
if (!m_master) return; |
8924 | 635 |
|
4419 | 636 |
setRandomSeed(); |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
637 |
|
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
638 |
QSortFilterProxyModel * mmodel = NULL; |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
639 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
640 |
switch(m_mapInfo.type) |
4337 | 641 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
642 |
case MapModel::GeneratedMap: |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
643 |
case MapModel::GeneratedMaze: |
10391 | 644 |
case MapModel::GeneratedPerlin: |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
645 |
case MapModel::FortsMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
646 |
setRandomTheme(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
647 |
break; |
8377 | 648 |
case MapModel::MissionMap: |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
649 |
if (m_withoutDLC) |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
650 |
{ |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
651 |
mmodel = m_missionMapModel->withoutDLC(); |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
652 |
missionMapChanged(mmodel->mapToSource(mmodel->index(rand() % mmodel->rowCount(),0))); |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
653 |
} |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
654 |
else |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
655 |
missionMapChanged(m_missionMapModel->index(rand() % m_missionMapModel->rowCount(),0)); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
656 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
657 |
case MapModel::StaticMap: |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
658 |
if (m_withoutDLC) |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
659 |
{ |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
660 |
mmodel = m_staticMapModel->withoutDLC(); |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
661 |
staticMapChanged(mmodel->mapToSource(mmodel->index(rand() % mmodel->rowCount(),0))); |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
662 |
} |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
663 |
else |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
664 |
staticMapChanged(m_staticMapModel->index(rand() % m_staticMapModel->rowCount(),0)); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
665 |
break; |
8377 | 666 |
default: |
667 |
break; |
|
4337 | 668 |
} |
669 |
} |
|
670 |
||
320 | 671 |
void HWMapContainer::setRandomSeed() |
672 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
673 |
setSeed(QUuid::createUuid().toString()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
674 |
emit seedChanged(m_seed); |
320 | 675 |
} |
1318 | 676 |
|
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
677 |
void HWMapContainer::setRandomWithoutDLC(bool withoutDLC) |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
678 |
{ |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
679 |
m_withoutDLC = withoutDLC; |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
680 |
} |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
681 |
|
1318 | 682 |
void HWMapContainer::setRandomTheme() |
683 |
{ |
|
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
684 |
QAbstractItemModel * tmodel; |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
685 |
|
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
686 |
if (m_withoutDLC) |
13253
b0022324fb4e
Add IsHiddenRole to ThemeModel for hidden themes
Wuzzy <Wuzzy2@mail.ru>
parents:
13251
diff
changeset
|
687 |
tmodel = m_themeModel->withoutDLCOrHidden(); |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
688 |
else |
13253
b0022324fb4e
Add IsHiddenRole to ThemeModel for hidden themes
Wuzzy <Wuzzy2@mail.ru>
parents:
13251
diff
changeset
|
689 |
tmodel = m_themeModel->withoutHidden(); |
11762
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
690 |
|
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
691 |
if(!tmodel->rowCount()) return; |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
692 |
quint32 themeNum = rand() % tmodel->rowCount(); |
6874644a2d00
in non-local games, don't include DLC-themes/maps/missions during random selection. thanks to unC0Rr for helping me realize that I was stupid in a different way than I thought :P
sheepluva
parents:
11759
diff
changeset
|
693 |
updateTheme(tmodel->index(themeNum,0)); |
8619
253750e192e7
Made pressing the button in mapContainer only randomize things if client is master. Fixes issue 545. Also synchronized themes. Fixes issue 547.
dag10
parents:
8475
diff
changeset
|
694 |
emit themeChanged(m_theme); |
1318 | 695 |
} |
1797 | 696 |
|
4941 | 697 |
void HWMapContainer::intSetTemplateFilter(int filter) |
698 |
{ |
|
8377 | 699 |
generationStyles->setCurrentRow(filter); |
4941 | 700 |
emit newTemplateFilter(filter); |
701 |
} |
|
702 |
||
1797 | 703 |
void HWMapContainer::setTemplateFilter(int filter) |
704 |
{ |
|
4941 | 705 |
intSetTemplateFilter(filter); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
706 |
if (m_mapInfo.type == MapModel::GeneratedMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
707 |
updatePreview(); |
1802 | 708 |
} |
709 |
||
3133 | 710 |
MapGenerator HWMapContainer::get_mapgen(void) const |
711 |
{ |
|
712 |
return mapgen; |
|
713 |
} |
|
714 |
||
4941 | 715 |
int HWMapContainer::getMazeSize(void) const |
3133 | 716 |
{ |
8377 | 717 |
return mazeStyles->currentRow(); |
3133 | 718 |
} |
719 |
||
4941 | 720 |
void HWMapContainer::intSetMazeSize(int size) |
3133 | 721 |
{ |
8377 | 722 |
mazeStyles->setCurrentRow(size); |
4941 | 723 |
emit mazeSizeChanged(size); |
724 |
} |
|
725 |
||
726 |
void HWMapContainer::setMazeSize(int size) |
|
727 |
{ |
|
728 |
intSetMazeSize(size); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
729 |
if (m_mapInfo.type == MapModel::GeneratedMaze) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
730 |
updatePreview(); |
3133 | 731 |
} |
732 |
||
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
733 |
void HWMapContainer::intSetMapgen(MapGenerator m) |
3133 | 734 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
735 |
if (mapgen != m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
736 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
737 |
mapgen = m; |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
738 |
|
10463 | 739 |
bool f = false; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
740 |
switch (m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
741 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
742 |
case MAPGEN_REGULAR: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
743 |
m_mapInfo.type = MapModel::GeneratedMap; |
10463 | 744 |
f = true; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
745 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
746 |
case MAPGEN_MAZE: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
747 |
m_mapInfo.type = MapModel::GeneratedMaze; |
10463 | 748 |
f = true; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
749 |
break; |
10391 | 750 |
case MAPGEN_PERLIN: |
751 |
m_mapInfo.type = MapModel::GeneratedPerlin; |
|
10463 | 752 |
f = true; |
10391 | 753 |
break; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
754 |
case MAPGEN_DRAWN: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
755 |
m_mapInfo.type = MapModel::HandDrawnMap; |
10463 | 756 |
f = true; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
757 |
break; |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
758 |
case MAPGEN_FORTS: |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
759 |
m_mapInfo.type = MapModel::FortsMap; |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
760 |
f = true; |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
761 |
break; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
762 |
case MAPGEN_MAP: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
763 |
switch (m_mapInfo.type) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
764 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
765 |
case MapModel::GeneratedMap: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
766 |
case MapModel::GeneratedMaze: |
10391 | 767 |
case MapModel::GeneratedPerlin: |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
768 |
case MapModel::HandDrawnMap: |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
769 |
case MapModel::FortsMap: |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
770 |
m_mapInfo.type = MapModel::Invalid; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
771 |
default: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
772 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
773 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
774 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
775 |
} |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
776 |
|
10463 | 777 |
if(f) |
778 |
changeMapType(m_mapInfo.type, QModelIndex()); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
779 |
} |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
780 |
} |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
781 |
|
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
782 |
void HWMapContainer::setMapgen(MapGenerator m) |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
783 |
{ |
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
784 |
intSetMapgen(m); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
785 |
if(m != MAPGEN_MAP) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
786 |
updatePreview(); |
3133 | 787 |
} |
4489 | 788 |
|
4537 | 789 |
void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
790 |
{ |
|
791 |
drawMapScene.decode(ar); |
|
4562 | 792 |
updatePreview(); |
4537 | 793 |
} |
794 |
||
4489 | 795 |
QByteArray HWMapContainer::getDrawnMapData() |
796 |
{ |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
797 |
return drawMapScene.encode(); |
4513
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
798 |
} |
4519 | 799 |
|
8377 | 800 |
void HWMapContainer::setNewSeed(const QString & newSeed) |
4519 | 801 |
{ |
8377 | 802 |
setSeed(newSeed); |
803 |
emit seedChanged(newSeed); |
|
4519 | 804 |
} |
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
805 |
|
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
806 |
DrawMapScene * HWMapContainer::getDrawMapScene() |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
807 |
{ |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
808 |
return &drawMapScene; |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
809 |
} |
4525 | 810 |
|
811 |
void HWMapContainer::mapDrawingFinished() |
|
812 |
{ |
|
4526 | 813 |
emit drawnMapChanged(getDrawnMapData()); |
4525 | 814 |
|
4562 | 815 |
updatePreview(); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
816 |
} |
4562 | 817 |
|
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
818 |
void HWMapContainer::showEvent(QShowEvent * event) |
9735
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
819 |
{ |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
820 |
if (!m_previewEnabled) |
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
821 |
{ |
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
822 |
m_previewEnabled = true; |
9745 | 823 |
setRandomTheme(); |
9735
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
824 |
updatePreview(); |
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
825 |
} |
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
826 |
QWidget::showEvent(event); |
9735
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
827 |
} |
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
828 |
|
4562 | 829 |
void HWMapContainer::updatePreview() |
830 |
{ |
|
9739
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
831 |
// abort if the widget isn't supposed to show anything yet |
c2c9dd2544b8
make lazy loading of map preview a little bit less of a hack
sheepluva
parents:
9735
diff
changeset
|
832 |
if (!m_previewEnabled) |
9735
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
833 |
return; |
6312152d92ad
don't generate any map previews until they are actually visible. this should improve hedgewars startup performance on weak machines
sheepluva
parents:
9452
diff
changeset
|
834 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
835 |
if (pMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
836 |
{ |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
837 |
disconnect(pMap, 0, this, SLOT(onImageReceived(const QPixmap))); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
838 |
disconnect(pMap, 0, this, SLOT(setHHLimit(int))); |
13265
2c0779260e8a
Partially fix wrong preview when joining host room with missing map
Wuzzy <Wuzzy2@mail.ru>
parents:
13264
diff
changeset
|
839 |
disconnect(pMap, 0, this, SLOT(onPreviewMapDestroyed(QObject *))); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
840 |
pMap = 0; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
841 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
842 |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
843 |
QPixmap failPixmap; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
844 |
QIcon failIcon; |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
845 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
846 |
switch(m_mapInfo.type) |
4562 | 847 |
{ |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
848 |
case MapModel::Invalid: |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
849 |
// Map error image |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
850 |
failPixmap = QPixmap(":/res/missingMap.png"); |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
851 |
setImage(failPixmap, linearGradMapError, false); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
852 |
lblDesc->clear(); |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
853 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
854 |
case MapModel::GeneratedMap: |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
855 |
case MapModel::GeneratedMaze: |
10391 | 856 |
case MapModel::GeneratedPerlin: |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
857 |
case MapModel::HandDrawnMap: |
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
858 |
case MapModel::FortsMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
859 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
860 |
break; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
861 |
default: |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
862 |
// For maps loaded from image |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
863 |
if(m_missingMap) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
864 |
{ |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
865 |
// Map error image due to missing map |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
866 |
failPixmap = QPixmap(":/res/missingMap.png"); |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
867 |
setImage(failPixmap, linearGradMapError, false); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
868 |
lblDesc->clear(); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
869 |
break; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
870 |
} |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
871 |
else |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
872 |
{ |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
873 |
// Draw map preview |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
874 |
QPixmap mapImage; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
875 |
bool success = mapImage.load("physfs://Maps/" + m_mapInfo.name + "/preview.png"); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
876 |
|
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
877 |
setHHLimit(m_mapInfo.limit); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
878 |
if(!success) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
879 |
{ |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
880 |
// Missing preview image |
13259
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
881 |
QPixmap empty = QPixmap(m_previewSize); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
882 |
empty.fill(Qt::transparent); |
1381ce67a781
Tweak map preview background colors
Wuzzy <Wuzzy2@mail.ru>
parents:
13258
diff
changeset
|
883 |
setImage(empty, linearGradNoPreview, true); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
884 |
return; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
885 |
} |
13258
dd054edd56df
Fix map type combo box being disabled for good when you select image or mission map
Wuzzy <Wuzzy2@mail.ru>
parents:
13256
diff
changeset
|
886 |
setImage(mapImage); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
887 |
} |
4562 | 888 |
} |
889 |
} |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
890 |
|
10480 | 891 |
void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl, int featureSize) |
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
892 |
{ |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
893 |
intSetMapgen(m); |
4941 | 894 |
intSetMazeSize(mazesize); |
895 |
intSetSeed(seed); |
|
896 |
intSetTemplateFilter(tmpl); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
897 |
// this one last because it will refresh the preview |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
898 |
intSetMap(map); |
10480 | 899 |
intSetMazeSize(mazesize); |
900 |
intSetFeatureSize(featureSize); |
|
4936
d65d438acd23
Merge MAP, MAPGEN and SEED params into one on room join, so engine isn't spawned three times for a preview. Not tested as I'm unable to see my rooms (why?)
unc0rr
parents:
4701
diff
changeset
|
901 |
} |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
902 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
903 |
void HWMapContainer::updateModelViews() |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
904 |
{ |
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:
6947
diff
changeset
|
905 |
// restore theme selection |
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:
6947
diff
changeset
|
906 |
// do this before map selection restore, because map may overwrite theme |
13264
e13777374583
Add some isNull checks for some strings in mapContainer
Wuzzy <Wuzzy2@mail.ru>
parents:
13263
diff
changeset
|
907 |
if (!m_theme.isNull() && !m_theme.isEmpty()) |
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:
6947
diff
changeset
|
908 |
{ |
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:
6947
diff
changeset
|
909 |
QModelIndexList mdl = m_themeModel->match(m_themeModel->index(0), Qt::DisplayRole, m_theme); |
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:
6947
diff
changeset
|
910 |
if (mdl.size() > 0) |
8377 | 911 |
updateTheme(mdl.at(0)); |
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:
6947
diff
changeset
|
912 |
else |
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:
6947
diff
changeset
|
913 |
setRandomTheme(); |
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:
6947
diff
changeset
|
914 |
} |
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:
6947
diff
changeset
|
915 |
|
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:
6947
diff
changeset
|
916 |
// restore map selection |
13264
e13777374583
Add some isNull checks for some strings in mapContainer
Wuzzy <Wuzzy2@mail.ru>
parents:
13263
diff
changeset
|
917 |
if (!m_curMap.isNull() && !m_curMap.isEmpty()) |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
918 |
intSetMap(m_curMap); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
919 |
else |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
920 |
updatePreview(); |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
921 |
} |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
922 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
923 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
924 |
void HWMapContainer::onPreviewMapDestroyed(QObject * map) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
925 |
{ |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
926 |
if (map == pMap) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
927 |
pMap = 0; |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
928 |
} |
8377 | 929 |
|
930 |
void HWMapContainer::mapTypeChanged(int index) |
|
931 |
{ |
|
932 |
changeMapType((MapModel::MapType)cType->itemData(index).toInt()); |
|
933 |
} |
|
934 |
||
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
935 |
void HWMapContainer::updateHelpTexts(MapModel::MapType type) |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
936 |
{ |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
937 |
QString randomAll = tr("Randomize the map, theme and seed"); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
938 |
QString randomNoMap = tr("Randomize the theme and seed"); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
939 |
QString randomSeed = tr("Randomize the seed"); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
940 |
QString randomAllPrev = tr("Click to randomize the map, theme and seed"); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
941 |
QString randomNoMapPrev = tr("Click to randomize the theme and seed"); |
11816
f9a4f4d11c3a
Fix problems with dynamic whats this texts
Wuzzy <almikes@aol.com>
parents:
11814
diff
changeset
|
942 |
QString mfsComplex = QString(tr("Adjust the complexity of the generated map")); |
f9a4f4d11c3a
Fix problems with dynamic whats this texts
Wuzzy <almikes@aol.com>
parents:
11814
diff
changeset
|
943 |
QString mfsFortsDistance = QString(tr("Adjust the distance between forts")); |
14421 | 944 |
QString mfsDrawnMap = QString(tr("Scale size of the drawn map")); |
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
945 |
switch (type) |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
946 |
{ |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
947 |
case MapModel::GeneratedMap: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
948 |
case MapModel::GeneratedPerlin: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
949 |
case MapModel::GeneratedMaze: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
950 |
mapPreview->setWhatsThis(randomAllPrev); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
951 |
mapFeatureSize->setWhatsThis(mfsComplex); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
952 |
btnRandomize->setWhatsThis(randomAll); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
953 |
break; |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
954 |
case MapModel::MissionMap: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
955 |
case MapModel::StaticMap: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
956 |
mapPreview->setWhatsThis(randomAllPrev); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
957 |
btnRandomize->setWhatsThis(randomAll); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
958 |
break; |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
959 |
case MapModel::HandDrawnMap: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
960 |
mapPreview->setWhatsThis(tr("Click to edit")); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
961 |
btnRandomize->setWhatsThis(randomSeed); |
14421 | 962 |
mapFeatureSize->setWhatsThis(mfsDrawnMap); |
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
963 |
break; |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
964 |
case MapModel::FortsMap: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
965 |
mapPreview->setWhatsThis(randomNoMapPrev); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
966 |
mapFeatureSize->setWhatsThis(mfsFortsDistance); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
967 |
btnRandomize->setWhatsThis(randomNoMap); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
968 |
break; |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
969 |
default: |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
970 |
break; |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
971 |
} |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
972 |
} |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
973 |
|
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
974 |
|
8377 | 975 |
void HWMapContainer::changeMapType(MapModel::MapType type, const QModelIndex & newMap) |
976 |
{ |
|
977 |
staticMapList->hide(); |
|
978 |
missionMapList->hide(); |
|
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
979 |
teMapName->hide(); |
8377 | 980 |
lblMapList->hide(); |
981 |
generationStyles->hide(); |
|
982 |
mazeStyles->hide(); |
|
983 |
lblDesc->hide(); |
|
984 |
btnLoadMap->hide(); |
|
985 |
btnEditMap->hide(); |
|
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
986 |
mapFeatureSize->show(); |
8377 | 987 |
|
988 |
switch (type) |
|
989 |
{ |
|
990 |
case MapModel::GeneratedMap: |
|
991 |
mapgen = MAPGEN_REGULAR; |
|
992 |
setMapInfo(MapModel::MapInfoRandom); |
|
993 |
lblMapList->setText(tr("Map size:")); |
|
994 |
lblMapList->show(); |
|
995 |
generationStyles->show(); |
|
996 |
break; |
|
997 |
case MapModel::GeneratedMaze: |
|
998 |
mapgen = MAPGEN_MAZE; |
|
999 |
setMapInfo(MapModel::MapInfoMaze); |
|
1000 |
lblMapList->setText(tr("Maze style:")); |
|
1001 |
lblMapList->show(); |
|
1002 |
mazeStyles->show(); |
|
1003 |
break; |
|
10391 | 1004 |
case MapModel::GeneratedPerlin: |
1005 |
mapgen = MAPGEN_PERLIN; |
|
1006 |
setMapInfo(MapModel::MapInfoPerlin); |
|
1007 |
lblMapList->setText(tr("Style:")); |
|
1008 |
lblMapList->show(); |
|
1009 |
mazeStyles->show(); |
|
1010 |
break; |
|
8377 | 1011 |
case MapModel::HandDrawnMap: |
1012 |
mapgen = MAPGEN_DRAWN; |
|
1013 |
setMapInfo(MapModel::MapInfoDrawn); |
|
1014 |
btnLoadMap->show(); |
|
14421 | 1015 |
//mapFeatureSize->hide(); |
8377 | 1016 |
btnEditMap->show(); |
1017 |
break; |
|
1018 |
case MapModel::MissionMap: |
|
9744 | 1019 |
setupMissionMapsView(); |
8377 | 1020 |
mapgen = MAPGEN_MAP; |
1021 |
missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
|
1022 |
lblMapList->setText(tr("Mission:")); |
|
1023 |
lblMapList->show(); |
|
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1024 |
setMapNameLabel(m_curMap, !m_missingMap); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1025 |
if(m_master) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1026 |
{ |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1027 |
missionMapList->show(); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1028 |
} |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1029 |
else |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1030 |
{ |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1031 |
teMapName->show(); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1032 |
} |
10480 | 1033 |
mapFeatureSize->hide(); |
8377 | 1034 |
lblDesc->setText(m_mapInfo.desc); |
1035 |
lblDesc->show(); |
|
1036 |
emit mapChanged(m_curMap); |
|
1037 |
break; |
|
1038 |
case MapModel::StaticMap: |
|
9744 | 1039 |
setupStaticMapsView(); |
8377 | 1040 |
mapgen = MAPGEN_MAP; |
1041 |
staticMapChanged(newMap.isValid() ? newMap : staticMapList->currentIndex()); |
|
1042 |
lblMapList->setText(tr("Map:")); |
|
1043 |
lblMapList->show(); |
|
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1044 |
setMapNameLabel(m_curMap, !m_missingMap); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1045 |
if(m_master) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1046 |
{ |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1047 |
staticMapList->show(); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1048 |
} |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1049 |
else |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1050 |
{ |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1051 |
teMapName->show(); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1052 |
} |
10480 | 1053 |
mapFeatureSize->hide(); |
8377 | 1054 |
emit mapChanged(m_curMap); |
1055 |
break; |
|
11749
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
1056 |
case MapModel::FortsMap: |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
1057 |
mapgen = MAPGEN_FORTS; |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
1058 |
setMapInfo(MapModel::MapInfoForts); |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
1059 |
lblMapList->hide(); |
ac58a063d26a
Added "Forts" to map type selection. This makes the mode easier selectable/discoverable. Also the slider can be used to adjust the distance between forts.
sheepluva
parents:
10959
diff
changeset
|
1060 |
break; |
8377 | 1061 |
default: |
1062 |
break; |
|
1063 |
} |
|
1064 |
||
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1065 |
// Update theme button size |
10477
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
1066 |
updateThemeButtonSize(); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1067 |
|
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
1068 |
// Update “What's This?” help texts |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
1069 |
updateHelpTexts(type); |
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
1070 |
|
8377 | 1071 |
// Update cType combobox |
1072 |
for (int i = 0; i < cType->count(); i++) |
|
1073 |
{ |
|
1074 |
if ((MapModel::MapType)cType->itemData(i).toInt() == type) |
|
1075 |
{ |
|
1076 |
cType->setCurrentIndex(i); |
|
1077 |
break; |
|
1078 |
} |
|
1079 |
} |
|
1080 |
||
8467 | 1081 |
repaint(); |
1082 |
||
8377 | 1083 |
emit mapgenChanged(mapgen); |
1084 |
} |
|
1085 |
||
10480 | 1086 |
void HWMapContainer::intSetFeatureSize(int val) |
1087 |
{ |
|
1088 |
mapFeatureSize->setValue(val); |
|
11814
f412d539284e
Add various “What's This?” texts to multiplayer, net and team editor frontend pages
Wuzzy <almikes@aol.com>
parents:
11790
diff
changeset
|
1089 |
updateHelpTexts((MapModel::MapType)cType->itemData(cType->currentIndex()).toInt()); |
10480 | 1090 |
emit mapFeatureSizeChanged(val); |
1091 |
} |
|
1092 |
void HWMapContainer::setFeatureSize(int val) |
|
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
1093 |
{ |
10477
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
1094 |
m_mapFeatureSize = val; |
10480 | 1095 |
intSetFeatureSize(val); |
15015
5d8068ee16fc
Give a more accurate hedgehog limit estimate for small drawn maps
Wuzzy <Wuzzy2@mail.ru>
parents:
14926
diff
changeset
|
1096 |
m_prevMapFeatureSize = m_mapFeatureSize; |
5d8068ee16fc
Give a more accurate hedgehog limit estimate for small drawn maps
Wuzzy <Wuzzy2@mail.ru>
parents:
14926
diff
changeset
|
1097 |
updatePreview(); |
10471
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
1098 |
} |
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
1099 |
|
d968b1ac130c
sheepluva and unc0rr didn't like the idea of slider over preview.
nemo
parents:
10465
diff
changeset
|
1100 |
// unused because I needed the space for the slider |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1101 |
void HWMapContainer::updateThemeButtonSize() |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1102 |
{ |
14421 | 1103 |
if (m_mapInfo.type != MapModel::StaticMap) |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1104 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1105 |
btnTheme->setIconSize(QSize(30, 30)); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1106 |
btnTheme->setFixedHeight(30); |
11790 | 1107 |
btnRandTheme->setFixedHeight(30); |
1108 |
btnRandTheme->setIconSize(QSize(24, 24)); |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1109 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1110 |
else |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1111 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1112 |
QSize iconSize = btnTheme->icon().actualSize(QSize(65535, 65535)); |
11790 | 1113 |
btnRandTheme->setFixedHeight(64); |
8430
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
1114 |
btnTheme->setFixedHeight(64); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1115 |
btnTheme->setIconSize(iconSize); |
11790 | 1116 |
btnRandTheme->setIconSize(QSize(32, 32)); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1117 |
} |
8430
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
1118 |
|
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
1119 |
repaint(); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1120 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1121 |
|
8377 | 1122 |
void HWMapContainer::showThemePrompt() |
1123 |
{ |
|
8475
f605bc59c603
Initial theme selection is now random. Theme prompt now has a search input and no longer uses FlowLayout. (Resolves issue 520)
dag10
parents:
8467
diff
changeset
|
1124 |
ThemePrompt prompt(m_themeID, this); |
8377 | 1125 |
int theme = prompt.exec() - 1; // Since 0 means canceled, so all indexes are +1'd |
1126 |
if (theme < 0) return; |
|
1127 |
||
1128 |
QModelIndex current = m_themeModel->index(theme, 0); |
|
1129 |
updateTheme(current); |
|
1130 |
emit themeChanged(m_theme); |
|
1131 |
} |
|
1132 |
||
1133 |
void HWMapContainer::updateTheme(const QModelIndex & current) |
|
1134 |
{ |
|
8475
f605bc59c603
Initial theme selection is now random. Theme prompt now has a search input and no longer uses FlowLayout. (Resolves issue 520)
dag10
parents:
8467
diff
changeset
|
1135 |
m_theme = selectedTheme = current.data(ThemeModel::ActualNameRole).toString(); |
f605bc59c603
Initial theme selection is now random. Theme prompt now has a search input and no longer uses FlowLayout. (Resolves issue 520)
dag10
parents:
8467
diff
changeset
|
1136 |
m_themeID = current.row(); |
12902
fc47fc4af6bd
Finish porting. Seems to work, but no thorough testing has been performed
unc0rr
parents:
11915
diff
changeset
|
1137 |
QIcon icon = current.data(Qt::DecorationRole).value<QIcon>(); |
8377 | 1138 |
btnTheme->setIcon(icon); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1139 |
QString themeLabel = tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString()); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1140 |
btnTheme->setText(themeLabel); |
10477
b219c5a2317f
Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.
nemo
parents:
10472
diff
changeset
|
1141 |
updateThemeButtonSize(); |
8377 | 1142 |
} |
1143 |
||
1144 |
void HWMapContainer::staticMapChanged(const QModelIndex & map, const QModelIndex & old) |
|
1145 |
{ |
|
1146 |
mapChanged(map, 0, old); |
|
1147 |
} |
|
1148 |
||
1149 |
void HWMapContainer::missionMapChanged(const QModelIndex & map, const QModelIndex & old) |
|
1150 |
{ |
|
1151 |
mapChanged(map, 1, old); |
|
1152 |
} |
|
1153 |
||
1154 |
// Type: 0 = static, 1 = mission |
|
1155 |
void HWMapContainer::mapChanged(const QModelIndex & map, int type, const QModelIndex & old) |
|
1156 |
{ |
|
1157 |
QListView * mapList; |
|
1158 |
||
13263
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1159 |
if (type == 0) |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1160 |
{ |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1161 |
mapList = staticMapList; |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1162 |
m_mapInfo.type = MapModel::StaticMap; |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1163 |
} |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1164 |
else if (type == 1) |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1165 |
{ |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1166 |
mapList = missionMapList; |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1167 |
m_mapInfo.type = MapModel::MissionMap; |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1168 |
} |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1169 |
else |
66dd7b5f7d33
Fix incorrect preview when selecting image map the first time in session
Wuzzy <Wuzzy2@mail.ru>
parents:
13261
diff
changeset
|
1170 |
return; |
8377 | 1171 |
|
1172 |
// Make sure it is a valid index |
|
1173 |
if (!map.isValid()) |
|
1174 |
{ |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1175 |
// Make sure there's always a valid selection in the map list |
8377 | 1176 |
if (old.isValid()) |
1177 |
{ |
|
1178 |
mapList->setCurrentIndex(old); |
|
1179 |
mapList->scrollTo(old); |
|
1180 |
} |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1181 |
m_mapInfo.type = MapModel::Invalid; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1182 |
m_missingMap = true; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1183 |
updatePreview(); |
8377 | 1184 |
return; |
1185 |
} |
|
1186 |
||
1187 |
// If map changed, update list selection |
|
1188 |
if (mapList->currentIndex() != map) |
|
1189 |
{ |
|
1190 |
mapList->setCurrentIndex(map); |
|
1191 |
mapList->scrollTo(map); |
|
1192 |
} |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1193 |
if (m_missingMap) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1194 |
{ |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1195 |
m_missingMap = false; |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1196 |
updatePreview(); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1197 |
} |
8377 | 1198 |
|
10463 | 1199 |
Q_ASSERT(map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); // Houston, we have a problem. |
1200 |
setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
|
8377 | 1201 |
} |
1202 |
||
1203 |
void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
|
1204 |
{ |
|
1205 |
m_mapInfo = mapInfo; |
|
1206 |
m_curMap = m_mapInfo.name; |
|
1207 |
||
1208 |
// the map has no pre-defined theme, so let's use the selected one |
|
13264
e13777374583
Add some isNull checks for some strings in mapContainer
Wuzzy <Wuzzy2@mail.ru>
parents:
13263
diff
changeset
|
1209 |
if (m_mapInfo.theme.isNull() || m_mapInfo.theme.isEmpty()) |
8377 | 1210 |
{ |
13264
e13777374583
Add some isNull checks for some strings in mapContainer
Wuzzy <Wuzzy2@mail.ru>
parents:
13263
diff
changeset
|
1211 |
if (!selectedTheme.isNull() && !selectedTheme.isEmpty()) |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1212 |
{ |
14833
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1213 |
// Fall back to a default theme if current theme is a background theme or hidden |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1214 |
QModelIndexList mdl = m_themeModel->match(m_themeModel->index(0), ThemeModel::ActualNameRole, m_theme); |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1215 |
if (mdl.size() > 0) |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1216 |
{ |
14926 | 1217 |
if ((mdl.at(0).data(ThemeModel::IsBackgroundThemeRole).toBool() == true) || (mdl.at(0).data(ThemeModel::IsHiddenRole).toBool() == true)) |
14833
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1218 |
{ |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1219 |
selectedTheme = "Nature"; |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1220 |
} |
8ed0c3761640
Change theme to Nature if changing from background-only or hidden theme to a generated map type
Wuzzy <Wuzzy2@mail.ru>
parents:
14671
diff
changeset
|
1221 |
} |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1222 |
setTheme(selectedTheme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1223 |
emit themeChanged(selectedTheme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1224 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1225 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1226 |
else |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1227 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1228 |
setTheme(m_mapInfo.theme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1229 |
emit themeChanged(m_mapInfo.theme); |
8377 | 1230 |
} |
1231 |
||
1232 |
lblDesc->setText(mapInfo.desc); |
|
1233 |
||
1234 |
updatePreview(); |
|
1235 |
emit mapChanged(m_curMap); |
|
1236 |
} |
|
1237 |
||
1238 |
void HWMapContainer::loadDrawing() |
|
1239 |
{ |
|
13217
e9e4cc867b6e
Add default directory DrawnMaps to put hand-drawn maps into
Wuzzy <Wuzzy2@mail.ru>
parents:
12902
diff
changeset
|
1240 |
QString loadDir = QDir(cfgdir->absolutePath() + "/DrawnMaps").absolutePath(); |
e9e4cc867b6e
Add default directory DrawnMaps to put hand-drawn maps into
Wuzzy <Wuzzy2@mail.ru>
parents:
12902
diff
changeset
|
1241 |
QString fileName = QFileDialog::getOpenFileName(this, tr("Load drawn map"), loadDir, tr("Drawn Maps") + " (*.hwmap);;" + tr("All files") + " (*)"); |
8377 | 1242 |
|
1243 |
if(fileName.isEmpty()) return; |
|
1244 |
||
1245 |
QFile f(fileName); |
|
1246 |
||
1247 |
if(!f.open(QIODevice::ReadOnly)) |
|
1248 |
{ |
|
1249 |
QMessageBox errorMsg(parentWidget()); |
|
1250 |
errorMsg.setIcon(QMessageBox::Warning); |
|
1251 |
errorMsg.setWindowTitle(QMessageBox::tr("File error")); |
|
1252 |
errorMsg.setText(QMessageBox::tr("Cannot open '%1' for reading").arg(fileName)); |
|
14841
b9437746bffb
Frontend: Force plain text mode for many message windows
Wuzzy <Wuzzy2@mail.ru>
parents:
14833
diff
changeset
|
1253 |
errorMsg.setTextFormat(Qt::PlainText); |
8377 | 1254 |
errorMsg.setWindowModality(Qt::WindowModal); |
1255 |
errorMsg.exec(); |
|
1256 |
} |
|
1257 |
else |
|
1258 |
{ |
|
1259 |
drawMapScene.decode(qUncompress(QByteArray::fromBase64(f.readAll()))); |
|
1260 |
mapDrawingFinished(); |
|
1261 |
} |
|
1262 |
} |
|
1263 |
||
1264 |
void HWMapContainer::showSeedPrompt() |
|
1265 |
{ |
|
1266 |
SeedPrompt prompt(parentWidget()->parentWidget(), getCurrentSeed(), isMaster()); |
|
1267 |
connect(&prompt, SIGNAL(seedSelected(const QString &)), this, SLOT(setNewSeed(const QString &))); |
|
1268 |
prompt.exec(); |
|
1269 |
} |
|
1270 |
||
1271 |
bool HWMapContainer::isMaster() |
|
1272 |
{ |
|
1273 |
return m_master; |
|
1274 |
} |
|
1275 |
||
1276 |
void HWMapContainer::setMaster(bool master) |
|
1277 |
{ |
|
8467 | 1278 |
if (master == m_master) return; |
8377 | 1279 |
m_master = master; |
8434 | 1280 |
|
8377 | 1281 |
foreach (QWidget *widget, m_childWidgets) |
1282 |
widget->setEnabled(master); |
|
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1283 |
|
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1284 |
if(m_mapInfo.type == MapModel::StaticMap) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1285 |
{ |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1286 |
teMapName->setHidden(master); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1287 |
staticMapList->setVisible(master); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1288 |
} |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1289 |
else if(m_mapInfo.type == MapModel::MissionMap) |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1290 |
{ |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1291 |
teMapName->setHidden(master); |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1292 |
missionMapList->setVisible(master); |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1293 |
} |
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1294 |
|
13261
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1295 |
if(master) |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1296 |
{ |
13261
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1297 |
// Room delegation cleanup if we get room control. |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1298 |
|
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1299 |
if(m_missingMap) |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1300 |
{ |
13271
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1301 |
// Reset map if we don't have the host's map |
13261
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1302 |
m_missingMap = false; |
13271
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1303 |
if(m_mapInfo.type == MapModel::MissionMap) |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1304 |
{ |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1305 |
missionMapList->selectionModel()->setCurrentIndex(m_missionMapModel->index(0, 0), QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent); |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1306 |
} |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1307 |
else |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1308 |
{ |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1309 |
if(m_mapInfo.type != MapModel::StaticMap) |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1310 |
{ |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1311 |
changeMapType(MapModel::StaticMap); |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1312 |
} |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1313 |
staticMapList->selectionModel()->setCurrentIndex(m_staticMapModel->index(0, 0), QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent); |
df1db657bbb4
If delegating room control, reset map of new master, if map is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13270
diff
changeset
|
1314 |
} |
13261
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1315 |
} |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1316 |
else |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1317 |
{ |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1318 |
// Set random theme if we don't have it |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1319 |
QModelIndexList mdl = m_themeModel->match(m_themeModel->index(0), ThemeModel::ActualNameRole, m_theme); |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1320 |
if(!mdl.size()) |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1321 |
setRandomTheme(); |
0cfa8f6a4e80
Force proper map and theme reset when host delegates to you if you don't have the map or theme
Wuzzy <Wuzzy2@mail.ru>
parents:
13260
diff
changeset
|
1322 |
} |
13251
0c98d3b249f7
Online room: Display error image in preview when host selects a map you don't have
Wuzzy <Wuzzy2@mail.ru>
parents:
13233
diff
changeset
|
1323 |
} |
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1324 |
else |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1325 |
{ |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1326 |
setMapNameLabel(m_curMap, true); |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1327 |
} |
8377 | 1328 |
} |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1329 |
|
13254
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1330 |
void HWMapContainer::setMissingTheme(const QString & name) |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1331 |
{ |
13264
e13777374583
Add some isNull checks for some strings in mapContainer
Wuzzy <Wuzzy2@mail.ru>
parents:
13263
diff
changeset
|
1332 |
if (name.isNull() || name.isEmpty()) return; |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1333 |
|
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
1334 |
m_theme = name; |
13254
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1335 |
QPixmap pixMissing = QPixmap(":/res/missingTheme@2x.png"); |
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1336 |
QIcon iconMissing = QIcon(); |
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1337 |
iconMissing.addPixmap(pixMissing, QIcon::Normal); |
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1338 |
iconMissing.addPixmap(pixMissing, QIcon::Disabled); |
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1339 |
btnTheme->setIcon(iconMissing); |
13260
7f8f2c77a9cc
Map container: Add question mark in front of missing theme name
Wuzzy <Wuzzy2@mail.ru>
parents:
13259
diff
changeset
|
1340 |
// Question mark in front of theme name denotes it's missing |
7f8f2c77a9cc
Map container: Add question mark in front of missing theme name
Wuzzy <Wuzzy2@mail.ru>
parents:
13259
diff
changeset
|
1341 |
btnTheme->setText(tr("Theme: %1").arg("?" + name)); |
13254
d2b58cf339fe
Show error icon when selected theme is missing
Wuzzy <Wuzzy2@mail.ru>
parents:
13253
diff
changeset
|
1342 |
updateThemeButtonSize(); |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8393
diff
changeset
|
1343 |
} |
9744 | 1344 |
|
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1345 |
void HWMapContainer::setupMissionMapsView(const QString & initialMap) |
9744 | 1346 |
{ |
1347 |
if(m_missionsViewSetup) return; |
|
1348 |
m_missionsViewSetup = true; |
|
1349 |
||
1350 |
m_missionMapModel->loadMaps(); |
|
1351 |
missionMapList->setModel(m_missionMapModel); |
|
1352 |
missionMapList->setEditTriggers(QAbstractItemView::NoEditTriggers); |
|
1353 |
QItemSelectionModel * missionSelectionModel = missionMapList->selectionModel(); |
|
1354 |
connect(missionSelectionModel, |
|
1355 |
SIGNAL(currentRowChanged(const QModelIndex &, const QModelIndex &)), |
|
1356 |
this, |
|
1357 |
SLOT(missionMapChanged(const QModelIndex &, const QModelIndex &))); |
|
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1358 |
int m = 0; |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1359 |
if(!initialMap.isNull()) |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1360 |
m = m_missionMapModel->findMap(initialMap); |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1361 |
missionSelectionModel->setCurrentIndex(m_missionMapModel->index(m, 0), QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent); |
9744 | 1362 |
} |
1363 |
||
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1364 |
void HWMapContainer::setupStaticMapsView(const QString & initialMap) |
9744 | 1365 |
{ |
1366 |
if(m_staticViewSetup) return; |
|
1367 |
m_staticViewSetup = true; |
|
1368 |
||
1369 |
m_staticMapModel->loadMaps(); |
|
1370 |
staticMapList->setModel(m_staticMapModel); |
|
1371 |
staticMapList->setEditTriggers(QAbstractItemView::NoEditTriggers); |
|
1372 |
QItemSelectionModel * staticSelectionModel = staticMapList->selectionModel(); |
|
1373 |
connect(staticSelectionModel, |
|
1374 |
SIGNAL(currentRowChanged(const QModelIndex &, const QModelIndex &)), |
|
1375 |
this, |
|
1376 |
SLOT(staticMapChanged(const QModelIndex &, const QModelIndex &))); |
|
13266
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1377 |
int m = 0; |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1378 |
if(!initialMap.isNull()) |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1379 |
m = m_staticMapModel->findMap(initialMap); |
01ac67500f50
Fix initial map preview being broken when joining room, part 2
Wuzzy <Wuzzy2@mail.ru>
parents:
13265
diff
changeset
|
1380 |
staticSelectionModel->setCurrentIndex(m_staticMapModel->index(m, 0), QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent); |
9744 | 1381 |
} |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1382 |
|
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1383 |
// Call this function instead of setting the text of the map name label |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1384 |
// directly. |
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1385 |
void HWMapContainer::setMapNameLabel(QString mapName, bool validMap) |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1386 |
{ |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1387 |
// Cut off insanely long names to be displayed |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1388 |
if(mapName.length() >= 90) |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1389 |
{ |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1390 |
mapName.truncate(84); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1391 |
mapName.append(" (...)"); |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1392 |
} |
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1393 |
teMapName->setPlainText(mapName); |
13270
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1394 |
if(validMap) |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1395 |
teMapName->setStyleSheet("background-color: transparent;"); |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1396 |
else |
8a5feb0edce5
QTfrontent: Print map and style name in red, if missing. And update map label after delegation
Wuzzy <Wuzzy2@mail.ru>
parents:
13266
diff
changeset
|
1397 |
teMapName->setStyleSheet("background-color: transparent; color: #b50000;"); |
13256
edb2f654f8f6
Shorten and wrap map name properly when viewing room as non-master
Wuzzy <Wuzzy2@mail.ru>
parents:
13255
diff
changeset
|
1398 |
} |