[FIX] pokemodr.ui file

[FIX] added better .pro rules
[FIX] PokeModTreeItem works now
[FIX] LICENSE file is purely the terms

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

21 files changed, 228 insertions, 40 deletions

diff --git a/Changelog b/Changelog
index a2263deb..be4e33c4 100644
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,14 @@
 -----------------
+Rev:  41
+Date: 23 January 2008
+User: MathStuf
+-----------------
+[FIX] pokemodr.ui file
+[FIX] added better .pro rules
+[FIX] PokeModTreeItem works now
+[FIX] LICENSE file is purely the terms
+
+-----------------
 Rev:  40
 Date: 22 January 2008
 User: MathStuf
diff --git a/battle/battle.pro b/battle/battle.pro
index ff39021e..a4bb134c 100644
--- a/battle/battle.pro
+++ b/battle/battle.pro
@@ -1,4 +1,4 @@
-OBJECTS_DIR = ../../obj/battle
+OBJECTS_DIR = .obj
 DESTDIR     = ../../lib
 LANGUAGE    = C++
 TEMPLATE    = lib
diff --git a/general/BugCatcher.h b/general/BugCatcher.h
index 9d20c617..ba002634 100644
--- a/general/BugCatcher.h
+++ b/general/BugCatcher.h
@@ -23,9 +23,12 @@
 #ifndef __BUGCATCHER__
 #define __BUGCATCHER__
 
+#include <kaboutdata.h>
 #include <kbugreport.h>
 #include "Exception.h"
 
