From: Juergen Spitzmueller Date: Sun, 24 Apr 2022 14:51:16 +0000 (+0200) Subject: Amend d8f540f51 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=64ec812da576af9e676bd37a5d6779fd1394aa63;p=features.git Amend d8f540f51 Properly handle aliases --- diff --git a/src/frontends/qt/GuiProgressView.cpp b/src/frontends/qt/GuiProgressView.cpp index b2e6ccc138..9dc9263bf7 100644 --- a/src/frontends/qt/GuiProgressView.cpp +++ b/src/frontends/qt/GuiProgressView.cpp @@ -89,7 +89,7 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area, DebugVector dmap; for (int i = 0 ; i < level_count; i++) { Debug::Type const level = Debug::value(i); - string const dbgname = Debug::name(level); + string const dbgname = Debug::realName(i); // ignore these if (dbgname == "any" || dbgname == "all" || dbgname == "none" || dbgname == "latex") diff --git a/src/support/debug.cpp b/src/support/debug.cpp index fa40d597fe..4b3219142e 100644 --- a/src/support/debug.cpp +++ b/src/support/debug.cpp @@ -118,6 +118,14 @@ string const Debug::name(Debug::Type val) } +string const Debug::realName(int idx) +{ + if (idx < numErrorTags) + return errorTags[idx].name; + return "unknown index"; +} + + Debug::Type Debug::value(string const & val) { Type l = Debug::NONE; diff --git a/src/support/debug.h b/src/support/debug.h index 2306524ca1..e284b9496e 100644 --- a/src/support/debug.h +++ b/src/support/debug.h @@ -130,9 +130,14 @@ namespace Debug { /// Return description of level std::string const description(Type val); - /// Return name of level + /// Return name of level from value. In case of aliases, + /// this returns the first entry found std::string const name(Type val); + /// Return name of level from index, in case of aliases + /// this is unambiguous + std::string const realName(int i); + /// Display the tags and descriptions of the current debug level void showLevel(std::ostream & os, Type level);