[FIX] Windows build

[FIX] Spacers now have size
[FIX] ListWidget editing now works (though could use some improvement with flickering)
[FIX] KFileDialog now compiles

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

47 files changed, 189 insertions, 219 deletions

diff --git a/Changelog b/Changelog
index f52a3360..102201b0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,14 @@
 -----------------
+Rev:  191
+Date: 3 June 2008
+User: MathStuf
+-----------------
+[FIX] Windows build
+[FIX] Spacers now have size
+[FIX] ListWidget editing now works (though could use some improvement with flickering)
+[FIX] KFileDialog now compiles
+
+-----------------
 Rev:  190
 Date: 2 June 2008
 User: MathStuf
diff --git a/pokemodr/FileDialog.cpp b/pokemodr/FileDialog.cpp
index f14f3a2a..7d0d12b7 100644
--- a/pokemodr/FileDialog.cpp
+++ b/pokemodr/FileDialog.cpp
@@ -36,8 +36,7 @@ FileDialog::FileDialog(const QSize& size) :
     if (m_size.isValid())
     {
         setPreviewWidget(new KImageFilePreview);
-        // FIXME: KDirOperator is failing here on linking :(
-//         connect(findChild<KDirOperator*>(), SIGNAL(dirActivated(const KFileItem&)), this, SLOT(sizeFilter(const FileItem&)));
+        connect(findChild<KDirOperator*>(), SIGNAL(dirActivated(const KFileItem&)), this, SLOT(sizeFilter(const FileItem&)));
     }
 }
 
diff --git a/pokemodr/MapTrainerTeamMemberUI.cpp b/pokemodr/MapTrainerTeamMemberUI.cpp
index 7f3689d0..45b2fc46 100644
--- a/pokemodr/MapTrainerTeamMemberUI.cpp
+++ b/pokemodr/MapTrainerTeamMemberUI.cpp
@@ -130,38 +130,22 @@ void MapTrainerTeamMemberUI::on_varLevel_valueChanged(const int level)
     static_cast<MapTrainerTeamMember*>(modified())->setLevel(level);
 }
 