+#include <iostream>
+
 class BugCatcher
 {
     public:
@@ -39,8 +42,10 @@ class BugCatcher
         }
         static void report(const Exception& e)
         {
+            std::cout << "FOOBAR" << std::endl;
             if (!about)
                 return;
+            std::cout << "FOOBAR" << std::endl;
             KBugReport bug(NULL, true, about);
             bug.setMessageBody(e.getMsg());
             bug.exec();
diff --git a/general/Frac.cpp b/general/Frac.cpp
index 76e7fd0b..090ec5e2 100644
--- a/general/Frac.cpp
+++ b/general/Frac.cpp
@@ -24,7 +24,7 @@
 
 void Frac::set(const unsigned n, const unsigned d) throw(Exception)
 {
-    if ((type == Improper) || ((n < d) && (type == Proper)) || ((d < n) && (type == Over1)))
+    if ((type == Improper) || ((n <= d) && (type == Proper)) || ((d < n) && (type == Over1)))
     {
         num = n;
         denom = d;
diff --git a/general/Frac.h b/general/Frac.h
index f419eee5..046fc789 100644
--- a/general/Frac.h
+++ b/general/Frac.h
@@ -42,7 +42,7 @@ class Frac
         {
             setType(t);
         }
-        Frac(const unsigned n, const unsigned d, const unsigned t = Proper)
+        Frac(const unsigned n, const unsigned d, const unsigned t = Proper) throw(Exception)
         {
             set(n, d, t);
         }
diff --git a/general/general.pro b/general/general.pro
index 63962d81..d9d26206 100644
--- a/general/general.pro
+++ b/general/general.pro
@@ -1,7 +1,8 @@
-OBJECTS_DIR = ../../obj/general
+OBJECTS_DIR = .obj
 DESTDIR     = ../../lib
 LANGUAGE    = C++
 TEMPLATE    = lib
+INCLUDEPATH+=/usr/include/kde4
 
 CONFIG     += qt warn_on dll
 
diff --git a/menus/menus.pro b/menus/menus.pro
index b72aa98f..a4bb134c 100644
--- a/menus/menus.pro
+++ b/menus/menus.pro
@@ -1,4 +1,4 @@
-OBJECTS_DIR = ../../obj/menus
+OBJECTS_DIR = .obj
 DESTDIR     = ../../lib
 LANGUAGE    = C++
 TEMPLATE    = lib
diff --git a/overworld/overworld.pro b/overworld/overworld.pro
index 0ed172c8..a4bb134c 100644
--- a/overworld/overworld.pro
+++ b/overworld/overworld.pro
@@ -1,4 +1,4 @@
-OBJECTS_DIR = ../../obj/overworld
+OBJECTS_DIR = .obj
 DESTDIR     = ../../lib
 LANGUAGE    = C++
 TEMPLATE    = lib
diff --git a/pokegen/pokegen.pro b/pokegen/pokegen.pro
index 138bb14d..192c1b16 100644
--- a/pokegen/pokegen.pro
+++ b/pokegen/pokegen.pro
@@ -1,4 +1,4 @@
-OBJECTS_DIR = ../../obj/pokegen
+OBJECTS_DIR = .obj
 DESTDIR     = ../../bin
 LANGUAGE    = C++
 TEMPLATE    = app
diff --git a/pokemod/Object.h b/pokemod/Object.h
index 67bdab52..f62bd78a 100644
--- a/pokemod/Object.h
+++ b/pokemod/Object.h
@@ -23,6 +23,8 @@
 #ifndef __POKEMOD_OBJECT__
 #define __POKEMOD_OBJECT__
 
+#include "../general/Exception.h"
+
 class Pokemod;
 
 class Object
diff --git a/pokemod/Pokemod.cpp b/pokemod/Pokemod.cpp
index 9585bbdd..919828eb 100644
--- a/pokemod/Pokemod.cpp
+++ b/pokemod/Pokemod.cpp
@@ -32,6 +32,21 @@
 
 const QStringList Pokemod::ValidationStr = QStringList() << "Message" << "Warn" << "Error";
 
+Pokemod::Pokemod() :
+        Object("Pokemod", *this, 0),
+        valOutput(NULL),
+        title(""),
+        version(""),
+        description(""),
+        startMap(UINT_MAX),
+        startWarp(UINT_MAX),
+        superPCUname(""),
+        superPCPasswd(""),
+        typeChart(1, 1, Frac(1, 1, Frac::Improper)),
+        rules(*this)
+{
+}
+
 Pokemod::Pokemod(const QString& fname) :
         Object("Pokemod", *this, 0),
         valOutput(NULL),
@@ -726,7 +741,7 @@ unsigned Pokemod::getNewTypeId() const
         ;
     return i;
 }
-void Pokemod::load(const QString& fname) throw(Exception)
+void Pokemod::load(const QString& fname, const unsigned _id) throw(Exception)
 {
     Ini ini(fname);
     QStringList fpath = fname.split('\\', QString::SkipEmptyParts).join("/").split('\\', QString::SkipEmptyParts);
diff --git a/pokemod/Pokemod.h b/pokemod/Pokemod.h
index c2be36a0..1ef026e4 100644
--- a/pokemod/Pokemod.h
+++ b/pokemod/Pokemod.h
@@ -60,9 +60,10 @@ class Pokemod : public Object
         };
         static const QStringList ValidationStr;
         
+        Pokemod();
         Pokemod(const QString& fpath);
         
-        void load(const QString& fpath) throw(Exception);
+        void load(const QString& fpath, const unsigned _id = 0) throw(Exception);
         void save() const throw(Exception);
         
         QString getPath() const;
diff --git a/pokemod/pokemod.pro b/pokemod/pokemod.pro
index fb942c1c..3d3ebbca 100644
--- a/pokemod/pokemod.pro
+++ b/pokemod/pokemod.pro
@@ -1,4 +1,4 @@
-OBJECTS_DIR = ../../obj/pokemod
+OBJECTS_DIR = .obj
 DESTDIR     = ../../lib
 LANGUAGE    = C++
 TEMPLATE    = lib
diff --git a/pokemodr/PokeModTreeItem.h b/pokemodr/PokeModTreeItem.h
index 58d20b2f..b135d59a 100644
--- a/pokemodr/PokeModTreeItem.h
+++ b/pokemodr/PokeModTreeItem.h
@@ -23,17 +23,27 @@
 #ifndef __POKEMODR_POKEMODTREEITEM__
 #define __POKEMODR_POKEMODTREEITEM__
 
-#include <ktreewidgetitem.h>
+#include <QObject>
+#include <QTreeWidgetItem>
 #include "../pokemod/Object.h"
 
-class PokeModTreeItem : public QTreeWidgetItem
+class PokeModTreeItem : public QObject, public QTreeWidgetItem
 {
+    Q_OBJECT
+    
     public:
-        PokeModTreeItem();
-        
+        PokeModTreeItem(Object& o, QTreeWidget* parent) :
+                QTreeWidgetItem(parent, QTreeWidgetItem::UserType),
+                obj(&o)
+        {
+        }
         
+        Object& getObject()
+        {
+            return *obj;
+        }
     private:
-        Object
+        Object* obj;
 };
 
 #endif
diff --git a/pokemodr/PokeModr.cpp b/pokemodr/PokeModr.cpp
index 85d8ef8d..0b668136 100644
--- a/pokemodr/PokeModr.cpp
+++ b/pokemodr/PokeModr.cpp
@@ -31,8 +31,6 @@
 
 int main(int argc, char* argv[])
 {
-    KApplication app;
-    
     KAboutData about("pokemodr", "pokemodr", ki18n("PokéModr"), VERSION_STRING, ki18n(""), KAboutData::License_Unknown, ki18n("©2007-2008 Ben Boeckel and Nerdy Productions"), ki18n("This program allows for an easy interface so that PokéMods can be easily created."), "http://sourceforge.net/projects/pokegen");
     about.setLicenseTextFile("LICENSE");
     about.setProgramName(ki18n("PokéModr"));
@@ -41,12 +39,13 @@ int main(int argc, char* argv[])
     about.addCredit(ki18n("Kevin Kofler"), ki18n("Qt, KDE, debugging help"), "kevin.kofler@chello.at", "http://www.tigen.org/kevin.kofler");
     
     KCmdLineArgs::init(argc, argv, &about);
+    KApplication app;
     
     BugCatcher::setAbout(&about);
     
     KConfig cfg("~/.kde/share/config/pokegenrc");
     
     PokeModrUI mainWindow(cfg.group("pokemodr"), cfg.group("pokemodr-recent"));
-    
+    mainWindow.show();
     return app.exec();
 }
diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
new file mode 100644
index 00000000..f43f4f5e
--- /dev/null
+++ b/pokemodr/PokeModrUI.cpp
@@ -0,0 +1,102 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        pokegen/PokeModrUI.cpp
+// Purpose:     Main window handling
+// Author:      Ben Boeckel
+// Modified by: Ben Boeckel
+// Created:     Wed Jan 23 10:42:50 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 <klocalizedstring.h>
+#include <kmenu.h>
+#include <kmenubar.h>
+#include <QMetaObject>
+#include "../general/BugCatcher.h"
+#include "../general/Exception.h"
+#include "PokeModrUI.h"
+
+#include "../pokemod/Pokemod.h"
+#include "RulesUI.h"
+
+PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent) :
+        KMainWindow(parent),
+        recent("&Recent Files...", NULL)
+{
+    setupUi(this);
+    QMetaObject::connectSlotsByName(this);
+    recent.loadEntries(history);
+    menuBar()->addMenu(helpMenu("", false));
+    restoreWindowSize(cfg);
+    cfg.readEntry("splitterPos", QVariant(100));
+//     if (cfg.readEntry("reloadOnStart", QVariant(false)).toBool())
+//         open(recent.urls().at(0));
+    
+    
+    // Testing
+    try
+    {
+        Pokemod foo;
+        RulesUI(foo.getRules(), formPanel);
+    }
+    catch (Exception& e)
+    {
+        BugCatcher::report(e);
+    }
+}
+
+void PokeModrUI::PokeModrUI::on_actionNew_triggered()
+{
+}
+
+void PokeModrUI::on_actionOpen_triggered()
+{
+}
+
+void PokeModrUI::on_actionSave_triggered()
+{
+}
+
+void PokeModrUI::on_actionSaveAs_triggered()
+{
+}
+
+void PokeModrUI::on_actionSaveAll_triggered()
+{
+}
+
+void PokeModrUI::on_actionQuit_triggered()
+{
+}
+
+void PokeModrUI::on_actionCopy_triggered()
+{
+}
+
+void PokeModrUI::on_actionPaste_triggered()
+{
+}
+
+void PokeModrUI::on_actionPreferences_triggered()
+{
+}
+
+void PokeModrUI::on_splitter_splitterMoved(const int pos)
+{
+}
+
+// void PokeModrUI::on_treePokemod_itemChanged(QTreeWidgetItem* item)
+// {
+// }
diff --git a/pokemodr/PokeModrUI.h b/pokemodr/PokeModrUI.h
index 29916215..6925a51f 100644
--- a/pokemodr/PokeModrUI.h
+++ b/pokemodr/PokeModrUI.h
@@ -27,16 +27,14 @@
 #include <krecentfilesaction.h>
 #include <QObject>
 #include <QWidget>
-#include "../general/Exception.h"
-#include "../pokemod/Rules.h"
-#include "gui/ui_pokemodr.h"
+#include "ui_pokemodr.h"
 
-class PokeModrUI : public QWidget, private Ui::formPokeModr
+class PokeModrUI : public KMainWindow, private Ui::formPokeModr
 {
     Q_OBJECT
     
     public:
-        PokeModrUI(KConfigGroup cfg, KConfigGroup recent, QWidget* parent = 0);
+        PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent = 0);
     public slots:
         void on_actionNew_triggered();
         void on_actionOpen_triggered();
@@ -48,11 +46,8 @@ class PokeModrUI : public QWidget, private Ui::formPokeModr
         void on_actionPaste_triggered();
         void on_actionPreferences_triggered();
         void on_splitter_splitterMoved(const int pos);
-        void on_treePokemod_clicked(const QTreeWidgetItem* item);
-        void on_treePokemod_customContextMenuRequested(const QPoint& pos);
+//         void on_treePokemod_itemChanged(QTreeWidgetItem* item);
     private:
-        void setGui();
-        
         KRecentFilesAction recent;
 };
 
