QTfrontend/ui/widget/mapContainer.cpp
author unc0rr
Thu, 22 Nov 2012 01:19:16 +0400
branchflibqtfrontend
changeset 8092 08960209db8c
parent 8070 66bc20d089fc
child 8130 4cab13c82b4e
permissions -rw-r--r--
Try to use map preview facilities: - HWGame and HWRecorder are completely broken - HWMap should work, but doesn't
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     1
/*
1066
1f1b3686a2b0 Update copyright headers a bit
unc0rr
parents: 883
diff changeset
     2
 * Hedgewars, a free turn based strategy game
6700
e04da46ee43c the most important commit of the year
koda
parents: 6616
diff changeset
     3
 * Copyright (c) 2006-2012 Igor Ulyanov <iulyanov@gmail.com>
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     4
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     5
 * This program is free software; you can redistribute it and/or modify
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     6
 * it under the terms of the GNU General Public License as published by
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     7
 * the Free Software Foundation; version 2 of the License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     8
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
     9
 * This program is distributed in the hope that it will be useful,
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    10
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    11
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    12
 * GNU General Public License for more details.
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    13
 *
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    14
 * You should have received a copy of the GNU General Public License
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    15
 * along with this program; if not, write to the Free Software
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    16
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    17
 */
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    18
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    19
#include <QPushButton>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    20
#include <QBuffer>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    21
#include <QUuid>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    22
#include <QBitmap>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    23
#include <QPainter>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    24
#include <QLinearGradient>
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    25
#include <QColor>
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    26
#include <QTextStream>
1209
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    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
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    29
#include <QVBoxLayout>
1224
0b9fbee5ceda - Add icons for each theme
unc0rr
parents: 1215
diff changeset
    30
#include <QIcon>
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
    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>
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    33
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    34
#include "hwconsts.h"
788
00720357601f - Get rid of PageSimpleGame, now pressing 'quick game' just starts round
unc0rr
parents: 682
diff changeset
    35
#include "mapContainer.h"
1209
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    36
#include "igbox.h"
5252
ded882439548 file association for mac!
koda
parents: 5238
diff changeset
    37
#include "HWApplication.h"
7258
722e8a0d89dc - Move colorsModel to appropriate place
unc0rr
parents: 7018
diff changeset
    38
#include "ThemeModel.h"
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    39
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    40
HWMapContainer::HWMapContainer(QWidget * parent) :
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    41
    QWidget(parent),
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    42
    mainLayout(this),
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
    43
    pMap(0),
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    44
    mapgen(MAPGEN_REGULAR),
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    45
    m_previewSize(256, 128)
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
    46
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    47
    hhSmall.load(":/res/hh_small.png");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    48
    hhLimit = 18;
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
    49
    templateFilter = 0;
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
    50
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    51
    linearGrad = QLinearGradient(QPoint(128, 0), QPoint(128, 128));
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    52
    linearGrad.setColorAt(1, QColor(0, 0, 192));
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    53
    linearGrad.setColorAt(0, QColor(66, 115, 225));
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
    54
