X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FMenuBackend.C;h=de6b67c0a181569acd798a36a52a345f21266430;hb=34d28f9daae536db06d6cf1a9dcf62dc0f5aa432;hp=53cdc1200de8d420482f2a0f42ab057e77bc1795;hpb=e7ca356bf7f6060b1ec23763f4333358e36f1355;p=lyx.git diff --git a/src/MenuBackend.C b/src/MenuBackend.C index 53cdc1200d..de6b67c0a1 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -4,33 +4,36 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * * ====================================================== */ +#include + #ifdef __GNUG__ #pragma implementation #endif -#include -#include -#include "support/LAssert.h" +#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" #include "importer.h" +#include "FloatList.h" +#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; @@ -56,6 +59,8 @@ MenuItem::MenuItem(Kind kind, string const & label, case UpdateFormats: case ExportFormats: case ImportFormats: + case FloatListInsert: + case FloatInsert: break; case Command: action_ = lyxaction.LookupFunc(command); @@ -75,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); @@ -97,6 +114,8 @@ Menu & Menu::read(LyXLex & lex) md_toc, md_updateformats, md_viewformats, + md_floatlistinsert, + md_floatinsert, md_last }; @@ -104,6 +123,8 @@ Menu & Menu::read(LyXLex & lex) { "documents", md_documents }, { "end", md_endmenu }, { "exportformats", md_exportformats }, + { "floatinsert", md_floatinsert }, + { "floatlistinsert", md_floatlistinsert }, { "importformats", md_importformats }, { "item", md_item }, { "lastfiles", md_lastfiles }, @@ -122,16 +143,16 @@ 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 name = _(lex.GetString()); - lex.next(); - string const command = lex.GetString(); + 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; @@ -170,11 +191,19 @@ Menu & Menu::read(LyXLex & lex) add(MenuItem(MenuItem::ImportFormats)); break; + case md_floatlistinsert: + add(MenuItem(MenuItem::FloatListInsert)); + break; + + 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; } @@ -219,6 +248,9 @@ void Menu::checkShortcuts() const } } + +namespace { + class compare_format { public: bool operator()(Format const * p1, Format const * p2) { @@ -226,20 +258,24 @@ public: } }; +} // namespace anon + + 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; - for (LastFiles::const_iterator lfit = lastfiles->begin(); - lfit != lastfiles->end() && ii < 10; - ++lfit, ++ii) { - string label = tostr(ii) + ". " + 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) + '|' + tostr(ii); - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_FILE_OPEN, (*lfit)); tomenu.add(MenuItem(MenuItem::Command, @@ -249,7 +285,9 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const break; case MenuItem::Documents: { - vector names = bufferlist.getFileNames(); + typedef vector Strings; + + Strings const names = bufferlist.getFileNames(); if (names.empty()) { tomenu.add(MenuItem(MenuItem::Command, @@ -258,11 +296,14 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const break; } - for (vector::const_iterator docit = names.begin(); - docit != names.end() ; ++docit) { - int action = - lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *docit); - string label = MakeDisplayPath(*docit, 30); + Strings::const_iterator docit = names.begin(); + Strings::const_iterator end = names.end(); + for (; docit != end ; ++docit) { + int const action = lyxaction + .getPseudoAction(LFUN_SWITCHBUFFER, + *docit); + string const label = + MakeDisplayPath(*docit, 30); tomenu.add(MenuItem(MenuItem::Command, label, action)); } @@ -273,9 +314,12 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const case MenuItem::ViewFormats: case MenuItem::UpdateFormats: case MenuItem::ExportFormats: { - vector formats; + typedef vector Formats; + + Formats formats; + kb_action action; - switch ((*cit).kind()) { + switch (cit->kind()) { case MenuItem::ImportFormats: formats = Importer::GetImportableFormats(); action = LFUN_IMPORT; @@ -294,26 +338,68 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const } sort(formats.begin(), formats.end(), compare_format()); - for (vector::const_iterator fit = formats.begin(); - fit != formats.end() ; ++fit) { + 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") label = _("Ascii text as paragraphs"); if (!(*fit)->shortcut().empty()) label += "|" + (*fit)->shortcut(); - int action2 = lyxaction. - getPseudoAction(action, (*fit)->name()); + int const action2 = lyxaction. + getPseudoAction(action, + (*fit)->name()); tomenu.add(MenuItem(MenuItem::Command, label, action2)); } } break; - + + case MenuItem::FloatListInsert: + { + FloatList::const_iterator cit = floatList.begin(); + FloatList::const_iterator end = floatList.end(); + for (; cit != end; ++cit) { + int const action = lyxaction + .getPseudoAction(LFUN_FLOAT_LIST, + cit->second.type()); + string const label = cit->second.name() + _(" List"); + tomenu.add(MenuItem(MenuItem::Command, + label, action)); + } + } + break; + + case MenuItem::FloatInsert: + { + 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(); + 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); } @@ -324,10 +410,11 @@ void Menu::expand(Menu & tomenu, Buffer * buf) const checkShortcuts(); } + bool Menu::hasSubmenu(string const & name) const { return find_if(begin(), end(), - compare_memfun(&MenuItem::submenu, name)) != end(); + lyx::compare_memfun(&MenuItem::submenu, name)) != end(); } @@ -347,9 +434,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)) @@ -358,14 +446,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: 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); @@ -462,23 +550,24 @@ void MenuBackend::add(Menu const & menu) bool MenuBackend::hasMenu(string const & name) const { return find_if(begin(), end(), - compare_memfun(&Menu::name, name)) != end(); + lyx::compare_memfun(&Menu::name, name)) != end(); } Menu const & MenuBackend::getMenu(string const & name) const { const_iterator cit = find_if(begin(), end(), - compare_memfun(&Menu::name, name)); - Assert(cit != end()); + lyx::compare_memfun(&Menu::name, name)); + lyx::Assert(cit != end()); return (*cit); } Menu & MenuBackend::getMenu(string const & name) { - MenuList::iterator it = find_if(menulist_.begin(), menulist_.end(), - compare_memfun(&Menu::name, name)); - Assert(it != menulist_.end()); + MenuList::iterator it = + find_if(menulist_.begin(), menulist_.end(), + lyx::compare_memfun(&Menu::name, name)); + lyx::Assert(it != menulist_.end()); return (*it); }