From d52f6c9f71c1ee94539fe94bd821df608d7ee602 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Tue, 26 Feb 2008 04:18:15 +0000
Subject: [FIX] Apply/Discard buttons now set correctly when loaded or changes
 are discarded [FIX] "Filler" tree items can no longer be selected

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@87 6ecfd1a5-f3ed-3746-8530-beee90d26b22
---
 pokemodr/PokeModrUI.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'pokemodr/PokeModrUI.cpp')

diff --git a/pokemodr/PokeModrUI.cpp b/pokemodr/PokeModrUI.cpp
index 897f7ee4..b3ee11ad 100644
--- a/pokemodr/PokeModrUI.cpp
+++ b/pokemodr/PokeModrUI.cpp
@@ -20,6 +20,10 @@
 //    with this program.  If not, see <http://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////////
 
+// Until QAction promotion is allowed in Qt Designer
+#include <kaction.h>
+#include <kicon.h>
+
 #include <klocalizedstring.h>
 #include <kmenu.h>
 #include <kmenubar.h>
@@ -110,6 +114,7 @@ PokeModrUI::PokeModrUI(KConfigGroup cfg, KConfigGroup history, QWidget* parent)
     setupUi(this);
     QMetaObject::connectSlotsByName(this);
     recent.loadEntries(history);
+    // This is just until Qt Designer allows for QActions to be promoted to KActions :/
     menuBar()->addMenu(customHelpMenu(false));
     restoreWindowSize(cfg);
     splitter->setSizes(QList<int>() << cfg.readEntry("treeWidth", 100) << cfg.readEntry("panelWidth", 100));
@@ -298,7 +303,7 @@ void PokeModrUI::closeEvent(QCloseEvent* event)
 void PokeModrUI::setChangedTitle(const bool c)
 {
     if (formPanel->widget())
-        setWindowTitle(QString("%1%2 - PokéModr").arg(static_cast<ObjectUI*>(formPanel->widget())->getOriginal()->getPokemod()->getTitle()).arg(c ? "*" : ""));
+        setWindowTitle(QString::fromUtf8("%1%2 - PokéModr").arg(static_cast<ObjectUI*>(formPanel->widget())->getOriginal()->getPokemod()->getTitle()).arg(c ? "*" : ""));
     else
         setWindowTitle("PokéModr");
 }
@@ -447,6 +452,7 @@ void PokeModrUI::on_treePokemod_currentItemChanged(QTreeWidgetItem* current, QTr
     {
         if (previous)
             treePokemod->setCurrentItem(previous);
+        current->setSelected(false);
         return;
     }
     if (formPanel->widget())
-- 
cgit