implemented item count selection dialog

apps/openmw/CMakeLists.txt

@@ -26,7 +26,7 @@ add_openmw_dir (mwgui
     text_input widgets race class birth review window_manager console dialogue
     dialogue_history window_base stats_window messagebox journalwindow charactercreation
     map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list
-    formatting itemwidget inventorywindow container hud
+    formatting itemwidget inventorywindow container hud countdialog
     )
 
 add_openmw_dir (mwdialogue

apps/openmw/mwgui/class.hpp

@@ -34,7 +34,7 @@ namespace MWGui
         typedef delegates::CMultiDelegate1<int> EventHandle_Int;
 
         /** Event : Button was clicked.\n
-            signature : void method(MyGUI::WidgetPtr widget, int index)\n
+            signature : void method(int index)\n
         */
         EventHandle_Int eventButtonSelected;
 

apps/openmw/mwgui/container.cpp

@@ -1,7 +1,12 @@
 #include "container.hpp"
 
-#include "window_manager.hpp"
+#include <cmath>
-#include "widgets.hpp"
+#include <algorithm>
+#include <iterator>
+#include <assert.h>
+#include <iostream>
+
+#include <boost/lexical_cast.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwworld/manualref.hpp"
@@ -13,14 +18,9 @@
 #include "../mwinput/inputmanager.hpp"
 #include "../mwsound/soundmanager.hpp"
 
-#include <cmath>
+#include "window_manager.hpp"
-#include <algorithm>
+#include "widgets.hpp"
-#include <iterator>
+#include "countdialog.hpp"
-#include <assert.h>
-#include <iostream>
-
-#include <boost/lexical_cast.hpp>
-
 
 using namespace MWGui;
 using namespace Widgets;
@@ -49,7 +49,10 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
 {
     if(!mDragAndDrop->mIsOnDragAndDrop)
     {
-        int count = (*_sender->getUserData<MWWorld::Ptr>()).getRefData().getCount();
+        mSelectedItem = _sender;
+
+        MWWorld::Ptr object = (*_sender->getUserData<MWWorld::Ptr>());
+        int count = object.getRefData().getCount();
 
         if (MWBase::Environment::get().getInputManager()->getShiftDown() || count == 1)
         {
@@ -61,8 +64,10 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
         }
         else
         {
-            /// \todo count selection window
+            CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
-            onSelectedItemImpl(_sender, count);
+            dialog->open(MWWorld::Class::get(object).getName(object), count);
+            dialog->eventOkClicked.clear();
+            dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerBase::onSelectedItemImpl);
         }
     }
     else
@@ -72,10 +77,10 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
 void ContainerBase::onSelectedItemImpl(MyGUI::Widget* _sender, int count)
 {
     mDragAndDrop->mIsOnDragAndDrop = true;
-    _sender->detachFromWidget();
+    mSelectedItem->detachFromWidget();
-    _sender->attachToWidget(mDragAndDrop->mDragAndDropWidget);
+    mSelectedItem->attachToWidget(mDragAndDrop->mDragAndDropWidget);
 
-    MWWorld::Ptr object = *_sender->getUserData<MWWorld::Ptr>();
+    MWWorld::Ptr object = *mSelectedItem->getUserData<MWWorld::Ptr>();
     int originalCount = object.getRefData().getCount();
     object.getRefData().setCount(count);
     mDragAndDrop->mStore.add(object);
@@ -84,9 +89,10 @@ void ContainerBase::onSelectedItemImpl(MyGUI::Widget* _sender, int count)
     std::string sound = MWWorld::Class::get(object).getUpSoundId(object);
     MWBase::Environment::get().getSoundManager()->playSound (sound, 1.0, 1.0);
 
-    mDragAndDrop->mDraggedWidget = _sender;
+    mDragAndDrop->mDraggedWidget = mSelectedItem;
     mDragAndDrop->mContainerWindow = const_cast<MWGui::ContainerBase*>(this);
-    static_cast<MyGUI::TextBox*>(_sender->getChildAt(0)->getChildAt(0))->setCaption(getCountString((*mDragAndDrop->mStore.begin()).getRefData().getCount()));
+    static_cast<MyGUI::TextBox*>(mSelectedItem->getChildAt(0)->getChildAt(0))->setCaption(
+        getCountString((*mDragAndDrop->mStore.begin()).getRefData().getCount()));
     drawItems();
 
     MWBase::Environment::get().getWindowManager()->setDragDrop(true);

apps/openmw/mwgui/container.hpp

@@ -68,6 +68,8 @@ namespace MWGui
         MyGUI::ScrollView* mItemView;
         MyGUI::Widget* mContainerWidget;
 
+        MyGUI::Widget* mSelectedItem;
+
         DragAndDrop* mDragAndDrop;
         MWWorld::Ptr mContainer;
 

apps/openmw/mwgui/countdialog.cpp

@@ -0,0 +1,110 @@
+#include "countdialog.hpp"
+
+#include <boost/lexical_cast.hpp>
+
+#include "../mwbase/environment.hpp"
+#include "../mwworld/world.hpp"
+
+namespace MWGui
+{
+    CountDialog::CountDialog(WindowManager& parWindowManager) :
+        WindowBase("openmw_count_window_layout.xml", parWindowManager)
+    {
+        getWidget(mSlider, "CountSlider");
+        getWidget(mItemEdit, "ItemEdit");
+        getWidget(mItemText, "ItemText");
+        getWidget(mLabelText, "LabelText");
+        getWidget(mOkButton, "OkButton");
+        getWidget(mCancelButton, "CancelButton");
+
+        mOkButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sOk")->str);
+        mCancelButton->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sCancel")->str);
+        mLabelText->setCaption(MWBase::Environment::get().getWorld()->getStore().gameSettings.search("sTake")->str);
+
+        mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CountDialog::onCancelButtonClicked);
+        mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &CountDialog::onOkButtonClicked);
+        mItemEdit->eventEditTextChange += MyGUI::newDelegate(this, &CountDialog::onEditTextChange);
+        mSlider->eventScrollChangePosition += MyGUI::newDelegate(this, &CountDialog::onSliderMoved);
+    }
+
+    void CountDialog::open(const std::string& item, const int maxCount)
+    {
+        setVisible(true);
+
+        MyGUI::IntSize viewSize = MyGUI::RenderManager::getInstance().getViewSize();
+
+        mSlider->setScrollRange(maxCount);
+        mItemText->setCaption(item);
+
+        int width = std::max(mItemText->getTextSize().width + 128, 320);
+        setCoord(viewSize.width/2 - width/2,
+                viewSize.height/2 - mMainWidget->getHeight()/2,
+                width,
+                mMainWidget->getHeight());
+
+        // make other gui elements inaccessible while this dialog is open
+        MyGUI::InputManager::getInstance().addWidgetModal(mMainWidget);
+
+        MyGUI::InputManager::getInstance().setKeyFocusWidget(mItemEdit);
+
+        mSlider->setScrollPosition(maxCount-1);
+        mItemEdit->setCaption(boost::lexical_cast<std::string>(maxCount));
+
+        int okButtonWidth = mOkButton->getTextSize().width + 24;
+        mOkButton->setCoord(width - 30 - okButtonWidth,
+                            mOkButton->getTop(),
+                            okButtonWidth,
+                            mOkButton->getHeight());
+
+        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
+        mCancelButton->setCoord(width - 30 - okButtonWidth - cancelButtonWidth - 8,
+                            mCancelButton->getTop(),
+                            cancelButtonWidth,
+                            mCancelButton->getHeight());
+    }
+
+    void CountDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
+    {
+        close();
+    }
+
+    void CountDialog::onOkButtonClicked(MyGUI::Widget* _sender)
+    {
+        eventOkClicked(NULL, mSlider->getScrollPosition()+1);
+
+        close();
+    }
+
+    void CountDialog::onEditTextChange(MyGUI::EditBox* _sender)
+    {
+        if (_sender->getCaption() == "")
+            return;
+    
+        unsigned int count;
+        try
+        {
+            count = boost::lexical_cast<unsigned int>(_sender->getCaption());
+        }
+        catch (std::bad_cast&)
+        {
+            count = 1;
+        }
+        if (count > mSlider->getScrollRange())
+        {
+            count = mSlider->getScrollRange();
+        }
+        mSlider->setScrollPosition(count-1);
+        onSliderMoved(mSlider, count-1);
+    }
+
+    void CountDialog::onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position)
+    {
+        mItemEdit->setCaption(boost::lexical_cast<std::string>(_position+1));
+    }
+
+    void CountDialog::close()
+    {
+        setVisible(false);
+        MyGUI::InputManager::getInstance().removeWidgetModal(mMainWidget);
+    }
+}

