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

fix in zone UI filters: lower case 'f' conflicted as hotkey with toggling between pit and pond in the pit screen. So now the filter keys use upper case letters instead.

develop
Robert Heinrich 2013-04-08 06:38:36 +02:00 committed by Anuradha Dissanayake
parent 024a3d766b
commit ce47033190
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/zone.cpp
Unescape Escape View File

@ -4250,31 +4250,31 @@ public:
} }
} }
// Not in query typing mode // Not in query typing mode
else if (input->count(interface_key::CUSTOM_G) && else if (input->count(interface_key::CUSTOM_SHIFT_G) &&
(mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::QueryBuilding)) (mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::QueryBuilding))
{ {
show_non_grazers = !show_non_grazers; show_non_grazers = !show_non_grazers;
apply_filters(); apply_filters();
} }
else if (input->count(interface_key::CUSTOM_C) && else if (input->count(interface_key::CUSTOM_SHIFT_C) &&
(mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding)) (mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding))
{ {
show_noncaged = !show_noncaged; show_noncaged = !show_noncaged;
apply_filters(); apply_filters();
} }
else if (input->count(interface_key::CUSTOM_P) && else if (input->count(interface_key::CUSTOM_SHIFT_P) &&
(mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding)) (mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding))
{ {
show_pastured = !show_pastured; show_pastured = !show_pastured;
apply_filters(); apply_filters();
} }
else if (input->count(interface_key::CUSTOM_M) && else if (input->count(interface_key::CUSTOM_SHIFT_M) &&
(mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding)) (mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding))
{ {
show_male = !show_male; show_male = !show_male;
apply_filters(); apply_filters();
} }
else if (input->count(interface_key::CUSTOM_F) && else if (input->count(interface_key::CUSTOM_SHIFT_F) &&
(mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding)) (mode == ui_sidebar_mode::ZonesPenInfo || mode == ui_sidebar_mode::ZonesPitInfo || mode == ui_sidebar_mode::QueryBuilding))
{ {
show_female = !show_female; show_female = !show_female;
@ -4332,31 +4332,31 @@ public:
{ {
x = left_margin; x = left_margin;
y += 2; y += 2;
OutputString(COLOR_LIGHTGREEN, x, y, "g"); OutputString(COLOR_LIGHTGREEN, x, y, "G");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_non_grazers) ? COLOR_WHITE : COLOR_GREY, x, y, "Non-Grazing"); OutputString((show_non_grazers) ? COLOR_WHITE : COLOR_GREY, x, y, "Non-Grazing");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "c"); OutputString(COLOR_LIGHTGREEN, x, y, "C");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_noncaged) ? COLOR_WHITE : COLOR_GREY, x, y, "Not Caged"); OutputString((show_noncaged) ? COLOR_WHITE : COLOR_GREY, x, y, "Not Caged");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "p"); OutputString(COLOR_LIGHTGREEN, x, y, "P");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_pastured) ? COLOR_WHITE : COLOR_GREY, x, y, "Currently Pastured"); OutputString((show_pastured) ? COLOR_WHITE : COLOR_GREY, x, y, "Currently Pastured");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "f"); OutputString(COLOR_LIGHTGREEN, x, y, "F");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_female) ? COLOR_WHITE : COLOR_GREY, x, y, "Female"); OutputString((show_female) ? COLOR_WHITE : COLOR_GREY, x, y, "Female");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "m"); OutputString(COLOR_LIGHTGREEN, x, y, "M");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_male) ? COLOR_WHITE : COLOR_GREY, x, y, "Male"); OutputString((show_male) ? COLOR_WHITE : COLOR_GREY, x, y, "Male");
} }
@ -4366,25 +4366,25 @@ public:
{ {
x = left_margin; x = left_margin;
y += 2; y += 2;
OutputString(COLOR_LIGHTGREEN, x, y, "c"); OutputString(COLOR_LIGHTGREEN, x, y, "C");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_noncaged) ? COLOR_WHITE : COLOR_GREY, x, y, "Not Caged"); OutputString((show_noncaged) ? COLOR_WHITE : COLOR_GREY, x, y, "Not Caged");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "p"); OutputString(COLOR_LIGHTGREEN, x, y, "P");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_pastured) ? COLOR_WHITE : COLOR_GREY, x, y, "Currently Pastured"); OutputString((show_pastured) ? COLOR_WHITE : COLOR_GREY, x, y, "Currently Pastured");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "f"); OutputString(COLOR_LIGHTGREEN, x, y, "F");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_female) ? COLOR_WHITE : COLOR_GREY, x, y, "Female"); OutputString((show_female) ? COLOR_WHITE : COLOR_GREY, x, y, "Female");
x = left_margin; x = left_margin;
++y; ++y;
OutputString(COLOR_LIGHTGREEN, x, y, "m"); OutputString(COLOR_LIGHTGREEN, x, y, "M");
OutputString(COLOR_WHITE, x, y, ": "); OutputString(COLOR_WHITE, x, y, ": ");
OutputString((show_male) ? COLOR_WHITE : COLOR_GREY, x, y, "Male"); OutputString((show_male) ? COLOR_WHITE : COLOR_GREY, x, y, "Male");
} }