* 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 "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;
case UpdateFormats:
case ExportFormats:
case ImportFormats:
+ case FloatListInsert:
+ case FloatInsert:
break;
case Command:
action_ = lyxaction.LookupFunc(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)
{
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 },
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;
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;
}
}
}
-
namespace {
class compare_format {
{
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) {
+ 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);
break;
case MenuItem::Documents: {
- vector<string> const names = bufferlist.getFileNames();
+ typedef vector<string> Strings;
+
+ Strings const names = bufferlist.getFileNames();
if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command,
break;
}
- for (vector<string>::const_iterator docit = names.begin();
- docit != names.end() ; ++docit) {
- int const action =
- lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *docit);
+ 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,
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats: {
- vector<Format const *> formats;
+ typedef vector<Format const *> Formats;
+
+ Formats formats;
+
kb_action action;
- switch ((*cit).kind()) {
+ switch (cit->kind()) {
case MenuItem::ImportFormats:
formats = Importer::GetImportableFormats();
action = LFUN_IMPORT;
}
sort(formats.begin(), formats.end(), compare_format());
- for (vector<Format const *>::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")
if (!(*fit)->shortcut().empty())
label += "|" + (*fit)->shortcut();
int const action2 = lyxaction.
- getPseudoAction(action, (*fit)->name());
+ 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);
}
checkShortcuts();
}
+
bool Menu::hasSubmenu(string const & name) const
{
return find_if(begin(), end(),
};
//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:
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);