From a139e4efb08c102edf7afeb4d46cdafed8f2d98f Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 13 Feb 2015 16:51:34 +0100
Subject: [PATCH] Grey out completed quests in journal quests list

---
 apps/openmw/mwgui/journalviewmodel.cpp |  4 ++--
 apps/openmw/mwgui/journalviewmodel.hpp |  4 ++--
 apps/openmw/mwgui/journalwindow.cpp    | 22 +++++++++++++++++++++-
 components/widgets/list.cpp            |  4 ++--
 components/widgets/list.hpp            |  2 +-
 files/mygui/openmw_journal.skin.xml    |  6 +++---
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/journalviewmodel.cpp b/apps/openmw/mwgui/journalviewmodel.cpp
index 3a86613f6..9a47070c2 100644
--- a/apps/openmw/mwgui/journalviewmodel.cpp
+++ b/apps/openmw/mwgui/journalviewmodel.cpp
@@ -199,7 +199,7 @@ struct JournalViewModelImpl : JournalViewModel
 
     };
 
-    void visitQuestNames (bool active_only, boost::function <void (const std::string&)> visitor) const
+    void visitQuestNames (bool active_only, boost::function <void (const std::string&, bool)> visitor) const
     {
         MWBase::Journal * journal = MWBase::Environment::get ().getJournal ();
 
@@ -231,7 +231,7 @@ struct JournalViewModelImpl : JournalViewModel
                 if (visitedQuests.find(quest.getName()) != visitedQuests.end())
                     continue;
 
-                visitor (quest.getName());
+                visitor (quest.getName(), isFinished);
 
                 visitedQuests.insert(quest.getName());
             }
diff --git a/apps/openmw/mwgui/journalviewmodel.hpp b/apps/openmw/mwgui/journalviewmodel.hpp
index 5f0189b59..b3c6b0183 100644
--- a/apps/openmw/mwgui/journalviewmodel.hpp
+++ b/apps/openmw/mwgui/journalviewmodel.hpp
@@ -67,8 +67,8 @@ namespace MWGui
         /// returns true if their are no journal entries to display
         virtual bool isEmpty () const = 0;
 
-        /// walks the active and optionally completed, quests providing the name
-        virtual void visitQuestNames (bool active_only, boost::function <void (const std::string&)> visitor) const = 0;
+        /// walks the active and optionally completed, quests providing the name and completed status
+        virtual void visitQuestNames (bool active_only, boost::function <void (const std::string&, bool)> visitor) const = 0;
 
         /// walks over the journal entries related to all quests with the given name
         /// If \a questName is empty, simply visits all journal entries
diff --git a/apps/openmw/mwgui/journalwindow.cpp b/apps/openmw/mwgui/journalwindow.cpp
index d7e27a277..4cfcc8064 100644
--- a/apps/openmw/mwgui/journalwindow.cpp
+++ b/apps/openmw/mwgui/journalwindow.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <MyGUI_TextBox.h>
+#include <MyGUI_Button.h>
 
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
@@ -428,11 +429,24 @@ namespace
             AddNamesToList(Gui::MWList* list) : mList(list) {}
 
             Gui::MWList* mList;
-            void operator () (const std::string& name)
+            void operator () (const std::string& name, bool finished=false)
             {
                 mList->addItem(name);
             }
         };
+        struct SetNamesInactive
+        {
+            SetNamesInactive(Gui::MWList* list) : mList(list) {}
+
+            Gui::MWList* mList;
+            void operator () (const std::string& name, bool finished)
+            {
+                if (finished)
+                {
+                    mList->getItemWidget(name)->setStateSelected(true);
+                }
+            }
+        };
 
         void notifyQuests(MyGUI::Widget* _sender)
         {
@@ -453,6 +467,12 @@ namespace
             mModel->visitQuestNames(!mAllQuests, add);
 
             list->adjustSize();
+
+            if (mAllQuests)
+            {
+                SetNamesInactive setInactive(list);
+                mModel->visitQuestNames(!mAllQuests, setInactive);
+            }
         }
 
         void notifyShowAll(MyGUI::Widget* _sender)
diff --git a/components/widgets/list.cpp b/components/widgets/list.cpp
index 28271e87d..f3d3a2c28 100644
--- a/components/widgets/list.cpp
+++ b/components/widgets/list.cpp
@@ -152,9 +152,9 @@ namespace Gui
         eventWidgetSelected(_sender);
     }
 
-    MyGUI::Widget* MWList::getItemWidget(const std::string& name)
+    MyGUI::Button *MWList::getItemWidget(const std::string& name)
     {
-        return mScrollView->findWidget (getName() + "_item_" + name);
+        return mScrollView->findWidget (getName() + "_item_" + name)->castType<MyGUI::Button>();
     }
 
 }
diff --git a/components/widgets/list.hpp b/components/widgets/list.hpp
index 093cd8c18..72c8a733c 100644
--- a/components/widgets/list.hpp
+++ b/components/widgets/list.hpp
@@ -43,7 +43,7 @@ namespace Gui
         std::string getItemNameAt(unsigned int at); ///< \attention if there are separators, this method will return "" at the place where the separator is
         void clear();
 
-        MyGUI::Widget* getItemWidget(const std::string& name);
+        MyGUI::Button* getItemWidget(const std::string& name);
         ///< get widget for an item name, useful to set up tooltip
 
         virtual void setPropertyOverride(const std::string& _key, const std::string& _value);
diff --git a/files/mygui/openmw_journal.skin.xml b/files/mygui/openmw_journal.skin.xml
index 942c9a4d4..42be2bb62 100644
--- a/files/mygui/openmw_journal.skin.xml
+++ b/files/mygui/openmw_journal.skin.xml
@@ -28,9 +28,9 @@
             <State name="normal" colour="#{fontcolour=journal_topic}" shift="0"/>
             <State name="highlighted" colour="#{fontcolour=journal_topic_over}" shift="0"/>
             <State name="pushed" colour="#{fontcolour=journal_topic_pressed}" shift="0"/>
-            <State name="normal_checked" colour="#{fontcolour=journal_topic_pressed}" shift="0"/>
-            <State name="highlighted_checked" colour="#{fontcolour=journal_topic_pressed}" shift="0"/>
-            <State name="pushed_checked" colour="#{fontcolour=journal_topic_pressed}" shift="0"/>
+            <State name="normal_checked" colour="0.2 0.2 0.2" shift="0"/>
+            <State name="highlighted_checked" colour="0.4 0.4 0.4" shift="0"/>
+            <State name="pushed_checked" colour="0.5 0.5 0.5" shift="0"/>
         </BasisSkin>
     </Resource>
 </MyGUI>