apps/openmw/mwgui/countdialog.hpp

@@ -0,0 +1,39 @@
+#ifndef MWGUI_COUNTDIALOG_H
+#define MWGUI_COUNTDIALOG_H
+
+#include "window_base.hpp"
+
+namespace MWGui
+{
+    class CountDialog : public WindowBase
+    {
+        public:
+            CountDialog(WindowManager& parWindowManager);
+            void open(const std::string& item, const int maxCount);
+
+            typedef MyGUI::delegates::CMultiDelegate2<MyGUI::Widget*, int> EventHandle_WidgetInt;
+
+            /** Event : Ok button was clicked.\n
+                signature : void method(MyGUI::Widget* _sender, int _count)\n
+            */
+            EventHandle_WidgetInt eventOkClicked;
+
+        private:
+            MyGUI::ScrollBar* mSlider;
+            MyGUI::EditBox* mItemEdit;
+            MyGUI::TextBox* mItemText;
+            MyGUI::TextBox* mLabelText;
+            MyGUI::Button* mOkButton;
+            MyGUI::Button* mCancelButton;
+
+            void onCancelButtonClicked(MyGUI::Widget* _sender);
+            void onOkButtonClicked(MyGUI::Widget* _sender);
+            void onEditTextChange(MyGUI::EditBox* _sender);
+            void onSliderMoved(MyGUI::ScrollBar* _sender, size_t _position);
+
+            void close();
+    };
+
+}
+
+#endif

