[DEL] SkinsUI.{h, cpp}, skins.ui, typechat.ui

[ADD] TypechartWidgetItem.h
[FIX] Typechart added

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

12 files changed, 125 insertions, 666 deletions

diff --git a/Changelog b/Changelog
index 6865dafb..99407b3e 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,13 @@
 -----------------
+Rev:  81
+Date: 24 February 2008
+User: MathStuf
+-----------------
+[DEL] SkinsUI.{h, cpp}, skins.ui, typechat.ui
+[ADD] TypechartWidgetItem.h
+[FIX] Typechart added
+
+-----------------
 Rev:  80
 Date: 24 February 2008
 User: MathStuf
diff --git a/pokemodr/ObjectUI.h b/pokemodr/ObjectUI.h
index 5ea41d76..dd4871ee 100644
--- a/pokemodr/ObjectUI.h
+++ b/pokemodr/ObjectUI.h
@@ -34,7 +34,8 @@
 #include <Object.h>
 #include <Pokemod.h>
 
-#define DBL_PREC 15
+#define DBL_PREC 7
+#define DBL_PREC_SHORT 5
 
 class ObjectUI : public QWidget
 {
diff --git a/pokemodr/PokemodUI.cpp b/pokemodr/PokemodUI.cpp
index e6bb3f91..418cee1f 100644
--- a/pokemodr/PokemodUI.cpp
+++ b/pokemodr/PokemodUI.cpp
@@ -28,6 +28,7 @@
 
 #include "ImageDialog.h"
 #include "PokemodUI.h"
+#include "TypechartWidgetItem.h"
 
 PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
         ObjectUI(parent),
@@ -45,6 +46,18 @@ PokemodUI::PokemodUI(Pokemod* p, QWidget* parent) :
         varMap->addItem(m->getName());
         varMap->setItemData(i, m->getId());
     }
+    varTypechart->setRowCount(pokemod->getTypeCount());
+    varTypechart->setColumnCount(pokemod->getTypeCount());
+    QStringList types;
+    Matrix<Frac>* tc = pokemod->getTypeChart();
+    for (int i = 0; i < pokemod->getTypeCount(); ++i)
+    {
+        types << pokemod->getItem(i)->getName();
+        for (int j = 0; j < pokemod->getTypeCount(); ++j)
+            static_cast<TypechartWidgetItem*>(varTypechart->item(i, j))->setData(Qt::EditRole, qVariantFromValue(static_cast<void*>(&(*tc)(i, j))));
+    }
+    varTypechart->setVerticalHeaderLabels(types);
+    varTypechart->setHorizontalHeaderLabels(types);
     setGui();
 }
 
@@ -298,3 +311,26 @@ void PokemodUI::on_varSurfFishSkin_pressed()
         setGui();
     }
 }
+
+void PokemodUI::on_varTypechart_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous)
+{
+    disconnect(varEffectivenessNum, SIGNAL(valueChanged(int)), static_cast<TypechartWidgetItem*>(previous), SLOT(setNum(int)));
+    disconnect(varEffectivenessDenom, SIGNAL(valueChanged(int)), static_cast<TypechartWidgetItem*>(previous), SLOT(setDenom(int)));
+    TypechartWidgetItem* twi = static_cast<TypechartWidgetItem*>(current);
+    varEffectivenessNum->setValue(static_cast<Frac*>(twi->data(Qt::EditRole).value<void*>())->getNum());
+    varEffectivenessNum->setMaximum(static_cast<Frac*>(twi->data(Qt::EditRole).value<void*>())->getDenom());
+    varEffectivenessDenom->setValue(static_cast<Frac*>(twi->data(Qt::EditRole).value<void*>())->getDenom());
+    connect(varEffectivenessNum, SIGNAL(valueChanged(int)), twi, SLOT(setNum(int)));
+    connect(varEffectivenessDenom, SIGNAL(valueChanged(int)), twi, SLOT(setDenom(int)));
+}
+
+void PokemodUI::on_varEffectivenessNum_valueChanged()
+{
+    emit(changed(true));
+}
+
+void PokemodUI::on_varEffectivenessDenom_valueChanged(const int e)
+{
+    varEffectivenessNum->setMaximum(e);
+    emit(changed(true));
+}
diff --git a/pokemodr/PokemodUI.h b/pokemodr/PokemodUI.h
index 837500d0..407aa263 100644
--- a/pokemodr/PokemodUI.h
+++ b/pokemodr/PokemodUI.h
@@ -59,6 +59,9 @@ class PokemodUI : public ObjectUI, private Ui::formPokemod
         void on_varSurfSkin_pressed();
         void on_varFishSkin_pressed();
         void on_varSurfFishSkin_pressed();
