MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Expand focus strings for jobmanagement and workquota_condition viewscreens

develop
lethosor 2017-05-27 00:56:40 -04:00
parent 2905376042
commit f59be2a9a0
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dfhack.init-example
Unescape Escape View File

@ -53,7 +53,7 @@ keybinding add Alt-S@title gui/settings-manager
keybinding add Alt-S@dwarfmode/Default gui/settings-manager keybinding add Alt-S@dwarfmode/Default gui/settings-manager
# change quantity of manager orders # change quantity of manager orders
keybinding add Alt-Q@jobmanagement gui/manager-quantity keybinding add Alt-Q@jobmanagement/Main gui/manager-quantity
############################## ##############################
# Generic adv mode bindings # # Generic adv mode bindings #

14
library/modules/Gui.cpp
Unescape Escape View File

@ -53,6 +53,7 @@ using namespace DFHack;
#include "df/viewscreen_dungeon_monsterstatusst.h" #include "df/viewscreen_dungeon_monsterstatusst.h"
#include "df/viewscreen_jobst.h" #include "df/viewscreen_jobst.h"
#include "df/viewscreen_joblistst.h" #include "df/viewscreen_joblistst.h"
#include "df/viewscreen_jobmanagementst.h"
#include "df/viewscreen_unitlistst.h" #include "df/viewscreen_unitlistst.h"
#include "df/viewscreen_buildinglistst.h" #include "df/viewscreen_buildinglistst.h"
#include "df/viewscreen_itemst.h" #include "df/viewscreen_itemst.h"
@ -66,6 +67,7 @@ using namespace DFHack;
#include "df/viewscreen_petst.h" #include "df/viewscreen_petst.h"
#include "df/viewscreen_tradegoodsst.h" #include "df/viewscreen_tradegoodsst.h"
#include "df/viewscreen_storesst.h" #include "df/viewscreen_storesst.h"
#include "df/viewscreen_workquota_conditionst.h"
#include "df/viewscreen_workshop_profilest.h" #include "df/viewscreen_workshop_profilest.h"
#include "df/ui_unit_view_mode.h" #include "df/ui_unit_view_mode.h"
#include "df/ui_sidebar_menus.h" #include "df/ui_sidebar_menus.h"
@ -557,6 +559,18 @@ DEFINE_GET_FOCUS_STRING_HANDLER(locations)
focus += "/" + enum_item_key(screen->menu); focus += "/" + enum_item_key(screen->menu);
} }
DEFINE_GET_FOCUS_STRING_HANDLER(jobmanagement)
{
focus += (screen->in_max_workshops ? "/MaxWorkshops" : "/Main");
}
DEFINE_GET_FOCUS_STRING_HANDLER(workquota_condition)
{
focus += "/" + enum_item_key(screen->mode);
if (screen->item_count_edit)
focus += "/EditCount";
}
std::string Gui::getFocusString(df::viewscreen *top) std::string Gui::getFocusString(df::viewscreen *top)
{ {
if (!top) if (!top)

2
scripts

@ -1 +1 @@
Subproject commit f6862e8c4351bc2e319df3e2b925c9b65eb7f1bb Subproject commit c4f6877a69ac1c69a405d122dd6e75c5605fe782