Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
authornemo
Fri, 05 Nov 2010 12:52:37 -0400
changeset 4125 877ecc9d9d82
parent 4124 2d13b60b7fa4
child 4126 8ac87321c8b9
Disable icons on maps/generated terrain dropdowns since they haven't been drawn yet. Add per-hog-ammo button
QTfrontend/mapContainer.cpp
QTfrontend/res/btnPerHogAmmo.png
--- a/QTfrontend/mapContainer.cpp	Fri Nov 05 12:33:52 2010 -0400
+++ b/QTfrontend/mapContainer.cpp	Fri Nov 05 12:52:37 2010 -0400
@@ -62,8 +62,14 @@
 
     chooseMap = new QComboBox(this);
     chooseMap->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-    chooseMap->addItem(QIcon(":/res/mapRandom.png"), QComboBox::tr("generated map..."));
-    chooseMap->addItem(QIcon(":/res/mapMaze.png"), QComboBox::tr("generated maze..."));
+    chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapRandom.png"), 
+QComboBox::tr("generated map..."));
+    chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapMaze.png"), 
+QComboBox::tr("generated maze..."));
     chooseMap->insertSeparator(chooseMap->count()); // separator between generators and missions
 
     int missionindex = chooseMap->count();
@@ -95,11 +101,17 @@
             mapInfo.push_back(mapLuaFile.exists());
             if(mapLuaFile.exists())
             {
-                chooseMap->insertItem(missionindex++, QIcon(":/res/mapMission.png"), QComboBox::tr("Mission") + ": " + map, mapInfo);
+                chooseMap->insertItem(missionindex++, 
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapMission.png"), 
+QComboBox::tr("Mission") + ": " + map, mapInfo);
                 numMissions++;
             }
             else
-                chooseMap->addItem(QIcon(":/res/mapCustom.png"), map, mapInfo);
+                chooseMap->addItem(
+// FIXME - need real icons. Disabling until then
+//QIcon(":/res/mapCustom.png"), 
+map, mapInfo);
             mapCfgFile.close();
         }
     }
Binary file QTfrontend/res/btnPerHogAmmo.png has changed