-void MapTrainerTeamMemberUI::on_varAbilities_itemSelectionChanged()
+void MapTrainerTeamMemberUI::on_varAbilities_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varAbilities->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varAbilities->item(i);
-        static_cast<MapTrainerTeamMember*>(modified())->setAbility(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<MapTrainerTeamMember*>(modified())->setAbility(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
 
-void MapTrainerTeamMemberUI::on_varItems_itemSelectionChanged()
+void MapTrainerTeamMemberUI::on_varItems_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varItems->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varItems->item(i);
-        static_cast<MapTrainerTeamMember*>(modified())->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<MapTrainerTeamMember*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
 
-void MapTrainerTeamMemberUI::on_varMoves_itemSelectionChanged()
+void MapTrainerTeamMemberUI::on_varMoves_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varMoves->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varMoves->item(i);
-        static_cast<MapTrainerTeamMember*>(modified())->setMove(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<MapTrainerTeamMember*>(modified())->setMove(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
 
-void MapTrainerTeamMemberUI::on_varNatures_itemSelectionChanged()
+void MapTrainerTeamMemberUI::on_varNatures_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varNatures->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varNatures->item(i);
-        static_cast<MapTrainerTeamMember*>(modified())->setNature(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<MapTrainerTeamMember*>(modified())->setNature(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
diff --git a/pokemodr/MapTrainerTeamMemberUI.h b/pokemodr/MapTrainerTeamMemberUI.h
index 2ad5d502..567bde89 100644
--- a/pokemodr/MapTrainerTeamMemberUI.h
+++ b/pokemodr/MapTrainerTeamMemberUI.h
@@ -40,10 +40,10 @@ class MapTrainerTeamMemberUI : public ObjectUI, private Ui::formMapTrainerTeamMe
     protected slots:
         void on_varSpecies_activated(const int species);
         void on_varLevel_valueChanged(const int level);
-        void on_varAbilities_itemSelectionChanged();
-        void on_varItems_itemSelectionChanged();
-        void on_varMoves_itemSelectionChanged();
-        void on_varNatures_itemSelectionChanged();
+        void on_varAbilities_itemClicked(QListWidgetItem* item);
+        void on_varItems_itemClicked(QListWidgetItem* item);
+        void on_varMoves_itemClicked(QListWidgetItem* item);
+        void on_varNatures_itemClicked(QListWidgetItem* item);
     private slots:
         void refreshGui();
         void setGui();
diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index 8f9bed09..52be0137 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -202,6 +202,7 @@ void PokemodUI::on_varTypechart_clicked(const QModelIndex& index)
 {
     m_index = index;
     varEffectiveness->setEnabled(true);
+    boxEffectiveness->setTitle(QString("%1 vs. %2").arg(varTypechart->model()->headerData(index.row(), Qt::Vertical, Qt::DisplayRole).toString()).arg(varTypechart->model()->headerData(index.column(), Qt::Horizontal, Qt::DisplayRole).toString()));
     varEffectiveness->setValue(varTypechart->model()->data(m_index, Qt::EditRole).value<Fraction>());
 }
 
diff --git a/pokemodr/SpeciesUI.cpp b/pokemodr/SpeciesUI.cpp
index 4b984228..8b849452 100644
--- a/pokemodr/SpeciesUI.cpp
+++ b/pokemodr/SpeciesUI.cpp
@@ -298,20 +298,12 @@ void SpeciesUI::on_varNidoranGroup_valueChanged(const int nidoranGroup)
     static_cast<Species*>(modified())->setNidoranGroup(nidoranGroup);
 }
 
-void SpeciesUI::on_varTypes_itemSelectionChanged()
+void SpeciesUI::on_varTypes_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varTypes->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varTypes->item(i);
-        static_cast<Species*>(modified())->setType(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<Species*>(modified())->setType(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
 
-void SpeciesUI::on_varEggGroups_itemSelectionChanged()
+void SpeciesUI::on_varEggGroups_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varEggGroups->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varEggGroups->item(i);
-        static_cast<Species*>(modified())->setEggGroup(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<Species*>(modified())->setEggGroup(item->data(Qt::UserRole).toInt(), !item->isSelected());
 }
diff --git a/pokemodr/SpeciesUI.h b/pokemodr/SpeciesUI.h
index 921f5987..650d6944 100644
--- a/pokemodr/SpeciesUI.h
+++ b/pokemodr/SpeciesUI.h
@@ -61,8 +61,8 @@ class SpeciesUI : public ObjectUI, private Ui::formSpecies
         void on_varEggSpecies_activated(const int eggSpecies);
         void on_varEggSteps_valueChanged(const int eggSteps);
         void on_varNidoranGroup_valueChanged(const int nidoranGroup);
-        void on_varTypes_itemSelectionChanged();
-        void on_varEggGroups_itemSelectionChanged();
+        void on_varTypes_itemClicked(QListWidgetItem* item);
+        void on_varEggGroups_itemClicked(QListWidgetItem* item);
     private slots:
         void initGui();
         void refreshGui();
diff --git a/pokemodr/StoreUI.cpp b/pokemodr/StoreUI.cpp
index fe9afaed..8c7e4a25 100644
--- a/pokemodr/StoreUI.cpp
+++ b/pokemodr/StoreUI.cpp
@@ -75,11 +75,7 @@ void StoreUI::on_varName_textChanged(const QString& name)
     varName->setCursorPosition(cursor);
 }
 
-void StoreUI::on_varItems_itemSelectionChanged()
+void StoreUI::on_varItems_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varItems->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varItems->item(i);
-        static_cast<Store*>(modified())->setItem(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<Store*>(modified())->setItem(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
diff --git a/pokemodr/StoreUI.h b/pokemodr/StoreUI.h
index 655f45cf..ea58e755 100644
--- a/pokemodr/StoreUI.h
+++ b/pokemodr/StoreUI.h
@@ -39,7 +39,7 @@ class StoreUI : public ObjectUI, private Ui::formStore
         void discard();
     protected slots:
         void on_varName_textChanged(const QString& name);
-        void on_varItems_itemSelectionChanged();
+        void on_varItems_itemClicked(QListWidgetItem* item);
     private slots:
         void refreshGui();
         void setGui();
diff --git a/pokemodr/TODO b/pokemodr/TODO
index 823fb0af..2ea13d3d 100644
--- a/pokemodr/TODO
+++ b/pokemodr/TODO
@@ -1,9 +1,9 @@
+Rules:
+    Screwed up widgets
+
 Models:
-   ContextMenu - Fix up deleting
+   ContextMenu
+        Fix up deleting
+        Disable pasting if not compatable
 
 When adding to an expanded item, its view is not updated
-
-=========
-
-Can't edit KListWidgets correctly
-    Replace with QListView?
diff --git a/pokemodr/TileUI.cpp b/pokemodr/TileUI.cpp
index d960a7f2..827d3433 100644
--- a/pokemodr/TileUI.cpp
+++ b/pokemodr/TileUI.cpp
@@ -81,13 +81,9 @@ void TileUI::on_varSprite_pressed()
     delete dialog;
 }
 
-void TileUI::on_varAccessibility_itemSelectionChanged()
+void TileUI::on_varAccessibility_itemClicked(QListWidgetItem* item)
 {
-    for (int i = 0; i < varAccessibility->count(); ++i)
-    {
-        const QListWidgetItem* widgetItem = varAccessibility->item(i);
-        static_cast<Tile*>(modified())->setFrom(widgetItem->data(Qt::UserRole).toInt(), widgetItem->isSelected());
-    }
+    static_cast<Tile*>(modified())->setFrom(item->data(Qt::UserRole).toInt(), item->isSelected());
 }
 
 void TileUI::on_varScript_valueChanged(const Script& script)
diff --git a/pokemodr/TileUI.h b/pokemodr/TileUI.h
index afcec6fe..176fd019 100644
--- a/pokemodr/TileUI.h
+++ b/pokemodr/TileUI.h
@@ -40,7 +40,7 @@ class TileUI : public ObjectUI, private Ui::formTile
     protected slots:
         void on_varName_textChanged(const QString& name);
         void on_varSprite_pressed();
-        void on_varAccessibility_itemSelectionChanged();
+        void on_varAccessibility_itemClicked(QListWidgetItem* item);
         void on_varScript_valueChanged(const Script& script);
     private slots:
         void initGui();
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index 7240fcdf..ffbfaa69 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -52,8 +52,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui
index d312b7ae..25c63ce7 100644
--- a/pokemodr/gui/author.ui
+++ b/pokemodr/gui/author.ui
@@ -66,8 +66,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index 1c8a895a..c8f0b7e2 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -53,8 +53,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -76,8 +76,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -99,8 +99,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -150,8 +150,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui
index af09679f..fd763d5a 100644
--- a/pokemodr/gui/coinlist.ui
+++ b/pokemodr/gui/coinlist.ui
@@ -40,8 +40,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui
index ad92797b..a5027bc8 100644
--- a/pokemodr/gui/coinlistobject.ui
+++ b/pokemodr/gui/coinlistobject.ui
@@ -79,8 +79,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui
index 2683b689..a50ab2bf 100644
--- a/pokemodr/gui/egggroup.ui
+++ b/pokemodr/gui/egggroup.ui
@@ -28,8 +28,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/globalscript.ui b/pokemodr/gui/globalscript.ui
index 720ef9f6..fb920252 100644
--- a/pokemodr/gui/globalscript.ui
+++ b/pokemodr/gui/globalscript.ui
@@ -19,7 +19,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QGroupBox" name="boxScipt" >
+    <widget class="QGroupBox" name="boxScript" >
      <property name="title" >
       <string>Script</string>
      </property>
@@ -37,8 +37,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index 776d6139..c47c47a8 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -104,21 +104,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui
index 6d596d55..87ed946f 100644
--- a/pokemodr/gui/itemtype.ui
+++ b/pokemodr/gui/itemtype.ui
@@ -82,8 +82,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/map.ui b/pokemodr/gui/map.ui
index 1df92885..c180b5d4 100644
--- a/pokemodr/gui/map.ui
+++ b/pokemodr/gui/map.ui
@@ -124,8 +124,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index 4360f86d..c842f7f9 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -53,8 +53,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -79,8 +79,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -121,8 +121,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index 66180f5b..3555a3df 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -103,8 +103,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui
index c7f194eb..73412ac3 100644
--- a/pokemodr/gui/maptrainerteammember.ui
+++ b/pokemodr/gui/maptrainerteammember.ui
@@ -120,8 +120,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index d547581a..284f7f4c 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -80,8 +80,6 @@
           </widget>
          </item>
         </layout>
-        <zorder>varToWarp</zorder>
-        <zorder>boxScript</zorder>
        </widget>
       </item>
      </layout>
@@ -106,8 +104,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui
index 85d423ed..77360138 100644
--- a/pokemodr/gui/mapwildlist.ui
+++ b/pokemodr/gui/mapwildlist.ui
@@ -28,8 +28,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui
index 538f3932..980e8da5 100644
--- a/pokemodr/gui/mapwildlistencounter.ui
+++ b/pokemodr/gui/mapwildlistencounter.ui
@@ -63,8 +63,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 4a26d78c..841c7524 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -155,8 +155,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index fa8537ba..38683034 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -79,8 +79,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 7295c558..71201558 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -102,8 +102,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -128,7 +128,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -151,7 +151,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -173,7 +173,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -196,7 +196,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -218,7 +218,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -241,7 +241,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -263,7 +263,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -286,7 +286,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -308,7 +308,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -331,7 +331,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -353,7 +353,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -376,7 +376,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -392,8 +392,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -414,9 +414,6 @@
        </item>
        <item>
         <widget class="QGroupBox" name="boxEffectiveness" >
-         <property name="title" >
-          <string>Effectiveness</string>
-         </property>
          <layout class="QVBoxLayout" >
           <item>
            <widget class="FractionWidget" name="varEffectiveness" >
diff --git a/pokemodr/gui/rules.ui b/pokemodr/gui/rules.ui
index 07693564..4afd943e 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -43,7 +43,7 @@
           <item>
            <widget class="QCheckBox" name="varCriticalDomains" >
             <property name="toolTip" >
-             <string>If checked, critical hit chances will be determined by generation II and newer formulas</string>
+             <string>If checked, critical hit chances will be determined by Generation II and newer formulas</string>
             </property>
             <property name="text" >
              <string>Critical Domains</string>
@@ -227,10 +227,10 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -433,10 +433,10 @@
          <property name="orientation" >
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
diff --git a/pokemodr/gui/script.ui b/pokemodr/gui/script.ui
index d9b6a4cc..62d6a2ce 100644
--- a/pokemodr/gui/script.ui
+++ b/pokemodr/gui/script.ui
@@ -33,19 +33,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/pokemodr/gui/sound.ui b/pokemodr/gui/sound.ui
index 132384c8..2aa1e980 100644
--- a/pokemodr/gui/sound.ui
+++ b/pokemodr/gui/sound.ui
@@ -50,8 +50,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/species.ui b/pokemodr/gui/species.ui
index 38a3b4a2..b72eb5e3 100644
--- a/pokemodr/gui/species.ui
+++ b/pokemodr/gui/species.ui
@@ -58,6 +58,9 @@
             <property name="toolTip" >
              <string>The chance that the species runs in a wild battle</string>
             </property>
+            <property name="behavior" >
+             <number>-1</number>
+            </property>
            </widget>
           </item>
          </layout>
@@ -74,6 +77,9 @@
             <property name="toolTip" >
              <string>Chance that the player can flee from a wild battle</string>
             </property>
+            <property name="behavior" >
+             <number>-1</number>
+            </property>
            </widget>
           </item>
          </layout>
@@ -90,6 +96,9 @@
             <property name="toolTip" >
              <string>Chance the species is carrying an item in a wild battle</string>
             </property>
+            <property name="behavior" >
+             <number>-1</number>
+            </property>
            </widget>
           </item>
          </layout>
@@ -102,8 +111,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -231,8 +240,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -331,8 +340,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -443,8 +452,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
@@ -469,7 +478,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -492,7 +501,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -515,7 +524,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -537,7 +546,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -560,7 +569,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -583,7 +592,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -605,7 +614,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -628,7 +637,7 @@
             </property>
             <property name="sizeHint" >
              <size>
-              <width>0</width>
+              <width>1</width>
               <height>0</height>
              </size>
             </property>
@@ -644,8 +653,8 @@
          </property>
          <property name="sizeHint" >
           <size>
-           <width>20</width>
-           <height>40</height>
+           <width>0</width>
+           <height>1</height>
           </size>
          </property>
         </spacer>
diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui
index de291ca2..bd3555f6 100644
--- a/pokemodr/gui/speciesability.ui
+++ b/pokemodr/gui/speciesability.ui
@@ -44,8 +44,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui
index 8079b2e4..4af1340d 100644
--- a/pokemodr/gui/speciesitem.ui
+++ b/pokemodr/gui/speciesitem.ui
@@ -44,8 +44,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui
index 68707a81..43af96c7 100644
--- a/pokemodr/gui/speciesmove.ui
+++ b/pokemodr/gui/speciesmove.ui
@@ -56,6 +56,19 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>0</width>
+       <height>1</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>
diff --git a/pokemodr/gui/sprite.ui b/pokemodr/gui/sprite.ui
index ce7b0c62..01b5df1b 100644
--- a/pokemodr/gui/sprite.ui
+++ b/pokemodr/gui/sprite.ui
@@ -34,8 +34,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -50,8 +50,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -66,8 +66,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/status.ui b/pokemodr/gui/status.ui
index 0243be0e..5037c86b 100644
--- a/pokemodr/gui/status.ui
+++ b/pokemodr/gui/status.ui
@@ -40,8 +40,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui
index 4adba2d1..36267b2a 100644
--- a/pokemodr/gui/store.ui
+++ b/pokemodr/gui/store.ui
@@ -44,8 +44,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/tile.ui b/pokemodr/gui/tile.ui
index bf995090..9d55d8ed 100644
--- a/pokemodr/gui/tile.ui
+++ b/pokemodr/gui/tile.ui
@@ -34,8 +34,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -60,8 +60,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -107,8 +107,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui
index b6fa5938..e8761143 100644
--- a/pokemodr/gui/time.ui
+++ b/pokemodr/gui/time.ui
@@ -50,8 +50,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/trainer.ui b/pokemodr/gui/trainer.ui
index b6e150fb..a2ba99f8 100644
--- a/pokemodr/gui/trainer.ui
+++ b/pokemodr/gui/trainer.ui
@@ -47,8 +47,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -73,8 +73,8 @@
         </property>
         <property name="sizeHint" >
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>1</width>
+          <height>0</height>
          </size>
         </property>
        </spacer>
@@ -89,8 +89,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index d1933056..ff8cfdb2 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -47,8 +47,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/gui/weather.ui b/pokemodr/gui/weather.ui
index 1664044a..2525b0aa 100644
--- a/pokemodr/gui/weather.ui
+++ b/pokemodr/gui/weather.ui
@@ -40,8 +40,8 @@
      </property>
      <property name="sizeHint" >
       <size>
-       <width>20</width>
-       <height>40</height>
+       <width>0</width>
+       <height>1</height>
       </size>
      </property>
     </spacer>
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index ca299df2..efce6949 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -10,7 +10,8 @@ LIBS += -L../bin \
  -lphonon \
  -lkdecore \
  -lkdeui \
- -lkio
+ -lkio \
+ -lkfile
 
 CONFIG += qt \
  warn_on \
@@ -24,7 +25,7 @@ QT += xml
 RESOURCES += overlays/overlays.qrc
 
 win32 {
-    TARGETDEPS += $${DESTDIR}/pokemod.dll
+    TARGETDEPS += $${DESTDIR}/pokemod0.dll
 } else {
     TARGETDEPS += $${DESTDIR}/libpokemod.so
 }