/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
*
* ====================================================== */
+#include <config.h>
+
#ifdef __GNUG__
#pragma implementation
#endif
-#include <config.h>
-#include <memory>
-#include "support/LAssert.h"
+#include <algorithm>
#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;
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) {
case Documents:
case Lastfiles:
case Toc:
- case References:
case ViewFormats:
case UpdateFormats:
case ExportFormats:
case ImportFormats:
+ case FloatListInsert:
+ case FloatInsert:
break;
case Command:
action_ = lyxaction.LookupFunc(command);
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;
}
+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);
md_importformats,
md_lastfiles,
md_optitem,
- md_references,
md_separator,
md_submenu,
md_toc,
md_updateformats,
md_viewformats,
+ md_floatlistinsert,
+ md_floatinsert,
md_last
};
{ "documents", md_documents },
{ "end", md_endmenu },
{ "exportformats", md_exportformats },
+ { "floatinsert", md_floatinsert },
+ { "floatlistinsert", md_floatlistinsert },
{ "importformats", md_importformats },
{ "item", md_item },
{ "lastfiles", md_lastfiles },
- { "optitem", md_optitem },
- { "references", md_references },
+ { "optitem", md_optitem },
{ "separator", md_separator },
{ "submenu", md_submenu },
{ "toc", md_toc },
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();
- 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;
add(MenuItem(MenuItem::Toc));
break;
- case md_references:
- add(MenuItem(MenuItem::References));
- break;
-
case md_viewformats:
add(MenuItem(MenuItem::ViewFormats));
break;
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;
}
return *this;
}
-struct compare_formatpair {
- bool operator()(FormatPair const & a, FormatPair const & b) {
- return a.format->prettyname < b.format->prettyname;
- }
-};
void Menu::checkShortcuts() const
{
}
}
+
+namespace {
+
+class compare_format {
+public:
+ bool operator()(Format const * p1, Format const * p2) {
+ return *p1 < *p2;
+ }
+};
+
+} // 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,
}
}
break;
-
+
case MenuItem::Documents: {
- vector<string> names = bufferlist.getFileNames();
-
+ typedef vector<string> Strings;
+
+ Strings const names = bufferlist.getFileNames();
+
if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
break;
}
- for (vector<string>::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));
}
}
break;
+ case MenuItem::ImportFormats:
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats: {
- vector<FormatPair> names;
+
+ if (!buf && cit->kind() != MenuItem::ImportFormats) {
+ tomenu.add(MenuItem(MenuItem::Command,
+ _("No Documents Open!"),
+ LFUN_NOACTION));
+ continue;
+ }
+
+ typedef vector<Format const *> Formats;
+
+ Formats formats;
+
kb_action action;
- if ((*cit).kind() == MenuItem::ViewFormats) {
- names = Exporter::GetExportableFormats(buf, true);
+ switch (cit->kind()) {
+ case MenuItem::ImportFormats:
+ formats = Importer::GetImportableFormats();
+ action = LFUN_IMPORT;
+ break;
+ case MenuItem::ViewFormats:
+ formats = Exporter::GetExportableFormats(buf, true);
action = LFUN_PREVIEW;
- } else if ((*cit).kind() == MenuItem::UpdateFormats) {
- names = Exporter::GetExportableFormats(buf, true);
+ break;
+ case MenuItem::UpdateFormats:
+ formats = Exporter::GetExportableFormats(buf, true);
action = LFUN_UPDATE;
- } else {
- names = Exporter::GetExportableFormats(buf, false);
+ break;
+ default:
+ formats = Exporter::GetExportableFormats(buf, false);
action = LFUN_EXPORT;
}
- sort(names.begin(), names.end(), compare_formatpair());
+ sort(formats.begin(), formats.end(), compare_format());
+
+ Formats::const_iterator fit = formats.begin();
+ Formats::const_iterator end = formats.end();
- for (vector<FormatPair>::const_iterator fit = names.begin();
- fit != names.end() ; ++fit) {
- if ((*fit).format->dummy())
+ for (; fit != end ; ++fit) {
+ if ((*fit)->dummy())
continue;
- string fmt = (*fit).format->name;
- string label = (*fit).format->prettyname;
- bool same_before =
- fit != names.begin() &&
- (*fit).format == (*(fit-1)).format;
- bool same_after =
- fit+1 != names.end() &&
- (*fit).format == (*(fit+1)).format;
- if ((*fit).from &&
- (same_before || same_after)) {
- fmt += ":" + (*fit).from->name;
- string head;
- split((*fit).command, head, ' ');
- label += _(" (using ") + head + ")";
- if (!(*fit).format->shortcut.empty() &&
- !same_before)
- label += "|" + (*fit).format->shortcut;
- } else if (!(*fit).format->shortcut.empty())
- label += "|" + (*fit).format->shortcut;
- int action2 = lyxaction.getPseudoAction(action, fmt);
+ string label = (*fit)->prettyname();
+ 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 const action2 = lyxaction.
+ getPseudoAction(action,
+ (*fit)->name());
tomenu.add(MenuItem(MenuItem::Command,
label, action2));
}
}
break;
- case MenuItem::ImportFormats: {
- vector<FormatPair> names = Converter::GetReachableTo("lyx");
- sort(names.begin(), names.end(), compare_formatpair());
+ 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;
- for (vector<FormatPair>::const_iterator fit = names.begin();
- fit != names.end() ; ++fit) {
- if ((*fit).format->dummy())
- continue;
- string fmt = (*fit).format->name;
- string label = (*fit).format->prettyname;
- if (!(*fit).format->shortcut.empty())
- label += "|" + (*fit).format->shortcut;
- int action2 = lyxaction.getPseudoAction(LFUN_IMPORT, fmt);
+ 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, action2));
+ 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);
}
}
+bool Menu::hasSubmenu(string const & name) const
+{
+ return find_if(begin(), end(),
+ lyx::compare_memfun(&MenuItem::submenu, name)) != end();
+}
+
+
void MenuBackend::read(LyXLex & lex)
{
enum Menutags {
};
//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))
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);
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);
{
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))
.add(MenuItem(MenuItem::Command,
_("LinuxDoc...|L"), "buffer-import linuxdoc"));
add(import);
-
+
Menu edit("edit");
edit
.add(MenuItem(MenuItem::Command, _("Cut"), "cut"))
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;
}
}
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);
}
projects / lyx.git / blobdiff