hid JournalWindow behind IJournalWindow interface, and put its entire

implementation, class definition and all, into journalwindow.cpp

apps/openmw/mwgui/journalwindow.cpp

@@ -5,6 +5,16 @@
 #include "../mwbase/journal.hpp"
 #include "../mwbase/soundmanager.hpp"
 
+#include <sstream>
+#include <set>
+#include <string>
+#include <utility>
+
+#include "windowbase.hpp"
+#include "imagebutton.hpp"
+
+using namespace MWGui;
+
 namespace
 {
     struct book
@@ -77,11 +87,22 @@ book formatText(std::string text,book mBook,int maxLine, int lineSize)
     //std::string
 }
 
+namespace
+{
+    struct JournalWindow : WindowBase, IJournalWindow
+    {
+        MyGUI::EditPtr mLeftTextWidget;
+        MyGUI::EditPtr mRightTextWidget;
+        MWGui::ImageButton* mPrevBtn;
+        MWGui::ImageButton* mNextBtn;
+        std::vector<std::string> mLeftPages;
+        std::vector<std::string> mRightPages;
+        int mPageNumber; //store the number of the current left page
 
-MWGui::JournalWindow::JournalWindow ()
+        JournalWindow ()
             : WindowBase("openmw_journal.layout")
             , mPageNumber(0)
-{
+        {
             mMainWidget->setVisible(false);
             //setCoord(0,0,498, 342);
             center();
@@ -89,31 +110,27 @@ MWGui::JournalWindow::JournalWindow ()
             getWidget(mLeftTextWidget, "LeftText");
             getWidget(mRightTextWidget, "RightText");
             getWidget(mPrevBtn, "PrevPageBTN");
-    mPrevBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyPrevPage);
+            mPrevBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&JournalWindow::notifyPrevPage);
             getWidget(mNextBtn, "NextPageBTN");
-    mNextBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&MWGui::JournalWindow::notifyNextPage);
+            mNextBtn->eventMouseButtonClick += MyGUI::newDelegate(this,&JournalWindow::notifyNextPage);
-    //MyGUI::ItemBox* list = new MyGUI::ItemBox();
+
-    //list->addItem("qaq","aqzazaz");
+
-    //mScrollerWidget->addChildItem(list);
+
-    //mScrollerWidget->addItem("dserzt",MyGUI::UString("fedgdfg"));
-    //mEditWidget->addText("ljblsxdvdsfvgedfvdfvdkjfghldfjgn sdv,nhsxl;vvn lklksbvlksb lbsdflkbdSLKJGBLskdhbvl<kbvlqksbgkqsjhdvb");
-    //mEditWidget->show();
-    //mEditWidget->setEditStatic(true);
-    mLeftTextWidget->addText("left texxxt  ");
             mLeftTextWidget->setEditReadOnly(true);
             mRightTextWidget->setEditReadOnly(true);
             mRightTextWidget->setEditStatic(true);
             mLeftTextWidget->setEditStatic(true);
-    mRightTextWidget->addText("Right texxt  ");
+        }
 
-    //std::list<std::string> list = formatText("OpenMW rgh dsfg sqef srg ZT  uzql n ZLIEHRF LQSJH GLOIjf qjfmj hslkdgn jlkdjhg qlr isgli shli uhs fiuh qksf cg ksjnf lkqsnbf ksbf sbfkl zbf kuyzflkj sbgdfkj zlfh ozhjfmo hzmfh lizuf rty qzt ezy tkyEZT RYYJ DG fgh  is an open-source implementation of the game engine found in the game Morrowind. This is a dumb test text msodjbg smojg smoig  fiiinnn");
+        void close()
-    //std::list<std::string> list = formatText();
+        {
-    //displayLeftText(list.front());
+            MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
-}
+        }
 
