[ADD] ItemEffect widget near completion (value2 setting on the widget needed)

[FIX] Cleaned out unneeded customwidget fields in .ui files

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

36 files changed, 29 insertions, 168 deletions

diff --git a/Changelog b/Changelog
index edeb1289..1e53a1ef 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,12 @@
 -----------------
+Rev:  151
+Date: 18 May 2008
+User: MathStuf
+-----------------
+[ADD] ItemEffect widget near completion (value2 setting on the widget needed)
+[FIX] Cleaned out unneeded customwidget fields in .ui files
+
+-----------------
 Rev:  150
 Date: 18 May 2008
 User: MathStuf
diff --git a/pokemod/ItemEffect.cpp b/pokemod/ItemEffect.cpp
index 895e101b..cd9266a3 100644
--- a/pokemod/ItemEffect.cpp
+++ b/pokemod/ItemEffect.cpp
@@ -422,6 +422,7 @@ void ItemEffect::setValue3(const int value3)
                 case B_Level:
                 case B_Friend:
                 case B_Weight:
+                    // TODO: ???
                     break;
                 case B_Area:
                     if (MapWildList::End <= value3)
@@ -522,10 +523,8 @@ void ItemEffect::setValue4(const Fraction& value4)
         case E_CoinCase:
         case E_Acorn:
         case E_Evolution:
