{ LFUN_WINDOW_NEW, "window-new", NoBuffer },
{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
{ LFUN_UNICODE_INSERT, "unicode-insert", Noop },
{ LFUN_WINDOW_NEW, "window-new", NoBuffer },
{ LFUN_WINDOW_CLOSE, "window-close", NoBuffer },
{ LFUN_UNICODE_INSERT, "unicode-insert", Noop },
- { LFUN_TOOLBAR_TOGGLE_STATE, "", Noop },
+ { LFUN_TOOLBAR_TOGGLE_STATE, "", NoBuffer },
{ LFUN_NOACTION, "", Noop }
};
{ LFUN_NOACTION, "", Noop }
};
using support::contains;
using support::makeDisplayPath;
using support::token;
using support::contains;
using support::makeDisplayPath;
using support::token;
+using support::uppercase;
int i = 1;
for (; cit != end; ++cit, ++i) {
int i = 1;
for (; cit != end; ++cit, ++i) {
- docstring label = convert<docstring>(i) + ". " + _(cit->name);
+ docstring label = char_type(uppercase(cit->name[0])) + _(cit->name.substr(1));
// frontends are not supposed to turn on/off toolbars, if they can not
// update ToolbarBackend::flags. That is to say, ToolbarsBackend::flags
// should reflect the true state of toolbars.
// frontends are not supposed to turn on/off toolbars, if they can not
// update ToolbarBackend::flags. That is to say, ToolbarsBackend::flags
// should reflect the true state of toolbars.
// in the case of auto.
if (cit->flags & ToolbarBackend::AUTO)
label += _(" (auto)");
// in the case of auto.
if (cit->flags & ToolbarBackend::AUTO)
label += _(" (auto)");
- label += char_type('|') + convert<docstring>(i);
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, _(cit->name))));
}
tomenu.add(MenuItem(MenuItem::Command, label,
FuncRequest(LFUN_TOOLBAR_TOGGLE_STATE, _(cit->name))));
}
for (; cit != end; ++cit) {
if (cit->name == name) {
int flags = cit->flags;
for (; cit != end; ++cit) {
if (cit->name == name) {
int flags = cit->flags;
- if (flags & ToolbarBackend::ON) {
- TurnOffFlag(ON);
- TurnOnFlag(OFF);
+ // off -> on
+ if (flags & ToolbarBackend::OFF) {
+ TurnOffFlag(OFF);
+ TurnOnFlag(ON);
+ // auto -> off
} else if (flags & ToolbarBackend::AUTO) {
TurnOffFlag(AUTO);
} else if (flags & ToolbarBackend::AUTO) {
TurnOffFlag(AUTO);
} else if ((flags & ToolbarBackend::MATH) || (flags & ToolbarBackend::TABLE)
|| (flags & ToolbarBackend::REVIEW)) {
} else if ((flags & ToolbarBackend::MATH) || (flags & ToolbarBackend::TABLE)
|| (flags & ToolbarBackend::REVIEW)) {
- // for math etc, toggle from off -> auto
- TurnOffFlag(OFF);
+ // for math etc, toggle from on -> auto
+ TurnOffFlag(ON);
TurnOnFlag(AUTO);
} else {
TurnOnFlag(AUTO);
} else {
- // for others, toggle from off -> on
- TurnOffFlag(OFF);
- TurnOnFlag(ON);
+ // for others, toggle from on -> off
+ TurnOffFlag(ON);
+ TurnOnFlag(OFF);
}
cit->flags = static_cast<lyx::ToolbarBackend::Flags>(flags);
return;
}
cit->flags = static_cast<lyx::ToolbarBackend::Flags>(flags);
return;
flag.message(from_utf8(N_("Exiting")));
flag.enabled(true);
return flag;
flag.message(from_utf8(N_("Exiting")));
flag.enabled(true);
return flag;
- } else if (cmd.action == LFUN_BOOKMARK_GOTO) {
+ } else if (cmd.action == LFUN_BOOKMARK_GOTO) {
// bookmarks can be valid even if there is no opened buffer
flag.enabled(LyX::ref().session().bookmarks().isValid(convert<unsigned int>(to_utf8(cmd.argument()))));
return flag;
} else if (cmd.action == LFUN_BOOKMARK_CLEAR) {
flag.enabled(LyX::ref().session().bookmarks().size() > 0);
return flag;
// bookmarks can be valid even if there is no opened buffer
flag.enabled(LyX::ref().session().bookmarks().isValid(convert<unsigned int>(to_utf8(cmd.argument()))));
return flag;
} else if (cmd.action == LFUN_BOOKMARK_CLEAR) {
flag.enabled(LyX::ref().session().bookmarks().size() > 0);
return flag;
+ } else if (cmd.action == LFUN_TOOLBAR_TOGGLE_STATE) {
+ ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
+ if (!(flags & ToolbarBackend::AUTO))
+ flag.setOnOff(flags & ToolbarBackend::ON);
+ return flag;
LCursor & cur = view()->cursor();
/* In LyX/Mac, when a dialog is open, the menus of the
LCursor & cur = view()->cursor();
/* In LyX/Mac, when a dialog is open, the menus of the
- case LFUN_TOOLBAR_TOGGLE_STATE: {
- ToolbarBackend::Flags flags = lyx_view_->getToolbarState(to_utf8(cmd.argument()));
- if (!(flags & ToolbarBackend::AUTO))
- flag.setOnOff(flags & ToolbarBackend::ON);
- break;
- }
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence
// this one is difficult to get right. As a half-baked
// solution, we consider only the first action of the sequence