X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FMenubar_pimpl.C;h=bb90a386bad67f2ace9652d0281f339869833cf4;hb=9f29ab3aa5fb11baca9bc28dc3710076cb3a2645;hp=cbc31742698138b36b1e6b996f7cb1c59728518c;hpb=29f7055e9527314060b4a74c31a46155ff264a63;p=lyx.git diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index cbc3174269..bb90a386ba 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -7,13 +7,14 @@ * *======================================================*/ +#include + +#include + #ifdef __GNUG__ #pragma implementation #endif -#include - -#include #include "support/lstrings.h" #include "support/LAssert.h" #include "debug.h" @@ -21,6 +22,7 @@ #include "lyxfunc.h" #include "kbmap.h" #include "buffer.h" +#include "Dialogs.h" #include "LyXView.h" #include "MenuBackend.h" #include "Menubar_pimpl.h" @@ -32,24 +34,27 @@ using std::min; typedef vector::size_type size_type; -extern kb_keymap * toplevel_keymap; +extern boost::scoped_ptr toplevel_keymap; extern LyXAction lyxaction; +namespace { + // Some constants -static const int MENU_LABEL_SIZE = FL_NORMAL_SIZE; -static const int mheight = 30; -static const int mbheight= 22; +const int MENU_LABEL_SIZE = FL_NORMAL_SIZE; +const int mheight = 30; +const int mbheight= 22; // where to place the menubar? -static const int yloc = (mheight - mbheight)/2; //air + bw; -static const int mbadd = 20; // menu button add (to width) +const int yloc = (mheight - mbheight)/2; //air + bw; +const int mbadd = 20; // menu button add (to width) // Some space between buttons on the menubar -static const int air = 2; -static char const * menu_tabstop = "aa"; -static char const * default_tabstop = "aaaaaaaa"; - -//Defined later, used in makeMenubar(). -extern "C" -void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button); +const int air = 2; +char const * menu_tabstop = "aa"; +char const * default_tabstop = "aaaaaaaa"; +// We do not want to mix position values in a menu (like the index of +// a submenu) with the action numbers which convey actual information. +// Therefore we offset all the action values by an arbitrary large +// constant. +const int action_offset = 1000; // This is used a few times below. inline @@ -60,6 +65,13 @@ int string_width(string const & str) static_cast(str.length())); } +} // namespace anon + + +//Defined later, used in makeMenubar(). +extern "C" +void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button); + Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mb) : owner_(view), menubackend_(&mb), current_group_(0) @@ -81,12 +93,6 @@ Menubar::Pimpl::Pimpl(LyXView * view, MenuBackend const & mb) } -Menubar::Pimpl::~Pimpl() -{ - // Should we do something here? -} - - void Menubar::Pimpl::makeMenubar(Menu const &menu) { FL_FORM * form = owner_->getForm(); @@ -110,7 +116,7 @@ void Menubar::Pimpl::makeMenubar(Menu const &menu) string label = i->label(); string shortcut = "#" + i->shortcut(); int width = string_width(label); - obj = fl_add_button(FL_TOUCH_BUTTON, + obj = fl_add_button(FL_MENU_BUTTON, air + moffset, yloc, width + mbadd, mbheight, @@ -126,10 +132,10 @@ void Menubar::Pimpl::makeMenubar(Menu const &menu) fl_set_object_shortcut(obj, shortcut.c_str(), 1); fl_set_object_callback(obj, C_Menubar_Pimpl_MenuCallback, 1); - ItemInfo * iteminfo = new ItemInfo(this, - new MenuItem(*i), obj); + boost::shared_ptr iteminfo(new ItemInfo(this, + new MenuItem(*i), obj)); buttonlist_.push_back(iteminfo); - obj->u_vdata = iteminfo; + obj->u_vdata = iteminfo.get(); } } @@ -169,11 +175,13 @@ void Menubar::Pimpl::set(string const & menu_name) void Menubar::Pimpl::openByName(string const & name) { - for (ButtonList::const_iterator cit = buttonlist_.begin(); - cit != buttonlist_.end(); ++cit) { - if ((*cit)->item_->submenu() == name) { - MenuCallback((*cit)->obj_, 1); - return; + if (menubackend_->getMenu(current_menu_name_).hasSubmenu(name)) { + for (ButtonList::const_iterator cit = buttonlist_.begin(); + cit != buttonlist_.end(); ++cit) { + if ((*cit)->item_->submenu() == name) { + MenuCallback((*cit)->obj_, 1); + return; + } } } lyxerr << "Menubar::Pimpl::openByName: menu " @@ -181,7 +189,10 @@ void Menubar::Pimpl::openByName(string const & name) } -string limit_string_length(string const & str) +namespace { + +inline +string const limit_string_length(string const & str) { string::size_type const max_item_length = 45; @@ -203,6 +214,7 @@ int get_new_submenu(vector & smn, Window win) return menu; } + size_type const max_number_of_items = 25; inline @@ -215,23 +227,33 @@ string const fixlabel(string const & str) #endif } +} // namespace anon + + void add_toc2(int menu, string const & extra_label, vector & smn, Window win, vector const & toc_list, size_type from, size_type to, int depth) { + int shortcut_count = 0; if (to - from <= max_number_of_items) { for (size_type i = from; i < to; ++i) { - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[i].par->id())); string label(4 * max(0, toc_list[i].depth - depth),' '); label += fixlabel(toc_list[i].str); label = limit_string_length(label); - label += "%x" + tostr(action); + label += "%x" + tostr(action + action_offset); if (i == to - 1 && depth == 0) label += extra_label; - fl_addtopup(menu, label.c_str()); + if (toc_list[i].depth == depth + && ++shortcut_count <= 9) { + label += "%h"; + fl_addtopup(menu, label.c_str(), + tostr(shortcut_count).c_str()); + } else + fl_addtopup(menu, label.c_str()); } } else { size_type pos = from; @@ -254,7 +276,7 @@ void add_toc2(int menu, string const & extra_label, toc_list[new_pos].depth > depth) ++new_pos; - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[pos].par->id())); string label(4 * max(0, toc_list[pos].depth - depth), ' '); @@ -262,25 +284,41 @@ void add_toc2(int menu, string const & extra_label, label = limit_string_length(label); if (new_pos == to && depth == 0) label += extra_label; + string shortcut; + if (toc_list[pos].depth == depth && + ++shortcut_count <= 9) + shortcut = tostr(shortcut_count); if (new_pos == pos + 1) { - label += "%x" + tostr(action); - fl_addtopup(menu, label.c_str()); + label += "%x" + tostr(action + action_offset); + if (!shortcut.empty()) { + label += "%h"; + fl_addtopup(menu, label.c_str(), + shortcut.c_str()); + } else + fl_addtopup(menu, label.c_str()); } 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); + if (!shortcut.empty()) { + label += "%h"; + fl_addtopup(menu, label.c_str(), menu2, + shortcut.c_str()); + } else + fl_addtopup(menu, label.c_str(), menu2); } pos = new_pos; } } } + void Menubar::Pimpl::add_toc(int menu, string const & extra_label, vector & smn, Window win) { +#if 0 //xgettext:no-c-format static char const * MenuNames[3] = { N_("List of Figures%m"), //xgettext:no-c-format @@ -305,12 +343,12 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label, fl_addtopup(menu2, ". . .%d"); break; } - int action = lyxaction. + int const action = lyxaction. getPseudoAction(LFUN_GOTO_PARAGRAPH, tostr(toc_list[j][i].par->id())); string label = fixlabel(toc_list[j][i].str); label = limit_string_length(label); - label += "%x" + tostr(action); + label += "%x" + tostr(action + action_offset); fl_addtopup(menu2, label.c_str()); } if (j == max_nonempty) { @@ -323,139 +361,54 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label, // Handle normal TOC if (max_nonempty == 0 && toc_list[0].empty()) { - fl_addtopup(menu,_("No Table of Contents%i")); + fl_addtopup(menu, (_("No Table of Contents%i") + + extra_label).c_str()); return; } add_toc2(menu, extra_label, smn, win, toc_list[0], 0, toc_list[0].size(), 0); - -} - -void add_references2(int menu, vector & smn, Window win, - vector const & label_list, string const & type) -{ - size_type const max_number_of_items = 25; - size_type const max_number_of_items2 = 20; - string::size_type const max_item_length = 40; - string::size_type const max_item_length2 = 20; - - if (label_list.size() <= max_number_of_items) - for (size_type i = 0; i < label_list.size(); ++i) { - int action = (type == "goto") - ? lyxaction.getPseudoAction(LFUN_REF_GOTO, - label_list[i]) - : lyxaction.getPseudoAction(LFUN_REF_INSERT, - type + "|++||++|" - + label_list[i]); - string label = label_list[i]; - if (label.size() > max_item_length) - label = label.substr(0, max_item_length-1) + "$"; - label += "%x" + tostr(action); - fl_addtopup(menu, label.c_str()); - } - else { - size_type count = 0; - for (size_type i = 0; i < label_list.size(); - i += max_number_of_items2) { - ++count; - if (count > max_number_of_items) { - fl_addtopup(menu, ". . .%d"); - break; - } - size_type j = min(label_list.size(), - i+max_number_of_items2); - - string label; - label += (label_list[i].size() > max_item_length2) - ? label_list[i].substr(0, max_item_length2-1) + "$" - : label_list[i]; - label += ".."; - label += (label_list[j-1].size() > max_item_length2) - ? label_list[j-1].substr(0, max_item_length2-1) + "$" - : label += label_list[j-1]; - - 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); +#else +#warning Fix Me! (Lgb) + Buffer::Lists toc_list = owner_->buffer()->getLists(); + Buffer::Lists::const_iterator cit = toc_list.begin(); + Buffer::Lists::const_iterator end = toc_list.end(); + for (; cit != end; ++cit) { + // Handle this elsewhere + if (cit->first == "TOC") continue; + + int menu2 = get_new_submenu(smn, win); + Buffer::SingleList::const_iterator ccit = cit->second.begin(); + Buffer::SingleList::const_iterator eend = cit->second.end(); + for (; ccit != eend; ++ccit) { + int const action = + lyxaction + .getPseudoAction(LFUN_GOTO_PARAGRAPH, + tostr(ccit->par->id())); + string label = fixlabel(ccit->str); + label = limit_string_length(label); + label += "%x" + tostr(action + action_offset); + fl_addtopup(menu2, label.c_str()); } + string const m = cit->first + "%m"; + fl_addtopup(menu, m.c_str(), menu2); } -} - - -void Menubar::Pimpl::add_references(int menu, string const & extra_label, - vector & smn, Window win) -{ - //xgettext:no-c-format - static char const * MenuNames[6] = { N_("Insert Reference%m"), - //xgettext:no-c-format - N_("Insert Page Number%m"), - //xgettext:no-c-format - N_("Insert vref%m"), - //xgettext:no-c-format - N_("Insert vpageref%m"), - //xgettext:no-c-format - N_("Insert Pretty Ref%m"), - //xgettext:no-c-format - N_("Goto Reference%m") }; - - int const EMPTY = 1; - int const SGML = 2; - int const READONLY = 4; - - static int MenuFlags[6] = { - EMPTY | READONLY, - EMPTY | READONLY, - EMPTY | READONLY | SGML, - EMPTY | READONLY | SGML, - EMPTY | READONLY | SGML, - EMPTY }; - - static string const MenuTypes[6] = { - "ref", "pageref", "vref", "vpageref", "prettyref", "goto" }; - - vector label_list = owner_->buffer()->getLabelList(); - - int flag = 0; - if (label_list.empty()) - flag += EMPTY; - if (owner_->buffer()->isSGML()) - flag += SGML; - if (owner_->buffer()->isReadonly()) - flag += READONLY; - - int max_nonempty = -1; - for (int i = 0; i < 6; ++i) - if ((MenuFlags[i] & flag) == 0) - max_nonempty = i; - - for (int i = 0; i < 6; ++i) { - if ((MenuFlags[i] & flag) == 0) { - string label = _(MenuNames[i]); - if (i == max_nonempty) - label += extra_label; - int menu2 = get_new_submenu(smn, win); - add_references2(menu2, smn, win, label_list, - MenuTypes[i]); - fl_addtopup(menu, label.c_str(), menu2); - } + + + // Handle normal TOC + cit = toc_list.find("TOC"); + if (cit == end) { + string const tmp = _("No Table of contents%i") + extra_label; + fl_addtopup(menu, tmp.c_str()); + return; + } else { + add_toc2(menu, extra_label, smn, win, + cit->second, 0, cit->second.size(), 0); } + +#endif } - int Menubar::Pimpl::create_submenu(Window win, LyXView * view, string const & menu_name, vector & smn) @@ -525,7 +478,7 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, // Get the keys bound to this action, but keep only the // first one later - string accel = toplevel_keymap->findbinding(item.action()); + string const accel = toplevel_keymap->findbinding(item.action()); // Build the menu label from all the info string label = item.label(); @@ -534,10 +487,11 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, // tabs to align shortcuts. do label += '\t'; - while (string_width(label) < max_width); + while (string_width(label) < max_width + 5); label += accel.substr(1,accel.find(']') - 1); } - label += "%x" + tostr(item.action()) + extra_label; + label += "%x" + tostr(item.action() + action_offset) + + extra_label; // Modify the entry using the function status string pupmode; @@ -562,11 +516,9 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, lyxerr[Debug::GUI] << "Command: \"" << lyxaction.getActionName(item.action()) - << "\", Binding " << accel - << ", shortcut " << shortcut - << endl; - - + << "\", binding \"" << accel + << "\", shortcut \"" << shortcut + << "\"" << endl; break; } @@ -599,10 +551,6 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, add_toc(menu, extra_label, smn, win); break; - case MenuItem::References: - add_references(menu, extra_label, smn, win); - break; - case MenuItem::Documents: case MenuItem::Lastfiles: case MenuItem::ViewFormats: @@ -618,6 +566,7 @@ int Menubar::Pimpl::create_submenu(Window win, LyXView * view, return menu; } + extern "C" void C_Menubar_Pimpl_MenuCallback(FL_OBJECT * ob, long button) { @@ -634,8 +583,14 @@ void Menubar::Pimpl::MenuCallback(FL_OBJECT * ob, long button) // << ", obj_=" << iteminfo->obj_ << ")" <pimpl_->owner_; - MenuItem const * item = iteminfo->item_; - + MenuItem const * item = iteminfo->item_.get(); + + /* get the splash out of the way. It would be nicer + * to only have this code at the start, but xforms + * makes it too ugly to do + */ + view->getDialogs()->destroySplash(); + if (button == 1) { // set the pseudo menu-button fl_set_object_boxtype(ob, FL_DOWN_BOX); @@ -663,9 +618,16 @@ void Menubar::Pimpl::MenuCallback(FL_OBJECT * ob, long button) fl_set_object_boxtype(ob, FL_FLAT_BOX); fl_redraw_object(ob); } - - if (choice >= 1) { - view->getLyXFunc()->Dispatch(choice); + + // If the action value is too low, then it is not a + // valid action, but something else. + if (choice >= action_offset + 1) { + view->getLyXFunc()->Dispatch(choice - action_offset); + } + else { + lyxerr[Debug::GUI] + << "MenuCallback: ignoring bogus action " + << choice << endl; } } else