+        void on_varTypechart_currentItemChanged(QTableWidgetItem* current, QTableWidgetItem* previous);
+        void on_varEffectivenessNum_valueChanged();
+        void on_varEffectivenessDenom_valueChanged(const int e);
     private:
         void setGui();
         
diff --git a/pokemodr/SkinsUI.cpp b/pokemodr/SkinsUI.cpp
deleted file mode 100644
index 9e9dd267..00000000
--- a/pokemodr/SkinsUI.cpp
+++ /dev/null
@@ -1,195 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        pokegen/SkinsUI.cpp
-// Purpose:     Skins UI form handling
-// Author:      Ben Boeckel
-// Modified by: Ben Boeckel
-// Created:     Fri Feb 22 19:16:28 2008
-// Copyright:   ©2007-2008 Ben Boeckel and Nerdy Productions
-// Licence:
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License along
-//    with this program.  If not, see <http://www.gnu.org/licenses/>.
-/////////////////////////////////////////////////////////////////////////////
-
-#include <QMetaObject>
-
-#include <BugCatcher.h>
-#include <Exception.h>
-#include <ImageCache.h>
-
-#include <Pokemod.h>
-
-#include "ImageDialog.h"
-#include "SkinsUI.h"
-
-SkinsUI::SkinsUI(Pokemod* p, QWidget* parent) :
-        ObjectUI(parent),
-        pokemod(p)
-{
-    setupUi(this);
-    QMetaObject::connectSlotsByName(this);
-    setObjects(pokemod, NULL);
-    setGui();
-}
-
-// KToolbar getToolbar(QWidget* parent)
-// {
-//     
-// }
-
-void SkinsUI::setGui()
-{
-    try
-    {
-        varWalkSkin->setIcon(ImageCache::open(pokemod->getWalkSkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-    try
-    {
-        varBikeSkin->setIcon(ImageCache::open(pokemod->getBikeSkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-    try
-    {
-        varFlySkin->setIcon(ImageCache::open(pokemod->getFlySkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-    try
-    {
-        varSurfSkin->setIcon(ImageCache::open(pokemod->getSurfSkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-    try
-    {
-        varFishSkin->setIcon(ImageCache::open(pokemod->getFishSkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-    try
-    {
-        varSurfFishSkin->setIcon(ImageCache::open(pokemod->getSurfFishSkin()));
-    }
-    catch (OpenException& e)
-    {
-        BugCatcher::report(e);
-    }
-}
-
-void SkinsUI::on_varWalkSkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setWalkSkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
-
-void SkinsUI::on_varBikeSkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setBikeSkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
-
-void SkinsUI::on_varFlySkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setFlySkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
-
-void SkinsUI::on_varSurfSkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setSurfSkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
-
-void SkinsUI::on_varFishSkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setFishSkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
-
-void SkinsUI::on_varSurfFishSkin_pressed()
-{
-    if (ImageDialog::exec())
-    {
-        try
-        {
-            pokemod->setSurfFishSkin(ImageDialog::selectedUrl());
-        }
-        catch (SaveException& e)
-        {
-            BugCatcher::report(e);
-        }
-        setGui();
-    }
-}
diff --git a/pokemodr/SkinsUI.h b/pokemodr/SkinsUI.h
deleted file mode 100644
index e76d9990..00000000
--- a/pokemodr/SkinsUI.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name:        pokegen/SkinsUI.h
-// Purpose:     Skins UI form handling
-// Author:      Ben Boeckel
-// Modified by: Ben Boeckel
-// Created:     Fri Feb 22 19:14:21 2008
-// Copyright:   ©2007-2008 Ben Boeckel and Nerdy Productions
-// Licence:
-//    This program is free software: you can redistribute it and/or modify
-//    it under the terms of the GNU General Public License as published by
-//    the Free Software Foundation, either version 3 of the License, or
-//    (at your option) any later version.
-//
-//    This program is distributed in the hope that it will be useful,
-//    but WITHOUT ANY WARRANTY; without even the implied warranty of
-//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//    GNU General Public License for more details.
-//
-//    You should have received a copy of the GNU General Public License along
-//    with this program.  If not, see <http://www.gnu.org/licenses/>.
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef __POKEMODR_SKINSUI__
-#define __POKEMODR_SKINSUI__
-
-#include <ktoolbar.h>
-
-#include <Pokemod.h>
-
-#include "ObjectUI.h"
-
-#include "ui_skins.h"
-
-class SkinsUI : public ObjectUI, private Ui::formSkins
-{
-    Q_OBJECT
-    
-    public:
-        SkinsUI(Pokemod* p, QWidget* parent);
-        
-//         KToolbar getToolbar(QWidget* parent);
-    public slots:
-        void on_varWalkSkin_pressed();
-        void on_varBikeSkin_pressed();
-        void on_varFlySkin_pressed();
-        void on_varSurfSkin_pressed();
-        void on_varFishSkin_pressed();
-        void on_varSurfFishSkin_pressed();
-    private:
-        void setGui();
-        
-        Pokemod* pokemod;
-};
-
-#endif
diff --git a/pokemodr/TODO b/pokemodr/TODO
index df4ee1f2..479fa5c8 100644
--- a/pokemodr/TODO
+++ b/pokemodr/TODO
@@ -5,7 +5,5 @@ MapEffect
 MapTrainer
 MoveEffect
 
-TypeChart
-
 Tree Handling
 Toolbar loading
diff --git a/pokemodr/TypechartWidgetItem.h b/pokemodr/TypechartWidgetItem.h
new file mode 100644
index 00000000..bf1fbe9c
--- /dev/null
+++ b/pokemodr/TypechartWidgetItem.h
@@ -0,0 +1,69 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        pokegen/TypechartWidgetItem.h
+// Purpose:     Provides an editor for tiles in the tilemap editor
+// Author:      Ben Boeckel
+// Modified by: Ben Boeckel
+// Created:     Sun Feb 24 04:28:24 2008
+// Copyright:   ©2007-2008 Ben Boeckel and Nerdy Productions
+// Licence:
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation, either version 3 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License along
+//    with this program.  If not, see <http://www.gnu.org/licenses/>.
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef __TYPECHARTWIDGETITEM__
+#define __TYPECHARTWIDGETITEM__
+
+#include <QObject>
+#include <QTableWidgetItem>
+#include <QVariant>
+
+#include <Frac.h>
+
+class TypechartWidgetItem : public QObject, public QTableWidgetItem
+{
+    Q_OBJECT
+    
+    public:
+        TypechartWidgetItem(Frac* mult) :
+                QTableWidgetItem(QTableWidgetItem::UserType),
+                multiplier(mult)
+        {
+        }
+        
+        QVariant data(const int role)
+        {
+            if (role == Qt::EditRole)
+                return qVariantFromValue(static_cast<void*>(multiplier));
+            else if (role == Qt::DisplayRole)
+                return QString::number(*multiplier, 'g', DBL_PREC_SHORT);
+            return QVariant();
+        }
+        void setData(int role, const QVariant& value)
+        {
+            if (role == Qt::EditRole)
+                multiplier = static_cast<Frac*>(value.value<void*>());
+        }
+    public slots:
+        void setNum(int n)
+        {
+            multiplier->setNum(n);
+        }
+        void setDenom(int d)
+        {
+            multiplier->setDenom(d);
+        }
+    private:
+        Frac* multiplier;
+};
+
+#endif
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index a8eee900..45f5915e 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>460</width>
-    <height>748</height>
+    <width>470</width>
+    <height>758</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" >
@@ -45,7 +45,7 @@
    <item>
     <widget class="QTabWidget" name="notebookPokemod" >
      <property name="currentIndex" >
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="tabGeneral" >
       <attribute name="title" >
@@ -520,7 +520,7 @@
       </attribute>
       <layout class="QVBoxLayout" >
        <item>
-        <widget class="QTableView" name="varTypechart" />
+        <widget class="QTableWidget" name="varTypechart" />
        </item>
        <item>
         <widget class="QGroupBox" name="boxEffectiveness" >
diff --git a/pokemodr/gui/skins.ui b/pokemodr/gui/skins.ui
deleted file mode 100644
index 5d17cddf..00000000
--- a/pokemodr/gui/skins.ui
+++ /dev/null
@@ -1,319 +0,0 @@
-<ui version="4.0" >
- <class>formSkins</class>
- <widget class="QWidget" name="formSkins" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>458</width>
-    <height>563</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" >
-   <item row="1" column="0" >
-    <widget class="QGroupBox" name="boxWalkingSkin" >
-     <property name="title" >
-      <string>Walking</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <property name="leftMargin" >
-       <number>4</number>
-      </property>
-      <property name="topMargin" >
-       <number>4</number>
-      </property>
-      <property name="rightMargin" >
-       <number>4</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>4</number>
-      </property>
-      <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="KIconButton" name="varWalkSkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-   <item row="1" column="1" >
-    <widget class="QGroupBox" name="boxBikingSkin" >
-     <property name="title" >
-      <string>Biking</string>
-     </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="KIconButton" name="varBikeSkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-   <item row="2" column="0" >
-    <widget class="QGroupBox" name="boxFlyingSkin" >
-     <property name="title" >
-      <string>Flying</string>
-     </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="KIconButton" name="varFlySkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-   <item row="2" column="1" >
-    <widget class="QGroupBox" name="boxSurfingSkin" >
-     <property name="title" >
-      <string>Surfing</string>
-     </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="KIconButton" name="varSurfSkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-   <item row="3" column="0" >
-    <widget class="QGroupBox" name="boxFishingSkin" >
-     <property name="title" >
-      <string>Fishing</string>
-     </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="KIconButton" name="varFishSkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-   <item row="4" column="0" colspan="2" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>424</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QGroupBox" name="boxSurfFishingSkin" >
-     <property name="title" >
-      <string>Surf Fishing</string>
-     </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="KIconButton" name="varSurfFishSkin" >
-        <property name="minimumSize" >
-         <size>
-          <width>192</width>
-          <height>128</height>
-         </size>
-        </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>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KIconButton</class>
-   <extends>QPushButton</extends>
-   <header>kicondialog.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/pokemodr/gui/typechart.ui b/pokemodr/gui/typechart.ui
deleted file mode 100644
index 912c3ad2..00000000
--- a/pokemodr/gui/typechart.ui
+++ /dev/null
@@ -1,89 +0,0 @@
-<ui version="4.0" >
- <class>formTypeEffectiveness</class>
- <widget class="QDialog" name="formTypeEffectiveness" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>226</width>
-    <height>226</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Type Effectiveness</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxEffectiveness" >
-     <property name="title" >
-      <string>Effectiveness</string>
-     </property>
-     <layout class="QVBoxLayout" >
-      <item>
-       <widget class="KLineEdit" name="varEffectiveness" >
-        <property name="toolTip" >
-         <string>Multiplier for attacks between the two types</string>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-        <property name="readOnly" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varEffectivenessNum" >
-        <property name="label" >
-         <string>Numerator</string>
-        </property>
-        <property name="minimum" >
-         <number>0</number>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="KIntNumInput" name="varEffectivenessDenom" >
-        <property name="label" >
-         <string>Denominator</string>
-        </property>
-        <property name="minimum" >
-         <number>1</number>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="KDialogButtonBox" name="buttons" >
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KDialogButtonBox</class>
-   <extends>QDialogButtonBox</extends>
-   <header>kdialogbuttonbox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KIntNumInput</class>
-   <extends>QWidget</extends>
-   <header>knuminput.h</header>
-  </customwidget>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 7177c977..77e7e3ba 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -117,7 +117,8 @@ HEADERS += AbilityUI.h \
  MapWarpUI.h \
  MapWildListUI.h \
  MapWildListEncounterUI.h \
- MapTrainerTeamMemberUI.h
+ MapTrainerTeamMemberUI.h \
+ TypechartWidgetItem.h
 
 FORMS += gui/ability.ui \
  gui/abilityeffect.ui \