-        {
             emit(warning(unused("value4")));
             return;
-        }
         case E_Ball:
             if (m_value2 == B_Master)
             {
diff --git a/pokemodr/AbilityEffectUI.cpp b/pokemodr/AbilityEffectUI.cpp
index a529b058..58033344 100644
--- a/pokemodr/AbilityEffectUI.cpp
+++ b/pokemodr/AbilityEffectUI.cpp
@@ -53,6 +53,7 @@ void AbilityEffectUI::setGui()
 {
     const bool resetEffects = (static_cast<AbilityEffect*>(modified())->effect() == m_lastEffect);
     const bool resetTrigger = (static_cast<AbilityEffect*>(modified())->trigger() == m_lastTrigger);
+    const bool isSplit = static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit();
     varChance->setValue(static_cast<AbilityEffect*>(modified())->chance());
     varEffect->setCurrentIndex(static_cast<AbilityEffect*>(modified())->effect());
     m_lastEffect = static_cast<AbilityEffect*>(modified())->effect();
@@ -68,9 +69,9 @@ void AbilityEffectUI::setGui()
             case AbilityEffect::E_Stats:
                 for (int i = Pokemod::ST_No_HP_Start; i < Pokemod::ST_End_Battle; ++i)
                 {
-                    if ((Pokemod::ST_SpecialDefense == i) && !static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit())
+                    if ((Pokemod::ST_SpecialDefense == i) && !isSplit)
                         continue;
-                    varValue1->addItem(Pokemod::StatGSCStr[i], varValue1->count());
+                    varValue1->addItem((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr)[i], varValue1->count());
                 }
                 break;
             case AbilityEffect::E_Status:
@@ -190,9 +191,9 @@ void AbilityEffectUI::setGui()
             case AbilityEffect::T_StatChange:
                 for (int i = Pokemod::ST_No_HP_Start; i < Pokemod::ST_End_Battle; ++i)
                 {
-                    if ((Pokemod::ST_SpecialDefense == i) && !static_cast<const Pokemod*>(original()->pokemod())->rules()->specialSplit())
+                    if ((Pokemod::ST_SpecialDefense == i) && !isSplit)
                         continue;
-                    varTriggerValue1->addItem(Pokemod::StatGSCStr[i], varValue1->count());
+                    varTriggerValue1->addItem((isSplit ? Pokemod::StatGSCStr : Pokemod::StatRBYStr)[i], varValue1->count());
                 }
                 break;
             case AbilityEffect::T_Status:
diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 509d67b2..f1496da1 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -53,7 +53,7 @@ PokeModrUI::PokeModrUI(KConfigGroup config, KConfigGroup history, QWidget* paren
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     m_recent->loadEntries(history);
-    // TODO: Somehow get KAction/KMenus into the ui files
+    // FIXME: Somehow get KAction/KMenus into the ui files
     KMenuBar* menubar = new KMenuBar(this);
     KMenu* menuFile = new KMenu("&File", menubar);
     menuFile->addAction(KStandardAction::openNew(this, SLOT(newPokemod()), menuFile));
diff --git a/pokemodr/gui/ability.ui b/pokemodr/gui/ability.ui
index 3bd91d51..cb9636a2 100644
--- a/pokemodr/gui/ability.ui
+++ b/pokemodr/gui/ability.ui
@@ -29,11 +29,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/abilityeffect.ui b/pokemodr/gui/abilityeffect.ui
index 9079ded0..f4143fd1 100644
--- a/pokemodr/gui/abilityeffect.ui
+++ b/pokemodr/gui/abilityeffect.ui
@@ -147,11 +147,6 @@
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
    <header>../FractionWidget.h</header>
diff --git a/pokemodr/gui/author.ui b/pokemodr/gui/author.ui
index 10c6c8ad..a4517c2d 100644
--- a/pokemodr/gui/author.ui
+++ b/pokemodr/gui/author.ui
@@ -67,11 +67,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/badge.ui b/pokemodr/gui/badge.ui
index a838d4a6..8727dba4 100644
--- a/pokemodr/gui/badge.ui
+++ b/pokemodr/gui/badge.ui
@@ -183,11 +183,6 @@
    <header>klistwidget.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
    <header>../FractionWidget.h</header>
diff --git a/pokemodr/gui/coinlist.ui b/pokemodr/gui/coinlist.ui
index 86b20965..8e09c5e7 100644
--- a/pokemodr/gui/coinlist.ui
+++ b/pokemodr/gui/coinlist.ui
@@ -50,11 +50,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/coinlistobject.ui b/pokemodr/gui/coinlistobject.ui
index bc6d480e..3047f0e9 100644
--- a/pokemodr/gui/coinlistobject.ui
+++ b/pokemodr/gui/coinlistobject.ui
@@ -85,11 +85,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/dialog.ui b/pokemodr/gui/dialog.ui
index ec27b846..c54bc4ca 100644
--- a/pokemodr/gui/dialog.ui
+++ b/pokemodr/gui/dialog.ui
@@ -46,11 +46,6 @@
    <header>kcombobox.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
diff --git a/pokemodr/gui/egggroup.ui b/pokemodr/gui/egggroup.ui
index a1e4f0bf..2d38d09a 100644
--- a/pokemodr/gui/egggroup.ui
+++ b/pokemodr/gui/egggroup.ui
@@ -29,11 +29,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/item.ui b/pokemodr/gui/item.ui
index 3fd21ee9..fe1a1418 100644
--- a/pokemodr/gui/item.ui
+++ b/pokemodr/gui/item.ui
@@ -120,11 +120,6 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
diff --git a/pokemodr/gui/itemeffect.ui b/pokemodr/gui/itemeffect.ui
index eeb59fcc..9755a55d 100644
--- a/pokemodr/gui/itemeffect.ui
+++ b/pokemodr/gui/itemeffect.ui
@@ -61,7 +61,7 @@
         </property>
         <layout class="QHBoxLayout" >
          <item>
-          <widget class="KIntNumInput" name="varVal1" >
+          <widget class="KIntNumInput" name="varValue1" >
            <property name="toolTip" >
             <string>Value 1</string>
            </property>
@@ -80,7 +80,7 @@
         </property>
         <layout class="QHBoxLayout" >
          <item>
-          <widget class="KComboBox" name="varVal2" >
+          <widget class="KComboBox" name="varValue2" >
            <property name="toolTip" >
             <string>Value 2</string>
            </property>
@@ -96,7 +96,7 @@
         </property>
         <layout class="QHBoxLayout" >
          <item>
-          <widget class="KComboBox" name="valVal3" >
+          <widget class="KComboBox" name="varValue3" >
            <property name="toolTip" >
             <string>Value 3</string>
            </property>
@@ -138,11 +138,6 @@
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
    <header>../FractionWidget.h</header>
diff --git a/pokemodr/gui/itemtype.ui b/pokemodr/gui/itemtype.ui
index 3f5f2944..ac2f6565 100644
--- a/pokemodr/gui/itemtype.ui
+++ b/pokemodr/gui/itemtype.ui
@@ -93,11 +93,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/mapeffect.ui b/pokemodr/gui/mapeffect.ui
index 12d6a248..41d4918c 100644
--- a/pokemodr/gui/mapeffect.ui
+++ b/pokemodr/gui/mapeffect.ui
@@ -240,7 +240,6 @@
    <class>PointWidget</class>
    <extends>QWidget</extends>
    <header>../PointWidget.h</header>
-   <container>1</container>
   </customwidget>
   <customwidget>
    <class>FlagWidget</class>
diff --git a/pokemodr/gui/maptrainer.ui b/pokemodr/gui/maptrainer.ui
index e9040213..5a784455 100644
--- a/pokemodr/gui/maptrainer.ui
+++ b/pokemodr/gui/maptrainer.ui
@@ -167,15 +167,9 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>PointWidget</class>
    <extends>QWidget</extends>
    <header>../PointWidget.h</header>
-   <container>1</container>
   </customwidget>
   <customwidget>
    <class>FlagWidget</class>
diff --git a/pokemodr/gui/maptrainerteammember.ui b/pokemodr/gui/maptrainerteammember.ui
index 37a7c3ad..5fe921a3 100644
--- a/pokemodr/gui/maptrainerteammember.ui
+++ b/pokemodr/gui/maptrainerteammember.ui
@@ -90,11 +90,6 @@
    <extends>QListWidget</extends>
    <header>klistwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/mapwarp.ui b/pokemodr/gui/mapwarp.ui
index fa8aa693..f4600225 100644
--- a/pokemodr/gui/mapwarp.ui
+++ b/pokemodr/gui/mapwarp.ui
@@ -213,15 +213,9 @@
    <header>klistwidget.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>PointWidget</class>
    <extends>QWidget</extends>
    <header>../PointWidget.h</header>
-   <container>1</container>
   </customwidget>
   <customwidget>
    <class>FlagWidget</class>
diff --git a/pokemodr/gui/mapwildlist.ui b/pokemodr/gui/mapwildlist.ui
index 1f6400c6..ba0e9aac 100644
--- a/pokemodr/gui/mapwildlist.ui
+++ b/pokemodr/gui/mapwildlist.ui
@@ -85,11 +85,6 @@
    <extends>QListWidget</extends>
    <header>klistwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/mapwildlistencounter.ui b/pokemodr/gui/mapwildlistencounter.ui
index 233f42c6..a0b2928d 100644
--- a/pokemodr/gui/mapwildlistencounter.ui
+++ b/pokemodr/gui/mapwildlistencounter.ui
@@ -69,11 +69,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/move.ui b/pokemodr/gui/move.ui
index 276e6fb6..bf10657a 100644
--- a/pokemodr/gui/move.ui
+++ b/pokemodr/gui/move.ui
@@ -262,11 +262,6 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>KTextEdit</class>
    <extends>QTextEdit</extends>
    <header>ktextedit.h</header>
diff --git a/pokemodr/gui/moveeffect.ui b/pokemodr/gui/moveeffect.ui
index b2187647..44aa4f27 100644
--- a/pokemodr/gui/moveeffect.ui
+++ b/pokemodr/gui/moveeffect.ui
@@ -107,11 +107,6 @@
    <header>knuminput.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>KCombobox</class>
    <extends>QWidget</extends>
    <header>kcombobox.h</header>
diff --git a/pokemodr/gui/nature.ui b/pokemodr/gui/nature.ui
index 800e6abf..98aeb4f2 100644
--- a/pokemodr/gui/nature.ui
+++ b/pokemodr/gui/nature.ui
@@ -91,11 +91,6 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
    <header>../FractionWidget.h</header>
diff --git a/pokemodr/gui/pokemod.ui b/pokemodr/gui/pokemod.ui
index 57c15998..618375e4 100644
--- a/pokemodr/gui/pokemod.ui
+++ b/pokemodr/gui/pokemod.ui
@@ -179,7 +179,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varWalkSkin" >
+           <widget class="KPushButton" name="varWalkSkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -212,7 +212,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varBikeSkin" >
+           <widget class="KPushButton" name="varBikeSkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -245,7 +245,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varFlySkin" >
+           <widget class="KPushButton" name="varFlySkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -278,7 +278,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varSurfSkin" >
+           <widget class="KPushButton" name="varSurfSkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -311,7 +311,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varFishSkin" >
+           <widget class="KPushButton" name="varFishSkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -344,7 +344,7 @@
            </spacer>
           </item>
           <item>
-           <widget class="KIconButton" name="varSurfFishSkin" >
+           <widget class="KPushButton" name="varSurfFishSkin" >
             <property name="minimumSize" >
              <size>
               <width>192</width>
@@ -425,11 +425,6 @@
    <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/rules.ui b/pokemodr/gui/rules.ui
index 2b4afbb7..eec4753c 100644
--- a/pokemodr/gui/rules.ui
+++ b/pokemodr/gui/rules.ui
@@ -460,11 +460,6 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>KTabWidget</class>
    <extends>QTabWidget</extends>
    <header>ktabwidget.h</header>
diff --git a/pokemodr/gui/sound.ui b/pokemodr/gui/sound.ui
index 120a63f3..5d0fa332 100644
--- a/pokemodr/gui/sound.ui
+++ b/pokemodr/gui/sound.ui
@@ -52,11 +52,6 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>Phonon::SeekSlider</class>
    <extends>QWidget</extends>
    <header location="global" >Phonon/SeekSlider</header>
diff --git a/pokemodr/gui/speciesability.ui b/pokemodr/gui/speciesability.ui
index f483ce7b..65dc1553 100644
--- a/pokemodr/gui/speciesability.ui
+++ b/pokemodr/gui/speciesability.ui
@@ -50,11 +50,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/speciesevolution.ui b/pokemodr/gui/speciesevolution.ui
index 98271bb9..0a9a528e 100644
--- a/pokemodr/gui/speciesevolution.ui
+++ b/pokemodr/gui/speciesevolution.ui
@@ -114,11 +114,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/speciesitem.ui b/pokemodr/gui/speciesitem.ui
index 19fdbe1c..adef114b 100644
--- a/pokemodr/gui/speciesitem.ui
+++ b/pokemodr/gui/speciesitem.ui
@@ -50,11 +50,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/speciesmove.ui b/pokemodr/gui/speciesmove.ui
index 5dd3d8ab..68707a81 100644
--- a/pokemodr/gui/speciesmove.ui
+++ b/pokemodr/gui/speciesmove.ui
@@ -69,11 +69,6 @@
    <extends>QWidget</extends>
    <header>knuminput.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/store.ui b/pokemodr/gui/store.ui
index dff1a633..47dce6c9 100644
--- a/pokemodr/gui/store.ui
+++ b/pokemodr/gui/store.ui
@@ -50,11 +50,6 @@
    <extends>QListWidget</extends>
    <header>klistwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/time.ui b/pokemodr/gui/time.ui
index ff1e51b2..dcc2bcac 100644
--- a/pokemodr/gui/time.ui
+++ b/pokemodr/gui/time.ui
@@ -51,11 +51,6 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
-  <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
diff --git a/pokemodr/gui/type.ui b/pokemodr/gui/type.ui
index 13c2d048..8615bbd2 100644
--- a/pokemodr/gui/type.ui
+++ b/pokemodr/gui/type.ui
@@ -86,11 +86,6 @@
    <header>klistwidget.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
-   <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
-  </customwidget>
-  <customwidget>
    <class>FractionWidget</class>
    <extends>QWidget</extends>
    <header>../FractionWidget.h</header>
diff --git a/pokemodr/models/ItemEffectModel.cpp b/pokemodr/models/ItemEffectModel.cpp
index 429a3f8b..02a08c70 100644
--- a/pokemodr/models/ItemEffectModel.cpp
+++ b/pokemodr/models/ItemEffectModel.cpp
@@ -19,7 +19,7 @@
 #include "ItemEffectModel.h"
 
 // PokeModr includes
-// #include "../ItemEffectUI.h"
+#include "../ItemEffectUI.h"
 
 // Pokemod includes
 #include "../../pokemod/Item.h"
@@ -53,9 +53,8 @@ QVariant ItemEffectModel::data(int role) const
     }
     else if (role == BaseModel::WidgetRole)
     {
-        // TODO: ItemEffectUI
-//         QWidget* widget = new ItemEffectUI(static_cast<ItemEffect*>(m_object), NULL);
-//         return QVariant::fromValue(widget);
+        QWidget* widget = new ItemEffectUI(static_cast<ItemEffect*>(m_object), NULL);
+        return QVariant::fromValue(widget);
     }
     return ObjectModel::data(role);
 }
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 3b5f7e01..0ac8a728 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -43,6 +43,7 @@ SOURCES += AbilityUI.cpp \
  FlagWidget.cpp \
  FractionWidget.cpp \
  ItemUI.cpp \
+ ItemEffectUI.cpp \
  ItemTypeUI.cpp \
  MapUI.cpp \
  MapEffectUI.cpp \
@@ -122,6 +123,7 @@ HEADERS += AbilityUI.h \
  FlagWidget.h \
  FractionWidget.h \
  ItemUI.h \
+ ItemEffectUI.h \
  ItemTypeUI.h \
  MapUI.h \
  MapEffectUI.h \