-void MWGui::JournalWindow::open()
+        void open()
-{
+        {
             mPageNumber = 0;
+            MWBase::Environment::get().getSoundManager()->playSound ("book open", 1.0, 1.0);
             if(MWBase::Environment::get().getJournal()->begin()!=MWBase::Environment::get().getJournal()->end())
             {
                 book journal;
@@ -152,23 +169,30 @@ void MWGui::JournalWindow::open()
             {
                 //std::cout << MWBase::Environment::get().getJournal()->begin()->getText(MWBase::Environment::get().getWorld()->getStore());
             }
-}
+        }
 
-void MWGui::JournalWindow::displayLeftText(std::string text)
+        void setVisible (bool newValue)
-{
+        {
+            WindowBase::setVisible (newValue);
+        }
+
+
+        void displayLeftText(std::string text)
+        {
             mLeftTextWidget->eraseText(0,mLeftTextWidget->getTextLength());
             mLeftTextWidget->addText(text);
-}
+        }
 
-void MWGui::JournalWindow::displayRightText(std::string text)
+        void displayRightText(std::string text)
-{
+        {
             mRightTextWidget->eraseText(0,mRightTextWidget->getTextLength());
             mRightTextWidget->addText(text);
-}
+        }
 
 
-void MWGui::JournalWindow::notifyNextPage(MyGUI::Widget* _sender)
+
-{
+        void notifyNextPage(MyGUI::Widget* _sender)
+        {
             if(mPageNumber < int(mLeftPages.size())-1)
             {
                 std::string nextSound = "book page2";
@@ -177,10 +201,10 @@ void MWGui::JournalWindow::notifyNextPage(MyGUI::Widget* _sender)
                 displayLeftText(mLeftPages[mPageNumber]);
                 displayRightText(mRightPages[mPageNumber]);
             }
-}
+        }
 
-void MWGui::JournalWindow::notifyPrevPage(MyGUI::Widget* _sender)
+        void notifyPrevPage(MyGUI::Widget* _sender)
-{
+        {
             if(mPageNumber > 0)
             {
                 std::string prevSound = "book page";
@@ -189,4 +213,9 @@ void MWGui::JournalWindow::notifyPrevPage(MyGUI::Widget* _sender)
                 displayLeftText(mLeftPages[mPageNumber]);
                 displayRightText(mRightPages[mPageNumber]);
             }
+        }
+    };
 }
+
+// glue the implementation to the interface
+IJournalWindow * MWGui::IJournalWindow::create () { return new JournalWindow (); }

apps/openmw/mwgui/journalwindow.hpp

@@ -1,39 +1,21 @@
 #ifndef MWGUI_JOURNAL_H
 #define MWGUI_JOURNAL_H
 
-#include <string>
+namespace MWBase { class WindowManager; }
-
-#include "windowbase.hpp"
-#include "imagebutton.hpp"
 
 namespace MWGui
 {
-    class JournalWindow : public WindowBase
+    struct IJournalWindow
     {
-        public:
+        /// construct a new instance of the one JournalWindow implementation
-            JournalWindow();
+        static IJournalWindow * create ();
-            virtual void open();
 
-        private:
+        /// destroy this instance of the JournalWindow implementation
-            void displayLeftText(std::string text);
+        virtual ~IJournalWindow () {};
-            void displayRightText(std::string text);
 
-
+        /// show/hide the journal window
-            /**
+        virtual void setVisible (bool newValue) = 0;
-            *Called when next/prev button is used.
-            */
-            void notifyNextPage(MyGUI::Widget* _sender);
-            void notifyPrevPage(MyGUI::Widget* _sender);
-
-            MyGUI::EditBox* mLeftTextWidget;
-            MyGUI::EditBox* mRightTextWidget;
-            MWGui::ImageButton* mPrevBtn;
-            MWGui::ImageButton* mNextBtn;
-            std::vector<std::string> mLeftPages;
-            std::vector<std::string> mRightPages;
-            int mPageNumber; //store the number of the current left page
     };
-
 }
 
 #endif

apps/openmw/mwgui/windowmanagerimp.cpp

@@ -145,7 +145,7 @@ namespace MWGui
         mMap = new MapWindow(cacheDir);
         mStatsWindow = new StatsWindow();
         mConsole = new Console(w,h, consoleOnlyScripts);
-        mJournal = new JournalWindow();
+        mJournal = IJournalWindow::create();
         mMessageBoxManager = new MessageBoxManager();
         mInventoryWindow = new InventoryWindow(mDragAndDrop);
         mTradeWindow = new TradeWindow();

apps/openmw/mwgui/windowmanagerimp.hpp

@@ -51,7 +51,7 @@ namespace MWGui
   class MainMenu;
   class StatsWindow;
   class InventoryWindow;
-  class JournalWindow;
+  class IJournalWindow;
   class CharacterCreation;
   class DragAndDrop;
   class ToolTips;
@@ -253,7 +253,7 @@ namespace MWGui
     StatsWindow *mStatsWindow;
     MessageBoxManager *mMessageBoxManager;
     Console *mConsole;
-    JournalWindow* mJournal;
+    IJournalWindow* mJournal;
     DialogueWindow *mDialogueWindow;
     ContainerWindow *mContainerWindow;
     DragAndDrop* mDragAndDrop;