5252
ded882439548 file association for mac!
koda
parents: 5238
diff changeset
    55
    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
    56
                                  1,
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
    57
                                  HWApplication::style()->pixelMetric(QStyle::PM_LayoutRightMargin),
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
    58
                                  HWApplication::style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
    59
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    60
    QWidget* mapWidget = new QWidget(this);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    61
    mainLayout.addWidget(mapWidget, 0, 0, Qt::AlignHCenter);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    62
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    63
    QGridLayout* mapLayout = new QGridLayout(mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    64
    mapLayout->setMargin(0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    65
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    66
    imageButt = new QPushButton(mapWidget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    67
    imageButt->setObjectName("imageButt");
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    68
    imageButt->setFixedSize(256 + 6, 128 + 6);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    69
    imageButt->setFlat(true);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    70
    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
    71
    mapLayout->addWidget(imageButt, 0, 0, 1, 2);
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
    72
    connect(imageButt, SIGNAL(clicked()), this, SLOT(setRandomMap()));
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    73
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    74
    chooseMap = new QComboBox(mapWidget);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
    75
    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
    76
    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
    77
    chooseMap->setEditable(false);
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
    78
    chooseMap->setModel(m_mapModel);
4487
dbf69c7c5e00 Add drawn map into the list of map generators
unc0rr
parents: 4419
diff changeset
    79
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    80
    mapLayout->addWidget(chooseMap, 1, 1);
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
    81
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    82
    QLabel * lblMap = new QLabel(tr("Map"), mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    83
    mapLayout->addWidget(lblMap, 1, 0);
1209
7f6cb1d7be2a Start remaking multiplayer page
unc0rr
parents: 1164
diff changeset
    84
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    85
    lblFilter = new QLabel(tr("Filter"), mapWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    86
    mapLayout->addWidget(lblFilter, 2, 0);
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
    87
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    88
    cbTemplateFilter = new QComboBox(mapWidget);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    89
    cbTemplateFilter->addItem(tr("All"), 0);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    90
    cbTemplateFilter->addItem(tr("Small"), 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    91
    cbTemplateFilter->addItem(tr("Medium"), 2);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    92
    cbTemplateFilter->addItem(tr("Large"), 3);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    93
    cbTemplateFilter->addItem(tr("Cavern"), 4);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    94
    cbTemplateFilter->addItem(tr("Wacky"), 5);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    95
    mapLayout->addWidget(cbTemplateFilter, 2, 1);
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
    96
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
    97
    connect(cbTemplateFilter, SIGNAL(activated(int)), this, SLOT(setTemplateFilter(int)));
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
    98
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
    99
    maze_size_label = new QLabel(tr("Type"), mapWidget);
5434
99078dea3a8f fix wrong location of "Type"-label in map-selection
sheepluva
parents: 5289
diff changeset
   100
    mapLayout->addWidget(maze_size_label, 2, 0);
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   101
    maze_size_label->hide();
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   102
    cbMazeSize = new QComboBox(mapWidget);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   103
    cbMazeSize->addItem(tr("Small tunnels"), 0);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   104
    cbMazeSize->addItem(tr("Medium tunnels"), 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   105
    cbMazeSize->addItem(tr("Large tunnels"), 2);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   106
    cbMazeSize->addItem(tr("Small floating islands"), 3);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   107
    cbMazeSize->addItem(tr("Medium floating islands"), 4);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   108
    cbMazeSize->addItem(tr("Large floating islands"), 5);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   109
    cbMazeSize->setCurrentIndex(1);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   110
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   111
    mapLayout->addWidget(cbMazeSize, 2, 1);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   112
    cbMazeSize->hide();
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   113
    connect(cbMazeSize, SIGNAL(activated(int)), this, SLOT(setMazeSize(int)));
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   114
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   115
    gbThemes = new IconedGroupBox(mapWidget);
4701
7ed88cfc99b1 restore showing a bigger icon for themes
koda
parents: 4699
diff changeset
   116
    gbThemes->setTitleTextPadding(80);
7ed88cfc99b1 restore showing a bigger icon for themes
koda
parents: 4699
diff changeset
   117
    gbThemes->setContentTopPadding(15);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   118
    gbThemes->setTitle(tr("Themes"));
1248
8c77eec56bf4 Better theme selection widget look
unc0rr
parents: 1228
diff changeset
   119
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   120
    //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
   121
    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
   122
    // 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
   123
    mapLayout->setRowMinimumHeight(2, 13);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   124
    QVBoxLayout * gbTLayout = new QVBoxLayout(gbThemes);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   125
    gbTLayout->setContentsMargins(0, 0, 0 ,0);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   126
    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
   127
    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
   128
    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
   129
    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
   130
    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
   131
    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
   132
    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
   133
    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
   134
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
    connect(lvThemes->selectionModel(), SIGNAL(currentRowChanged( const QModelIndex &, const QModelIndex &)), this, SLOT(themeSelected( const QModelIndex &, const QModelIndex &)));
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   136
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   137
    // 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
   138
    lvThemes->setStyleSheet(QString(
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   139
                                "QListView{"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   140
                                "border: solid;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   141
                                "border-width: 0px;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   142
                                "border-radius: 0px;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   143
                                "border-color: transparent;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   144
                                "background-color: #0d0544;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   145
                                "color: #ffcc00;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   146
                                "font: bold 13px;"
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   147
                                "}"
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
                           );
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   150
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
   151
    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
   152
    lvThemes->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   153
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   154
    mapLayout->setSizeConstraint(QLayout::SetFixedSize);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   155
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   156
    QWidget* seedWidget = new QWidget(this);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   157
    mainLayout.addWidget(seedWidget, 1, 0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   158
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   159
    QGridLayout* seedLayout = new QGridLayout(seedWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   160
    seedLayout->setMargin(0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   161
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   162
    seedLabel = new QLabel(tr("Seed"), seedWidget);
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   163
    seedLayout->addWidget(seedLabel, 3, 0);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   164
    seedEdit = new QLineEdit(seedWidget);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   165
    seedEdit->setMaxLength(54);
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   166
    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
   167
    seedLayout->addWidget(seedEdit, 3, 1);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   168
    seedLayout->setColumnStretch(1, 5);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   169
    seedSet = new QPushButton(seedWidget);
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   170
    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
   171
    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
   172
    seedLayout->setColumnStretch(2, 1);
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   173
    seedLayout->addWidget(seedSet, 3, 2);
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   174
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   175
    seedLabel->setVisible(false);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   176
    seedEdit->setVisible(false);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   177
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   178
    setRandomSeed();
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   179
    setRandomTheme();
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   180
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   181
    chooseMap->setCurrentIndex(0);
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   182
    mapChanged(0);
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   183
    // use signal "activated" rather than currentIndexChanged
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   184
    // 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
   185
    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
   186
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   187
    // 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
   188
    connect(&DataManager::instance(), SIGNAL(updated()), this, SLOT(updateModelViews()));
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   189
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   190
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   191
void HWMapContainer::setImage(const QImage newImage)
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   192
{
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   193
    QPixmap px(m_previewSize);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   194
    QPixmap pxres(px.size());
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   195
    QPainter p(&pxres);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   196
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   197
    px.fill(Qt::yellow);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   198
    QBitmap bm = QBitmap::fromImage(newImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   199
    px.setMask(bm);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   200
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   201
    p.fillRect(pxres.rect(), linearGrad);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   202
    p.drawPixmap(QPoint(0, 0), px);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   203
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   204
    addInfoToPreview(pxres);
4561
da9d27bc6ea6 Seems like just a source of bugs
unc0rr
parents: 4560
diff changeset
   205
    //chooseMap->setCurrentIndex(mapgen);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   206
    pMap = 0;
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   207
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   208
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   209
void HWMapContainer::setHHLimit(int newHHLimit)
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   210
{
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   211
    hhLimit = newHHLimit;
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   212
}
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   213
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   214
void HWMapContainer::mapChanged(int index)
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   215
{
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   216
    if (chooseMap->currentIndex() != index)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   217
        chooseMap->setCurrentIndex(index);
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   218
7014
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   219
    if (index < 0)
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   220
    {
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   221
        m_mapInfo.type = MapModel::Invalid;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   222
        updatePreview();
7014
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   223
        return;
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   224
    }
7014
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   225
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
   226
    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
   227
    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
   228
    m_curMap = m_mapInfo.name;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   229
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   230
    switch(m_mapInfo.type)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   231
    {
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   232
        case MapModel::GeneratedMap:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   233
            mapgen = MAPGEN_REGULAR;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   234
            gbThemes->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   235
            lblFilter->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   236
            cbTemplateFilter->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   237
            maze_size_label->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   238
            cbMazeSize->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   239
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   240
        case MapModel::GeneratedMaze:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   241
            mapgen = MAPGEN_MAZE;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   242
            gbThemes->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   243
            lblFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   244
            cbTemplateFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   245
            maze_size_label->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   246
            cbMazeSize->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   247
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   248
        case MapModel::HandDrawnMap:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   249
            mapgen = MAPGEN_DRAWN;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   250
            gbThemes->show();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   251
            lblFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   252
            cbTemplateFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   253
            maze_size_label->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   254
            cbMazeSize->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   255
            break;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   256
        default:
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   257
            mapgen = MAPGEN_NAMED;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   258
            gbThemes->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   259
            lblFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   260
            cbTemplateFilter->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   261
            maze_size_label->hide();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   262
            cbMazeSize->hide();
6940
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   263
            m_theme = m_mapInfo.theme;
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   264
    }
5794
cc6e8403664d Send mapgen for static maps
unc0rr
parents: 5793
diff changeset
   265
6940
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   266
    // 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
   267
    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
   268
    {
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   269
        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
   270
        emit themeChanged(m_theme);
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   271
    }
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   272
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   273
    updatePreview();
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   274
    emit mapChanged(m_curMap);
5794
cc6e8403664d Send mapgen for static maps
unc0rr
parents: 5793
diff changeset
   275
    emit mapgenChanged(mapgen);
331
6bfc326e4976 Selecting map works in net game
unc0rr
parents: 329
diff changeset
   276
}
6bfc326e4976 Selecting map works in net game
unc0rr
parents: 329
diff changeset
   277
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   278
// Should this add text to identify map size?
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   279
void HWMapContainer::addInfoToPreview(QPixmap image)
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   280
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   281
    QPixmap finalImage = QPixmap(image.size());
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   282
    finalImage.fill(QColor(0, 0, 0, 0));
2377
f3fab2b09e0c And in frontend
nemo
parents: 2021
diff changeset
   283
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   284
    QPainter p(&finalImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   285
    p.drawPixmap(image.rect(), image);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   286
    //p.setPen(QColor(0xf4,0x9e,0xe9));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   287
    p.setPen(QColor(0xff,0xcc,0x00));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   288
    p.setBrush(QColor(0, 0, 0));
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   289
    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
   290
    p.setFont(QFont("MS Shell Dlg", 10));
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   291
    QString text = (hhLimit > 0) ? QString::number(hhLimit) : "?";
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   292
    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
   293
    p.drawPixmap(image.rect().width() - hhSmall.rect().width() - 5, 5, hhSmall.rect().width(), hhSmall.rect().height(), hhSmall);
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   294
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   295
    imageButt->setIcon(finalImage);
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   296
    imageButt->setIconSize(image.size());
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   297
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   298
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   299
void HWMapContainer::askForGeneratedPreview()
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   300
{
8070
66bc20d089fc Okay, remove previous request only if it has same parent
unc0rr
parents: 8049
diff changeset
   301
    pMap = new HWMap(this);
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   302
    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
   303
    connect(pMap, SIGNAL(HHLimitReceived(int)), this, SLOT(setHHLimit(int)));
7008
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   304
    connect(pMap, SIGNAL(destroyed(QObject *)), this, SLOT(onPreviewMapDestroyed(QObject *)));
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   305
    pMap->getImage(m_seed,
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   306
                   getTemplateFilter(),
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   307
                   get_mapgen(),
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   308
                   getMazeSize(),
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   309
                   getDrawnMapData()
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   310
                  );
7017
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   311
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   312
    setHHLimit(0);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   313
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   314
    const QPixmap waitIcon(":/res/iconTime.png");
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   315
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   316
    QPixmap waitImage(m_previewSize);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   317
    QPainter p(&waitImage);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   318
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   319
    p.fillRect(waitImage.rect(), linearGrad);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   320
    int x = (waitImage.width() - waitIcon.width()) / 2;
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   321
    int y = (waitImage.height() - waitIcon.height()) / 2;
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   322
    p.drawPixmap(QPoint(x, y), waitIcon);
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   323
19a434fc91fc visually indicate when map preview generation is in progress.
sheepluva
parents: 7014
diff changeset
   324
    addInfoToPreview(waitImage);
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   325
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   326
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
   327
void HWMapContainer::themeSelected(const QModelIndex & current, const QModelIndex &)
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   328
{
6940
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   329
    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
   330
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
    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
   332
    emit themeChanged(m_theme);
1215
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   333
}
0c1c294c0f7e Themes list now works
unc0rr
parents: 1214
diff changeset
   334
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   335
QString HWMapContainer::getCurrentSeed() const
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   336
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   337
    return m_seed;
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   338
}
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   339
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   340
QString HWMapContainer::getCurrentMap() const
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   341
{
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   342
    if(chooseMap->currentIndex() < MAPGEN_NAMED) return QString();
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   343
    return(m_curMap);
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   344
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   345
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   346
QString HWMapContainer::getCurrentTheme() const
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   347
{
6940
211aca8c1f4f decouple current theme from map theme (fixes theme confusion bugs of last commit)
sheepluva
parents: 6939
diff changeset
   348
    return(m_theme);
3008
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   349
}
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   350
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   351
bool HWMapContainer::getCurrentIsMission() const
e57cafce4227 Frontend:
smxx
parents: 2948
diff changeset
   352
{
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   353
    return(m_mapInfo.type == MapModel::MissionMap);
1790
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   354
}
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   355
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   356
int HWMapContainer::getCurrentHHLimit() const
c84223511ca8 frontend's part of nemo patch
unc0rr
parents: 1366
diff changeset
   357
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   358
    return hhLimit;
249
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   359
}
ff85fa029541 map choose from files added
displacer
parents: 216
diff changeset
   360
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
   361
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
   362
{
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   363
    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
   364
}
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
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
   367
{
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   368
    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
   369
}
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
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   371
quint32 HWMapContainer::getTemplateFilter() const
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   372
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   373
    return cbTemplateFilter->itemData(cbTemplateFilter->currentIndex()).toInt();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   374
}
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   375
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   376
void HWMapContainer::resizeEvent ( QResizeEvent * event )
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   377
{
4560
5d6c7f88db73 - Some work on drawMap widget and scene to allow undo, clear, save and load operations
unc0rr
parents: 4557
diff changeset
   378
    Q_UNUSED(event);
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   379
    //imageButt->setIconSize(imageButt->size());
184
f97a7a3dc8f6 - Update more headers
unc0rr
parents: 183
diff changeset
   380
}
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   381
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
   382
void HWMapContainer::intSetSeed(const QString & seed)
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   383
{
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   384
    m_seed = seed;
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   385
    if (seed != seedEdit->text())
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   386
        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
   387
}
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
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
   390
{
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
    intSetSeed(seed);
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   392
    if ((m_mapInfo.type == MapModel::GeneratedMap) || (m_mapInfo.type == MapModel::GeneratedMaze))
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   393
        updatePreview();
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   394
}
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   395
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
   396
void HWMapContainer::intSetMap(const QString & map)
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   397
{
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   398
    m_curMap = map;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   399
6983
ede55af89e78 roomslistmodel: prettier names for map +rnd+ etc.; point out unavailable maps
sheepluva
parents: 6960
diff changeset
   400
    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
   401
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   402
    mapChanged(id);
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   403
}
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   404
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   405
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
   406
{
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   407
    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
   408
        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
   409
}
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
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   411
void HWMapContainer::setTheme(const QString & theme)
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   412
{
6937
7f77fa908a4e messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents: 6933
diff changeset
   413
    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
   414
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
    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
   416
        lvThemes->setCurrentIndex(mdl.at(0));
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   417
}
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   418
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   419
void HWMapContainer::setRandomMap()
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   420
{
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
   421
    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
   422
4419
3d99c2c806ec fix for frontend desync
prg
parents: 4337
diff changeset
   423
    setRandomSeed();
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   424
    switch(m_mapInfo.type)
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   425
    {
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   426
        case MapModel::GeneratedMap:
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   427
        case MapModel::GeneratedMaze:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   428
            setRandomTheme();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   429
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   430
        case MapModel::HandDrawnMap:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   431
            emit drawMapRequested();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   432
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   433
        case MapModel::MissionMap:
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   434
        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
   435
            // 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
   436
            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
   437
            mapChanged(idx);
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   438
            break;
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   439
        case MapModel::Invalid:
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   440
            mapChanged(0);
4337
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   441
    }
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   442
}
85e02b1a8e8f merge 0.9.14.1 to trunk
nemo
parents: 4322
diff changeset
   443
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   444
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   445
void HWMapContainer::setRandomSeed()
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   446
{
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   447
    setSeed(QUuid::createUuid().toString());
2948
3f21a9dc93d0 Replace tabs with spaces using 'expand -t 4' command
unc0rr
parents: 2377
diff changeset
   448
    emit seedChanged(m_seed);
320
1ee7f087195a - HWMapContainer sets and stores the theme
unc0rr
parents: 314
diff changeset
   449
}
1318
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   450
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   451
void HWMapContainer::setRandomTheme()
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   452
{
6937
7f77fa908a4e messing with the theme model a bit (gets now auto-updated after DLC download too)
sheepluva
parents: 6933
diff changeset
   453
    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
   454
    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
   455
    lvThemes->setCurrentIndex(m_themeModel->index(themeNum));
1318
18da1c5e960d - Shut the client's tries to configure server up
unc0rr
parents: 1248
diff changeset
   456
}
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   457
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   458
void HWMapContainer::intSetTemplateFilter(int filter)
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   459
{
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   460
    cbTemplateFilter->setCurrentIndex(filter);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   461
    emit newTemplateFilter(filter);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   462
}
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   463
1797
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   464
void HWMapContainer::setTemplateFilter(int filter)
fedd8649fdd9 Templates filter by nemo
unc0rr
parents: 1790
diff changeset
   465
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   466
    intSetTemplateFilter(filter);
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   467
    if (m_mapInfo.type == MapModel::GeneratedMap)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   468
        updatePreview();
1802
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   469
}
dd148e2506e2 Move template filter to map widget (by nemo)
unc0rr
parents: 1797
diff changeset
   470
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   471
int HWMapContainer::get_mapgen(void) const
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   472
{
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   473
    return mapgen;
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   474
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   475
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   476
int HWMapContainer::getMazeSize(void) const
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   477
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   478
    return cbMazeSize->currentIndex();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   479
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   480
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   481
void HWMapContainer::intSetMazeSize(int size)
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   482
{
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   483
    cbMazeSize->setCurrentIndex(size);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   484
    emit mazeSizeChanged(size);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   485
}
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   486
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   487
void HWMapContainer::setMazeSize(int size)
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   488
{
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   489
    intSetMazeSize(size);
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   490
    if (m_mapInfo.type == MapModel::GeneratedMaze)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   491
        updatePreview();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   492
}
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   493
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   494
void HWMapContainer::intSetMapgen(int m)
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   495
{
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   496
    if (mapgen != m)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   497
    {
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   498
        mapgen = m;
5793
401ab167bd9f This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents: 5789
diff changeset
   499
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   500
        switch (m)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   501
        {
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   502
            case MAPGEN_REGULAR:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   503
                m_mapInfo.type = MapModel::GeneratedMap;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   504
                break;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   505
            case MAPGEN_MAZE:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   506
                m_mapInfo.type = MapModel::GeneratedMaze;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   507
                break;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   508
            case MAPGEN_DRAWN:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   509
                m_mapInfo.type = MapModel::HandDrawnMap;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   510
                break;
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   511
            case MAPGEN_NAMED:
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   512
                switch (m_mapInfo.type)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   513
                {
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   514
                    case MapModel::GeneratedMap:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   515
                    case MapModel::GeneratedMaze:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   516
                    case MapModel::HandDrawnMap:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   517
                        m_mapInfo.type = MapModel::Invalid;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   518
                    default:
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   519
                        break;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   520
                }
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   521
                break;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   522
        }
5793
401ab167bd9f This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents: 5789
diff changeset
   523
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   524
        if(m != MAPGEN_NAMED)
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   525
            chooseMap->setCurrentIndex(m);
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   526
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   527
        emit mapgenChanged(m);
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   528
    }
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
   529
}
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
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   531
void HWMapContainer::setMapgen(int m)
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
   532
{
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
    intSetMapgen(m);
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   534
    if(m != MAPGEN_NAMED)
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   535
        updatePreview();
3133
1ab5f18f4df8 prg's maze generator
nemo
parents: 3009
diff changeset
   536
}
4489
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   537
4537
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   538
void HWMapContainer::setDrawnMapData(const QByteArray & ar)
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   539
{
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   540
    drawMapScene.decode(ar);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   541
    updatePreview();
4537
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   542
}
f95f7218531a Recieve and parse DRAWNMAP config
unc0rr
parents: 4534
diff changeset
   543
4489
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   544
QByteArray HWMapContainer::getDrawnMapData()
c4ca9ced258b - Pass map drawing data to engine
unc0rr
parents: 4487
diff changeset
   545
{
4520
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   546
    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
   547
}
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   548
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   549
void HWMapContainer::seedEdited()
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   550
{
4699
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   551
    if (seedLabel->isVisible() == false )
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   552
    {
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   553
        seedLabel->setVisible(true);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   554
        seedEdit->setVisible(true);
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   555
        seedSet->setText(tr("Set"));
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   556
        return;
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   557
    }
47d8a524780a hide seed...
koda
parents: 4566
diff changeset
   558
4557
4004bef2aa9d fix layout in game config widget as per nemo's request
Henek
parents: 4550
diff changeset
   559
    if (seedEdit->text().isEmpty())
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   560
        seedEdit->setText(m_seed);
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   561
    else
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   562
    {
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   563
        setSeed(seedEdit->text());
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   564
        emit seedChanged(seedEdit->text());
4519
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   565
    }
aee36896d46b exposing seed for editing and viewing
Henek
parents: 4513
diff changeset
   566
}
4520
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   567
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   568
DrawMapScene * HWMapContainer::getDrawMapScene()
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   569
{
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   570
    return &drawMapScene;
e7882bd1a894 Allow to draw maps in frontend and play them (only locally, some bugs to fix)
unc0rr
parents: 4519
diff changeset
   571
}
4525
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   572
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   573
void HWMapContainer::mapDrawingFinished()
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   574
{
4526
38afca1e4248 Debug messages
unc0rr
parents: 4525
diff changeset
   575
    emit drawnMapChanged(getDrawnMapData());
4525
0a81be113e21 Try to send drawn map data to net server
unc0rr
parents: 4520
diff changeset
   576
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   577
    updatePreview();
4550
d300ea498486 added set button to seed edit so maps won't regenerate as often
Henek
parents: 4537
diff changeset
   578
}
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   579
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   580
void HWMapContainer::updatePreview()
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   581
{
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   582
    if (pMap)
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   583
    {
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   584
        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
   585
        disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   586
        pMap = 0;
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   587
    }
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   588
7014
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   589
    QPixmap failIcon;
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   590
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   591
    switch(m_mapInfo.type)
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   592
    {
7014
c0b32404ef74 + display lack of map in a nice way, don't generate bogus preview in the background
sheepluva
parents: 7008
diff changeset
   593
        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
   594
            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
   595
            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
   596
            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
   597
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   598
        case MapModel::GeneratedMap:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   599
            askForGeneratedPreview();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   600
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   601
        case MapModel::GeneratedMaze:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   602
            askForGeneratedPreview();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   603
            break;
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   604
        case MapModel::HandDrawnMap:
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   605
            askForGeneratedPreview();
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   606
            break;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   607
        default:
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   608
            QPixmap mapImage;
8049
133e22b5c410 Get rid of DataManager::findFileForRead
unc0rr
parents: 7794
diff changeset
   609
            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
   610
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
            if(!success)
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   612
            {
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   613
                imageButt->setIcon(QIcon());
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   614
                return;
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   615
            }
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   616
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   617
            hhLimit = m_mapInfo.limit;
6616
f77bb02b669f astyle -C -S -L -N --style=allman --recursive "QTfrontend/*.cpp" "QTfrontend/*.h"
nemo
parents: 6157
diff changeset
   618
            addInfoToPreview(mapImage);
4562
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   619
    }
b55f78fd2bf6 - Simplify map container code a bit
unc0rr
parents: 4561
diff changeset
   620
}
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
   621
8092
08960209db8c Try to use map preview facilities:
unc0rr
parents: 8070
diff changeset
   622
void HWMapContainer::setAllMapParameters(const QString &map, int 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
   623
{
5793
401ab167bd9f This should be a real fix (7643cbb88f09 reverted). Not tested.
unc0rr
parents: 5789
diff changeset
   624
    intSetMapgen(m);
4941
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   625
    intSetMazeSize(mazesize);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   626
    intSetSeed(seed);
90572c338e60 Fix for my last commit (which was all nonsense)
unc0rr
parents: 4936
diff changeset
   627
    intSetTemplateFilter(tmpl);
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   628
    // 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
   629
    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
   630
}
6933
78d194a30520 mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents: 6700
diff changeset
   631
78d194a30520 mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents: 6700
diff changeset
   632
6938
217ed62e872c MapModel, various cleanups. TODO/FIXME: QComboBox separator not working with custom models
sheepluva
parents: 6937
diff changeset
   633
void HWMapContainer::updateModelViews()
6933
78d194a30520 mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents: 6700
diff changeset
   634
{
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
   635
    // 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
   636
    // 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
   637
    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
   638
    {
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
        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
   640
        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
   641
            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
   642
        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
   643
            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
   644
    }
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
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
    // restore map selection
7018
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   647
    if ((!m_curMap.isEmpty()) && (chooseMap->currentIndex() < 0))
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   648
        intSetMap(m_curMap);
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   649
    else
6a1f46c026bf some tweaks/fixes/etc to the map preview and reload stuff
sheepluva
parents: 7017
diff changeset
   650
        updatePreview();
6933
78d194a30520 mapContainer: use DataManager, reload maps after data update (e.g. by DLC)
sheepluva
parents: 6700
diff changeset
   651
}
7008
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   652
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   653
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   654
void HWMapContainer::onPreviewMapDestroyed(QObject * map)
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   655
{
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   656
    if (map == pMap)
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   657
        pMap = 0;
25563f054ef3 fix a previewmap-related QObject::disconnect segfault
sheepluva
parents: 6983
diff changeset
   658
}