#include <config.h>
#include <algorithm>
-#include <cctype>
#include "support/lstrings.h"
-#include "support/filetools.h"
#include "support/LAssert.h"
#include "debug.h"
#include "LyXAction.h"
#include "lyxfunc.h"
#include "kbmap.h"
-#include "bufferlist.h"
-#include "lastfiles.h"
+#include "buffer.h"
#include "LyXView.h"
#include "MenuBackend.h"
#include "Menubar_pimpl.h"
-#include "exporter.h"
-using std::pair;
using std::endl;
using std::vector;
using std::max;
extern kb_keymap * toplevel_keymap;
extern LyXAction lyxaction;
-extern BufferList bufferlist;
-extern LastFiles * lastfiles;
// Some constants
-const int MENU_LABEL_SIZE = FL_NORMAL_SIZE;
-const int mheight = 30;
-const int mbheight= 22;
+static const int MENU_LABEL_SIZE = FL_NORMAL_SIZE;
+static const int mheight = 30;
+static const int mbheight= 22;
// where to place the menubar?
-const int yloc = (mheight - mbheight)/2; //air + bw;
-const int mbadd = 20; // menu button add (to width)
+static const int yloc = (mheight - mbheight)/2; //air + bw;
+static const int mbadd = 20; // menu button add (to width)
// Some space between buttons on the menubar
-const int air = 2;
-char const * menu_tabstop = "aa";
-char const * default_tabstop = "aaaaaaaa";
+static const int air = 2;
+static char const * menu_tabstop = "aa";
+static char const * default_tabstop = "aaaaaaaa";
//Defined later, used in makeMenubar().
extern "C"
int string_width(string const & str)
{
return fl_get_string_widthTAB(FL_NORMAL_STYLE, MENU_LABEL_SIZE,
- str.c_str(), str.length());
+ str.c_str(),
+ static_cast<int>(str.length()));
}
break;
}
string label = i->label();
- string shortcut = '#' + i->shortcut();
+ string shortcut = "#" + i->shortcut();
int width = string_width(label);
obj = fl_add_button(FL_TOUCH_BUTTON,
air + moffset, yloc,
}
-void Menubar::Pimpl::add_lastfiles(int menu, string const & extra_label)
-{
- int ii = 1;
- for (LastFiles::const_iterator cit = lastfiles->begin();
- cit != lastfiles->end() && ii < 10; ++cit, ++ii) {
-
- int action =
- lyxaction.getPseudoAction(LFUN_FILE_OPEN, (*cit));
- string label = tostr(ii) + ". "
- + MakeDisplayPath((*cit),30)
- + "%x" + tostr(action) + "%h";
- if ((cit + 1) == lastfiles->end())
- label += extra_label;
- string shortcut = tostr(ii) + "#" + tostr(ii);
- lyxerr[Debug::GUI] << "shortcut is " << shortcut <<
- endl;
-
- fl_addtopup(menu, label.c_str(), shortcut.c_str());
- }
-
-}
-
-void Menubar::Pimpl::add_documents(int menu, string const & extra_label)
-{
- vector<string> names = bufferlist.getFileNames();
-
- if (names.empty()) {
- fl_addtopup(menu,_("No Documents Open!%i"));
- return;
- }
-
- for (vector<string>::const_iterator cit = names.begin();
- cit != names.end() ; ++cit) {
- int action =
- lyxaction.getPseudoAction(LFUN_SWITCHBUFFER, *cit);
- string label = MakeDisplayPath(*cit, 30)
- + "%x" + tostr(action);
- if ((cit + 1) == names.end())
- label += extra_label;
-
- fl_addtopup(menu, label.c_str());
- }
-
-}
-
-
string limit_string_length(string const & str)
{
string::size_type const max_item_length = 45;
if (str.size() > max_item_length)
- return str.substr(0, max_item_length-3) + "...";
+ return str.substr(0, max_item_length - 3) + "...";
else
return str;
}
-size_type const max_number_of_menus = 32;
+
+int get_new_submenu(vector<int> & smn, Window win)
+{
+ static size_type max_number_of_menus = 32;
+ if (smn.size() >= max_number_of_menus)
+ max_number_of_menus =
+ fl_setpup_maxpup(static_cast<int>(2*smn.size()));
+ int menu = fl_newpup(win);
+ smn.push_back(menu);
+ return menu;
+}
+
size_type const max_number_of_items = 25;
+inline
+string const fixlabel(string const & str)
+{
+#if FL_REVISION < 89
+ return subst(str, '%', '?');
+#else
+ return subst(str, "%", "%%");
+#endif
+}
+
void add_toc2(int menu, string const & extra_label,
vector<int> & smn, Window win,
vector<Buffer::TocItem> const & toc_list,
getPseudoAction(LFUN_GOTO_PARAGRAPH,
tostr(toc_list[i].par->id()));
string label(4 * max(0, toc_list[i].depth - depth),' ');
- label += toc_list[i].str;
+ label += fixlabel(toc_list[i].str);
label = limit_string_length(label);
label += "%x" + tostr(action);
if (i == to - 1 && depth == 0)
while (pos < to) {
++count;
if (count > max_number_of_items) {
- fl_addtopup(menu, ". . .%d");
+ int menu2 = get_new_submenu(smn, win);
+ add_toc2(menu2, extra_label, smn, win,
+ toc_list, pos, to, depth);
+ string label = _("More");
+ label += "...%m";
+ if (depth == 0)
+ label += extra_label;
+ fl_addtopup(menu, label.c_str(), menu2);
break;
}
size_type new_pos = pos+1;
getPseudoAction(LFUN_GOTO_PARAGRAPH,
tostr(toc_list[pos].par->id()));
string label(4 * max(0, toc_list[pos].depth - depth), ' ');
- label += toc_list[pos].str;
+ label += fixlabel(toc_list[pos].str);
label = limit_string_length(label);
if (new_pos == to && depth == 0)
label += extra_label;
if (new_pos == pos + 1) {
label += "%x" + tostr(action);
fl_addtopup(menu, label.c_str());
- } else if (smn.size() < max_number_of_menus) {
- int menu2 = fl_newpup(win);
- smn.push_back(menu2);
+ } else {
+ int menu2 = get_new_submenu(smn, win);
add_toc2(menu2, extra_label, smn, win,
toc_list, pos, new_pos, depth+1);
label += "%m";
fl_addtopup(menu, label.c_str(), menu2);
- } else {
- label += "%d";
- fl_addtopup(menu, label.c_str());
}
pos = new_pos;
}
for (int j = 1; j <= 3; ++j)
if (!toc_list[j].empty()) {
- int menu2 = fl_newpup(win);
- smn.push_back(menu2);
+ int menu2 = get_new_submenu(smn, win);
for (size_type i = 0; i < toc_list[j].size(); ++i) {
if (i > max_number_of_items) {
fl_addtopup(menu2, ". . .%d");
int action = lyxaction.
getPseudoAction(LFUN_GOTO_PARAGRAPH,
tostr(toc_list[j][i].par->id()));
- string label =
- limit_string_length(toc_list[j][i].str);
+ string label = fixlabel(toc_list[j][i].str);
+ label = limit_string_length(label);
label += "%x" + tostr(action);
fl_addtopup(menu2, label.c_str());
}
if (j == max_nonempty) {
- string label = _(MenuNames[j-1]);
+ string label = _(MenuNames[j - 1]);
label += "%l";
fl_addtopup(menu, label.c_str(), menu2);
} else
- fl_addtopup(menu, _(MenuNames[j-1]), menu2);
+ fl_addtopup(menu, _(MenuNames[j - 1]), menu2);
}
// Handle normal TOC
? label_list[j-1].substr(0, max_item_length2-1) + "$"
: label += label_list[j-1];
- if (smn.size() < max_number_of_menus) {
- int menu2 = fl_newpup(win);
- smn.push_back(menu2);
- for (size_type k = i; k < j; ++k) {
- int action = (type == "goto")
- ? lyxaction.getPseudoAction(LFUN_REF_GOTO,
- label_list[k])
- : lyxaction.getPseudoAction(LFUN_REF_INSERT,
- type + "|++||++|"
- + label_list[k]);
- string label2 = label_list[k];
- if (label2.size() > max_item_length)
- label2 = label2.substr(0, max_item_length-1) + "$";
- label2 += "%x" + tostr(action);
- fl_addtopup(menu2, label2.c_str());
- }
- label += "%m";
- fl_addtopup(menu, label.c_str(), menu2);
- } else {
- label += "%d";
- fl_addtopup(menu, label.c_str());
+ int menu2 = get_new_submenu(smn, win);
+ for (size_type k = i; k < j; ++k) {
+ int action = (type == "goto")
+ ? lyxaction.getPseudoAction(LFUN_REF_GOTO,
+ label_list[k])
+ : lyxaction.getPseudoAction(LFUN_REF_INSERT,
+ type + "|++||++|"
+ + label_list[k]);
+ string label2 = label_list[k];
+ if (label2.size() > max_item_length)
+ label2 = label2.substr(0, max_item_length-1) + "$";
+ label2 += "%x" + tostr(action);
+ fl_addtopup(menu2, label2.c_str());
}
+ label += "%m";
+ fl_addtopup(menu, label.c_str(), menu2);
}
}
}
string label = _(MenuNames[i]);
if (i == max_nonempty)
label += extra_label;
- if (smn.size() < max_number_of_menus) {
- int menu2 = fl_newpup(win);
- smn.push_back(menu2);
- add_references2(menu2, smn, win, label_list,
- MenuTypes[i]);
- fl_addtopup(menu, label.c_str(), menu2);
- } else {
- label += "%d";
- fl_addtopup(menu, label.c_str());
- }
+ int menu2 = get_new_submenu(smn, win);
+ add_references2(menu2, smn, win, label_list,
+ MenuTypes[i]);
+ fl_addtopup(menu, label.c_str(), menu2);
}
}
}
-void Menubar::Pimpl::add_formats(int menu, string const & extra_label,
- kb_action action, bool viewable)
-{
- vector<pair<string,string> > names =
- viewable
- ? Exporter::GetViewableFormats(owner_->buffer())
- : Exporter::GetExportableFormats(owner_->buffer());
-
- for (vector<pair<string,string> >::const_iterator cit = names.begin();
- cit != names.end() ; ++cit) {
- int action2 =
- lyxaction.getPseudoAction(action, (*cit).first);
- string label = (*cit).second
- + "%x" + tostr(action2);
- if ((cit + 1) == names.end())
- label += extra_label;
-
- fl_addtopup(menu, label.c_str());
- }
-}
-
-
int Menubar::Pimpl::create_submenu(Window win, LyXView * view,
string const & menu_name,
vector<int> & smn)
<< menu_name << "'" << endl;
return -1;
}
- Menu md = menubackend_->getMenu(menu_name);
+ Menu md = Menu();
+ menubackend_->getMenu(menu_name).expand(md, owner_->buffer());
- int menu = fl_newpup(win);
+ int menu = get_new_submenu(smn, win);
fl_setpup_softedge(menu, true);
fl_setpup_bw(menu, -1);
lyxerr[Debug::GUI] << "Adding menu " << menu
<< " in deletion list" << endl;
- smn.push_back(menu);
// Compute the size of the largest label (because xforms is
// not able to support shortcuts correctly...)
string shortcut = item.shortcut();
if (!shortcut.empty()) {
shortcut += lowercase(shortcut[0]);
- fl_addtopup(menu, (label + "%h").c_str(),
+ label += "%h";
+ fl_addtopup(menu, label.c_str(),
submenu, shortcut.c_str());
}
else {
// we just ignore it.
break;
- case MenuItem::Documents:
- add_documents(menu, extra_label);
- break;
-
- case MenuItem::Lastfiles:
- add_lastfiles(menu, extra_label);
- break;
-
case MenuItem::Toc:
add_toc(menu, extra_label, smn, win);
break;
add_references(menu, extra_label, smn, win);
break;
+ case MenuItem::Documents:
+ case MenuItem::Lastfiles:
case MenuItem::ViewFormats:
- add_formats(menu, extra_label, LFUN_PREVIEW, true);
- break;
-
case MenuItem::UpdateFormats:
- add_formats(menu, extra_label, LFUN_UPDATE, true);
- break;
-
case MenuItem::ExportFormats:
- add_formats(menu, extra_label, LFUN_EXPORT, false);
+ lyxerr << "Menubar::Pimpl::create_submenu: "
+ "this should not happen" << endl;
break;
}
projects / lyx.git / blobdiff