diff -r 6e8b807bda4b -r ba39a1d396c0 QTfrontend/ui/widget/mapContainer.h --- a/QTfrontend/ui/widget/mapContainer.h Sun Jun 10 18:56:51 2018 +0200 +++ b/QTfrontend/ui/widget/mapContainer.h Sun Jun 10 19:12:26 2018 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -99,12 +100,11 @@ void drawnMapChanged(const QByteArray & data); private slots: - void setImage(const QPixmap & newImage); + void onImageReceived(const QPixmap & newImage); void setHHLimit(int hhLimit); void setRandomSeed(); void setRandomTheme(); void setRandomMap(); - void addInfoToPreview(const QPixmap & image); void setNewSeed(const QString & newSeed); void mapTypeChanged(int); void showThemePrompt(); @@ -147,6 +147,7 @@ QComboBox * cType; QListView * staticMapList; QListView * missionMapList; + QTextEdit * teMapName; QListWidget * generationStyles; QListWidget * mazeStyles; QLabel * lblMapList; @@ -158,12 +159,14 @@ QPushButton * btnRandTheme; QString selectedTheme; QPushButton * btnSeed; + QHBoxLayout * twoColumnLayout; bool m_master; QList m_childWidgets; bool m_previewEnabled; bool m_missionsViewSetup; bool m_staticViewSetup; bool m_withoutDLC; + bool m_missingMap; void intSetSeed(const QString & seed); void intSetMap(const QString & map); @@ -171,15 +174,20 @@ void intSetTemplateFilter(int); void intSetMazeSize(int size); void intSetFeatureSize(int size); - void intSetIconlessTheme(const QString & name); + void setMissingTheme(const QString & name); void mapChanged(const QModelIndex & map, int type, const QModelIndex & old = QModelIndex()); + void setImage(const QPixmap & newImage); + void setImage(const QPixmap & newImage, const QLinearGradient & linearGrad, bool showHHLimit); + void addInfoToPreview(const QPixmap & image); + void addInfoToPreview(const QPixmap & image, const QLinearGradient & linearGrad, bool drawHHLimit); void setMapInfo(MapModel::MapInfo mapInfo); void changeMapType(MapModel::MapType type, const QModelIndex & newMap = QModelIndex()); void updateHelpTexts(MapModel::MapType type); void updatePreview(); void updateThemeButtonSize(); - void setupMissionMapsView(); - void setupStaticMapsView(); + void setupMissionMapsView(const QString & initialMap = QString()); + void setupStaticMapsView(const QString & initialMap = QString()); + void setMapNameLabel(QString mapName, bool validMap); MapModel::MapInfo m_mapInfo; int m_themeID; @@ -188,7 +196,10 @@ QString m_theme; QString m_curMap; - QLinearGradient linearGrad; ///< for preview background + QLinearGradient linearGradNormal; ///< for preview background + QLinearGradient linearGradLoading; ///< for preview background while loading/generating map + QLinearGradient linearGradNoPreview; ///< for preview background when map preview image is missing + QLinearGradient linearGradMapError; ///< for preview background when map is missing QSize m_previewSize; };