No need for an extra icon

This commit is contained in:
Juergen Spitzmueller 2018-12-27 11:18:13 +01:00
parent 0f4fcb80ee
commit c57d04908f
7 changed files with 4 additions and 7 deletions

View File

@ -473,7 +473,6 @@ dist_images_DATA1X = \
images/down.svgz \
images/dynamic-char-styles.svgz \
images/dynamic-custom-insets.svgz \
images/dynamic-freefonts.svgz \
images/editclear.svgz \
images/emblem-readonly.svgz \
images/emblem-shellescape.svgz \
@ -1760,7 +1759,6 @@ dist_imagesoxygen_DATA1X = \
images/oxygen/dialog-toggle_toc.svgz \
images/oxygen/dynamic-char-styles.svgz \
images/oxygen/dynamic-custom-insets.svgz \
images/oxygen/dynamic-freefonts.svgz \
images/oxygen/down.svgz \
images/oxygen/editclear.svgz \
images/oxygen/ert-insert.svgz \
@ -1967,7 +1965,6 @@ dist_imagesclassic_DATA = \
images/classic/dialog-show_vclog.png \
images/classic/dialog-toggle_findreplaceadv.png \
images/classic/dialog-toggle_toc.png \
images/classic/dynamic-freefonts.png \
images/classic/down.png \
images/classic/ert-insert.png \
images/classic/file-open.png \

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

Binary file not shown.

View File

@ -138,7 +138,7 @@ ToolbarSet
Item "Include file" "dialog-show-new-inset include"
Separator
Item "Text properties" "dialog-show character"
DynamicMenu "dynamic-freefonts" "Apply recent text properties"
DynamicMenu "textstyle-apply" "Apply recent text properties"
Item "Paragraph settings" "layout-paragraph"
Item "Thesaurus" "thesaurus-entry"
End

View File

@ -323,7 +323,7 @@ bool DynamicMenuButton::isMenuType(string const & s)
{
return s == "dynamic-custom-insets"
|| s == "dynamic-char-styles"
|| s == "dynamic-freefonts"
|| s == "textstyle-apply"
|| s == "paste";
}
@ -365,7 +365,7 @@ void DynamicMenuButton::updateTriggered()
setEnabled(!bv->buffer().isReadonly()
&& !m->isEmpty()
&& inset->insetAllowed(FLEX_CODE));
} else if (menutype == "dynamic-freefonts") {
} else if (menutype == "textstyle-apply") {
m->clear();
vector<docstring> ffList = bv->cursor().innerText()->getFreeFonts();
unsigned int i = 0;

View File

@ -86,7 +86,7 @@ protected Q_SLOTS:
/// (stdtoolbars.inc, usually) and must be one of:
/// dynamic-custom-insets
/// dynamic-char-styles
/// dynamic-freefonts
/// textstyle-apply
/// paste
/// To add a new one of these, you must add a routine, like
/// loadFlexInsets, that will populate the menu, and call it from