forked from mirror/openmw-tes3mp
added some trade window stuff, which does nothing yet.
This commit is contained in:
parent
630241c8e2
commit
0c1d06d9f7
6 changed files with 79 additions and 18 deletions
|
@ -26,7 +26,7 @@ add_openmw_dir (mwgui
|
||||||
text_input widgets race class birth review window_manager console dialogue
|
text_input widgets race class birth review window_manager console dialogue
|
||||||
dialogue_history window_base stats_window messagebox journalwindow charactercreation
|
dialogue_history window_base stats_window messagebox journalwindow charactercreation
|
||||||
map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list
|
map_window window_pinnable_base cursorreplace tooltips scrollwindow bookwindow list
|
||||||
formatting itemwidget inventorywindow container hud countdialog
|
formatting itemwidget inventorywindow container hud countdialog tradewindow
|
||||||
)
|
)
|
||||||
|
|
||||||
add_openmw_dir (mwdialogue
|
add_openmw_dir (mwdialogue
|
||||||
|
|
|
@ -4,23 +4,6 @@
|
||||||
#include "container.hpp"
|
#include "container.hpp"
|
||||||
#include "window_pinnable_base.hpp"
|
#include "window_pinnable_base.hpp"
|
||||||
|
|
||||||
namespace MWWorld
|
|
||||||
{
|
|
||||||
class Environment;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace MyGUI
|
|
||||||
{
|
|
||||||
class Gui;
|
|
||||||
class Widget;
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace MWGui
|
|
||||||
{
|
|
||||||
class WindowManager;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
namespace MWGui
|
namespace MWGui
|
||||||
{
|
{
|
||||||
class InventoryWindow : public ContainerBase, public WindowPinnableBase
|
class InventoryWindow : public ContainerBase, public WindowPinnableBase
|
||||||
|
@ -60,4 +43,5 @@ namespace MWGui
|
||||||
virtual void _unequipItem(MWWorld::Ptr item);
|
virtual void _unequipItem(MWWorld::Ptr item);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // Inventory_H
|
#endif // Inventory_H
|
||||||
|
|
10
apps/openmw/mwgui/tradewindow.cpp
Normal file
10
apps/openmw/mwgui/tradewindow.cpp
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
#include "tradewindow.hpp"
|
||||||
|
|
||||||
|
namespace MWGui
|
||||||
|
{
|
||||||
|
TradeWindow::TradeWindow(WindowManager& parWindowManager) :
|
||||||
|
WindowBase("openmw_trade_window_layout.xml", parWindowManager),
|
||||||
|
ContainerBase(NULL) // no drag&drop
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
41
apps/openmw/mwgui/tradewindow.hpp
Normal file
41
apps/openmw/mwgui/tradewindow.hpp
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
#ifndef MWGUI_TRADEWINDOW_H
|
||||||
|
#define MWGUI_TRADEWINDOW_H
|
||||||
|
|
||||||
|
#include "container.hpp"
|
||||||
|
#include "window_base.hpp"
|
||||||
|
|
||||||
|
namespace MyGUI
|
||||||
|
{
|
||||||
|
class Gui;
|
||||||
|
class Widget;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace MWGui
|
||||||
|
{
|
||||||
|
class WindowManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
namespace MWGui
|
||||||
|
{
|
||||||
|
class TradeWindow : public ContainerBase, public WindowBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TradeWindow(WindowManager& parWindowManager);
|
||||||
|
|
||||||
|
//virtual void Update();
|
||||||
|
//virtual void notifyContentChanged();
|
||||||
|
|
||||||
|
protected:
|
||||||
|
MyGUI::Button* mFilterAll;
|
||||||
|
MyGUI::Button* mFilterWeapon;
|
||||||
|
MyGUI::Button* mFilterApparel;
|
||||||
|
MyGUI::Button* mFilterMagic;
|
||||||
|
MyGUI::Button* mFilterMisc;
|
||||||
|
|
||||||
|
void onWindowResize(MyGUI::Window* _sender);
|
||||||
|
void onFilterChanged(MyGUI::Widget* _sender);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
|
@ -72,6 +72,7 @@ namespace MWGui
|
||||||
class DialogueWindow;
|
class DialogueWindow;
|
||||||
class MessageBoxManager;
|
class MessageBoxManager;
|
||||||
class CountDialog;
|
class CountDialog;
|
||||||
|
class TradeWindow;
|
||||||
|
|
||||||
struct ClassPoint
|
struct ClassPoint
|
||||||
{
|
{
|
||||||
|
@ -226,6 +227,7 @@ namespace MWGui
|
||||||
ScrollWindow* mScrollWindow;
|
ScrollWindow* mScrollWindow;
|
||||||
BookWindow* mBookWindow;
|
BookWindow* mBookWindow;
|
||||||
CountDialog* mCountDialog;
|
CountDialog* mCountDialog;
|
||||||
|
TradeWindow* mTradeWindow;
|
||||||
|
|
||||||
CharacterCreation* mCharGen;
|
CharacterCreation* mCharGen;
|
||||||
|
|
||||||
|
|
24
files/mygui/openmw_trade_window_layout.xml
Normal file
24
files/mygui/openmw_trade_window_layout.xml
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<MyGUI type="Layout">
|
||||||
|
<Widget type="Window" skin="MW_Window" layer="Windows" position="0 0 600 300" name="_Main">
|
||||||
|
|
||||||
|
<!-- Items in inventory -->
|
||||||
|
<Widget type="Widget" skin="MW_Box" position="0 38 350 185" name="box" align="Left Top Stretch">
|
||||||
|
<Widget type="ScrollView" skin="MW_ScrollViewH" position="4 4 342 181" align="Left Top Stretch" name="ItemView">
|
||||||
|
<Widget type="Button" skin="" name="Items" position="0 0 342 181" name="Items" align="Left Top Stretch"/>
|
||||||
|
</Widget>
|
||||||
|
</Widget>
|
||||||
|
|
||||||
|
<!-- Categories -->
|
||||||
|
<Widget type="Widget" position="0 8 350 24" align="Left Top HStretch" name="Categories">
|
||||||
|
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="AllButton"/>
|
||||||
|
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="WeaponButton"/>
|
||||||
|
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="ApparelButton"/>
|
||||||
|
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="MagicButton"/>
|
||||||
|
<Widget type="Button" skin="MW_Button" position="0 0 60 24" name="MiscButton"/>
|
||||||
|
</Widget>
|
||||||
|
|
||||||
|
</Widget>
|
||||||
|
|
||||||
|
</MyGUI>
|
Loading…
Reference in a new issue