author | unc0rr |
Mon, 02 Dec 2013 23:20:07 +0400 | |
changeset 9738 | 18bb6d1fc9d9 |
parent 9735 | 6312152d92ad |
child 9739 | c2c9dd2544b8 |
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 |
|
16 |
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA |
|
17 |
*/ |
|
18 |
||
19 |
#include <QPushButton> |
|
20 |
#include <QBuffer> |
|
21 |
#include <QUuid> |
|
22 |
#include <QBitmap> |
|
23 |
#include <QPainter> |
|
24 |
#include <QLinearGradient> |
|
25 |
#include <QColor> |
|
249 | 26 |
#include <QTextStream> |
1209 | 27 |
#include <QLabel> |
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
|
28 |
#include <QListView> |
1209 | 29 |
#include <QVBoxLayout> |
1224 | 30 |
#include <QIcon> |
4519 | 31 |
#include <QLineEdit> |
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
|
32 |
#include <QStringListModel> |
8377 | 33 |
#include <QListWidget> |
34 |
#include <QListWidgetItem> |
|
35 |
#include <QDebug> |
|
36 |
#include <QFile> |
|
37 |
#include <QFileDialog> |
|
38 |
#include <QInputDialog> |
|
39 |
#include <QMessageBox> |
|
249 | 40 |
|
41 |
#include "hwconsts.h" |
|
788
00720357601f
- Get rid of PageSimpleGame, now pressing 'quick game' just starts round
unc0rr
parents:
682
diff
changeset
|
42 |
#include "mapContainer.h" |
8377 | 43 |
#include "themeprompt.h" |
44 |
#include "seedprompt.h" |
|
1209 | 45 |
#include "igbox.h" |
5252 | 46 |
#include "HWApplication.h" |
7258 | 47 |
#include "ThemeModel.h" |
184 | 48 |
|
8377 | 49 |
|
50 |
||
184 | 51 |
HWMapContainer::HWMapContainer(QWidget * parent) : |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
52 |
QWidget(parent), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
53 |
mainLayout(this), |
3133 | 54 |
pMap(0), |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
55 |
mapgen(MAPGEN_REGULAR), |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
56 |
m_previewSize(256, 128) |
184 | 57 |
{ |
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
|
58 |
m_previewDirty = true; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
59 |
hhSmall.load(":/res/hh_small.png"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
60 |
hhLimit = 18; |
1797 | 61 |
templateFilter = 0; |
8377 | 62 |
m_master = true; |
2377 | 63 |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
64 |
linearGrad = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
65 |
linearGrad.setColorAt(1, QColor(0, 0, 192)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
66 |
linearGrad.setColorAt(0, QColor(66, 115, 225)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
67 |
|
5252 | 68 |
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
|
69 |
10, |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
70 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
71 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); |
2377 | 72 |
|
8377 | 73 |
m_staticMapModel = DataManager::instance().staticMapModel(); |
74 |
m_missionMapModel = DataManager::instance().missionMapModel(); |
|
75 |
m_themeModel = DataManager::instance().themeModel(); |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
76 |
|
8377 | 77 |
/* Layouts */ |
249 | 78 |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
79 |
QWidget * topWidget = new QWidget(); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
80 |
QHBoxLayout * topLayout = new QHBoxLayout(topWidget); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
81 |
topWidget->setContentsMargins(0, 0, 0, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
82 |
topLayout->setContentsMargins(0, 0, 0, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
83 |
|
8377 | 84 |
QHBoxLayout * twoColumnLayout = new QHBoxLayout(); |
85 |
QVBoxLayout * leftLayout = new QVBoxLayout(); |
|
86 |
QVBoxLayout * rightLayout = new QVBoxLayout(); |
|
87 |
twoColumnLayout->addLayout(leftLayout, 0); |
|
88 |
twoColumnLayout->addStretch(1); |
|
89 |
twoColumnLayout->addLayout(rightLayout, 0); |
|
90 |
QVBoxLayout * drawnControls = new QVBoxLayout(); |
|
91 |
||
92 |
/* Map type combobox */ |
|
4487 | 93 |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
94 |
topLayout->setSpacing(10); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
95 |
topLayout->addWidget(new QLabel(tr("Map type:")), 0); |
8377 | 96 |
cType = new QComboBox(this); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
97 |
topLayout->addWidget(cType, 1); |
8377 | 98 |
cType->insertItem(0, tr("Image map"), MapModel::StaticMap); |
99 |
cType->insertItem(1, tr("Mission map"), MapModel::MissionMap); |
|
100 |
cType->insertItem(2, tr("Hand-drawn"), MapModel::HandDrawnMap); |
|
101 |
cType->insertItem(3, tr("Randomly generated"), MapModel::GeneratedMap); |
|
102 |
cType->insertItem(4, tr("Random maze"), MapModel::GeneratedMaze); |
|
103 |
connect(cType, SIGNAL(currentIndexChanged(int)), this, SLOT(mapTypeChanged(int))); |
|
104 |
m_childWidgets << cType; |
|
249 | 105 |
|
8377 | 106 |
/* Randomize button */ |
1802 | 107 |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
108 |
topLayout->addStretch(1); |
8377 | 109 |
const QIcon& lp = QIcon(":/res/dice.png"); |
110 |
QSize sz = lp.actualSize(QSize(65535, 65535)); |
|
111 |
btnRandomize = new QPushButton(); |
|
112 |
btnRandomize->setText(tr("Random")); |
|
113 |
btnRandomize->setIcon(lp); |
|
114 |
btnRandomize->setFixedHeight(30); |
|
115 |
btnRandomize->setIconSize(sz); |
|
116 |
btnRandomize->setFlat(true); |
|
117 |
btnRandomize->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
|
118 |
connect(btnRandomize, SIGNAL(clicked()), this, SLOT(setRandomMap())); |
|
119 |
m_childWidgets << btnRandomize; |
|
120 |
btnRandomize->setStyleSheet("padding: 5px;"); |
|
121 |
btnRandomize->setFixedHeight(cType->height()); |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
122 |
topLayout->addWidget(btnRandomize, 1); |
1802 | 123 |
|
8377 | 124 |
/* Seed button */ |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
125 |
|
8377 | 126 |
btnSeed = new QPushButton(parentWidget()->parentWidget()); |
127 |
btnSeed->setText(tr("Seed")); |
|
128 |
btnSeed->setStyleSheet("padding: 5px;"); |
|
129 |
btnSeed->setFixedHeight(cType->height()); |
|
130 |
connect(btnSeed, SIGNAL(clicked()), this, SLOT(showSeedPrompt())); |
|
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
131 |
topLayout->addWidget(btnSeed, 0); |
1802 | 132 |
|
8377 | 133 |
/* Map preview label */ |
134 |
||
135 |
QLabel * lblMapPreviewText = new QLabel(this); |
|
136 |
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
|
137 |
leftLayout->addWidget(lblMapPreviewText, 0); |
8377 | 138 |
|
139 |
/* Map Preview */ |
|
4562 | 140 |
|
8467 | 141 |
mapPreview = new QPushButton(this); |
8377 | 142 |
mapPreview->setObjectName("mapPreview"); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
143 |
mapPreview->setFlat(true); |
8377 | 144 |
mapPreview->setFixedSize(256, 128); |
8467 | 145 |
mapPreview->setContentsMargins(0, 0, 0, 0); |
8377 | 146 |
leftLayout->addWidget(mapPreview, 0); |
8467 | 147 |
connect(mapPreview, SIGNAL(clicked()), this, SLOT(previewClicked())); |
8377 | 148 |
|
149 |
/* Bottom-Left layout */ |
|
3133 | 150 |
|
8377 | 151 |
QVBoxLayout * bottomLeftLayout = new QVBoxLayout(); |
152 |
leftLayout->addLayout(bottomLeftLayout, 1); |
|
153 |
||
154 |
/* Map list label */ |
|
155 |
||
156 |
lblMapList = new QLabel(); |
|
157 |
rightLayout->addWidget(lblMapList, 0); |
|
158 |
||
159 |
/* Static maps list */ |
|
1248 | 160 |
|
8377 | 161 |
staticMapList = new QListView; |
162 |
staticMapList->setModel(m_staticMapModel); |
|
163 |
rightLayout->addWidget(staticMapList, 1); |
|
164 |
staticMapList->setEditTriggers(QAbstractItemView::NoEditTriggers); |
|
165 |
m_childWidgets << staticMapList; |
|
166 |
QItemSelectionModel * staticSelectionModel = staticMapList->selectionModel(); |
|
167 |
connect(staticSelectionModel, |
|
168 |
SIGNAL(currentRowChanged(const QModelIndex &, const QModelIndex &)), |
|
169 |
this, |
|
170 |
SLOT(staticMapChanged(const QModelIndex &, const QModelIndex &))); |
|
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
|
171 |
|
8377 | 172 |
/* Mission maps list */ |
1802 | 173 |
|
8377 | 174 |
missionMapList = new QListView; |
175 |
missionMapList->setModel(m_missionMapModel); |
|
176 |
missionMapList->setEditTriggers(QAbstractItemView::NoEditTriggers); |
|
177 |
rightLayout->addWidget(missionMapList, 1); |
|
178 |
m_childWidgets << missionMapList; |
|
179 |
QItemSelectionModel * missionSelectionModel = missionMapList->selectionModel(); |
|
180 |
connect(missionSelectionModel, |
|
181 |
SIGNAL(currentRowChanged(const QModelIndex &, const QModelIndex &)), |
|
182 |
this, |
|
183 |
SLOT(missionMapChanged(const QModelIndex &, const QModelIndex &))); |
|
184 |
||
185 |
/* Map load and edit buttons */ |
|
186 |
||
187 |
drawnControls->addStretch(1); |
|
2377 | 188 |
|
8377 | 189 |
btnLoadMap = new QPushButton(tr("Load map drawing")); |
190 |
btnLoadMap->setStyleSheet("padding: 20px;"); |
|
191 |
drawnControls->addWidget(btnLoadMap, 0); |
|
192 |
m_childWidgets << btnLoadMap; |
|
193 |
connect(btnLoadMap, SIGNAL(clicked()), this, SLOT(loadDrawing())); |
|
194 |
||
195 |
btnEditMap = new QPushButton(tr("Edit map drawing")); |
|
196 |
btnEditMap->setStyleSheet("padding: 20px;"); |
|
197 |
drawnControls->addWidget(btnEditMap, 0); |
|
198 |
m_childWidgets << btnEditMap; |
|
199 |
connect(btnEditMap, SIGNAL(clicked()), this, SIGNAL(drawMapRequested())); |
|
200 |
||
201 |
drawnControls->addStretch(1); |
|
202 |
||
203 |
rightLayout->addLayout(drawnControls); |
|
204 |
||
205 |
/* Generator style list */ |
|
2377 | 206 |
|
8377 | 207 |
generationStyles = new QListWidget(); |
208 |
new QListWidgetItem(tr("All"), generationStyles); |
|
209 |
new QListWidgetItem(tr("Small"), generationStyles); |
|
210 |
new QListWidgetItem(tr("Medium"), generationStyles); |
|
211 |
new QListWidgetItem(tr("Large"), generationStyles); |
|
212 |
new QListWidgetItem(tr("Cavern"), generationStyles); |
|
213 |
new QListWidgetItem(tr("Wacky"), generationStyles); |
|
214 |
connect(generationStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setTemplateFilter(int))); |
|
215 |
m_childWidgets << generationStyles; |
|
216 |
rightLayout->addWidget(generationStyles, 1); |
|
217 |
||
218 |
/* Maze style list */ |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
219 |
|
8377 | 220 |
mazeStyles = new QListWidget(); |
221 |
new QListWidgetItem(tr("Small tunnels"), mazeStyles); |
|
222 |
new QListWidgetItem(tr("Medium tunnels"), mazeStyles); |
|
8695 | 223 |
new QListWidgetItem(tr("Large tunnels"), mazeStyles); |
8377 | 224 |
new QListWidgetItem(tr("Small islands"), mazeStyles); |
225 |
new QListWidgetItem(tr("Medium islands"), mazeStyles); |
|
226 |
new QListWidgetItem(tr("Large islands"), mazeStyles); |
|
227 |
connect(mazeStyles, SIGNAL(currentRowChanged(int)), this, SLOT(setMazeSize(int))); |
|
228 |
m_childWidgets << mazeStyles; |
|
229 |
rightLayout->addWidget(mazeStyles, 1); |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
230 |
|
8377 | 231 |
/* Mission description */ |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
232 |
|
8377 | 233 |
lblDesc = new QLabel(); |
234 |
lblDesc->setWordWrap(true); |
|
235 |
lblDesc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
236 |
lblDesc->setAlignment(Qt::AlignTop | Qt::AlignLeft); |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
237 |
lblDesc->setStyleSheet("font: 10px;"); |
8467 | 238 |
bottomLeftLayout->addWidget(lblDesc, 100); |
8377 | 239 |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
240 |
/* Add stretch above theme button */ |
8377 | 241 |
|
242 |
bottomLeftLayout->addStretch(1); |
|
243 |
||
244 |
/* Theme chooser */ |
|
1215 | 245 |
|
8377 | 246 |
btnTheme = new QPushButton(); |
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
247 |
btnTheme->setFlat(true); |
8377 | 248 |
connect(btnTheme, SIGNAL(clicked()), this, SLOT(showThemePrompt())); |
249 |
m_childWidgets << btnTheme; |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
250 |
bottomLeftLayout->addWidget(btnTheme, 0); |
4699 | 251 |
|
8377 | 252 |
/* Add everything to main layout */ |
253 |
||
8886
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
254 |
mainLayout.addWidget(topWidget, 0); |
5c521d1fdd63
Fixed map preview overlap on certain locales (Fixes issue 549).
dag10
parents:
8695
diff
changeset
|
255 |
mainLayout.addLayout(twoColumnLayout, 1); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
256 |
|
8377 | 257 |
/* Set defaults */ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
258 |
|
8377 | 259 |
setRandomSeed(); |
260 |
setMazeSize(0); |
|
261 |
setTemplateFilter(0); |
|
262 |
staticMapChanged(m_staticMapModel->index(0, 0)); |
|
263 |
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
|
264 |
changeMapType(MapModel::GeneratedMap); |
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
|
265 |
setRandomTheme(); |
184 | 266 |
} |
267 |
||
268 |
void HWMapContainer::setImage(const QImage newImage) |
|
269 |
{ |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
270 |
QPixmap px(m_previewSize); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
271 |
QPixmap pxres(px.size()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
272 |
QPainter p(&pxres); |
184 | 273 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
274 |
px.fill(Qt::yellow); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
275 |
QBitmap bm = QBitmap::fromImage(newImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
276 |
px.setMask(bm); |
184 | 277 |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
278 |
p.fillRect(pxres.rect(), linearGrad); |
8467 | 279 |
p.drawPixmap(0, 0, px); |
184 | 280 |
|
1790 | 281 |
addInfoToPreview(pxres); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
282 |
pMap = 0; |
8377 | 283 |
|
284 |
cType->setEnabled(isMaster()); |
|
249 | 285 |
} |
286 |
||
1790 | 287 |
void HWMapContainer::setHHLimit(int newHHLimit) |
288 |
{ |
|
289 |
hhLimit = newHHLimit; |
|
290 |
} |
|
291 |
||
292 |
// Should this add text to identify map size? |
|
293 |
void HWMapContainer::addInfoToPreview(QPixmap image) |
|
294 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
295 |
QPixmap finalImage = QPixmap(image.size()); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
296 |
finalImage.fill(QColor(0, 0, 0, 0)); |
2377 | 297 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
298 |
QPainter p(&finalImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
299 |
p.drawPixmap(image.rect(), image); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
300 |
//p.setPen(QColor(0xf4,0x9e,0xe9)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
301 |
p.setPen(QColor(0xff,0xcc,0x00)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
302 |
p.setBrush(QColor(0, 0, 0)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
303 |
p.drawRect(image.rect().width() - hhSmall.rect().width() - 28, 3, 40, 20); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
304 |
p.setFont(QFont("MS Shell Dlg", 10)); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
305 |
QString text = (hhLimit > 0) ? QString::number(hhLimit) : "?"; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
306 |
p.drawText(image.rect().width() - hhSmall.rect().width() - 14 - (hhLimit > 9 ? 10 : 0), 18, text); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
307 |
p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall); |
1790 | 308 |
|
8467 | 309 |
// Shrink, crop, and center preview image |
310 |
QPixmap centered(QSize(m_previewSize.width() - 6, m_previewSize.height() - 6)); |
|
311 |
QPainter pc(¢ered); |
|
312 |
pc.fillRect(centered.rect(), linearGrad); |
|
313 |
pc.drawPixmap(-3, -3, finalImage); |
|
314 |
||
315 |
mapPreview->setIcon(QIcon(centered)); |
|
316 |
mapPreview->setIconSize(centered.size()); |
|
184 | 317 |
} |
318 |
||
4562 | 319 |
void HWMapContainer::askForGeneratedPreview() |
184 | 320 |
{ |
8070
66bc20d089fc
Okay, remove previous request only if it has same parent
unc0rr
parents:
8049
diff
changeset
|
321 |
pMap = new HWMap(this); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
322 |
connect(pMap, SIGNAL(ImageReceived(const QImage)), this, SLOT(setImage(const QImage))); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
323 |
connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
324 |
connect(pMap, SIGNAL(destroyed(QObject *)), this, SLOT(onPreviewMapDestroyed(QObject *))); |
4562 | 325 |
pMap->getImage(m_seed, |
326 |
getTemplateFilter(), |
|
327 |
get_mapgen(), |
|
4941 | 328 |
getMazeSize(), |
4562 | 329 |
getDrawnMapData() |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
330 |
); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
331 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
332 |
setHHLimit(0); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
333 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
334 |
const QPixmap waitIcon(":/res/iconTime.png"); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
335 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
336 |
QPixmap waitImage(m_previewSize); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
337 |
QPainter p(&waitImage); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
338 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
339 |
p.fillRect(waitImage.rect(), linearGrad); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
340 |
int x = (waitImage.width() - waitIcon.width()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
341 |
int y = (waitImage.height() - waitIcon.height()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
342 |
p.drawPixmap(QPoint(x, y), waitIcon); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
343 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
344 |
addInfoToPreview(waitImage); |
184 | 345 |
|
8377 | 346 |
cType->setEnabled(false); |
1215 | 347 |
} |
348 |
||
8467 | 349 |
void HWMapContainer::previewClicked() |
350 |
{ |
|
9452 | 351 |
if (isMaster()) // should only perform these if master, but disabling the button when not, causes an unattractive preview. |
352 |
switch (m_mapInfo.type) |
|
353 |
{ |
|
354 |
case MapModel::HandDrawnMap: |
|
355 |
emit drawMapRequested(); |
|
356 |
break; |
|
357 |
default: |
|
358 |
setRandomMap(); |
|
359 |
break; |
|
360 |
} |
|
8467 | 361 |
} |
362 |
||
184 | 363 |
QString HWMapContainer::getCurrentSeed() const |
364 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
365 |
return m_seed; |
184 | 366 |
} |
367 |
||
249 | 368 |
QString HWMapContainer::getCurrentMap() const |
369 |
{ |
|
8377 | 370 |
switch (m_mapInfo.type) |
371 |
{ |
|
372 |
case MapModel::StaticMap: |
|
373 |
case MapModel::MissionMap: |
|
374 |
return m_curMap; |
|
375 |
default: |
|
376 |
return QString(); |
|
377 |
} |
|
249 | 378 |
} |
379 |
||
380 |
QString HWMapContainer::getCurrentTheme() const |
|
381 |
{ |
|
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
382 |
return(m_theme); |
3008 | 383 |
} |
384 |
||
385 |
bool HWMapContainer::getCurrentIsMission() const |
|
386 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
387 |
return(m_mapInfo.type == MapModel::MissionMap); |
1790 | 388 |
} |
389 |
||
390 |
int HWMapContainer::getCurrentHHLimit() const |
|
391 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
392 |
return hhLimit; |
249 | 393 |
} |
394 |
||
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
|
395 |
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
|
396 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
397 |
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
|
398 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
399 |
|
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
400 |
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
|
401 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
402 |
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
|
403 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
404 |
|
1802 | 405 |
quint32 HWMapContainer::getTemplateFilter() const |
406 |
{ |
|
8377 | 407 |
return generationStyles->currentRow(); |
1802 | 408 |
} |
409 |
||
184 | 410 |
void HWMapContainer::resizeEvent ( QResizeEvent * event ) |
411 |
{ |
|
4560
5d6c7f88db73
- Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents:
4557
diff
changeset
|
412 |
Q_UNUSED(event); |
184 | 413 |
} |
320 | 414 |
|
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
|
415 |
void HWMapContainer::intSetSeed(const QString & seed) |
320 | 416 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
417 |
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
|
418 |
} |
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
|
419 |
|
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
|
420 |
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
|
421 |
{ |
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
|
422 |
intSetSeed(seed); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
423 |
if ((m_mapInfo.type == MapModel::GeneratedMap) || (m_mapInfo.type == MapModel::GeneratedMaze)) |
4562 | 424 |
updatePreview(); |
320 | 425 |
} |
426 |
||
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
|
427 |
void HWMapContainer::intSetMap(const QString & map) |
320 | 428 |
{ |
8377 | 429 |
if (map == "+rnd+") |
430 |
{ |
|
431 |
changeMapType(MapModel::GeneratedMap); |
|
432 |
} |
|
433 |
else if (map == "+maze+") |
|
434 |
{ |
|
435 |
changeMapType(MapModel::GeneratedMaze); |
|
436 |
} |
|
437 |
else if (map == "+drawn+") |
|
438 |
{ |
|
439 |
changeMapType(MapModel::HandDrawnMap); |
|
440 |
} |
|
441 |
else if (m_staticMapModel->mapExists(map)) |
|
442 |
{ |
|
443 |
changeMapType(MapModel::StaticMap, m_staticMapModel->index(m_staticMapModel->findMap(map), 0)); |
|
444 |
} |
|
445 |
else if (m_missionMapModel->mapExists(map)) |
|
446 |
{ |
|
447 |
changeMapType(MapModel::MissionMap, m_missionMapModel->index(m_missionMapModel->findMap(map), 0)); |
|
448 |
} else |
|
449 |
{ |
|
450 |
qDebug() << "HWMapContainer::intSetMap: Map doesn't exist: " << map; |
|
451 |
} |
|
320 | 452 |
} |
453 |
||
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
454 |
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
|
455 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
456 |
if ((m_mapInfo.type == MapModel::Invalid) || (map != m_mapInfo.name)) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
457 |
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
|
458 |
} |
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
|
459 |
|
320 | 460 |
void HWMapContainer::setTheme(const QString & theme) |
461 |
{ |
|
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
|
462 |
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
|
463 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
464 |
if(mdl.size()) |
8377 | 465 |
updateTheme(mdl.at(0)); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
466 |
else |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
467 |
intSetIconlessTheme(theme); |
320 | 468 |
} |
4562 | 469 |
|
4337 | 470 |
void HWMapContainer::setRandomMap() |
471 |
{ |
|
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
|
472 |
if (!m_master) return; |
8924 | 473 |
|
4419 | 474 |
setRandomSeed(); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
475 |
switch(m_mapInfo.type) |
4337 | 476 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
477 |
case MapModel::GeneratedMap: |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
478 |
case MapModel::GeneratedMaze: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
479 |
setRandomTheme(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
480 |
break; |
8377 | 481 |
case MapModel::MissionMap: |
482 |
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
|
483 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
484 |
case MapModel::StaticMap: |
8377 | 485 |
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
|
486 |
break; |
8377 | 487 |
default: |
488 |
break; |
|
4337 | 489 |
} |
490 |
} |
|
491 |
||
320 | 492 |
void HWMapContainer::setRandomSeed() |
493 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
494 |
setSeed(QUuid::createUuid().toString()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
495 |
emit seedChanged(m_seed); |
320 | 496 |
} |
1318 | 497 |
|
498 |
void HWMapContainer::setRandomTheme() |
|
499 |
{ |
|
6937
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
500 |
if(!m_themeModel->rowCount()) return; |
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
501 |
quint32 themeNum = rand() % m_themeModel->rowCount(); |
8377 | 502 |
updateTheme(m_themeModel->index(themeNum)); |
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
|
503 |
emit themeChanged(m_theme); |
1318 | 504 |
} |
1797 | 505 |
|
4941 | 506 |
void HWMapContainer::intSetTemplateFilter(int filter) |
507 |
{ |
|
8377 | 508 |
generationStyles->setCurrentRow(filter); |
4941 | 509 |
emit newTemplateFilter(filter); |
510 |
} |
|
511 |
||
1797 | 512 |
void HWMapContainer::setTemplateFilter(int filter) |
513 |
{ |
|
4941 | 514 |
intSetTemplateFilter(filter); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
515 |
if (m_mapInfo.type == MapModel::GeneratedMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
516 |
updatePreview(); |
1802 | 517 |
} |
518 |
||
3133 | 519 |
MapGenerator HWMapContainer::get_mapgen(void) const |
520 |
{ |
|
521 |
return mapgen; |
|
522 |
} |
|
523 |
||
4941 | 524 |
int HWMapContainer::getMazeSize(void) const |
3133 | 525 |
{ |
8377 | 526 |
return mazeStyles->currentRow(); |
3133 | 527 |
} |
528 |
||
4941 | 529 |
void HWMapContainer::intSetMazeSize(int size) |
3133 | 530 |
{ |
8377 | 531 |
mazeStyles->setCurrentRow(size); |
4941 | 532 |
emit mazeSizeChanged(size); |
533 |
} |
|
534 |
||
535 |
void HWMapContainer::setMazeSize(int size) |
|
536 |
{ |
|
537 |
intSetMazeSize(size); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
538 |
if (m_mapInfo.type == MapModel::GeneratedMaze) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
539 |
updatePreview(); |
3133 | 540 |
} |
541 |
||
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 |
void HWMapContainer::intSetMapgen(MapGenerator m) |
3133 | 543 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
544 |
if (mapgen != m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
545 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
546 |
mapgen = m; |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
547 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
548 |
switch (m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
549 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
550 |
case MAPGEN_REGULAR: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
551 |
m_mapInfo.type = MapModel::GeneratedMap; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
552 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
553 |
case MAPGEN_MAZE: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
554 |
m_mapInfo.type = MapModel::GeneratedMaze; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
555 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
556 |
case MAPGEN_DRAWN: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
557 |
m_mapInfo.type = MapModel::HandDrawnMap; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
558 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
559 |
case MAPGEN_MAP: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
560 |
switch (m_mapInfo.type) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
561 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
562 |
case MapModel::GeneratedMap: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
563 |
case MapModel::GeneratedMaze: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
564 |
case MapModel::HandDrawnMap: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
565 |
m_mapInfo.type = MapModel::Invalid; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
566 |
default: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
567 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
568 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
569 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
570 |
} |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
571 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
572 |
emit mapgenChanged(m); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
573 |
} |
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
|
574 |
} |
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
|
575 |
|
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
|
576 |
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
|
577 |
{ |
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
|
578 |
intSetMapgen(m); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
579 |
if(m != MAPGEN_MAP) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
580 |
updatePreview(); |
3133 | 581 |
} |
4489 | 582 |
|
4537 | 583 |
void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
584 |
{ |
|
585 |
drawMapScene.decode(ar); |
|
4562 | 586 |
updatePreview(); |
4537 | 587 |
} |
588 |
||
4489 | 589 |
QByteArray HWMapContainer::getDrawnMapData() |
590 |
{ |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
591 |
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
|
592 |
} |
4519 | 593 |
|
8377 | 594 |
void HWMapContainer::setNewSeed(const QString & newSeed) |
4519 | 595 |
{ |
8377 | 596 |
setSeed(newSeed); |
597 |
emit seedChanged(newSeed); |
|
4519 | 598 |
} |
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
599 |
|
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
600 |
DrawMapScene * HWMapContainer::getDrawMapScene() |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
601 |
{ |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
602 |
return &drawMapScene; |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
603 |
} |
4525 | 604 |
|
605 |
void HWMapContainer::mapDrawingFinished() |
|
606 |
{ |
|
4526 | 607 |
emit drawnMapChanged(getDrawnMapData()); |
4525 | 608 |
|
4562 | 609 |
updatePreview(); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
610 |
} |
4562 | 611 |
|
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
|
612 |
void HWMapContainer::paintEvent(QPaintEvent * event) |
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
|
613 |
{ |
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
|
614 |
if (m_previewDirty) |
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
|
615 |
updatePreview(); |
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
|
616 |
QWidget::paintEvent(event); |
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
|
617 |
} |
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
|
618 |
|
4562 | 619 |
void HWMapContainer::updatePreview() |
620 |
{ |
|
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
|
621 |
// don't update preview if e.g. widget not being displayed |
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
|
622 |
if (this->visibleRegion().isEmpty()) |
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
|
623 |
{ |
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
|
624 |
// but remember to update it later |
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
|
625 |
m_previewDirty = true; |
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
|
626 |
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
|
627 |
} |
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
|
628 |
|
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
|
629 |
m_previewDirty = false; |
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
|
630 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
631 |
if (pMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
632 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
633 |
disconnect(pMap, 0, this, SLOT(setImage(const QImage))); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
634 |
disconnect(pMap, 0, this, SLOT(setHHLimit(int))); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
635 |
pMap = 0; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
636 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
637 |
|
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
638 |
QPixmap failIcon; |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
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) |
4562 | 641 |
{ |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
642 |
case MapModel::Invalid: |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
643 |
failIcon = QPixmap(":/res/btnDisabled.png"); |
8467 | 644 |
mapPreview->setIcon(QIcon(failIcon)); |
645 |
mapPreview->setIconSize(failIcon.size()); |
|
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
646 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
647 |
case MapModel::GeneratedMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
648 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
649 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
650 |
case MapModel::GeneratedMaze: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
651 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
652 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
653 |
case MapModel::HandDrawnMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
654 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
655 |
break; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
656 |
default: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
657 |
QPixmap mapImage; |
8049 | 658 |
bool success = mapImage.load("physfs://Maps/" + m_mapInfo.name + "/preview.png"); |
6939
970389573788
MapModel converted to QStandardItemList; separators fixed; changed used data format (human-readable struct instead of magic list) for map info in HwMapContainer (+ various small cleanups in that class)
sheepluva
parents:
6938
diff
changeset
|
659 |
|
970389573788
MapModel converted to QStandardItemList; separators fixed; changed used data format (human-readable struct instead of magic list) for map info in HwMapContainer (+ various small cleanups in that class)
sheepluva
parents:
6938
diff
changeset
|
660 |
if(!success) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
661 |
{ |
8467 | 662 |
mapPreview->setIcon(QIcon()); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
663 |
return; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
664 |
} |
4562 | 665 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
666 |
hhLimit = m_mapInfo.limit; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
667 |
addInfoToPreview(mapImage); |
4562 | 668 |
} |
669 |
} |
|
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
|
670 |
|
4941 | 671 |
void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl) |
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
|
672 |
{ |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
673 |
intSetMapgen(m); |
4941 | 674 |
intSetMazeSize(mazesize); |
675 |
intSetSeed(seed); |
|
676 |
intSetTemplateFilter(tmpl); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
677 |
// 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
|
678 |
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
|
679 |
} |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
680 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
681 |
void HWMapContainer::updateModelViews() |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
682 |
{ |
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
|
683 |
// 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
|
684 |
// do this before map selection restore, because map may overwrite 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
|
685 |
if (!m_theme.isEmpty()) |
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
|
686 |
{ |
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
|
687 |
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
|
688 |
if (mdl.size() > 0) |
8377 | 689 |
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
|
690 |
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
|
691 |
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
|
692 |
} |
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
|
693 |
|
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
|
694 |
// restore map selection |
8377 | 695 |
if (!m_curMap.isEmpty()) |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
696 |
intSetMap(m_curMap); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
697 |
else |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
698 |
updatePreview(); |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
699 |
} |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
700 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
701 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
702 |
void HWMapContainer::onPreviewMapDestroyed(QObject * map) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
703 |
{ |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
704 |
if (map == pMap) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
705 |
pMap = 0; |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
706 |
} |
8377 | 707 |
|
708 |
void HWMapContainer::mapTypeChanged(int index) |
|
709 |
{ |
|
710 |
changeMapType((MapModel::MapType)cType->itemData(index).toInt()); |
|
711 |
} |
|
712 |
||
713 |
void HWMapContainer::changeMapType(MapModel::MapType type, const QModelIndex & newMap) |
|
714 |
{ |
|
715 |
staticMapList->hide(); |
|
716 |
missionMapList->hide(); |
|
717 |
lblMapList->hide(); |
|
718 |
generationStyles->hide(); |
|
719 |
mazeStyles->hide(); |
|
720 |
lblDesc->hide(); |
|
721 |
btnLoadMap->hide(); |
|
722 |
btnEditMap->hide(); |
|
723 |
||
724 |
switch (type) |
|
725 |
{ |
|
726 |
case MapModel::GeneratedMap: |
|
727 |
mapgen = MAPGEN_REGULAR; |
|
728 |
setMapInfo(MapModel::MapInfoRandom); |
|
729 |
lblMapList->setText(tr("Map size:")); |
|
730 |
lblMapList->show(); |
|
731 |
generationStyles->show(); |
|
732 |
break; |
|
733 |
case MapModel::GeneratedMaze: |
|
734 |
mapgen = MAPGEN_MAZE; |
|
735 |
setMapInfo(MapModel::MapInfoMaze); |
|
736 |
lblMapList->setText(tr("Maze style:")); |
|
737 |
lblMapList->show(); |
|
738 |
mazeStyles->show(); |
|
739 |
break; |
|
740 |
case MapModel::HandDrawnMap: |
|
741 |
mapgen = MAPGEN_DRAWN; |
|
742 |
setMapInfo(MapModel::MapInfoDrawn); |
|
743 |
btnLoadMap->show(); |
|
744 |
btnEditMap->show(); |
|
745 |
break; |
|
746 |
case MapModel::MissionMap: |
|
747 |
mapgen = MAPGEN_MAP; |
|
748 |
missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
|
749 |
lblMapList->setText(tr("Mission:")); |
|
750 |
lblMapList->show(); |
|
751 |
missionMapList->show(); |
|
752 |
lblDesc->setText(m_mapInfo.desc); |
|
753 |
lblDesc->show(); |
|
754 |
emit mapChanged(m_curMap); |
|
755 |
break; |
|
756 |
case MapModel::StaticMap: |
|
757 |
mapgen = MAPGEN_MAP; |
|
758 |
staticMapChanged(newMap.isValid() ? newMap : staticMapList->currentIndex()); |
|
759 |
lblMapList->setText(tr("Map:")); |
|
760 |
lblMapList->show(); |
|
761 |
staticMapList->show(); |
|
762 |
emit mapChanged(m_curMap); |
|
763 |
break; |
|
764 |
default: |
|
765 |
break; |
|
766 |
} |
|
767 |
||
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
768 |
// Update theme button size |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
769 |
updateThemeButtonSize(); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
770 |
|
8377 | 771 |
// Update cType combobox |
772 |
for (int i = 0; i < cType->count(); i++) |
|
773 |
{ |
|
774 |
if ((MapModel::MapType)cType->itemData(i).toInt() == type) |
|
775 |
{ |
|
776 |
cType->setCurrentIndex(i); |
|
777 |
break; |
|
778 |
} |
|
779 |
} |
|
780 |
||
8467 | 781 |
repaint(); |
782 |
||
8377 | 783 |
emit mapgenChanged(mapgen); |
784 |
} |
|
785 |
||
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
786 |
void HWMapContainer::updateThemeButtonSize() |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
787 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
788 |
if (m_mapInfo.type == MapModel::MissionMap) |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
789 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
790 |
btnTheme->setIconSize(QSize(30, 30)); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
791 |
btnTheme->setFixedHeight(30); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
792 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
793 |
else |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
794 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
795 |
QSize iconSize = btnTheme->icon().actualSize(QSize(65535, 65535)); |
8430
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
796 |
btnTheme->setFixedHeight(64); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
797 |
btnTheme->setIconSize(iconSize); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
798 |
} |
8430
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
799 |
|
5a5c34a75e1a
Aesthetic improvements to chat widget. Also fixed the ghosting issue in a few areas by using repaint().
dag10
parents:
8424
diff
changeset
|
800 |
repaint(); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
801 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
802 |
|
8377 | 803 |
void HWMapContainer::showThemePrompt() |
804 |
{ |
|
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
|
805 |
ThemePrompt prompt(m_themeID, this); |
8377 | 806 |
int theme = prompt.exec() - 1; // Since 0 means canceled, so all indexes are +1'd |
807 |
if (theme < 0) return; |
|
808 |
||
809 |
QModelIndex current = m_themeModel->index(theme, 0); |
|
810 |
updateTheme(current); |
|
811 |
emit themeChanged(m_theme); |
|
812 |
} |
|
813 |
||
814 |
void HWMapContainer::updateTheme(const QModelIndex & current) |
|
815 |
{ |
|
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
|
816 |
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
|
817 |
m_themeID = current.row(); |
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
|
818 |
QIcon icon = qVariantValue<QIcon>(current.data(Qt::DecorationRole)); |
8377 | 819 |
QSize iconSize = icon.actualSize(QSize(65535, 65535)); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
820 |
btnTheme->setFixedHeight(64); |
8377 | 821 |
btnTheme->setIconSize(iconSize); |
822 |
btnTheme->setIcon(icon); |
|
8941 | 823 |
btnTheme->setText(tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString())); |
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
824 |
updateThemeButtonSize(); |
8377 | 825 |
} |
826 |
||
827 |
void HWMapContainer::staticMapChanged(const QModelIndex & map, const QModelIndex & old) |
|
828 |
{ |
|
829 |
mapChanged(map, 0, old); |
|
830 |
} |
|
831 |
||
832 |
void HWMapContainer::missionMapChanged(const QModelIndex & map, const QModelIndex & old) |
|
833 |
{ |
|
834 |
mapChanged(map, 1, old); |
|
835 |
} |
|
836 |
||
837 |
// Type: 0 = static, 1 = mission |
|
838 |
void HWMapContainer::mapChanged(const QModelIndex & map, int type, const QModelIndex & old) |
|
839 |
{ |
|
840 |
QListView * mapList; |
|
841 |
||
842 |
if (type == 0) mapList = staticMapList; |
|
843 |
else if (type == 1) mapList = missionMapList; |
|
844 |
else return; |
|
845 |
||
846 |
// Make sure it is a valid index |
|
847 |
if (!map.isValid()) |
|
848 |
{ |
|
849 |
if (old.isValid()) |
|
850 |
{ |
|
851 |
mapList->setCurrentIndex(old); |
|
852 |
mapList->scrollTo(old); |
|
853 |
} |
|
854 |
else |
|
855 |
{ |
|
856 |
m_mapInfo.type = MapModel::Invalid; |
|
857 |
updatePreview(); |
|
858 |
} |
|
859 |
||
860 |
return; |
|
861 |
} |
|
862 |
||
863 |
// If map changed, update list selection |
|
864 |
if (mapList->currentIndex() != map) |
|
865 |
{ |
|
866 |
mapList->setCurrentIndex(map); |
|
867 |
mapList->scrollTo(map); |
|
868 |
} |
|
869 |
||
870 |
if (map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()) |
|
871 |
setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>()); |
|
872 |
else |
|
873 |
Q_ASSERT(false); // Houston, we have a problem. |
|
874 |
||
875 |
} |
|
876 |
||
877 |
void HWMapContainer::setMapInfo(MapModel::MapInfo mapInfo) |
|
878 |
{ |
|
879 |
m_mapInfo = mapInfo; |
|
880 |
m_curMap = m_mapInfo.name; |
|
881 |
||
882 |
// the map has no pre-defined theme, so let's use the selected one |
|
883 |
if (m_mapInfo.theme.isEmpty()) |
|
884 |
{ |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
885 |
if (!selectedTheme.isEmpty()) |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
886 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
887 |
setTheme(selectedTheme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
888 |
emit themeChanged(selectedTheme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
889 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
890 |
} |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
891 |
else |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
892 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
893 |
setTheme(m_mapInfo.theme); |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
894 |
emit themeChanged(m_mapInfo.theme); |
8377 | 895 |
} |
896 |
||
897 |
lblDesc->setText(mapInfo.desc); |
|
898 |
||
899 |
updatePreview(); |
|
900 |
emit mapChanged(m_curMap); |
|
901 |
} |
|
902 |
||
903 |
void HWMapContainer::loadDrawing() |
|
904 |
{ |
|
905 |
QString fileName = QFileDialog::getOpenFileName(NULL, tr("Load drawn map"), ".", tr("Drawn Maps") + " (*.hwmap);;" + tr("All files") + " (*)"); |
|
906 |
||
907 |
if(fileName.isEmpty()) return; |
|
908 |
||
909 |
QFile f(fileName); |
|
910 |
||
911 |
if(!f.open(QIODevice::ReadOnly)) |
|
912 |
{ |
|
913 |
QMessageBox errorMsg(parentWidget()); |
|
914 |
errorMsg.setIcon(QMessageBox::Warning); |
|
915 |
errorMsg.setWindowTitle(QMessageBox::tr("File error")); |
|
916 |
errorMsg.setText(QMessageBox::tr("Cannot open '%1' for reading").arg(fileName)); |
|
917 |
errorMsg.setWindowModality(Qt::WindowModal); |
|
918 |
errorMsg.exec(); |
|
919 |
} |
|
920 |
else |
|
921 |
{ |
|
922 |
drawMapScene.decode(qUncompress(QByteArray::fromBase64(f.readAll()))); |
|
923 |
mapDrawingFinished(); |
|
924 |
} |
|
925 |
} |
|
926 |
||
927 |
void HWMapContainer::showSeedPrompt() |
|
928 |
{ |
|
929 |
SeedPrompt prompt(parentWidget()->parentWidget(), getCurrentSeed(), isMaster()); |
|
930 |
connect(&prompt, SIGNAL(seedSelected(const QString &)), this, SLOT(setNewSeed(const QString &))); |
|
931 |
prompt.exec(); |
|
932 |
} |
|
933 |
||
934 |
bool HWMapContainer::isMaster() |
|
935 |
{ |
|
936 |
return m_master; |
|
937 |
} |
|
938 |
||
939 |
void HWMapContainer::setMaster(bool master) |
|
940 |
{ |
|
8467 | 941 |
if (master == m_master) return; |
8377 | 942 |
m_master = master; |
8434 | 943 |
|
8377 | 944 |
foreach (QWidget *widget, m_childWidgets) |
945 |
widget->setEnabled(master); |
|
946 |
} |
|
8393
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
947 |
|
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
948 |
void HWMapContainer::intSetIconlessTheme(const QString & name) |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
949 |
{ |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
950 |
if (name.isEmpty()) return; |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
951 |
|
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
952 |
m_theme = name; |
85bd6c7b2641
Can now change theme for static and mission maps.
dag10 <gottlieb.drew@gmail.com>
parents:
8377
diff
changeset
|
953 |
btnTheme->setIcon(QIcon()); |
8941 | 954 |
btnTheme->setText(tr("Theme: %1").arg(name)); |
8401
87410ae372f6
Server messages localization using Qt's l10n subsystem:
unc0rr
parents:
8393
diff
changeset
|
955 |
} |