#include "lyxlex.h"
#include "debug.h"
#include "lyxlex.h"
+#include "support/lstrings.h"
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()
{
add(LFUN_DEPTH);
add(SEPARATOR);
- add(LFUN_TEX);
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)
{
//consistency check
- if (compare_no_case(lex.GetString(), "toolbar"))
+ if (compare_no_case(lex.getString(), "toolbar")) {
lyxerr << "Toolbar::read: ERROR wrong token:`"
- << lex.GetString() << '\'' << endl;
+ << lex.getString() << '\'' << endl;
+ }
defaults.clear();
- string func;
bool quit = false;
lex.pushTable(toolTags, TO_LAST - 1);
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- while (lex.IsOK() && !quit) {
+ while (lex.isOK() && !quit) {
switch (lex.lex()) {
case TO_ADD:
- if (lex.next()) {
- func = lex.GetString();
+ if (lex.next(true)) {
+ string const func = lex.getString();
lyxerr[Debug::PARSER]
<< "Toolbar::read TO_ADD func: `"
<< func << "'" << endl;
break;
case TO_ENDTOOLBAR:
- // should not set automatically
- //set();
quit = true;
break;
default:
int const tf = lyxaction.LookupFunc(func);
if (tf == -1) {
- lyxerr << "Toolbar::add: no LyX command called`"
- << func << "'exists!" << endl;
+ lyxerr << "Toolbar::add: no LyX command called `"
+ << func << "' exists!" << endl;
} else {
add(tf);
}