X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FToolbarDefaults.C;h=8930ae982a3b827be2f02ee4308fc2622483270c;hb=98c966c64594611e469313314abd1e59524adb4a;hp=83a45ce48c41b7dd9a5ed6d05ef296ed070c3dd8;hpb=a0bf0835e531b77fb00417c4256eee8baa020c26;p=lyx.git diff --git a/src/ToolbarDefaults.C b/src/ToolbarDefaults.C index 83a45ce48c..8930ae982a 100644 --- a/src/ToolbarDefaults.C +++ b/src/ToolbarDefaults.C @@ -1,6 +1,6 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich @@ -27,6 +27,28 @@ using std::endl; extern LyXAction lyxaction; ToolbarDefaults toolbardefaults; +namespace { + +enum _tooltags { + TO_ADD = 1, + TO_ENDTOOLBAR, + TO_SEPARATOR, + TO_LAYOUTS, + TO_NEWLINE, + TO_LAST +}; + + +struct keyword_item toolTags[TO_LAST - 1] = { + { "end", TO_ENDTOOLBAR }, + { "icon", TO_ADD }, + { "layouts", TO_LAYOUTS }, + { "newline", TO_NEWLINE }, + { "separator", TO_SEPARATOR } +}; + +} // end of anon namespace + ToolbarDefaults::ToolbarDefaults() { @@ -40,7 +62,7 @@ void ToolbarDefaults::add(int action) } -void ToolbarDefaults::init() +void ToolbarDefaults::init() { add(LAYOUTS); add(LFUN_FILE_OPEN); @@ -53,46 +75,27 @@ void ToolbarDefaults::init() add(LFUN_COPY); add(LFUN_PASTE); add(SEPARATOR); - + add(LFUN_EMPH); add(LFUN_NOUN); add(LFUN_FREE); add(SEPARATOR); - + add(LFUN_INSET_FOOTNOTE); add(LFUN_INSET_MARGINAL); - add(LFUN_DEPTH); + add(LFUN_DEPTH_PLUS); add(SEPARATOR); - add(LFUN_MATH_MODE); + add(LFUN_MATH_MODE); add(SEPARATOR); - add(LFUN_FIGURE); + add(LFUN_INSET_GRAPHICS); add(LFUN_DIALOG_TABULAR_INSERT); } -enum _tooltags { - TO_ADD = 1, - TO_ENDTOOLBAR, - TO_SEPARATOR, - TO_LAYOUTS, - TO_NEWLINE, - TO_LAST -}; - - -struct keyword_item toolTags[TO_LAST - 1] = { - { "end", TO_ENDTOOLBAR }, - { "icon", TO_ADD }, - { "layouts", TO_LAYOUTS }, - { "newline", TO_NEWLINE }, - { "separator", TO_SEPARATOR } -}; - - -void ToolbarDefaults::read(LyXLex & lex) +void ToolbarDefaults::read(LyXLex & lex) { //consistency check if (compare_no_case(lex.getString(), "toolbar")) { @@ -101,9 +104,9 @@ void ToolbarDefaults::read(LyXLex & lex) } defaults.clear(); - + bool quit = false; - + lex.pushTable(toolTags, TO_LAST - 1); if (lyxerr.debugging(Debug::PARSER)) @@ -120,22 +123,20 @@ void ToolbarDefaults::read(LyXLex & lex) add(func); } break; - + case TO_SEPARATOR: add(SEPARATOR); break; - + case TO_LAYOUTS: add(LAYOUTS); break; - + case TO_NEWLINE: add(NEWLINE); break; - + case TO_ENDTOOLBAR: - // should not set automatically - //set(); quit = true; break; default: @@ -154,7 +155,7 @@ void ToolbarDefaults::add(string const & func) if (tf == -1) { lyxerr << "Toolbar::add: no LyX command called `" - << func << "' exists!" << endl; + << func << "' exists!" << endl; } else { add(tf); }