[ADD] GenericListItem.{h, cpp}

[FIX] BadgeUI bugs (some still exist)
[FIX] Other UI bugs fixed

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

1 files changed, 17 insertions, 11 deletions

diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 6f539844..8c932d3b 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -28,12 +28,16 @@
 #include "../general/Exception.h"
 #include "PokeModrUI.h"
 
-#include "../pokemod/Pokemod.h"
+#include "AbilityUI.h"
+#include "AuthorUI.h"
+#include "BadgeUI.h"
 #include "NatureUI.h"
 #include "ItemTypeUI.h"
 #include "RulesUI.h"
 #include "TimeUI.h"
 
+#include <iostream>
+
 PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent) :
         QMainWindow(parent),
         config(cfg),
@@ -48,19 +52,16 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent)
 //     if (cfg.readEntry("reloadOnStart", QVariant(false)).toBool())
 //         open(recent.urls().at(0));
     
-    
     // Testing
+    pokemod = new Pokemod();
     try
     {
-        Pokemod foo;
-        foo.newNature();
-        NatureUI* n = new NatureUI(&foo.getNature(0), formPanel);
-        formPanel->setViewport(n);
-//         foo.newItemType();
-//         ItemTypeUI* it = new ItemTypeUI(&foo.getItemType(0), formPanel);
-//         formPanel->setViewport(it);
-//         foo.newTime();
-//         formPanel->setViewport(new TimeUI(&foo.getTime(0), formPanel));
+//         formPanel->setViewport(new AbilityUI(&pokemod->newAbility(), formPanel));
+//         formPanel->setViewport(new AuthorUI(&pokemod->newAuthor(), formPanel));
+        formPanel->setViewport(new BadgeUI(&pokemod->newBadge(), formPanel));
+//         formPanel->setViewport(NatureUI(&pokemod->newNature(), formPanel));
+//         formPanel->setViewport(new ItemTypeUI(&pokemod->newItemType(), formPanel));
+//         formPanel->setViewport(new TimeUI(&pokemod->newTime(), formPanel));
 //         formPanel->setViewport(new RulesUI(&foo.getRules(), formPanel));
     }
     catch (Exception& e)
@@ -69,6 +70,11 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent)
     }
 }
 
+PokeModrUI::~PokeModrUI()
+{
+    delete pokemod;
+}
+
 void PokeModrUI::PokeModrUI::setChangedTitle(const bool c)
 {
 }