sheepy-clone: comparison QTfrontend/ui/widget/mapContainer.cpp

equal deleted inserted replaced

-:d49bd0dd735d
+:0c98d3b249f7
 m_staticViewSetup = false;
 m_script = QString();
 m_prevMapFeatureSize = 12;
 m_mapFeatureSize = 12;
 m_withoutDLC = false;
+m_missingMap = false;
 hhSmall.load(":/res/hh_small.png");
 hhLimit = 18;
 templateFilter = 0;
 m_master = true;
 QWidget * topWidget = new QWidget();
 QHBoxLayout * topLayout = new QHBoxLayout(topWidget);
 topWidget->setContentsMargins(0, 0, 0, 0);
 topLayout->setContentsMargins(0, 0, 0, 0);
-QHBoxLayout * twoColumnLayout = new QHBoxLayout();
+twoColumnLayout = new QHBoxLayout();
 QVBoxLayout * leftLayout = new QVBoxLayout();
+leftLayout->setAlignment(Qt::AlignLeft);
 QVBoxLayout * rightLayout = new QVBoxLayout();
 twoColumnLayout->addLayout(leftLayout, 0);
-twoColumnLayout->addStretch(1);
 twoColumnLayout->addLayout(rightLayout, 0);
 QVBoxLayout * drawnControls = new QVBoxLayout();
 /* Map type label */
 leftLayout->addLayout(bottomLeftLayout, 1);
 /* Map list label */
 lblMapList = new QLabel(this);
+lblMapList->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
+lblMapList->setAlignment(Qt::AlignTop | Qt::AlignLeft);
 rightLayout->addWidget(lblMapList, 0);
 m_childWidgets << lblMapList;
 /* Static maps list */
 /* Mission maps list */
 missionMapList = new QListView(this);
 rightLayout->addWidget(missionMapList, 1);
 m_childWidgets << missionMapList;
+/* Map name label (when not room master) */
+lblMapName = new QLabel(this);
+lblMapName->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+lblMapName->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+lblMapName->setTextFormat(Qt::PlainText);
+lblMapName->setWordWrap(true),
+rightLayout->addWidget(lblMapName, 1);
+m_childWidgets << lblMapName;
 /* Map load and edit buttons */
 drawnControls->addStretch(1);
 //mapFeatureSize->setTickPosition(QSlider::TicksBelow);
 mapFeatureSize->setMaximum(25);
 mapFeatureSize->setMinimum(1);
 //mapFeatureSize->setFixedWidth(259);
 mapFeatureSize->setValue(m_mapFeatureSize);
-mapFeatureSize->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+mapFeatureSize->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
 bottomLeftLayout->addWidget(mapFeatureSize, 0);
 connect(mapFeatureSize, SIGNAL(valueChanged(int)), this, SLOT(setFeatureSize(int)));
 m_childWidgets << mapFeatureSize;
 /* Mission description */
 lblDesc = new QLabel();
 lblDesc->setWordWrap(true);
 lblDesc->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-lblDesc->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+lblDesc->setAlignment(Qt::AlignBottom | Qt::AlignLeft);
 lblDesc->setStyleSheet("font: 10px;");
 bottomLeftLayout->addWidget(lblDesc, 100);
 /* Add stretch above theme button */
 {
 //nuffin
 }
 else if (m_staticMapModel->mapExists(map))
 {
+m_missingMap = false;
 changeMapType(MapModel::StaticMap, m_staticMapModel->index(m_staticMapModel->findMap(map), 0));
 }
 else if (m_missionMapModel->mapExists(map))
 {
+m_missingMap = false;
 changeMapType(MapModel::MissionMap, m_missionMapModel->index(m_missionMapModel->findMap(map), 0));
 } else
 {
 qDebug() << "HWMapContainer::intSetMap: Map doesn't exist: " << map;
+m_missingMap = true;
+lblMapName->setText(map);
+updatePreview();
 }
 }
 void HWMapContainer::setMap(const QString & map)
 {
-if ((m_mapInfo.type == MapModel::Invalid) || (map != m_mapInfo.name))
+if ((m_mapInfo.type == MapModel::Invalid) || (map != m_mapInfo.name) || m_missingMap)
 intSetMap(map);
 }
 void HWMapContainer::setTheme(const QString & theme)
 {
 disconnect(pMap, 0, this, SLOT(setImage(const QPixmap)));
 disconnect(pMap, 0, this, SLOT(setHHLimit(int)));
 pMap = 0;
 }
