/* This file is part of
- * ======================================================
- *
+ * ======================================================
+ *
* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
#pragma implementation
#endif
+#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 "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) {
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);
{ "importformats", md_importformats },
{ "item", md_item },
{ "lastfiles", md_lastfiles },
- { "optitem", md_optitem },
+ { "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 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;
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;
}
class compare_format {
public:
bool operator()(Format const * p1, Format const * p2) {
- return *p1 < *p2;
+ return *p1 < *p2;
}
};
{
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)
}
}
break;
-
+
case MenuItem::Documents: {
typedef vector<string> Strings;
-
+
Strings const names = bufferlist.getFileNames();
-
+
if (names.empty()) {
tomenu.add(MenuItem(MenuItem::Command,
_("No Documents Open!"),
case MenuItem::ViewFormats:
case MenuItem::UpdateFormats:
case MenuItem::ExportFormats: {
- typedef vector<Format const *> Formats;
+
+ 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;
- 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")
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));
}
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);
}
};
//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;
}
}
projects / lyx.git / blobdiff