author | unc0rr |
Sun, 07 Oct 2012 00:12:46 +0400 | |
changeset 7725 | 4ad05a478c6c |
parent 7258 | 722e8a0d89dc |
child 7794 | ab7b94c03bc9 |
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> |
4562 | 32 |
#include <QMessageBox> |
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
|
33 |
#include <QStringListModel> |
249 | 34 |
|
35 |
#include "hwconsts.h" |
|
788
00720357601f
- Get rid of PageSimpleGame, now pressing 'quick game' just starts round
unc0rr
parents:
682
diff
changeset
|
36 |
#include "mapContainer.h" |
1209 | 37 |
#include "igbox.h" |
5252 | 38 |
#include "HWApplication.h" |
7258 | 39 |
#include "ThemeModel.h" |
184 | 40 |
|
41 |
HWMapContainer::HWMapContainer(QWidget * parent) : |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
42 |
QWidget(parent), |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
43 |
mainLayout(this), |
3133 | 44 |
pMap(0), |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
45 |
mapgen(MAPGEN_REGULAR), |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
46 |
m_previewSize(256, 128) |
184 | 47 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
48 |
hhSmall.load(":/res/hh_small.png"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
49 |
hhLimit = 18; |
1797 | 50 |
templateFilter = 0; |
2377 | 51 |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
52 |
linearGrad = QLinearGradient(QPoint(128, 0), QPoint(128, 128)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
53 |
linearGrad.setColorAt(1, QColor(0, 0, 192)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
54 |
linearGrad.setColorAt(0, QColor(66, 115, 225)); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
55 |
|
5252 | 56 |
mainLayout.setContentsMargins(HWApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin), |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
57 |
1, |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
58 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin), |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
59 |
HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin)); |
2377 | 60 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
61 |
QWidget* mapWidget = new QWidget(this); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
62 |
mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
63 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
64 |
QGridLayout* mapLayout = new QGridLayout(mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
65 |
mapLayout->setMargin(0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
66 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
67 |
imageButt = new QPushButton(mapWidget); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
68 |
imageButt->setObjectName("imageButt"); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
69 |
imageButt->setFixedSize(256 + 6, 128 + 6); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
70 |
imageButt->setFlat(true); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
71 |
imageButt->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);//QSizePolicy::Minimum, QSizePolicy::Minimum); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
72 |
mapLayout->addWidget(imageButt, 0, 0, 1, 2); |
4337 | 73 |
connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap())); |
249 | 74 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
75 |
chooseMap = new QComboBox(mapWidget); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
76 |
chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
77 |
m_mapModel = DataManager::instance().mapModel(); |
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
|
78 |
chooseMap->setEditable(false); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
79 |
chooseMap->setModel(m_mapModel); |
4487 | 80 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
81 |
mapLayout->addWidget(chooseMap, 1, 1); |
249 | 82 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
83 |
QLabel * lblMap = new QLabel(tr("Map"), mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
84 |
mapLayout->addWidget(lblMap, 1, 0); |
1209 | 85 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
86 |
lblFilter = new QLabel(tr("Filter"), mapWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
87 |
mapLayout->addWidget(lblFilter, 2, 0); |
1802 | 88 |
|
4941 | 89 |
cbTemplateFilter = new QComboBox(mapWidget); |
90 |
cbTemplateFilter->addItem(tr("All"), 0); |
|
91 |
cbTemplateFilter->addItem(tr("Small"), 1); |
|
92 |
cbTemplateFilter->addItem(tr("Medium"), 2); |
|
93 |
cbTemplateFilter->addItem(tr("Large"), 3); |
|
94 |
cbTemplateFilter->addItem(tr("Cavern"), 4); |
|
95 |
cbTemplateFilter->addItem(tr("Wacky"), 5); |
|
96 |
mapLayout->addWidget(cbTemplateFilter, 2, 1); |
|
1802 | 97 |
|
4941 | 98 |
connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int))); |
1802 | 99 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
100 |
maze_size_label = new QLabel(tr("Type"), mapWidget); |
5434
99078dea3a8f
fix wrong location of "Type"-label in map-selection
sheepluva
parents:
5289
diff
changeset
|
101 |
mapLayout->addWidget(maze_size_label, 2, 0); |
3133 | 102 |
maze_size_label->hide(); |
4941 | 103 |
cbMazeSize = new QComboBox(mapWidget); |
104 |
cbMazeSize->addItem(tr("Small tunnels"), 0); |
|
105 |
cbMazeSize->addItem(tr("Medium tunnels"), 1); |
|
106 |
cbMazeSize->addItem(tr("Large tunnels"), 2); |
|
107 |
cbMazeSize->addItem(tr("Small floating islands"), 3); |
|
108 |
cbMazeSize->addItem(tr("Medium floating islands"), 4); |
|
109 |
cbMazeSize->addItem(tr("Large floating islands"), 5); |
|
110 |
cbMazeSize->setCurrentIndex(1); |
|
4562 | 111 |
|
4941 | 112 |
mapLayout->addWidget(cbMazeSize, 2, 1); |
113 |
cbMazeSize->hide(); |
|
114 |
connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int))); |
|
3133 | 115 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
116 |
gbThemes = new IconedGroupBox(mapWidget); |
4701 | 117 |
gbThemes->setTitleTextPadding(80); |
118 |
gbThemes->setContentTopPadding(15); |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
119 |
gbThemes->setTitle(tr("Themes")); |
1248 | 120 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
121 |
//gbThemes->setStyleSheet("padding: 0px"); // doesn't work - stylesheet is set with icon |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
122 |
mapLayout->addWidget(gbThemes, 0, 2, 3, 1); |
6946
576c453822bf
fix for issue 186 ("Screen gets messed up when selecting Hand Drawn Map")
sheepluva
parents:
6940
diff
changeset
|
123 |
// disallow row to be collapsed (so it can't get ignored when Qt applies rowSpan of gbThemes) |
576c453822bf
fix for issue 186 ("Screen gets messed up when selecting Hand Drawn Map")
sheepluva
parents:
6940
diff
changeset
|
124 |
mapLayout->setRowMinimumHeight(2, 13); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
125 |
QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
126 |
gbTLayout->setContentsMargins(0, 0, 0 ,0); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
127 |
gbTLayout->setSpacing(0); |
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
|
128 |
lvThemes = new QListView(mapWidget); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
129 |
lvThemes->setMinimumHeight(30); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
130 |
lvThemes->setFixedWidth(140); |
6937
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
131 |
m_themeModel = DataManager::instance().themeModel(); |
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
132 |
lvThemes->setModel(m_themeModel); |
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
|
133 |
lvThemes->setIconSize(QSize(16, 16)); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
134 |
lvThemes->setEditTriggers(QListView::NoEditTriggers); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
135 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
136 |
connect(lvThemes->selectionModel(), SIGNAL(currentRowChanged( const QModelIndex &, const QModelIndex &)), this, SLOT(themeSelected( const QModelIndex &, const QModelIndex &))); |
1802 | 137 |
|
138 |
// override default style to tighten up theme scroller |
|
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
|
139 |
lvThemes->setStyleSheet(QString( |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
140 |
"QListView{" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
141 |
"border: solid;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
142 |
"border-width: 0px;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
143 |
"border-radius: 0px;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
144 |
"border-color: transparent;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
145 |
"background-color: #0d0544;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
146 |
"color: #ffcc00;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
147 |
"font: bold 13px;" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
148 |
"}" |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
149 |
) |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
150 |
); |
2377 | 151 |
|
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
|
152 |
gbTLayout->addWidget(lvThemes); |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
153 |
lvThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum); |
2377 | 154 |
|
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
155 |
mapLayout->setSizeConstraint(QLayout::SetFixedSize); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
156 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
157 |
QWidget* seedWidget = new QWidget(this); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
158 |
mainLayout.addWidget(seedWidget, 1, 0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
159 |
|
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
160 |
QGridLayout* seedLayout = new QGridLayout(seedWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
161 |
seedLayout->setMargin(0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
162 |
|
4699 | 163 |
seedLabel = new QLabel(tr("Seed"), seedWidget); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
164 |
seedLayout->addWidget(seedLabel, 3, 0); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
165 |
seedEdit = new QLineEdit(seedWidget); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
166 |
seedEdit->setMaxLength(54); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
167 |
connect(seedEdit, SIGNAL(returnPressed()), this, SLOT(seedEdited())); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
168 |
seedLayout->addWidget(seedEdit, 3, 1); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
169 |
seedLayout->setColumnStretch(1, 5); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
170 |
seedSet = new QPushButton(seedWidget); |
4699 | 171 |
seedSet->setText(QPushButton::tr("more")); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
172 |
connect(seedSet, SIGNAL(clicked()), this, SLOT(seedEdited())); |
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
173 |
seedLayout->setColumnStretch(2, 1); |
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
174 |
seedLayout->addWidget(seedSet, 3, 2); |
1215 | 175 |
|
4699 | 176 |
seedLabel->setVisible(false); |
177 |
seedEdit->setVisible(false); |
|
178 |
||
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
179 |
setRandomSeed(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
180 |
setRandomTheme(); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
181 |
|
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
182 |
chooseMap->setCurrentIndex(0); |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
183 |
mapChanged(0); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
184 |
// use signal "activated" rather than currentIndexChanged |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
185 |
// because index is somtimes changed a few times in a row programmatically |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
186 |
connect(chooseMap, SIGNAL(activated(int)), this, SLOT(mapChanged(int))); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
187 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
188 |
// update model views after model changes (to e.g. re-adjust separators) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
189 |
connect(&DataManager::instance(), SIGNAL(updated()), this, SLOT(updateModelViews())); |
184 | 190 |
} |
191 |
||
192 |
void HWMapContainer::setImage(const QImage newImage) |
|
193 |
{ |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
194 |
QPixmap px(m_previewSize); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
195 |
QPixmap pxres(px.size()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
196 |
QPainter p(&pxres); |
184 | 197 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
198 |
px.fill(Qt::yellow); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
199 |
QBitmap bm = QBitmap::fromImage(newImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
200 |
px.setMask(bm); |
184 | 201 |
|
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
202 |
p.fillRect(pxres.rect(), linearGrad); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
203 |
p.drawPixmap(QPoint(0, 0), px); |
184 | 204 |
|
1790 | 205 |
addInfoToPreview(pxres); |
4561 | 206 |
//chooseMap->setCurrentIndex(mapgen); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
207 |
pMap = 0; |
249 | 208 |
} |
209 |
||
1790 | 210 |
void HWMapContainer::setHHLimit(int newHHLimit) |
211 |
{ |
|
212 |
hhLimit = newHHLimit; |
|
213 |
} |
|
214 |
||
249 | 215 |
void HWMapContainer::mapChanged(int index) |
216 |
{ |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
217 |
if (chooseMap->currentIndex() != index) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
218 |
chooseMap->setCurrentIndex(index); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
219 |
|
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
220 |
if (index < 0) |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
221 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
222 |
m_mapInfo.type = MapModel::Invalid; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
223 |
updatePreview(); |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
224 |
return; |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
225 |
} |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
226 |
|
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
|
227 |
Q_ASSERT(chooseMap->itemData(index, Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); |
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
|
228 |
m_mapInfo = chooseMap->itemData(index, Qt::UserRole + 1).value<MapModel::MapInfo>(); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
229 |
m_curMap = m_mapInfo.name; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
230 |
|
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
231 |
switch(m_mapInfo.type) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
232 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
233 |
case MapModel::GeneratedMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
234 |
mapgen = MAPGEN_REGULAR; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
235 |
gbThemes->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
236 |
lblFilter->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
237 |
cbTemplateFilter->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
238 |
maze_size_label->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
239 |
cbMazeSize->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
240 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
241 |
case MapModel::GeneratedMaze: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
242 |
mapgen = MAPGEN_MAZE; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
243 |
gbThemes->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
244 |
lblFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
245 |
cbTemplateFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
246 |
maze_size_label->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
247 |
cbMazeSize->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
248 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
249 |
case MapModel::HandDrawnMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
250 |
mapgen = MAPGEN_DRAWN; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
251 |
gbThemes->show(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
252 |
lblFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
253 |
cbTemplateFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
254 |
maze_size_label->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
255 |
cbMazeSize->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
256 |
break; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
257 |
default: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
258 |
mapgen = MAPGEN_MAP; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
259 |
gbThemes->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
260 |
lblFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
261 |
cbTemplateFilter->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
262 |
maze_size_label->hide(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
263 |
cbMazeSize->hide(); |
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
264 |
m_theme = m_mapInfo.theme; |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
265 |
} |
5794 | 266 |
|
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
267 |
// the map has no pre-defined theme, so let's use the selected one |
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
|
268 |
if (m_mapInfo.theme.isEmpty()) |
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
269 |
{ |
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
270 |
m_theme = lvThemes->currentIndex().data().toString(); |
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
271 |
emit themeChanged(m_theme); |
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
272 |
} |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
273 |
|
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
274 |
updatePreview(); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
275 |
emit mapChanged(m_curMap); |
5794 | 276 |
emit mapgenChanged(mapgen); |
331 | 277 |
} |
278 |
||
1790 | 279 |
// Should this add text to identify map size? |
280 |
void HWMapContainer::addInfoToPreview(QPixmap image) |
|
281 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
282 |
QPixmap finalImage = QPixmap(image.size()); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
283 |
finalImage.fill(QColor(0, 0, 0, 0)); |
2377 | 284 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
285 |
QPainter p(&finalImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
286 |
p.drawPixmap(image.rect(), image); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
287 |
//p.setPen(QColor(0xf4,0x9e,0xe9)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
288 |
p.setPen(QColor(0xff,0xcc,0x00)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
289 |
p.setBrush(QColor(0, 0, 0)); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
290 |
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
|
291 |
p.setFont(QFont("MS Shell Dlg", 10)); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
292 |
QString text = (hhLimit > 0) ? QString::number(hhLimit) : "?"; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
293 |
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
|
294 |
p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall); |
1790 | 295 |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
296 |
imageButt->setIcon(finalImage); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
297 |
imageButt->setIconSize(image.size()); |
184 | 298 |
} |
299 |
||
4562 | 300 |
void HWMapContainer::askForGeneratedPreview() |
184 | 301 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
302 |
pMap = new HWMap(); |
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
303 |
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
|
304 |
connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int))); |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
305 |
connect(pMap, SIGNAL(destroyed(QObject *)), this, SLOT(onPreviewMapDestroyed(QObject *))); |
4562 | 306 |
pMap->getImage(m_seed, |
307 |
getTemplateFilter(), |
|
308 |
get_mapgen(), |
|
4941 | 309 |
getMazeSize(), |
4562 | 310 |
getDrawnMapData() |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
311 |
); |
7017
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
312 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
313 |
setHHLimit(0); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
314 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
315 |
const QPixmap waitIcon(":/res/iconTime.png"); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
316 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
317 |
QPixmap waitImage(m_previewSize); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
318 |
QPainter p(&waitImage); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
319 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
320 |
p.fillRect(waitImage.rect(), linearGrad); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
321 |
int x = (waitImage.width() - waitIcon.width()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
322 |
int y = (waitImage.height() - waitIcon.height()) / 2; |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
323 |
p.drawPixmap(QPoint(x, y), waitIcon); |
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
324 |
|
19a434fc91fc
visually indicate when map preview generation is in progress.
sheepluva
parents:
7014
diff
changeset
|
325 |
addInfoToPreview(waitImage); |
184 | 326 |
} |
327 |
||
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
|
328 |
void HWMapContainer::themeSelected(const QModelIndex & current, const QModelIndex &) |
1215 | 329 |
{ |
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
330 |
m_theme = current.data().toString(); |
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
|
331 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
332 |
gbThemes->setIcon(qVariantValue<QIcon>(current.data(Qt::UserRole))); |
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
333 |
emit themeChanged(m_theme); |
1215 | 334 |
} |
335 |
||
184 | 336 |
QString HWMapContainer::getCurrentSeed() const |
337 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
338 |
return m_seed; |
184 | 339 |
} |
340 |
||
249 | 341 |
QString HWMapContainer::getCurrentMap() const |
342 |
{ |
|
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
|
343 |
if(chooseMap->currentIndex() < MAPGEN_MAP) return QString(); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
344 |
return(m_curMap); |
249 | 345 |
} |
346 |
||
347 |
QString HWMapContainer::getCurrentTheme() const |
|
348 |
{ |
|
6940
211aca8c1f4f
decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents:
6939
diff
changeset
|
349 |
return(m_theme); |
3008 | 350 |
} |
351 |
||
352 |
bool HWMapContainer::getCurrentIsMission() const |
|
353 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
354 |
return(m_mapInfo.type == MapModel::MissionMap); |
1790 | 355 |
} |
356 |
||
357 |
int HWMapContainer::getCurrentHHLimit() const |
|
358 |
{ |
|
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
359 |
return hhLimit; |
249 | 360 |
} |
361 |
||
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
|
362 |
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
|
363 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
364 |
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
|
365 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
366 |
|
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
367 |
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
|
368 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
369 |
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
|
370 |
} |
1dd97c710f5a
added general scripts to multiplayer and added option for scripts to allow user set schemes or weapon sets.
Henek
parents:
4511
diff
changeset
|
371 |
|
1802 | 372 |
quint32 HWMapContainer::getTemplateFilter() const |
373 |
{ |
|
4941 | 374 |
return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt(); |
1802 | 375 |
} |
376 |
||
184 | 377 |
void HWMapContainer::resizeEvent ( QResizeEvent * event ) |
378 |
{ |
|
4560
5d6c7f88db73
- Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents:
4557
diff
changeset
|
379 |
Q_UNUSED(event); |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
380 |
//imageButt->setIconSize(imageButt->size()); |
184 | 381 |
} |
320 | 382 |
|
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
|
383 |
void HWMapContainer::intSetSeed(const QString & seed) |
320 | 384 |
{ |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
385 |
m_seed = seed; |
4519 | 386 |
if (seed != seedEdit->text()) |
387 |
seedEdit->setText(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
|
388 |
} |
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
|
389 |
|
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
|
390 |
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
|
391 |
{ |
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
|
392 |
intSetSeed(seed); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
393 |
if ((m_mapInfo.type == MapModel::GeneratedMap) || (m_mapInfo.type == MapModel::GeneratedMaze)) |
4562 | 394 |
updatePreview(); |
320 | 395 |
} |
396 |
||
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
|
397 |
void HWMapContainer::intSetMap(const QString & map) |
320 | 398 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
399 |
m_curMap = map; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
400 |
|
6983
ede55af89e78
roomslistmodel: prettier names for map +rnd+ etc.; point out unavailable maps
sheepluva
parents:
6960
diff
changeset
|
401 |
int id = m_mapModel->indexOf(map); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
402 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
403 |
mapChanged(id); |
320 | 404 |
} |
405 |
||
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
406 |
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
|
407 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
408 |
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
|
409 |
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
|
410 |
} |
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
|
411 |
|
320 | 412 |
void HWMapContainer::setTheme(const QString & theme) |
413 |
{ |
|
6937
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
414 |
QModelIndexList mdl = m_themeModel->match(m_themeModel->index(0), Qt::DisplayRole, 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
|
415 |
|
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
416 |
if(mdl.size()) |
9d18b61bd3eb
- Implement ThemesModel (load theme icons once, store in memory, don't reload from disk every time selection changes)
unc0rr
parents:
5252
diff
changeset
|
417 |
lvThemes->setCurrentIndex(mdl.at(0)); |
320 | 418 |
} |
4562 | 419 |
|
4337 | 420 |
void HWMapContainer::setRandomMap() |
421 |
{ |
|
6947
1be3e48e1d53
MapModel: add getters for random maps based on type, so that the mapContainer does not have to magically know how maps and separators are ordered within the model
sheepluva
parents:
6946
diff
changeset
|
422 |
int idx; |
1be3e48e1d53
MapModel: add getters for random maps based on type, so that the mapContainer does not have to magically know how maps and separators are ordered within the model
sheepluva
parents:
6946
diff
changeset
|
423 |
|
4419 | 424 |
setRandomSeed(); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
425 |
switch(m_mapInfo.type) |
4337 | 426 |
{ |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
427 |
case MapModel::GeneratedMap: |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
428 |
case MapModel::GeneratedMaze: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
429 |
setRandomTheme(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
430 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
431 |
case MapModel::HandDrawnMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
432 |
emit drawMapRequested(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
433 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
434 |
case MapModel::MissionMap: |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
435 |
case MapModel::StaticMap: |
6947
1be3e48e1d53
MapModel: add getters for random maps based on type, so that the mapContainer does not have to magically know how maps and separators are ordered within the model
sheepluva
parents:
6946
diff
changeset
|
436 |
// get random map of same type |
1be3e48e1d53
MapModel: add getters for random maps based on type, so that the mapContainer does not have to magically know how maps and separators are ordered within the model
sheepluva
parents:
6946
diff
changeset
|
437 |
idx = m_mapModel->randomMap(m_mapInfo.type); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
438 |
mapChanged(idx); |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
439 |
break; |
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
440 |
case MapModel::Invalid: |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
441 |
mapChanged(0); |
4337 | 442 |
} |
443 |
} |
|
444 |
||
320 | 445 |
|
446 |
void HWMapContainer::setRandomSeed() |
|
447 |
{ |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
448 |
setSeed(QUuid::createUuid().toString()); |
2948
3f21a9dc93d0
Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents:
2377
diff
changeset
|
449 |
emit seedChanged(m_seed); |
320 | 450 |
} |
1318 | 451 |
|
452 |
void HWMapContainer::setRandomTheme() |
|
453 |
{ |
|
6937
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
454 |
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
|
455 |
quint32 themeNum = rand() % m_themeModel->rowCount(); |
7f77fa908a4e
messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents:
6933
diff
changeset
|
456 |
lvThemes->setCurrentIndex(m_themeModel->index(themeNum)); |
1318 | 457 |
} |
1797 | 458 |
|
4941 | 459 |
void HWMapContainer::intSetTemplateFilter(int filter) |
460 |
{ |
|
461 |
cbTemplateFilter->setCurrentIndex(filter); |
|
462 |
emit newTemplateFilter(filter); |
|
463 |
} |
|
464 |
||
1797 | 465 |
void HWMapContainer::setTemplateFilter(int filter) |
466 |
{ |
|
4941 | 467 |
intSetTemplateFilter(filter); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
468 |
if (m_mapInfo.type == MapModel::GeneratedMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
469 |
updatePreview(); |
1802 | 470 |
} |
471 |
||
3133 | 472 |
MapGenerator HWMapContainer::get_mapgen(void) const |
473 |
{ |
|
474 |
return mapgen; |
|
475 |
} |
|
476 |
||
4941 | 477 |
int HWMapContainer::getMazeSize(void) const |
3133 | 478 |
{ |
4941 | 479 |
return cbMazeSize->currentIndex(); |
3133 | 480 |
} |
481 |
||
4941 | 482 |
void HWMapContainer::intSetMazeSize(int size) |
3133 | 483 |
{ |
4941 | 484 |
cbMazeSize->setCurrentIndex(size); |
485 |
emit mazeSizeChanged(size); |
|
486 |
} |
|
487 |
||
488 |
void HWMapContainer::setMazeSize(int size) |
|
489 |
{ |
|
490 |
intSetMazeSize(size); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
491 |
if (m_mapInfo.type == MapModel::GeneratedMaze) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
492 |
updatePreview(); |
3133 | 493 |
} |
494 |
||
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
|
495 |
void HWMapContainer::intSetMapgen(MapGenerator m) |
3133 | 496 |
{ |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
497 |
if (mapgen != m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
498 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
499 |
mapgen = m; |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
500 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
501 |
switch (m) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
502 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
503 |
case MAPGEN_REGULAR: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
504 |
m_mapInfo.type = MapModel::GeneratedMap; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
505 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
506 |
case MAPGEN_MAZE: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
507 |
m_mapInfo.type = MapModel::GeneratedMaze; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
508 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
509 |
case MAPGEN_DRAWN: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
510 |
m_mapInfo.type = MapModel::HandDrawnMap; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
511 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
512 |
case MAPGEN_MAP: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
513 |
switch (m_mapInfo.type) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
514 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
515 |
case MapModel::GeneratedMap: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
516 |
case MapModel::GeneratedMaze: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
517 |
case MapModel::HandDrawnMap: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
518 |
m_mapInfo.type = MapModel::Invalid; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
519 |
default: |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
520 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
521 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
522 |
break; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
523 |
} |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
524 |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
525 |
if(m != MAPGEN_MAP) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
526 |
chooseMap->setCurrentIndex(m); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
527 |
|
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
528 |
emit mapgenChanged(m); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
529 |
} |
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
|
530 |
} |
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
|
531 |
|
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
|
532 |
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
|
533 |
{ |
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
|
534 |
intSetMapgen(m); |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
535 |
if(m != MAPGEN_MAP) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
536 |
updatePreview(); |
3133 | 537 |
} |
4489 | 538 |
|
4537 | 539 |
void HWMapContainer::setDrawnMapData(const QByteArray & ar) |
540 |
{ |
|
541 |
drawMapScene.decode(ar); |
|
4562 | 542 |
updatePreview(); |
4537 | 543 |
} |
544 |
||
4489 | 545 |
QByteArray HWMapContainer::getDrawnMapData() |
546 |
{ |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
547 |
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
|
548 |
} |
4519 | 549 |
|
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
550 |
void HWMapContainer::seedEdited() |
4519 | 551 |
{ |
4699 | 552 |
if (seedLabel->isVisible() == false ) |
553 |
{ |
|
554 |
seedLabel->setVisible(true); |
|
555 |
seedEdit->setVisible(true); |
|
556 |
seedSet->setText(tr("Set")); |
|
557 |
return; |
|
558 |
} |
|
559 |
||
4557
4004bef2aa9d
fix layout in game config widget as per nemo's request
Henek
parents:
4550
diff
changeset
|
560 |
if (seedEdit->text().isEmpty()) |
4519 | 561 |
seedEdit->setText(m_seed); |
562 |
else |
|
563 |
{ |
|
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
564 |
setSeed(seedEdit->text()); |
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
565 |
emit seedChanged(seedEdit->text()); |
4519 | 566 |
} |
567 |
} |
|
4520
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
568 |
|
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
569 |
DrawMapScene * HWMapContainer::getDrawMapScene() |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
570 |
{ |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
571 |
return &drawMapScene; |
e7882bd1a894
Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents:
4519
diff
changeset
|
572 |
} |
4525 | 573 |
|
574 |
void HWMapContainer::mapDrawingFinished() |
|
575 |
{ |
|
4526 | 576 |
emit drawnMapChanged(getDrawnMapData()); |
4525 | 577 |
|
4562 | 578 |
updatePreview(); |
4550
d300ea498486
added set button to seed edit so maps won't regenerate as often
Henek
parents:
4537
diff
changeset
|
579 |
} |
4562 | 580 |
|
581 |
void HWMapContainer::updatePreview() |
|
582 |
{ |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
583 |
if (pMap) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
584 |
{ |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
585 |
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
|
586 |
disconnect(pMap, 0, this, SLOT(setHHLimit(int))); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
587 |
pMap = 0; |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
588 |
} |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
589 |
|
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
590 |
QPixmap failIcon; |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
591 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
592 |
switch(m_mapInfo.type) |
4562 | 593 |
{ |
7014
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
594 |
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
|
595 |
failIcon = QPixmap(":/res/btnDisabled.png"); |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
596 |
imageButt->setIcon(failIcon); |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
597 |
imageButt->setIconSize(failIcon.size()); |
c0b32404ef74
+ display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents:
7008
diff
changeset
|
598 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
599 |
case MapModel::GeneratedMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
600 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
601 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
602 |
case MapModel::GeneratedMaze: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
603 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
604 |
break; |
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
605 |
case MapModel::HandDrawnMap: |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
606 |
askForGeneratedPreview(); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
607 |
break; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
608 |
default: |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
609 |
QPixmap mapImage; |
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
|
610 |
bool success = mapImage.load( |
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
|
611 |
DataManager::instance().findFileForRead( |
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
|
612 |
"Maps/" + m_mapInfo.name + "/preview.png") |
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
|
613 |
); |
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
|
614 |
|
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
|
615 |
if(!success) |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
616 |
{ |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
617 |
imageButt->setIcon(QIcon()); |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
618 |
return; |
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
619 |
} |
4562 | 620 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
621 |
hhLimit = m_mapInfo.limit; |
6616
f77bb02b669f
astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents:
6157
diff
changeset
|
622 |
addInfoToPreview(mapImage); |
4562 | 623 |
} |
624 |
} |
|
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
|
625 |
|
4941 | 626 |
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
|
627 |
{ |
5793
401ab167bd9f
This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents:
5789
diff
changeset
|
628 |
intSetMapgen(m); |
4941 | 629 |
intSetMazeSize(mazesize); |
630 |
intSetSeed(seed); |
|
631 |
intSetTemplateFilter(tmpl); |
|
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
632 |
// 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
|
633 |
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
|
634 |
} |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
635 |
|
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
636 |
|
6938
217ed62e872c
MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents:
6937
diff
changeset
|
637 |
void HWMapContainer::updateModelViews() |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
638 |
{ |
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
|
639 |
// 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
|
640 |
// 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
|
641 |
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
|
642 |
{ |
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
|
643 |
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
|
644 |
if (mdl.size() > 0) |
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
|
645 |
lvThemes->setCurrentIndex(mdl.at(0)); |
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
|
646 |
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
|
647 |
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
|
648 |
} |
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
|
649 |
|
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
|
650 |
// restore map selection |
7018
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
651 |
if ((!m_curMap.isEmpty()) && (chooseMap->currentIndex() < 0)) |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
652 |
intSetMap(m_curMap); |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
653 |
else |
6a1f46c026bf
some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents:
7017
diff
changeset
|
654 |
updatePreview(); |
6933
78d194a30520
mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents:
6700
diff
changeset
|
655 |
} |
7008
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
656 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
657 |
|
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
658 |
void HWMapContainer::onPreviewMapDestroyed(QObject * map) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
659 |
{ |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
660 |
if (map == pMap) |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
661 |
pMap = 0; |
25563f054ef3
fix a previewmap-related QObject::disconnect segfault
sheepluva
parents:
6983
diff
changeset
|
662 |
} |