two patches from john

[lyx.git] / src / debug.C

diff --git a/src/debug.C b/src/debug.C
index 5f8f536b7eb85eab96a238273627db87e469b2aa..fcc14891cb03bda5d207dff153776108a9e0a55d 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -3,7 +3,7 @@
 * 
 *           LyX, The Document Processor
 *        
-*           Copyright 1999-2000 The LyX Team.
+*           Copyright 1999-2001 The LyX Team.
 *
 * ====================================================== */
 
@@ -12,10 +12,18 @@
 #endif
 
 #include <config.h>
-#include "debug.h"
 
 #include <iomanip>
+
+#include "debug.h"
+#include "gettext.h"
+#include "support/lstrings.h"
+
+using std::ostream;
 using std::setw;
+using std::endl;
+
+namespace {
 
 struct error_item {
        Debug::type level;
@@ -23,30 +31,46 @@ struct error_item {
        char const * desc;
 };
 
-static error_item errorTags[] = {
-       { Debug::INFO,          "info",         "General information"},
-       { Debug::INIT,          "init",         "Program initialisation"},
-       { Debug::KEY,           "key",          "Keyboard events handling"},
-       { Debug::TOOLBAR,       "toolbar",      "Toolbar handling"},
-       { Debug::PARSER,        "parser",       "Lyxlex grammer parser"},
-       { Debug::LYXRC,         "lyxrc",        "Configuration files reading"},
-       { Debug::KBMAP,         "kbmap",        "Custom keyboard definition"},
-       { Debug::LATEX,         "latex",        "LaTeX generation/execution"},
-       { Debug::DEPEND,        "depend",       "Dependency information"},
-       { Debug::MATHED,        "mathed",       "Math editor"},
-       { Debug::FONT,          "font",         "Font handling"},
-       { Debug::TCLASS,        "tclass",       "Textclass files reading"},
-       { Debug::LYXVC,         "lyxvc",        "Version control"},
-       { Debug::LYXSERVER,     "lyxserver",    "External control interface"},
-       { Debug::ROFF,          "roff",         "Keep *roff temporary files"},
-       { Debug::ACTION,        "action",       "User commands"},
-       { Debug::LYXLEX,        "lyxlex",       "The LyX Lexxer"},
-       { Debug::NONE,          "none",         "No debugging message"},
-        { Debug::ANY,          "any",          "All debugging messages"}
+
+error_item errorTags[] = {
+       { Debug::NONE,      "none",      N_("No debugging message")},
+       { Debug::INFO,      "info",      N_("General information")},
+       { Debug::INIT,      "init",      N_("Program initialisation")},
+       { Debug::KEY,       "key",       N_("Keyboard events handling")},
+       { Debug::GUI,       "gui",       N_("GUI handling")},
+       { Debug::PARSER,    "parser",    N_("Lyxlex grammer parser")},
+       { Debug::LYXRC,     "lyxrc",     N_("Configuration files reading")},
+       { Debug::KBMAP,     "kbmap",     N_("Custom keyboard definition")},
+       { Debug::LATEX,     "latex",     N_("LaTeX generation/execution")},
+       { Debug::MATHED,    "mathed",    N_("Math editor")},
+       { Debug::FONT,      "font",      N_("Font handling")},
+       { Debug::TCLASS,    "tclass",    N_("Textclass files reading")},
+       { Debug::LYXVC,     "lyxvc",     N_("Version control")},
+       { Debug::LYXSERVER, "lyxserver", N_("External control interface")},
+       { Debug::ROFF,      "roff",      N_("Keep *roff temporary files")},
+       { Debug::ACTION,    "action",    N_("User commands")},
+       { Debug::LYXLEX,    "lyxlex",    N_("The LyX Lexxer")},
+       { Debug::DEPEND,    "depend",    N_("Dependency information")},
+       { Debug::INSETS,    "insets",    N_("LyX Insets")},
+       { Debug::FILES,     "files",     N_("Files used by LyX")},
+       { Debug::WORKAREA,  "workarea",  N_("Workarea events")},
+       { Debug::INSETTEXT, "insettext", N_("Insettext/tabular messanges")},
+       { Debug::ANY,       "any",       N_("All debugging messages")}
 };
 
 
-static const int numErrorTags = sizeof(errorTags)/sizeof(error_item);
+int const numErrorTags = sizeof(errorTags)/sizeof(error_item);
+
+} // namespace anon
+
+       
+Debug::type const Debug::ANY = Debug::type(
+       Debug::INFO | Debug::INIT | Debug::KEY | Debug::GUI |
+       Debug::PARSER | Debug::LYXRC | Debug::KBMAP | Debug::LATEX |
+       Debug::MATHED | Debug::FONT | Debug::TCLASS | Debug::LYXVC |
+       Debug::LYXSERVER | Debug::ROFF | Debug::ACTION | Debug::LYXLEX |
+       Debug::DEPEND | Debug::INSETS | Debug::FILES | Debug::WORKAREA |
+       Debug::INSETTEXT);
 
 
 Debug::type Debug::value(string const & val) 
@@ -82,16 +106,16 @@ void Debug::showLevel(ostream & o, Debug::type level)
                if (errorTags[i].level != Debug::ANY
                    && errorTags[i].level != Debug::NONE
                    && errorTags[i].level & level)
-                       o << "Debugging `" << errorTags[i].name
-                         << "' (" << errorTags[i].desc << ')' << endl;
+                       o << _("Debugging `") << errorTags[i].name
+                         << "' (" << _(errorTags[i].desc) << ')' << endl;
 }
 
 
 void Debug::showTags(ostream & os) 
 {
        for (int i = 0 ; i < numErrorTags ; ++i)
-               os << setw(5) << errorTags[i].level
+               os << setw(7) << errorTags[i].level
                   << setw(10) << errorTags[i].name
-                  << "  " << errorTags[i].desc << '\n';
+                  << "  " << _(errorTags[i].desc) << '\n';
        os.flush();
 }