From 3a19b08078d42837126cc585d2a9b6f5f61b2c2b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 26 Jan 2016 21:40:24 +0300 Subject: Add quick shortcuts for add selected item to each craft inventory slot. Add craft tab with shortcuts in input tab. --- src/gui/windows/npcdialog.h | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) (limited to 'src/gui/windows/npcdialog.h') diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 29f728c91..524ae7bd8 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -77,6 +77,25 @@ class NpcDialog final : public Window, void postInit() override final; + enum NpcInputState + { + NPC_INPUT_NONE = 0, + NPC_INPUT_LIST, + NPC_INPUT_STRING, + NPC_INPUT_INTEGER, + NPC_INPUT_ITEM, + NPC_INPUT_ITEM_INDEX, + NPC_INPUT_ITEM_CRAFT + }; + + enum NpcActionState + { + NPC_ACTION_WAIT = 0, + NPC_ACTION_NEXT, + NPC_ACTION_INPUT, + NPC_ACTION_CLOSE + }; + /** * Called when receiving actions from the widgets. */ @@ -228,6 +247,9 @@ class NpcDialog final : public Window, const int amount, const int slot); + NpcInputState getInputState() + { return mInputState; } + static void copyToClipboard(const BeingId npcId, const int x, const int y); @@ -303,24 +325,6 @@ class NpcDialog final : public Window, ItemContainer *mItemContainer A_NONNULLPOINTER; ScrollArea *mItemScrollArea A_NONNULLPOINTER; - enum NpcInputState - { - NPC_INPUT_NONE = 0, - NPC_INPUT_LIST, - NPC_INPUT_STRING, - NPC_INPUT_INTEGER, - NPC_INPUT_ITEM, - NPC_INPUT_ITEM_INDEX, - NPC_INPUT_ITEM_CRAFT - }; - - enum NpcActionState - { - NPC_ACTION_WAIT = 0, - NPC_ACTION_NEXT, - NPC_ACTION_INPUT, - NPC_ACTION_CLOSE - }; NpcInputState mInputState; NpcActionState mActionState; -- cgit v1.2.3-70-g09d2