[FIX] UI forms now only allow apply/discard when it can be applied

[FIX] Skins and such use buttons in all UI forms now

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@71 6ecfd1a5-f3ed-3746-8530-beee90d26b22

56 files changed, 289 insertions, 61 deletions

diff --git a/Changelog b/Changelog
index 2df2670a..740fa9fb 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  71
+Date: 22 February 2008
+User: MathStuf
+-----------------
+[FIX] UI forms now only allow apply/discard when it can be applied
+[FIX] Skins and such use buttons in all UI forms now
+
+-----------------
 Rev:  70
 Date: 22 February 2008
 User: MathStuf
diff --git a/pokemodr/AbilityUI.cpp b/pokemodr/AbilityUI.cpp
index b41cadb1..079490c2 100644
--- a/pokemodr/AbilityUI.cpp
+++ b/pokemodr/AbilityUI.cpp
@@ -32,6 +32,7 @@ AbilityUI::AbilityUI(Ability* a, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(ability, ability_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/AuthorUI.cpp b/pokemodr/AuthorUI.cpp
index 413ea775..efc5510e 100644
--- a/pokemodr/AuthorUI.cpp
+++ b/pokemodr/AuthorUI.cpp
@@ -34,6 +34,7 @@ AuthorUI::AuthorUI(Author* a, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(author, author_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/BadgeUI.cpp b/pokemodr/BadgeUI.cpp
index c6edda26..1f27595b 100644
--- a/pokemodr/BadgeUI.cpp
+++ b/pokemodr/BadgeUI.cpp
@@ -41,6 +41,7 @@ BadgeUI::BadgeUI(Badge* b, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(badge, badge_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     varHMs->addItems(HMStr);
     const bool isSplit = badge->getPokemod()->getRules()->getSpecialSplit();
     varStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
diff --git a/pokemodr/CoinListObjectUI.cpp b/pokemodr/CoinListObjectUI.cpp
index 5f5606e3..71b9f075 100644
--- a/pokemodr/CoinListObjectUI.cpp
+++ b/pokemodr/CoinListObjectUI.cpp
@@ -41,6 +41,7 @@ CoinListObjectUI::CoinListObjectUI(CoinListObject* c, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(coinListObject, coinListObject_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     varType->addItems(CoinListObject::TypeStr);
     setGui();
 }
diff --git a/pokemodr/CoinListUI.cpp b/pokemodr/CoinListUI.cpp
index 539d086e..9095dffd 100644
--- a/pokemodr/CoinListUI.cpp
+++ b/pokemodr/CoinListUI.cpp
@@ -40,6 +40,7 @@ CoinListUI::CoinListUI(CoinList* c, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(coinList, coinList_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < coinList->getPokemod()->getItemCount(); ++i)
     {
         const Item* it = coinList->getPokemod()->getItem(i);
diff --git a/pokemodr/EggGroupUI.cpp b/pokemodr/EggGroupUI.cpp
index 15b716f5..56459d83 100644
--- a/pokemodr/EggGroupUI.cpp
+++ b/pokemodr/EggGroupUI.cpp
@@ -32,6 +32,7 @@ EggGroupUI::EggGroupUI(EggGroup* e, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(eggGroup, eggGroup_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/ItemTypeUI.cpp b/pokemodr/ItemTypeUI.cpp
index 7520303e..db2e8f34 100644
--- a/pokemodr/ItemTypeUI.cpp
+++ b/pokemodr/ItemTypeUI.cpp
@@ -35,6 +35,7 @@ ItemTypeUI::ItemTypeUI(ItemType* i, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(itemType, itemType_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/ItemUI.cpp b/pokemodr/ItemUI.cpp
index f54fb5c9..fdd7c008 100644
--- a/pokemodr/ItemUI.cpp
+++ b/pokemodr/ItemUI.cpp
@@ -37,6 +37,7 @@ ItemUI::ItemUI(Item* i, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(item, item_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < item->getPokemod()->getItemTypeCount(); ++i)
     {
         const ItemType* it = item->getPokemod()->getItemType(i);
diff --git a/pokemodr/MapUI.cpp b/pokemodr/MapUI.cpp
index 1be2db2d..e1c50556 100644
--- a/pokemodr/MapUI.cpp
+++ b/pokemodr/MapUI.cpp
@@ -42,6 +42,7 @@ MapUI::MapUI(Map* m, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(map, map_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < map->getWarpCount(); ++i)
         varFlyWarp->addItem(map->getWarp(i)->getName());
     varType->addItems(Map::TypeStr);
diff --git a/pokemodr/MoveUI.cpp b/pokemodr/MoveUI.cpp
index b1a0c51e..c513cd7a 100644
--- a/pokemodr/MoveUI.cpp
+++ b/pokemodr/MoveUI.cpp
@@ -37,6 +37,7 @@ MoveUI::MoveUI(Move* m, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(move, move_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < move->getPokemod()->getTypeCount(); ++i)
     {
         const Type* t = move->getPokemod()->getType(i);
diff --git a/pokemodr/NatureUI.cpp b/pokemodr/NatureUI.cpp
index b09823a3..bd008f34 100644
--- a/pokemodr/NatureUI.cpp
+++ b/pokemodr/NatureUI.cpp
@@ -39,6 +39,7 @@ NatureUI::NatureUI(Nature* n, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(nature, nature_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     const bool isSplit = nature->getPokemod()->getRules()->getSpecialSplit();
     varStat->addItems((isSplit ? StatRBYStr : StatGSCStr).mid(0, isSplit ? ST_End_RBY : ST_End_GSC));
     setGui();
diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index d3be9621..dddbf447 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -38,6 +38,7 @@ PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(pokemod, pokemod_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < pokemod->getPokemod()->getMapCount(); ++i)
     {
         const Map* m = pokemod->getPokemod()->getMap(i);
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index 82ed6bb2..cec7fc3a 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -35,6 +35,7 @@ RulesUI::RulesUI(Rules* r, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(rules, rules_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/SpeciesAbilityUI.cpp b/pokemodr/SpeciesAbilityUI.cpp
index b72d3200..f055a776 100644
--- a/pokemodr/SpeciesAbilityUI.cpp
+++ b/pokemodr/SpeciesAbilityUI.cpp
@@ -40,6 +40,7 @@ SpeciesAbilityUI::SpeciesAbilityUI(SpeciesAbility* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(speciesAbility, speciesAbility_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < speciesAbility->getPokemod()->getAbilityCount(); ++i)
     {
         const Ability* a = speciesAbility->getPokemod()->getAbility(i);
diff --git a/pokemodr/SpeciesEvolutionUI.cpp b/pokemodr/SpeciesEvolutionUI.cpp
index 9a034ecc..be8857e2 100644
--- a/pokemodr/SpeciesEvolutionUI.cpp
+++ b/pokemodr/SpeciesEvolutionUI.cpp
@@ -42,6 +42,7 @@ SpeciesEvolutionUI::SpeciesEvolutionUI(SpeciesEvolution* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(speciesEvolution, speciesEvolution_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < speciesEvolution->getPokemod()->getSpeciesCount(); ++i)
     {
         const Species* s = speciesEvolution->getPokemod()->getSpecies(i);
diff --git a/pokemodr/SpeciesItemUI.cpp b/pokemodr/SpeciesItemUI.cpp
index 84264e85..c6c5aa46 100644
--- a/pokemodr/SpeciesItemUI.cpp
+++ b/pokemodr/SpeciesItemUI.cpp
@@ -40,6 +40,7 @@ SpeciesItemUI::SpeciesItemUI(SpeciesItem* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(speciesItem, speciesItem_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < speciesItem->getPokemod()->getItemCount(); ++i)
     {
         const Item* it = speciesItem->getPokemod()->getItem(i);
diff --git a/pokemodr/SpeciesMoveUI.cpp b/pokemodr/SpeciesMoveUI.cpp
index a529ec01..5bbbe4d9 100644
--- a/pokemodr/SpeciesMoveUI.cpp
+++ b/pokemodr/SpeciesMoveUI.cpp
@@ -40,6 +40,7 @@ SpeciesMoveUI::SpeciesMoveUI(SpeciesMove* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(speciesMove, speciesMove_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < speciesMove->getPokemod()->getMoveCount(); ++i)
     {
         const Move* m = speciesMove->getPokemod()->getMove(i);
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index 0d230f12..bd378241 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -44,6 +44,7 @@ SpeciesUI::SpeciesUI(Species* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(species, species_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     const bool isSplit = species->getPokemod()->getRules()->getSpecialSplit();
     varBaseStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
     varEVStat->addItems((isSplit ? StatGSCStr : StatRBYStr).mid(0, isSplit ? ST_End_GSC : ST_End_RBY));
diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp
index c6166324..eae6c201 100644
--- a/pokemodr/StoreUI.cpp
+++ b/pokemodr/StoreUI.cpp
@@ -41,6 +41,7 @@ StoreUI::StoreUI(Store* s, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(store, store_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     for (int i = 0; i < store->getPokemod()->getItemCount(); ++i)
     {
         const Item* it = store->getPokemod()->getItem(i);
diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp
index ba217703..6a22bd32 100644
--- a/pokemodr/TileUI.cpp
+++ b/pokemodr/TileUI.cpp
@@ -43,6 +43,7 @@ TileUI::TileUI(Tile* t, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(tile, tile_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     varAccessibility->addItems(DirectionStr.mid(0, 4));
     varHMType->addItems(HMStr);
     for (int i = 0; i < tile->getPokemod()->getTileCount(); ++i)
diff --git a/pokemodr/TimeUI.cpp b/pokemodr/TimeUI.cpp
index 67347f04..692a6c03 100644
--- a/pokemodr/TimeUI.cpp
+++ b/pokemodr/TimeUI.cpp
@@ -35,6 +35,7 @@ TimeUI::TimeUI(Time* t, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(time, time_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/TypeUI.cpp b/pokemodr/TypeUI.cpp
index d5f31fba..5982a3ef 100644
--- a/pokemodr/TypeUI.cpp
+++ b/pokemodr/TypeUI.cpp
@@ -36,6 +36,7 @@ TypeUI::TypeUI(Type* t, QWidget* parent) :
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     setObjects(type, type_mod);
+    connect(this, SIGNAL(setChanged(bool)), boxButtons, SLOT(setDisabled(bool)));
     setGui();
 }
 
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index d181d0c9..fbb8e1cf 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -5,13 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>211</width>
-    <height>179</height>
+    <width>191</width>
+    <height>159</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/abilityeffect.ui b/pokemodr/gui/abilityeffect.ui
index c9826b23..fea16b67 100644
--- a/pokemodr/gui/abilityeffect.ui
+++ b/pokemodr/gui/abilityeffect.ui
@@ -5,13 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>244</width>
-    <height>922</height>
+    <width>254</width>
+    <height>942</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui
index 33cfee23..6a913138 100644
--- a/pokemodr/gui/author.ui
+++ b/pokemodr/gui/author.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index 0a4d9bcb..e168f6fa 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -100,8 +103,8 @@
        <widget class="KPushButton" name="varFace" >
         <property name="minimumSize" >
          <size>
-          <width>0</width>
-          <height>0</height>
+          <width>64</width>
+          <height>64</height>
          </size>
         </property>
        </widget>
@@ -123,8 +126,8 @@
        <widget class="KPushButton" name="varBadge" >
         <property name="minimumSize" >
          <size>
-          <width>0</width>
-          <height>0</height>
+          <width>64</width>
+          <height>64</height>
          </size>
         </property>
        </widget>
diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui
index 660a9ae7..4298c9d2 100644
--- a/pokemodr/gui/coinlist.ui
+++ b/pokemodr/gui/coinlist.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui
index 01f60892..8fe715a0 100644
--- a/pokemodr/gui/coinlistobject.ui
+++ b/pokemodr/gui/coinlistobject.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/dialog.ui b/pokemodr/gui/dialog.ui
index d3ea7e4b..d3963acb 100644
--- a/pokemodr/gui/dialog.ui
+++ b/pokemodr/gui/dialog.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui
index cc0d7f6d..f1c22099 100644
--- a/pokemodr/gui/egggroup.ui
+++ b/pokemodr/gui/egggroup.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index 5fb9b341..ec0294c1 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/itemeffect.ui b/pokemodr/gui/itemeffect.ui
index 99fa3b4b..d0428b60 100644
--- a/pokemodr/gui/itemeffect.ui
+++ b/pokemodr/gui/itemeffect.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui
index 4ba1eb4a..b2e0003a 100644
--- a/pokemodr/gui/itemtype.ui
+++ b/pokemodr/gui/itemtype.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui
index da951b2c..9b185834 100644
--- a/pokemodr/gui/map.ui
+++ b/pokemodr/gui/map.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index b2ee4ef9..89b16391 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -5,13 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>290</width>
-    <height>1040</height>
+    <width>300</width>
+    <height>1067</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -138,14 +141,21 @@
      </property>
      <layout class="QHBoxLayout" >
       <item>
-       <widget class="QGraphicsView" name="viewSkin" >
-        <property name="minimumSize" >
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
          <size>
-          <width>192</width>
-          <height>128</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
-        <property name="maximumSize" >
+       </spacer>
+      </item>
+      <item>
+       <widget class="KIconButton" name="varSkin" >
+        <property name="minimumSize" >
          <size>
           <width>192</width>
           <height>128</height>
@@ -156,6 +166,19 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -332,6 +355,11 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
+   <class>KIconButton</class>
+   <extends>QPushButton</extends>
+   <header>kicondialog.h</header>
+  </customwidget>
+  <customwidget>
    <class>KIntNumInput</class>
    <extends>QWidget</extends>
    <header>knuminput.h</header>
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index 0a183ea8..810fc454 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>290</width>
-    <height>1220</height>
+    <height>1227</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -106,20 +109,21 @@
      </property>
      <layout class="QHBoxLayout" >
       <item>
-       <widget class="QGraphicsView" name="varSkin" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
         </property>
-        <property name="minimumSize" >
+        <property name="sizeHint" >
          <size>
-          <width>192</width>
-          <height>128</height>
+          <width>40</width>
+          <height>20</height>
          </size>
         </property>
-        <property name="maximumSize" >
+       </spacer>
+      </item>
+      <item>
+       <widget class="KIconButton" name="varSkin" >
+        <property name="minimumSize" >
          <size>
           <width>192</width>
           <height>128</height>
@@ -130,6 +134,19 @@
         </property>
        </widget>
       </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
@@ -363,6 +380,11 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
+   <class>KIconButton</class>
+   <extends>QPushButton</extends>
+   <header>kicondialog.h</header>
+  </customwidget>
+  <customwidget>
    <class>KIntNumInput</class>
    <extends>QWidget</extends>
    <header>knuminput.h</header>
diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui
index f15b0c6d..7e0079b5 100644
--- a/pokemodr/gui/maptrainerteammember.ui
+++ b/pokemodr/gui/maptrainerteammember.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index f2d2ab00..7af45ba9 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>290</width>
-    <height>1053</height>
+    <height>1010</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -207,29 +210,20 @@
    <item>
     <widget class="QGroupBox" name="boxDestination" >
      <property name="title" >
-      <string>Destination</string>
+      <string>Destination Map</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
-       <widget class="QGroupBox" name="boxMap" >
-        <property name="title" >
-         <string>Map</string>
+       <widget class="KComboBox" name="varToMap" >
+        <property name="toolTip" >
+         <string>Map the warp goes to</string>
+        </property>
+        <property name="insertPolicy" >
+         <enum>QComboBox::NoInsert</enum>
+        </property>
+        <property name="sizeAdjustPolicy" >
+         <enum>QComboBox::AdjustToContents</enum>
         </property>
-        <layout class="QHBoxLayout" >
-         <item>
-          <widget class="KComboBox" name="varToMap" >
-           <property name="toolTip" >
-            <string>Map the warp goes to</string>
-           </property>
-           <property name="insertPolicy" >
-            <enum>QComboBox::NoInsert</enum>
-           </property>
-           <property name="sizeAdjustPolicy" >
-            <enum>QComboBox::AdjustToContents</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
        </widget>
       </item>
       <item>
diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui
index bea9cd92..32d3ea02 100644
--- a/pokemodr/gui/mapwildlist.ui
+++ b/pokemodr/gui/mapwildlist.ui
@@ -5,7 +5,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>244</width>
+    <width>226</width>
     <height>402</height>
    </rect>
   </property>
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui
index 4af39f15..e894b2de 100644
--- a/pokemodr/gui/mapwildlistencounter.ui
+++ b/pokemodr/gui/mapwildlistencounter.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index af6c2835..86d8207a 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/moveeffect.ui b/pokemodr/gui/moveeffect.ui
index 1acadaf1..f4365756 100644
--- a/pokemodr/gui/moveeffect.ui
+++ b/pokemodr/gui/moveeffect.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index 5fd54691..d6e386f9 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 8333506e..317cada0 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -96,7 +99,7 @@
    <item>
     <widget class="QGroupBox" name="boxStartPosition" >
      <property name="title" >
-      <string>Start Position</string>
+      <string>Start Map</string>
      </property>
      <layout class="QVBoxLayout" >
       <item>
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index d106749b..71352716 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index c3de93a5..fe0f5c5b 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>254</width>
-    <height>715</height>
+    <width>244</width>
+    <height>695</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -16,6 +16,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -617,7 +620,14 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varMaleFront" />
+           <widget class="KIconButton" name="varMaleFront" >
+            <property name="minimumSize" >
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer>
@@ -633,7 +643,14 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varMaleBack" />
+           <widget class="KIconButton" name="varMaleBack" >
+            <property name="minimumSize" >
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer>
@@ -671,7 +688,14 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varFemaleFront" />
+           <widget class="KIconButton" name="varFemaleFront" >
+            <property name="minimumSize" >
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer>
@@ -687,7 +711,14 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varFemaleBack" />
+           <widget class="KIconButton" name="varFemaleBack" >
+            <property name="minimumSize" >
+             <size>
+              <width>64</width>
+              <height>64</height>
+             </size>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer>
@@ -725,7 +756,14 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varList" />
+           <widget class="KIconButton" name="varList" >
+            <property name="minimumSize" >
+             <size>
+              <width>128</width>
+              <height>64</height>
+             </size>
+            </property>
+           </widget>
           </item>
           <item>
            <spacer>
diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui
index 5c01cb8c..986eaf4f 100644
--- a/pokemodr/gui/speciesability.ui
+++ b/pokemodr/gui/speciesability.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/speciesevolution.ui b/pokemodr/gui/speciesevolution.ui
index 7ff2f2e5..ca8f9a56 100644
--- a/pokemodr/gui/speciesevolution.ui
+++ b/pokemodr/gui/speciesevolution.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui
index cf906dda..93e123e4 100644
--- a/pokemodr/gui/speciesitem.ui
+++ b/pokemodr/gui/speciesitem.ui
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui
index 9d14b224..167a74f6 100644
--- a/pokemodr/gui/speciesmove.ui
+++ b/pokemodr/gui/speciesmove.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>226</width>
-    <height>317</height>
+    <width>236</width>
+    <height>337</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -15,6 +15,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui
index e2e0833e..61cac586 100644
--- a/pokemodr/gui/store.ui
+++ b/pokemodr/gui/store.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index 4c0b0371..45cb76bc 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -5,13 +5,16 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>236</width>
-    <height>941</height>
+    <width>226</width>
+    <height>957</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
@@ -68,12 +71,44 @@
      </property>
      <layout class="QHBoxLayout" >
       <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
        <widget class="KPushButton" name="varImage" >
+        <property name="minimumSize" >
+         <size>
+          <width>64</width>
+          <height>64</height>
+         </size>
+        </property>
         <property name="toolTip" >
          <string>Image of the tile</string>
         </property>
        </widget>
       </item>
+      <item>
+       <spacer>
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" >
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui
index 358ac5ba..fab0e009 100644
--- a/pokemodr/gui/time.ui
+++ b/pokemodr/gui/time.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index 2c1270b0..2f1967c0 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -12,6 +12,9 @@
   <layout class="QVBoxLayout" >
    <item>
     <widget class="QGroupBox" name="boxButtons" >
+     <property name="enabled" >
+      <bool>false</bool>
+     </property>
      <property name="title" >
       <string/>
      </property>
diff --git a/pokemodr/gui/typechart.ui b/pokemodr/gui/typechart.ui
index c70f687e..912c3ad2 100644
--- a/pokemodr/gui/typechart.ui
+++ b/pokemodr/gui/typechart.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>242</width>
-    <height>225</height>
+    <width>226</width>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle" >