From 318a56669d6bbbe32d81be1a1c80ace9ea33fff3 Mon Sep 17 00:00:00 2001 From: PatR Date: Wed, 5 Aug 2020 12:48:12 -0700 Subject: [PATCH] augment Qt Info menu Add ^X (as "Attributes (extended status)") to the "Info" drop down menu, also Overview, and Annotate. Attributes and Overview work, Annotate results in running southeast. Existing entries Conduct, Adjust, and Skills execute nethack's '?' command so I didn't bother holding back on adding Annotate. Other existing entries (Inventory, Discoveries, Spells, and Name) work. If there's any sort of pattern involved, I'm not seeing it. The Game menu has "Save", which shows up and works, but that's supposed to be followed by "Quit" which doesn't show up when the menu is used. This doesn't attempt to deal with that. Command+q keystroke, which should close the application, behaves the same as previously mentioned "quit nethack" in nethack menu: runs nethack's '?' command and then resumes play. --- doc/fixes37.0 | 4 +++- win/Qt/qt_main.cpp | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/fixes37.0 b/doc/fixes37.0 index 970889489..d23b99349 100644 --- a/doc/fixes37.0 +++ b/doc/fixes37.0 @@ -1,4 +1,4 @@ -NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.273 $ $NHDT-Date: 1596652492 2020/08/05 18:34:52 $ +NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.274 $ $NHDT-Date: 1596656886 2020/08/05 19:48:06 $ General Fixes and Modified Features ----------------------------------- @@ -356,6 +356,8 @@ Qt: clicking on the window's Close button brought up a dialog offering infinite loop with complaints about Qt's event loop already being active; change dialog: offer "Save and exit" or "Quit without saving" with no opportunity to try to back out of the Close operation +Qt: add 3.6 status fields Stone, Slime, Strngl, Deaf, Lev, Fly, Ride +Qt: add Attributes, Overview, and Annotate to the "Info" pull down menu tiles: add indicator of thonged portion to aklys tile tty: role and race selection menus weren't filtering out potential choices which got excluded by OPTIONS=align:!lawful or !neutral or !chaotic diff --git a/win/Qt/qt_main.cpp b/win/Qt/qt_main.cpp index 975917e4d..0f6870b9d 100644 --- a/win/Qt/qt_main.cpp +++ b/win/Qt/qt_main.cpp @@ -631,12 +631,15 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) : { help, 0, 1}, { info, "Inventory", 3, ddoinv}, + { info, "Attributes (extended status)", 3, doattributes }, + { info, "Overview", 3, dooverview }, { info, "Conduct", 3, doconduct}, { info, "Discoveries", 3, dodiscovered}, { info, "List/reorder spells", 3, dovspell}, - { info, "Adjust letters", 2, doorganize}, + { info, "Adjust inventory letters", 2, doorganize }, { info, 0, 3}, { info, "Name object or creature", 3, docallcmd}, + { info, "Annotate level", 2, donamelevel }, { info, 0, 3}, { info, "Skills", 3, enhance_weapon_skill},