summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-04-20 13:59:24 +0300
committerAndrei Karas <akaras@inbox.ru>2015-04-20 13:59:24 +0300
commit08a6e7e710f34b4363513b6c583ce1a6660c96b5 (patch)
tree5aa4732a26ba00709694a3bf00c322143034d209
parente3009cfe9cc0a824450d3e71a0ce8d6b5cd9ff91 (diff)
downloadplus-08a6e7e710f34b4363513b6c583ce1a6660c96b5.tar.gz
plus-08a6e7e710f34b4363513b6c583ce1a6660c96b5.tar.bz2
plus-08a6e7e710f34b4363513b6c583ce1a6660c96b5.tar.xz
plus-08a6e7e710f34b4363513b6c583ce1a6660c96b5.zip
Add action for open yellow bar settings page (quick page).
-rw-r--r--src/actions/windows.cpp18
-rw-r--r--src/actions/windows.h1
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/input/inputaction.h1
-rw-r--r--src/input/inputactionmap.h9
-rw-r--r--src/input/pages/windows.cpp6
6 files changed, 37 insertions, 0 deletions
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 6b359ff8d..4008245fa 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -53,6 +53,8 @@
#include "gui/widgets/tabs/chat/chattab.h"
+#include "utils/gettext.h"
+
#ifdef EATHENA_SUPPORT
#include "net/serverfeatures.h"
#endif
@@ -314,4 +316,20 @@ impHandler0(updaterWindowShow)
return true;
}
+impHandler0(quickWindowShow)
+{
+ if (setupWindow)
+ {
+ if (setupWindow->isWindowVisible())
+ {
+ setupWindow->doCancel();
+ }
+ setupWindow->setVisible(true);
+ setupWindow->activateTab(_("Quick"));
+ setupWindow->requestMoveToTop();
+ return true;
+ }
+ return false;
+}
+
} // namespace Actions
diff --git a/src/actions/windows.h b/src/actions/windows.h
index e3a4120cf..59ffc502e 100644
--- a/src/actions/windows.h
+++ b/src/actions/windows.h
@@ -53,6 +53,7 @@ namespace Actions
decHandler(updaterWindowShow);
decHandler(bankWindowShow);
decHandler(cartWindowShow);
+ decHandler(quickWindowShow);
} // namespace Actions
#undef decHandler
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index b81ab29dd..a2d8b1ef5 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1966,6 +1966,8 @@ void PopupMenu::showPopup(const int x, const int y, const ProgressBar *const b)
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
+ mBrowserBox->addRow("/yellowbar", _("Open yellow bar settings"));
+ // TRANSLATORS: popup menu item
mBrowserBox->addRow("reset yellow", _("Reset yellow bar"));
mBrowserBox->addRow("##3---");
// TRANSLATORS: popup menu item
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index f39b1864b..d5bad5483 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -594,6 +594,7 @@ namespace InputAction
CREATE_PUBLIC_ROOM,
JOIN_ROOM,
LEAVE_ROOM,
+ WINDOW_QUICK_SETTINGS,
TOTAL
};
} // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 9d6293628..54a15e806 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4451,6 +4451,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
InputCondition::INGAME,
"leaveroom",
false},
+ {"keyWindowStatusBar",
+ emptyKey,
+ emptyKey,
+ Input::GRP_DEFAULT | Input::GRP_GUI,
+ &Actions::quickWindowShow,
+ InputAction::NO_VALUE, 50,
+ InputCondition::GAME | InputCondition::NOTARGET,
+ "yellowbar|quickoptions",
+ false},
};
#undef defaultAction
diff --git a/src/input/pages/windows.cpp b/src/input/pages/windows.cpp
index 396facb49..8d1f8ebc7 100644
--- a/src/input/pages/windows.cpp
+++ b/src/input/pages/windows.cpp
@@ -200,6 +200,12 @@ SetupActionData setupActionDataWindows[] =
"",
},
{
+ // TRANSLATORS: input action name
+ N_("Quick settings window"),
+ InputAction::WINDOW_QUICK_SETTINGS,
+ "",
+ },
+ {
// TRANSLATORS: input action label
N_("Tabs"),
InputAction::NO_VALUE,