diff --git a/pokemodr/RulesUI.cpp b/pokemodr/RulesUI.cpp
index d5cf7e4c..0d729ff5 100644
--- a/pokemodr/RulesUI.cpp
+++ b/pokemodr/RulesUI.cpp
@@ -26,6 +26,7 @@
 
 RulesUI::RulesUI(Rules& r, QWidget* parent) :
         QWidget(parent),
+        changed(false),
         rules(r.getPokemod(), r),
         rules_mod(r.getPokemod(), r)
 {
@@ -35,6 +36,11 @@ RulesUI::RulesUI(Rules& r, QWidget* parent) :
     setGui();
 }
 
+// KToolBar Rules::getToolbar(QWidget* parent)
+// {
+//     return KToolBar(parent);
+// }
+
 void RulesUI::setGui()
 {
     boxGenders->setChecked(rules_mod.getGenderAllowed() ? Qt::Checked : Qt::Unchecked);
@@ -68,11 +74,13 @@ void RulesUI::setGui()
 void RulesUI::on_buttonApply_clicked()
 {
     rules = rules_mod;
+    changed = false;
 }
 
 void RulesUI::on_buttonDiscard_clicked()
 {
     rules_mod = rules;
+    changed = false;
 }
 
 void RulesUI::on_boxGenders_toggled(const bool g)
@@ -80,6 +88,7 @@ void RulesUI::on_boxGenders_toggled(const bool g)
     rules_mod.setGenderAllowed(g);
     if (!g)
         varBreeding->setCheckState(Qt::Unchecked);
+    changed = true;
 }
 
 void RulesUI::on_varBreeding_toggled(const bool b) throw(Exception)
