equal
deleted
inserted
replaced
522 } else |
522 } else |
523 { |
523 { |
524 qDebug() << "HWMapContainer::intSetMap: Map doesn't exist: " << map; |
524 qDebug() << "HWMapContainer::intSetMap: Map doesn't exist: " << map; |
525 m_missingMap = true; |
525 m_missingMap = true; |
526 lblMapName->setText(map); |
526 lblMapName->setText(map); |
|
527 if (m_mapInfo.type != MapModel::StaticMap && m_mapInfo.type != MapModel::MissionMap) |
|
528 { |
|
529 m_mapInfo.type = MapModel::StaticMap; |
|
530 changeMapType(MapModel::StaticMap, QModelIndex()); |
|
531 } |
527 updatePreview(); |
532 updatePreview(); |
528 } |
533 } |
529 } |
534 } |
530 |
535 |
531 void HWMapContainer::setMap(const QString & map) |
536 void HWMapContainer::setMap(const QString & map) |
932 setupMissionMapsView(); |
937 setupMissionMapsView(); |
933 mapgen = MAPGEN_MAP; |
938 mapgen = MAPGEN_MAP; |
934 missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
939 missionMapChanged(newMap.isValid() ? newMap : missionMapList->currentIndex()); |
935 lblMapList->setText(tr("Mission:")); |
940 lblMapList->setText(tr("Mission:")); |
936 lblMapList->show(); |
941 lblMapList->show(); |
|
942 lblMapName->setText(m_curMap); |
937 if(m_master) |
943 if(m_master) |
938 { |
944 { |
939 missionMapList->show(); |
945 missionMapList->show(); |
940 } |
946 } |
941 else |
947 else |
951 setupStaticMapsView(); |
957 setupStaticMapsView(); |
952 mapgen = MAPGEN_MAP; |
958 mapgen = MAPGEN_MAP; |
953 staticMapChanged(newMap.isValid() ? newMap : staticMapList->currentIndex()); |
959 staticMapChanged(newMap.isValid() ? newMap : staticMapList->currentIndex()); |
954 lblMapList->setText(tr("Map:")); |
960 lblMapList->setText(tr("Map:")); |
955 lblMapList->show(); |
961 lblMapList->show(); |
|
962 lblMapName->setText(m_curMap); |
956 if(m_master) |
963 if(m_master) |
957 { |
964 { |
958 staticMapList->show(); |
965 staticMapList->show(); |
959 } |
966 } |
960 else |
967 else |
1125 setTheme(m_mapInfo.theme); |
1132 setTheme(m_mapInfo.theme); |
1126 emit themeChanged(m_mapInfo.theme); |
1133 emit themeChanged(m_mapInfo.theme); |
1127 } |
1134 } |
1128 |
1135 |
1129 lblDesc->setText(mapInfo.desc); |
1136 lblDesc->setText(mapInfo.desc); |
1130 lblMapName->setText(m_curMap); |
|
1131 |
1137 |
1132 updatePreview(); |
1138 updatePreview(); |
1133 emit mapChanged(m_curMap); |
1139 emit mapChanged(m_curMap); |
1134 } |
1140 } |
1135 |
1141 |