*/
#include <config.h>
-#include <gtkmm.h>
#include "GMenubar.h"
#include "GView.h"
#include "debug.h"
#include "lyxfunc.h"
+using std::string;
+
+namespace lyx {
+namespace frontend {
+
namespace
{
-class LyxMenu : public Gtk::Menu
-{
+class LyxMenu : public Gtk::Menu {
public:
LyxMenu() { menu_.reset(new ::Menu); }
void ClearMenu(Gtk::MenuShell * menu)
{
- Gtk::Menu_Helpers::MenuList::iterator m, end;
- m = menu->items().begin();
- end = menu->items().end();
+ Gtk::Menu_Helpers::MenuList::iterator m = menu->items().begin();
+ Gtk::Menu_Helpers::MenuList::iterator end = menu->items().end();
Gtk::Menu * subMenu;
for (; m != end; ++m) {
if ((subMenu = m->get_submenu()) != 0) {
}
-GMenubar::GMenubar(LyXView *lyxView, MenuBackend const & /*menuBackend*/) :
+GMenubar::GMenubar(LyXView * lyxView, MenuBackend const & /*menuBackend*/) :
view_(lyxView)
{
GView * gview = static_cast<GView*>(lyxView);
- Gtk::VBox& vbox = gview->getVBox();
Menu const & menu = menubackend.getMenubar();
Menu::const_iterator i = menu.begin();
Menu::const_iterator end = menu.end();
labelTrans(i->label(), i->shortcut()),
*gmenu));
menubar_.items().back().signal_activate().connect(
- SigC::bind(SigC::slot(*this, &GMenubar::onSubMenuActivate), &(*i),
+ sigc::bind(sigc::mem_fun(*this, &GMenubar::onSubMenuActivate), &(*i),
&menubar_.items().back()));
mainMenuNames_.push_back(i->submenuname());
}
menubar_.show();
- vbox.children().push_back(Gtk::Box_Helpers::Element(menubar_,
- Gtk::PACK_SHRINK));
+ gview->getBox(GView::Top).children().push_back(
+ Gtk::Box_Helpers::Element(menubar_, Gtk::PACK_SHRINK));
}
case MenuItem::Command:
{
FuncStatus const flag =
- view_->getLyXFunc().getStatus(i->action());
- if (!flag.disabled())
+ view_->getLyXFunc().getStatus(i->func());
+ if (flag.enabled())
return false;
break;
}
void GMenubar::onSubMenuActivate(MenuItem const * item,
- Gtk::MenuItem * gitem)
+ Gtk::MenuItem * gitem)
{
Gtk::Menu * gmenu = gitem->get_submenu();
ClearMenu(gmenu);
labelTrans(i->label(), i->shortcut()),
*gmenu_new));
gmenu->items().back().signal_activate().connect(
- SigC::bind(SigC::slot(*this, &GMenubar::onSubMenuActivate),
+ sigc::bind(sigc::mem_fun(*this, &GMenubar::onSubMenuActivate),
&(*i),
&gmenu->items().back()));
if (submenuDisabled(&(*i)))
case MenuItem::Command:
{
FuncStatus const flag =
- view_->getLyXFunc().getStatus(i->action());
- bool on, off;
- on = flag.onoff(true);
- off = flag.onoff(false);
+ view_->getLyXFunc().getStatus(i->func());
+ bool on = flag.onoff(true);
+ bool off = flag.onoff(false);
if (on || off) {
gmenu->items().push_back(
gmenu->items().back());
citem.set_active(on);
} else {
- gmenu->items().push_back(
- Gtk::Menu_Helpers::MenuElem(
- labelTrans(i->label(),
- i->shortcut())));
+ //This is necessary because add_accel_label is protected,
+ //and even if you subclass Gtk::MenuItem then add_accel_label
+ //doesn't do what you'd expect.
+ Gtk::MenuItem * item = Gtk::manage(new Gtk::MenuItem);
+ Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox);
+ Gtk::Label * label1 = Gtk::manage(new Gtk::Label(
+ labelTrans(i->label(), i->shortcut()), true));
+ Gtk::Label * label2 = Gtk::manage(new Gtk::Label(
+ " " + i->binding(), false));
+ hbox->pack_start(*label1, false, false, 0);
+ hbox->pack_end(*label2, false, false, 0);
+ item->add(*hbox);
+
+ gmenu->append(*item);
+ item->show_all();
}
Gtk::MenuItem & item = gmenu->items().back();
item.signal_activate().connect(
- SigC::bind(SigC::slot(*this, &GMenubar::onCommandActivate),
+ sigc::bind(sigc::mem_fun(*this, &GMenubar::onCommandActivate),
&(*i), &item));
- if (flag.disabled())
+ if (!flag.enabled())
item.set_sensitive(false);
break;
}
void GMenubar::onCommandActivate(MenuItem const * item,
Gtk::MenuItem * /*gitem*/)
{
- view_->getLyXFunc().dispatch(item->action(), true);
+ view_->getLyXFunc().dispatch(item->func(), true);
}
+
+} // namespace frontend
+} // namespace lyx