nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt pick-none menu vs [cancel]

Browse Source 
Qt menus have [ok][cancel][all][none][other stuff] buttons across
the top but it was disabling [cancel] for inventory viewing and
other pick-none menus.  Enable that so that [cancel] is a viable
alternative to typing ESC or clicking on [ok] for dismissing the
menu without picking anything.
This commit is contained in:
PatR
2020-07-30 08:58:57 -07:00
parent c96a9ff389
commit 8ca0834eb2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.260 $ $NHDT-Date: 1596039461 2020/07/29 16:17:41 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.261 $ $NHDT-Date: 1596124734 2020/07/30 15:58:54 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -329,6 +329,9 @@ Qt: organize extended command selection grid by columns instead of by rows
(first N entries down left column, next N entries down 2nd column, &c) (first N entries down left column, next N entries down 2nd column, &c)
Qt: when selecting an extended command by typing its name, support <delete> Qt: when selecting an extended command by typing its name, support <delete>
(aka <rubout>) in addition to <backspace> to go back a character (aka <rubout>) in addition to <backspace> to go back a character
Qt: switch to fixed-width font for menus
Qt: don't disable [cancel] button when viewing inventory or other pick-none
menus; ESC works to dismiss those and [cancel] should be the same
tiles: add indicator of thonged portion to aklys tile tiles: add indicator of thonged portion to aklys tile
tty: role and race selection menus weren't filtering out potential choices tty: role and race selection menus weren't filtering out potential choices
which got excluded by OPTIONS=align:!lawful or !neutral or !chaotic which got excluded by OPTIONS=align:!lawful or !neutral or !chaotic

2
win/Qt/qt_menu.cpp
View File

@@ -222,7 +222,7 @@ int NetHackQtMenuWindow::SelectMenu(int h, MENU_ITEM_P **menu_list)
how=h; how=h;
ok->setEnabled(how!=PICK_ONE);ok->setDefault(how!=PICK_ONE); ok->setEnabled(how!=PICK_ONE);ok->setDefault(how!=PICK_ONE);
cancel->setEnabled(how!=PICK_NONE); cancel->setEnabled(true);
all->setEnabled(how==PICK_ANY); all->setEnabled(how==PICK_ANY);
none->setEnabled(how==PICK_ANY); none->setEnabled(how==PICK_ANY);
invert->setEnabled(how==PICK_ANY); invert->setEnabled(how==PICK_ANY);