@@ -87,6 +96,7 @@ void RulesUI::on_varBreeding_toggled(const bool b) throw(Exception)
     try
     {
         rules_mod.setBreedingAllowed(b);
+        changed = true;
     }
     catch (Exception& e)
     {
@@ -98,31 +108,37 @@ void RulesUI::on_varBreeding_toggled(const bool b) throw(Exception)
 void RulesUI::on_varHeldItems_valueChanged(const int h)
 {
     rules_mod.setHoldItems(h);
+    changed = true;
 }
 
 void RulesUI::on_boxCriticalDomains_toggled(const bool c)
 {
     rules_mod.setCriticalDomains(c);
+    changed = true;
 }
 
 void RulesUI::on_boxAllowAbilities_toggled(const bool a)
 {
     rules_mod.setAbilityAllowed(a);
+    changed = true;
 }
 
 void RulesUI::on_boxAllowNatures_toggled(const bool a)
 {
     rules_mod.setNatureAllowed(a);
+    changed = true;
 }
 
 void RulesUI::on_varBoxes_valueChanged(const int b)
 {
     rules_mod.setNumBoxes(b);
+    changed = true;
 }
 
 void RulesUI::on_varBoxSize_valueChanged(const int b)
 {
     rules_mod.setBoxSize(b);
+    changed = true;
 }
 
 void RulesUI::on_varMaxPartySize_valueChanged(const int m) throw(BoundsException)
@@ -131,6 +147,7 @@ void RulesUI::on_varMaxPartySize_valueChanged(const int m) throw(BoundsException
         varMaxFight->setValue(m);
     rules_mod.setMaxParty(m);
     varMaxFight->setMaximum(m);
+    changed = true;
 }
 
 void RulesUI::on_varMaxFight_valueChanged(const int m) throw(BoundsException)
@@ -138,6 +155,7 @@ void RulesUI::on_varMaxFight_valueChanged(const int m) throw(BoundsException)
     try
     {
         rules_mod.setMaxFight(m);
+        changed = true;
     }
     catch (BoundsException& e)
     {
@@ -150,6 +168,7 @@ void RulesUI::on_varMaxMoves_valueChanged(const int m) throw(BoundsException)
     try
     {
         rules_mod.setMaxMoves(m);
+        changed = true;
     }
     catch (BoundsException& e)
     {
@@ -163,6 +182,7 @@ void RulesUI::on_varMaxLevel_valueChanged(const int m) throw(BoundsException)
     try
     {
         rules_mod.setMaxLevel(m);
+        changed = true;
     }
     catch (BoundsException& e)
     {
@@ -174,11 +194,13 @@ void RulesUI::on_varMaxLevel_valueChanged(const int m) throw(BoundsException)
 void RulesUI::on_varMaxMoney_valueChanged(const int m)
 {
     rules_mod.setMaxMoney(m);
+    changed = true;
 }
 
 void RulesUI::on_boxHardCash_toggled(const int h)
 {
     rules_mod.setHardCash(h);
+    changed = true;
 }
 
 void RulesUI::on_boxSplitSpecial_toggled(const bool s)
@@ -186,11 +208,13 @@ void RulesUI::on_boxSplitSpecial_toggled(const bool s)
     rules_mod.setSpecialSplit(s);
     if (!s)
         varSplitSpecialDV->setCheckState(Qt::Unchecked);
+    changed = true;
 }
 
 void RulesUI::on_varSplitSpecialDV_toggled(const bool s)
 {
     rules_mod.setSpecialDVSplit(s);
+    changed = true;
 }
 
 void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m) throw(BoundsException)
@@ -198,7 +222,10 @@ void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m) throw(BoundsExce
     try
     {
         if (Rules::DVStr.contains(m))
+        {
             rules_mod.setMaxDVValue((Rules::DVStr.indexOf(m) << 4) + 16);
+            changed = true;
+        }
         else
             throw(BoundsException("RulesUI", "maxDVValue"));
     }
@@ -212,26 +239,31 @@ void RulesUI::on_varMaxDV_currentIndexChanged(const QString& m) throw(BoundsExce
 void RulesUI::on_boxHappiness_toggled(const bool h)
 {
     rules_mod.setHappiness(h);
+    changed = true;
 }
 
 void RulesUI::on_varFaintLoss_valueChanged(const int f)
 {
     rules_mod.setHappyFaintLoss(f);
+    changed = true;
 }
 
 void RulesUI::on_varLevelGain_valueChanged(const int l)
 {
     rules_mod.setHappyLevelGain(l);
+    changed = true;
 }
 
 void RulesUI::on_varNumSteps_valueChanged(const int n)
 {
     rules_mod.setHappySteps(n);
+    changed = true;
 }
 
 void RulesUI::on_boxEffortValues_toggled(const int e)
 {
     rules_mod.setEffortValuesAllowed(e);
+    changed = true;
 }
 
 void RulesUI::on_varMaxEV_valueChanged(const int m) throw(Exception)
@@ -240,11 +272,13 @@ void RulesUI::on_varMaxEV_valueChanged(const int m) throw(Exception)
         varMaxEVPerStat->setValue(m);
     rules_mod.setMaxTotalEV(m);
     varMaxEVPerStat->setMaximum(m);
+    changed = true;
 }
 
 void RulesUI::on_varMaxEVPerStat_valueChanged(const int m) throw(Exception)
 {
     rules_mod.setMaxEVPerStat(m);
+    changed = true;
 }
 
 void RulesUI::on_varPokerusNum_valueChanged(const int p) throw(Exception)
@@ -253,6 +287,7 @@ void RulesUI::on_varPokerusNum_valueChanged(const int p) throw(Exception)
     {
         rules_mod.setPokerusChanceNum(p);
         varPokerus->setText(QString::number(rules_mod.getPokerusChance()));
+        changed = true;
     }
     catch (Exception& e)
     {
@@ -268,6 +303,7 @@ void RulesUI::on_varPokerusDenom_valueChanged(const int p) throw(Exception)
         rules_mod.setPokerusChanceDenom(p);
         varPokerusNum->setMaximum(p - 1);
         varPokerus->setText(QString::number(rules_mod.getPokerusChance()));
+        changed = true;
     }
     catch (Exception& e)
     {
diff --git a/pokemodr/RulesUI.h b/pokemodr/RulesUI.h
index df7aba10..854f2f4e 100644
--- a/pokemodr/RulesUI.h
+++ b/pokemodr/RulesUI.h
@@ -23,11 +23,12 @@
 #ifndef __POKEMODR_RULESUI__
 #define __POKEMODR_RULESUI__
 
+#include <ktoolbar.h>
 #include <QObject>
 #include <QWidget>
 #include "../general/Exception.h"
 #include "../pokemod/Rules.h"
-#include "gui/ui_rules.h"
+#include "ui_rules.h"
 
 class RulesUI : public QWidget, private Ui::formRules
 {
@@ -35,6 +36,8 @@ class RulesUI : public QWidget, private Ui::formRules
     
     public:
         RulesUI(Rules& r, QWidget* parent = 0);
+        
+//         KToolBar getToolbar(QWidget* parent);
     public slots:
         void on_buttonApply_clicked();
         void on_buttonDiscard_clicked();
@@ -67,10 +70,10 @@ class RulesUI : public QWidget, private Ui::formRules
     private:
         void setGui();
         
+        bool changed;
+        
         Rules rules;
         Rules rules_mod;
-        
-        friend class Object;
 };
 
 #endif
diff --git a/pokemodr/gui/pokemodr.ui b/pokemodr/gui/pokemodr.ui
index e7d53cfd..6536a1c9 100644
--- a/pokemodr/gui/pokemodr.ui
+++ b/pokemodr/gui/pokemodr.ui
@@ -1,6 +1,6 @@
 <ui version="4.0" >
- <class>mainWindow</class>
- <widget class="QMainWindow" name="mainWindow" >
+ <class>formPokeModr</class>
+ <widget class="KMainWindow" name="mainWindow" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -65,6 +65,20 @@
    <addaction name="menuFile" />
    <addaction name="menuEdit" />
   </widget>
+  <widget class="QToolBar" name="toolbar" >
+   <property name="windowTitle" >
+    <string/>
+   </property>
+   <property name="movable" >
+    <bool>true</bool>
+   </property>
+   <attribute name="toolBarArea" >
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak" >
+    <bool>false</bool>
+   </attribute>
+  </widget>
   <action name="actionNew" >
    <property name="text" >
     <string>&amp;New</string>
@@ -120,11 +134,6 @@
     <string>Ctrl+Alt+S</string>
    </property>
   </action>
-  <action name="actionPreferences" >
-   <property name="text" >
-    <string>Preferences...</string>
-   </property>
-  </action>
   <action name="actionQuit" >
    <property name="text" >
     <string>&amp;Quit</string>
diff --git a/pokemodr/pokemodr.pro b/pokemodr/pokemodr.pro
index 97cdd45d..f77ce787 100644
--- a/pokemodr/pokemodr.pro
+++ b/pokemodr/pokemodr.pro
@@ -1,7 +1,7 @@
-OBJECTS_DIR = ../../obj/pokemodr
+OBJECTS_DIR = .obj
 DESTDIR     = ../../bin
-UI_DIR      = gui
-MOC_DIR     = gui
+UI_DIR      = .ui
+MOC_DIR     = .moc
 LANGUAGE    = C++
 TEMPLATE    = app
 LIBS       += -L/usr/lib64/kde4/devel -lkdecore -lkdeui -L../../lib -lgeneral -lpokemod