-QPixmap failIcon;
+QPixmap failPixmap;
+QIcon failIcon;
 switch(m_mapInfo.type)
 {
 case MapModel::Invalid:
-failIcon = QPixmap(":/res/btnDisabled.png");
+failPixmap = QPixmap(":/res/missingMap.png");
-mapPreview->setIcon(QIcon(failIcon));
+failIcon = QIcon();
-mapPreview->setIconSize(failIcon.size());
+failIcon.addPixmap(failPixmap, QIcon::Normal);
+failIcon.addPixmap(failPixmap, QIcon::Disabled);
+mapPreview->setIcon(failIcon);
+mapPreview->setIconSize(failPixmap.size());
+lblDesc->clear();
 break;
 case MapModel::GeneratedMap:
 case MapModel::GeneratedMaze:
 case MapModel::GeneratedPerlin:
 case MapModel::HandDrawnMap:
 case MapModel::FortsMap:
 askForGeneratedPreview();
 break;
 default:
-QPixmap mapImage;
+if(m_missingMap)
-bool success = mapImage.load("physfs://Maps/" + m_mapInfo.name + "/preview.png");
-if(!success)
 {
-mapPreview->setIcon(QIcon());
+failPixmap = QPixmap(":/res/missingMap.png");
-return;
+failIcon = QIcon();
+failIcon.addPixmap(failPixmap, QIcon::Normal);
+failIcon.addPixmap(failPixmap, QIcon::Disabled);
+mapPreview->setIcon(failIcon);
+mapPreview->setIconSize(failPixmap.size());
+lblDesc->clear();
+break;
 }
+else
-hhLimit = m_mapInfo.limit;
+{
-addInfoToPreview(mapImage);
+QPixmap mapImage;
+bool success = mapImage.load("physfs://Maps/" + m_mapInfo.name + "/preview.png");
+if(!success)
+{
+mapPreview->setIcon(QIcon());
+return;
+}
+hhLimit = m_mapInfo.limit;
+addInfoToPreview(mapImage);
+}
 }
 }
 void HWMapContainer::setAllMapParameters(const QString &map, MapGenerator m, int mazesize, const QString &seed, int tmpl, int featureSize)
 {
 void HWMapContainer::changeMapType(MapModel::MapType type, const QModelIndex & newMap)
 {
 staticMapList->hide();
 missionMapList->hide();
+lblMapName->hide();
 lblMapList->hide();
 generationStyles->hide();
 mazeStyles->hide();
 lblDesc->hide();
 btnLoadMap->hide();
 setupMissionMapsView();
 mapgen = MAPGEN_MAP;
 missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex());
 lblMapList->setText(tr("Mission:"));
 lblMapList->show();
-missionMapList->show();
+if(m_master)
+{
+missionMapList->show();
+}
+else
+{
+lblMapName->show();
+}
 mapFeatureSize->hide();
 lblDesc->setText(m_mapInfo.desc);
 lblDesc->show();
 emit mapChanged(m_curMap);
 break;
 setupStaticMapsView();
 mapgen = MAPGEN_MAP;
 staticMapChanged(newMap.isValid() ? newMap : staticMapList->currentIndex());
 lblMapList->setText(tr("Map:"));
 lblMapList->show();
+if(m_master)
+{
+staticMapList->show();
+}
+else
+{
+lblMapName->show();
+}
 mapFeatureSize->hide();
-staticMapList->show();
 emit mapChanged(m_curMap);
 break;
 case MapModel::FortsMap:
 mapgen = MAPGEN_FORTS;
 setMapInfo(MapModel::MapInfoForts);
 void HWMapContainer::updateTheme(const QModelIndex & current)
 {
 m_theme = selectedTheme = current.data(ThemeModel::ActualNameRole).toString();
 m_themeID = current.row();
 QIcon icon = current.data(Qt::DecorationRole).value<QIcon>();
-//QSize iconSize = icon.actualSize(QSize(65535, 65535));
-//btnTheme->setFixedHeight(64);
-//btnTheme->setIconSize(iconSize);
 btnTheme->setIcon(icon);
-btnTheme->setText(tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString()));
+QString themeLabel = tr("Theme: %1").arg(current.data(Qt::DisplayRole).toString());
+btnTheme->setText(themeLabel);
 updateThemeButtonSize();
 }
 void HWMapContainer::staticMapChanged(const QModelIndex & map, const QModelIndex & old)
 {
 else                return;
 // Make sure it is a valid index
 if (!map.isValid())
 {
+// Make sure there's always a valid selection in the map list
 if (old.isValid())
 {
 mapList->setCurrentIndex(old);
 mapList->scrollTo(old);
 }
-else
+m_mapInfo.type = MapModel::Invalid;
-{
+m_missingMap = true;
-m_mapInfo.type = MapModel::Invalid;
+updatePreview();
-updatePreview();
-}
 return;
 }
 // If map changed, update list selection
 if (mapList->currentIndex() != map)
 {
 mapList->setCurrentIndex(map);
 mapList->scrollTo(map);
+}
+if (m_missingMap)
+{
+m_missingMap = false;
+updatePreview();
 }
 Q_ASSERT(map.data(Qt::UserRole + 1).canConvert<MapModel::MapInfo>()); // Houston, we have a problem.
 setMapInfo(map.data(Qt::UserRole + 1).value<MapModel::MapInfo>());
 }
 setTheme(m_mapInfo.theme);
 emit themeChanged(m_mapInfo.theme);
 }
 lblDesc->setText(mapInfo.desc);
+lblMapName->setText(m_curMap);
 updatePreview();
 emit mapChanged(m_curMap);
 }
 if (master == m_master) return;
 m_master = master;
 foreach (QWidget *widget, m_childWidgets)
 widget->setEnabled(master);
+if(m_mapInfo.type == MapModel::StaticMap)
+{
+lblMapName->setHidden(master);
+staticMapList->setVisible(master);
+}
+else if(m_mapInfo.type == MapModel::MissionMap)
+{
+lblMapName->setHidden(master);
+missionMapList->setVisible(master);
+}
+if(m_missingMap)
+{
+// Force map type reset if host provided missing map
+m_missingMap = false;
+changeMapType(MapModel::GeneratedMap);
+}
 }
 void HWMapContainer::intSetIconlessTheme(const QString & name)
 {
 if (name.isEmpty()) return;

changeset 13251	0c98d3b249f7
parent 13233	d23742ccf92b
child 13253	b0022324fb4e