X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=f094ef3ed8827c952080857663178d56b6715ad5;hb=98c966c64594611e469313314abd1e59524adb4a;hp=f7aaa81e460be287a830d3db861ba7a1d1872da2;hpb=52153a589b4224d794de4f61f3f55b8d8832186f;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index f7aaa81e46..f094ef3ed8 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -1,6 +1,6 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich @@ -15,12 +15,14 @@ #pragma implementation #endif +#include #include "MenuBackend.h" #include "lyxlex.h" #include "LyXAction.h" #include "debug.h" #include "gettext.h" #include "lastfiles.h" +#include "lyx_main.h" // for lastfiles #include "bufferlist.h" #include "converter.h" #include "exporter.h" @@ -29,9 +31,9 @@ #include "support/LAssert.h" #include "support/filetools.h" #include "support/lyxfunctional.h" +#include "support/lstrings.h" extern LyXAction lyxaction; -extern LastFiles * lastfiles; extern BufferList bufferlist; using std::endl; @@ -44,8 +46,8 @@ using std::sort; MenuBackend menubackend; -MenuItem::MenuItem(Kind kind, string const & label, - string const & command, bool optional) +MenuItem::MenuItem(Kind kind, string const & label, + string const & command, bool optional) : kind_(kind), label_(label), optional_(optional) { switch (kind) { @@ -65,11 +67,11 @@ MenuItem::MenuItem(Kind kind, string const & label, if (action_ == LFUN_UNKNOWN_ACTION) { lyxerr << "MenuItem(): LyX command `" - << command << "' does not exist." << endl; + << command << "' does not exist." << endl; } if (optional_) - lyxerr[Debug::GUI] << "Optional item " - << command << endl; + lyxerr[Debug::GUI] << "Optional item " + << command << endl; break; case Submenu: submenu_ = command; @@ -78,6 +80,18 @@ MenuItem::MenuItem(Kind kind, string const & label, } +string const MenuItem::label() const +{ + return token(label_, '|', 0); +} + + +string const MenuItem::shortcut() const +{ + return token(label_, '|', 1); +} + + Menu & Menu::add(MenuItem const & i) { items_.push_back(i); @@ -114,7 +128,7 @@ Menu & Menu::read(LyXLex & lex) { "importformats", md_importformats }, { "item", md_item }, { "lastfiles", md_lastfiles }, - { "optitem", md_optitem }, + { "optitem", md_optitem }, { "separator", md_separator }, { "submenu", md_submenu }, { "toc", md_toc }, @@ -129,17 +143,17 @@ Menu & Menu::read(LyXLex & lex) bool quit = false; bool optional = false; - while (lex.IsOK() && !quit) { + while (lex.isOK() && !quit) { switch (lex.lex()) { case md_optitem: optional = true; // fallback to md_item case md_item: { - lex.next(); - string const name = _(lex.GetString()); - lex.next(); - string const command = lex.GetString(); - add(MenuItem(MenuItem::Command, name, + lex.next(true); + string const name = _(lex.getString()); + lex.next(true); + string const command = lex.getString(); + add(MenuItem(MenuItem::Command, name, command, optional)); optional = false; break; @@ -184,12 +198,12 @@ Menu & Menu::read(LyXLex & lex) case md_floatinsert: add(MenuItem(MenuItem::FloatInsert)); break; - + case md_submenu: { - lex.next(); - string mlabel = _(lex.GetString()); - lex.next(); - string mname = lex.GetString(); + lex.next(true); + string const mlabel = _(lex.getString()); + lex.next(true); + string const mname = lex.getString(); add(MenuItem(MenuItem::Submenu, mlabel, mname)); break; } @@ -240,7 +254,7 @@ namespace { class compare_format { public: bool operator()(Format const * p1, Format const * p2) { - return *p1 < *p2; + return *p1 < *p2; } }; @@ -251,12 +265,12 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const { for (const_iterator cit = begin(); cit != end() ; ++cit) { - switch ((*cit).kind()) { + switch (cit->kind()) { case MenuItem::Lastfiles: { int ii = 1; LastFiles::const_iterator lfit = lastfiles->begin(); LastFiles::const_iterator end = lastfiles->end(); - + for (; lfit != end && ii < 10; ++lfit, ++ii) { string const label = tostr(ii) + ". " + MakeDisplayPath((*lfit), 30) @@ -269,12 +283,12 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const } } break; - + case MenuItem::Documents: { typedef vector Strings; - + Strings const names = bufferlist.getFileNames(); - + if (names.empty()) { tomenu.add(MenuItem(MenuItem::Command, _("No Documents Open!"), @@ -300,38 +314,46 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const case MenuItem::ViewFormats: case MenuItem::UpdateFormats: case MenuItem::ExportFormats: { - typedef vector Formats; + + if (!buf && cit->kind() != MenuItem::ImportFormats) { + tomenu.add(MenuItem(MenuItem::Command, + _("No Documents Open!"), + LFUN_NOACTION)); + continue; + } + typedef vector Formats; + Formats formats; - + kb_action action; - switch ((*cit).kind()) { + switch (cit->kind()) { case MenuItem::ImportFormats: formats = Importer::GetImportableFormats(); action = LFUN_IMPORT; break; case MenuItem::ViewFormats: - formats = Exporter::GetExportableFormats(buf, true); + formats = Exporter::GetExportableFormats(buf, true); action = LFUN_PREVIEW; break; case MenuItem::UpdateFormats: - formats = Exporter::GetExportableFormats(buf, true); + formats = Exporter::GetExportableFormats(buf, true); action = LFUN_UPDATE; break; default: - formats = Exporter::GetExportableFormats(buf, false); + formats = Exporter::GetExportableFormats(buf, false); action = LFUN_EXPORT; } sort(formats.begin(), formats.end(), compare_format()); Formats::const_iterator fit = formats.begin(); Formats::const_iterator end = formats.end(); - + for (; fit != end ; ++fit) { if ((*fit)->dummy()) continue; string label = (*fit)->prettyname(); - if ((*cit).kind() == MenuItem::ImportFormats) + if (cit->kind() == MenuItem::ImportFormats) if ((*fit)->name() == "text") label = _("Ascii text as lines"); else if ((*fit)->name() == "textparagraph") @@ -355,8 +377,7 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const int const action = lyxaction .getPseudoAction(LFUN_FLOAT_LIST, cit->second.type()); - string label = "List of "; - label += cit->second.name(); + string const label = _(cit->second.name()) + _(" List"); tomenu.add(MenuItem(MenuItem::Command, label, action)); } @@ -368,16 +389,25 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const FloatList::const_iterator cit = floatList.begin(); FloatList::const_iterator end = floatList.end(); for (; cit != end; ++cit) { + // normal float int const action = lyxaction .getPseudoAction(LFUN_INSET_FLOAT, cit->second.type()); - string const label = cit->second.name(); + string const label = _(cit->second.name()); tomenu.add(MenuItem(MenuItem::Command, label, action)); + + // and the wide version + int const action2 = lyxaction + .getPseudoAction(LFUN_INSET_WIDE_FLOAT, + cit->second.type()); + string const label2 = _("Wide ") + label; + tomenu.add(MenuItem(MenuItem::Command, + label2, action2)); } } break; - + default: tomenu.add(*cit); } @@ -412,9 +442,10 @@ void MenuBackend::read(LyXLex & lex) }; //consistency check - if (compare_no_case(lex.GetString(), "menuset")) + if (compare_no_case(lex.getString(), "menuset")) { lyxerr << "Menubackend::read: ERROR wrong token:`" - << lex.GetString() << '\'' << endl; + << lex.getString() << '\'' << endl; + } lex.pushTable(menutags, md_last - 1); if (lyxerr.debugging(Debug::PARSER)) @@ -423,14 +454,14 @@ void MenuBackend::read(LyXLex & lex) bool quit = false; bool menubar = false; - while (lex.IsOK() && !quit) { + while (lex.isOK() && !quit) { switch (lex.lex()) { - case md_menubar: + case md_menubar: menubar = true; // fallback to md_menu case md_menu: { - lex.next(); - string name = lex.GetString(); + lex.next(true); + string const name = lex.getString(); if (hasMenu(name)) { if (getMenu(name).menubar() == menubar) { getMenu(name).read(lex); @@ -438,7 +469,7 @@ void MenuBackend::read(LyXLex & lex) lex.printError("Cannot append to menu `$$Token' unless it is of the same type"); return; } - } else { + } else { Menu menu(name, menubar); menu.read(lex); add(menu); @@ -463,13 +494,13 @@ void MenuBackend::defaults() { menulist_.clear(); - lyxerr[Debug::GUI] << "MenuBackend::defaults: using default values" + lyxerr[Debug::GUI] << "MenuBackend::defaults: using default values" << endl; Menu file("file"); file .add(MenuItem(MenuItem::Command, _("New...|N"), "buffer-new")) - .add(MenuItem(MenuItem::Command, _("Open...|O"), "buffer-open")) + .add(MenuItem(MenuItem::Command, _("Open...|O"), "file-open")) .add(MenuItem(MenuItem::Submenu, _("Import|I"), "import")) .add(MenuItem(MenuItem::Command, _("Quit|Q"), "lyx-quit")) .add(MenuItem(MenuItem::Separator)) @@ -483,7 +514,7 @@ void MenuBackend::defaults() .add(MenuItem(MenuItem::Command, _("LinuxDoc...|L"), "buffer-import linuxdoc")); add(import); - + Menu edit("edit"); edit .add(MenuItem(MenuItem::Command, _("Cut"), "cut")) @@ -511,8 +542,8 @@ void MenuBackend::defaults() if (lyxerr.debugging(Debug::GUI)) { for (const_iterator cit = begin(); cit != end() ; ++cit) - lyxerr << "Menu name: " << cit->name() - << ", Menubar: " << cit->menubar() + lyxerr << "Menu name: " << cit->name() + << ", Menubar: " << cit->menubar() << endl; } }