apps/openmw/mwgui/window_manager.cpp

@@ -14,6 +14,7 @@
 #include "list.hpp"
 #include "hud.hpp"
 #include "mainmenu.hpp"
+#include "countdialog.hpp"
 
 #include "../mwmechanics/mechanicsmanager.hpp"
 #include "../mwinput/inputmanager.hpp"
@@ -46,6 +47,7 @@ WindowManager::WindowManager(
   , mDialogueWindow(nullptr)
   , mBookWindow(NULL)
   , mScrollWindow(NULL)
+  , mCountDialog(NULL)
   , mCharGen(NULL)
   , playerClass()
   , playerName()
@@ -112,6 +114,7 @@ WindowManager::WindowManager(
     mToolTips = new ToolTips(this);
     mScrollWindow = new ScrollWindow(*this);
     mBookWindow = new BookWindow(*this);
+    mCountDialog = new CountDialog(*this);
 
     // The HUD is always on
     hud->setVisible(true);

apps/openmw/mwgui/window_manager.hpp

@@ -71,6 +71,7 @@ namespace MWGui
   class InfoBoxDialog;
   class DialogueWindow;
   class MessageBoxManager;
+  class CountDialog;
 
   struct ClassPoint
   {
@@ -133,6 +134,7 @@ namespace MWGui
 
     MWGui::BookWindow* getBookWindow() {return mBookWindow;}
     MWGui::ScrollWindow* getScrollWindow() {return mScrollWindow;}
+    MWGui::CountDialog* getCountDialog() {return mCountDialog;}
 
     MyGUI::Gui* getGui() const { return gui; }
 
@@ -223,6 +225,7 @@ namespace MWGui
     InventoryWindow *mInventoryWindow;
     ScrollWindow* mScrollWindow;
     BookWindow* mBookWindow;
+    CountDialog* mCountDialog;
 
     CharacterCreation* mCharGen;
 

files/mygui/CMakeLists.txt

@@ -55,6 +55,7 @@ configure_file("${SDIR}/openmw_tooltips.xml" "${DDIR}/openmw_tooltips.xml" COPYO
 configure_file("${SDIR}/openmw_scroll_layout.xml" "${DDIR}/openmw_scroll_layout.xml" COPYONLY)
 configure_file("${SDIR}/openmw_scroll_skin.xml" "${DDIR}/openmw_scroll_skin.xml" COPYONLY)
 configure_file("${SDIR}/openmw_book_layout.xml" "${DDIR}/openmw_book_layout.xml" COPYONLY)
+configure_file("${SDIR}/openmw_count_window_layout.xml" "${DDIR}/openmw_count_window_layout.xml" COPYONLY)
 configure_file("${SDIR}/atlas1.cfg" "${DDIR}/atlas1.cfg" COPYONLY)
 configure_file("${SDIR}/smallbars.png" "${DDIR}/smallbars.png" COPYONLY)
 configure_file("${SDIR}/transparent.png" "${DDIR}/transparent.png" COPYONLY)

files/mygui/openmw_count_window_layout.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<MyGUI type="Layout">
+    <Widget type="Window" skin="MW_Dialog" layer="Windows" position="0 0 600 125" name="_Main">
+        <Property key="Visible" value="false"/>
+
+        <Widget type="TextBox" skin="SandText" position="4 0 592 24" name="LabelText" align="Left Top HStretch">
+            <Property key="TextAlign" value="Center"/>
+        </Widget>
+
+        <Widget type="TextBox" skin="SandText" position="4 30 532 24" name="ItemText" align="Left Top HStretch">
+            <Property key="TextAlign" value="Right"/>
+        </Widget>
+
+        <Widget type="EditBox" skin="MW_TextEdit" position="540 30 32 24" name="ItemEdit" align="Right Top">
+            <Property key="TextAlign" value="Center"/>
+        </Widget>
+
+        <Widget type="ScrollBar" skin="MW_HScroll" position="28 60 544 18" name="CountSlider" align="Left Top HStretch">
+            <Property key="MoveToClick" value="true"/>
+        </Widget>
+
+        <Widget type="Button" skin="MW_Button" position="512 90 60 24" name="OkButton" align="Right Top"/>
+        <Widget type="Button" skin="MW_Button" position="417 90 60 24" name="CancelButton" align="Right Top"/>
+
+    </Widget>
+</MyGUI>