From: Juergen Spitzmueller <spitz@lyx.org>
Date: Thu, 27 Dec 2018 10:18:13 +0000 (+0100)
Subject: No need for an extra icon
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0118e42208fab33c55d54dcf1d380e817ebbdee9;p=features.git

No need for an extra icon
---

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 032103e2ab..3816d5c727 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -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  \
diff --git a/lib/images/classic/dynamic-freefonts.png b/lib/images/classic/dynamic-freefonts.png
deleted file mode 100644
index a63ad1d76a..0000000000
Binary files a/lib/images/classic/dynamic-freefonts.png and /dev/null differ
diff --git a/lib/images/dynamic-freefonts.svgz b/lib/images/dynamic-freefonts.svgz
deleted file mode 100644
index 5830eefb90..0000000000
Binary files a/lib/images/dynamic-freefonts.svgz and /dev/null differ
diff --git a/lib/images/oxygen/dynamic-freefonts.svgz b/lib/images/oxygen/dynamic-freefonts.svgz
deleted file mode 100644
index 7a7ffd0d66..0000000000
Binary files a/lib/images/oxygen/dynamic-freefonts.svgz and /dev/null differ
diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc
index 4d862d8387..4b20445ca0 100644
--- a/lib/ui/stdtoolbars.inc
+++ b/lib/ui/stdtoolbars.inc
@@ -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
diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 006a353710..0fba820ba5 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -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;
diff --git a/src/frontends/qt4/GuiToolbar.h b/src/frontends/qt4/GuiToolbar.h
index 8d82f538e3..24d11e3137 100644
--- a/src/frontends/qt4/GuiToolbar.h
+++ b/src/frontends/qt4/GuiToolbar.h
@@ -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