anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 02:14:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Two separators collapse into one

Browse Source 
It seems guaranteed by the Qt docs that two menu separators collapse into
one. This allows this little simplification.
This commit is contained in:
Guillaume Munch 2017-01-11 21:03:47 +01:00
parent fd14b6f5a3
commit bd1ce03b40
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontends/qt4/Menus.cpp
View File

@ -1703,7 +1703,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
{ {
if (!bv) if (!bv)
return; return;
if (!bv->cursor().inTexted()) if (!bv->cursor().inTexted())
return; return;
@ -1719,7 +1719,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
map<string, docstring> styles = quoteparams.getTypes(); map<string, docstring> styles = quoteparams.getTypes();
string const qtype = qinset->getType(); string const qtype = qinset->getType();
map<string, docstring>::const_iterator qq = styles.begin(); map<string, docstring>::const_iterator qq = styles.begin();
map<string, docstring>::const_iterator end = styles.end(); map<string, docstring>::const_iterator end = styles.end();
@ -1768,7 +1768,7 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
docstring const style = from_ascii(qq->first); docstring const style = from_ascii(qq->first);
bool langdef = (style[0] == langqs); bool langdef = (style[0] == langqs);
bool globaldef = (style[0] == globalqsc); bool globaldef = (style[0] == globalqsc);
if (prefixIs(style, qtype[0])) { if (prefixIs(style, qtype[0])) {
FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + style); FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + style);
docstring const desc = quoteparams.getShortGuiLabel(style); docstring const desc = quoteparams.getShortGuiLabel(style);
@ -1786,7 +1786,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
add(MenuItem(MenuItem::Separator)); add(MenuItem(MenuItem::Separator));
bool have_section = false;
bool display_static = false; bool display_static = false;
// ... then potentially items to reset to the defaults and to dynamic style ... // ... then potentially items to reset to the defaults and to dynamic style ...
if (!main_dynamic_qs && globalqsc != 'x') { if (!main_dynamic_qs && globalqsc != 'x') {
@ -1794,7 +1793,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
docstring const desc = bformat(_("Use dynamic quotes (%1$s)|d"), docstring const desc = bformat(_("Use dynamic quotes (%1$s)|d"),
quoteparams.getGuiLabel(globalqs)); quoteparams.getGuiLabel(globalqs));
add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
have_section = true;
display_static = true; display_static = true;
} }
if (!main_global_qs && langdefqs != globalqs) { if (!main_global_qs && langdefqs != globalqs) {
@ -1803,7 +1801,6 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
docstring const desc = bformat(_("Reset to document default (%1$s, %2$s)|o"), docstring const desc = bformat(_("Reset to document default (%1$s, %2$s)|o"),
quoteparams.getGuiLabel(globalqs), variant); quoteparams.getGuiLabel(globalqs), variant);
add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
have_section = true;
} }
if (!main_langdef_qs) { if (!main_langdef_qs) {
FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + globalqsc + wildcards); FuncRequest cmd = FuncRequest(LFUN_INSET_MODIFY, subcmd + globalqsc + wildcards);
@ -1813,11 +1810,9 @@ void MenuDefinition::expandQuotes(BufferView const * bv)
: bformat(_("Reset to language default (%1$s)|l"), : bformat(_("Reset to language default (%1$s)|l"),
quoteparams.getGuiLabel(langdefqs)); quoteparams.getGuiLabel(langdefqs));
add(MenuItem(MenuItem::Command, toqstr(desc), cmd)); add(MenuItem(MenuItem::Command, toqstr(desc), cmd));
have_section = true;
} }
if (have_section) add(MenuItem(MenuItem::Separator));
add(MenuItem(MenuItem::Separator));
// ... and a subitem with the rest // ... and a subitem with the rest
MenuItem item(MenuItem::Submenu, qt_("Change Style|y")); MenuItem item(MenuItem::Submenu, qt_("Change Style|y"));