[LyX/master] Use dialog-show in icon names

Juergen Spitzmueller spitz at lyx.org
Fri Feb 12 11:16:44 UTC 2021


commit fbef5e687aa009dd55c677e080f7bce8c593bd21
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Fri Feb 12 12:18:51 2021 +0100

    Use dialog-show in icon names
    
    (and search for them also with dialog-toggle counterpart lfuns)
    
    Fixes #12137
---
 lib/Makefile.am                                    |   12 ++++++------
 lib/images/classic/dialog-show_findreplaceadv.png  |  Bin 0 -> 1132 bytes
 lib/images/classic/dialog-show_toc.png             |  Bin 0 -> 761 bytes
 .../classic/dialog-toggle_findreplaceadv.png       |  Bin 1132 -> 0 bytes
 lib/images/classic/dialog-toggle_toc.png           |  Bin 761 -> 0 bytes
 lib/images/dialog-show_findreplaceadv.svgz         |  Bin 0 -> 3840 bytes
 lib/images/dialog-show_toc.svgz                    |  Bin 0 -> 2319 bytes
 lib/images/dialog-toggle_findreplaceadv.svgz       |  Bin 3840 -> 0 bytes
 lib/images/dialog-toggle_toc.svgz                  |  Bin 2319 -> 0 bytes
 lib/images/oxygen/dialog-show_findreplaceadv.svgz  |  Bin 0 -> 9956 bytes
 lib/images/oxygen/dialog-show_toc.svgz             |  Bin 0 -> 7350 bytes
 .../oxygen/dialog-toggle_findreplaceadv.svgz       |  Bin 9956 -> 0 bytes
 lib/images/oxygen/dialog-toggle_toc.svgz           |  Bin 7350 -> 0 bytes
 src/frontends/qt/GuiApplication.cpp                |    2 ++
 14 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c73bcd2..18761f0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -583,13 +583,13 @@ dist_images_DATA1X = \
 	images/dialog-show-new-inset_ref.svgz \
 	images/dialog-show_character.svgz \
 	images/dialog-show_findreplace.svgz \
+	images/dialog-show_findreplaceadv.svgz \
 	images/dialog-show_mathdelimiter.svgz \
 	images/dialog-show_mathmatrix.svgz \
 	images/dialog-show_print.svgz \
 	images/dialog-show_spellchecker.svgz \
+	images/dialog-show_toc.svgz \
 	images/dialog-show_vclog.svgz \
-	images/dialog-toggle_findreplaceadv.svgz \
-	images/dialog-toggle_toc.svgz \
 	images/down.svgz \
 	images/dynamic-char-styles.svgz \
 	images/dynamic-custom-insets.svgz \
@@ -2052,13 +2052,13 @@ dist_imagesoxygen_DATA1X = \
 	images/oxygen/dialog-show-new-inset_ref.svgz \
 	images/oxygen/dialog-show_character.svgz \
 	images/oxygen/dialog-show_findreplace.svgz \
+	images/oxygen/dialog-show_findreplaceadv.svgz \
 	images/oxygen/dialog-show_mathdelimiter.svgz \
 	images/oxygen/dialog-show_mathmatrix.svgz \
 	images/oxygen/dialog-show_print.svgz \
 	images/oxygen/dialog-show_spellchecker.svgz \
+	images/oxygen/dialog-show_toc.svgz \
 	images/oxygen/dialog-show_vclog.svgz \
-	images/oxygen/dialog-toggle_findreplaceadv.svgz \
-	images/oxygen/dialog-toggle_toc.svgz \
 	images/oxygen/dynamic-char-styles.svgz \
 	images/oxygen/dynamic-custom-insets.svgz \
 	images/oxygen/down.svgz \
@@ -2255,6 +2255,7 @@ dist_imagesclassic_DATA = \
 	images/classic/depth-decrement.png  \
 	images/classic/depth-increment.png  \
 	images/classic/dialog-preferences.png  \
+	images/classic/dialog-show_findreplaceadv.png  \
 	images/classic/dialog-show_mathdelimiter.png  \
 	images/classic/dialog-show_mathmatrix.png  \
 	images/classic/dialog-show-new-inset_citation.png  \
@@ -2265,9 +2266,8 @@ dist_imagesclassic_DATA = \
 	images/classic/dialog-show_findreplace.png  \
 	images/classic/dialog-show_print.png  \
 	images/classic/dialog-show_spellchecker.png  \
+	images/classic/dialog-show_toc.png  \
 	images/classic/dialog-show_vclog.png  \
-	images/classic/dialog-toggle_findreplaceadv.png  \
-	images/classic/dialog-toggle_toc.png  \
 	images/classic/down.png  \
 	images/classic/ert-insert.png  \
 	images/classic/file-open.png  \
diff --git a/lib/images/classic/dialog-show_findreplaceadv.png b/lib/images/classic/dialog-show_findreplaceadv.png
new file mode 100644
index 0000000..aea99c0
Binary files /dev/null and b/lib/images/classic/dialog-show_findreplaceadv.png differ
diff --git a/lib/images/classic/dialog-show_toc.png b/lib/images/classic/dialog-show_toc.png
new file mode 100644
index 0000000..8c65b62
Binary files /dev/null and b/lib/images/classic/dialog-show_toc.png differ
diff --git a/lib/images/classic/dialog-toggle_findreplaceadv.png b/lib/images/classic/dialog-toggle_findreplaceadv.png
deleted file mode 100644
index aea99c0..0000000
Binary files a/lib/images/classic/dialog-toggle_findreplaceadv.png and /dev/null differ
diff --git a/lib/images/classic/dialog-toggle_toc.png b/lib/images/classic/dialog-toggle_toc.png
deleted file mode 100644
index 8c65b62..0000000
Binary files a/lib/images/classic/dialog-toggle_toc.png and /dev/null differ
diff --git a/lib/images/dialog-show_findreplaceadv.svgz b/lib/images/dialog-show_findreplaceadv.svgz
new file mode 100644
index 0000000..81bd5c8
Binary files /dev/null and b/lib/images/dialog-show_findreplaceadv.svgz differ
diff --git a/lib/images/dialog-show_toc.svgz b/lib/images/dialog-show_toc.svgz
new file mode 100644
index 0000000..e38be0f
Binary files /dev/null and b/lib/images/dialog-show_toc.svgz differ
diff --git a/lib/images/dialog-toggle_findreplaceadv.svgz b/lib/images/dialog-toggle_findreplaceadv.svgz
deleted file mode 100644
index 81bd5c8..0000000
Binary files a/lib/images/dialog-toggle_findreplaceadv.svgz and /dev/null differ
diff --git a/lib/images/dialog-toggle_toc.svgz b/lib/images/dialog-toggle_toc.svgz
deleted file mode 100644
index e38be0f..0000000
Binary files a/lib/images/dialog-toggle_toc.svgz and /dev/null differ
diff --git a/lib/images/oxygen/dialog-show_findreplaceadv.svgz b/lib/images/oxygen/dialog-show_findreplaceadv.svgz
new file mode 100644
index 0000000..f7c4018
Binary files /dev/null and b/lib/images/oxygen/dialog-show_findreplaceadv.svgz differ
diff --git a/lib/images/oxygen/dialog-show_toc.svgz b/lib/images/oxygen/dialog-show_toc.svgz
new file mode 100644
index 0000000..10022f8
Binary files /dev/null and b/lib/images/oxygen/dialog-show_toc.svgz differ
diff --git a/lib/images/oxygen/dialog-toggle_findreplaceadv.svgz b/lib/images/oxygen/dialog-toggle_findreplaceadv.svgz
deleted file mode 100644
index f7c4018..0000000
Binary files a/lib/images/oxygen/dialog-toggle_findreplaceadv.svgz and /dev/null differ
diff --git a/lib/images/oxygen/dialog-toggle_toc.svgz b/lib/images/oxygen/dialog-toggle_toc.svgz
deleted file mode 100644
index 10022f8..0000000
Binary files a/lib/images/oxygen/dialog-toggle_toc.svgz and /dev/null differ
diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp
index 104aa00..dc996a5 100644
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -490,6 +490,8 @@ IconInfo iconInfo(FuncRequest const & f, bool unknown, bool rtl)
 		name.replace(' ', '_');
 		name.replace(';', '_');
 		name.replace('\\', "backslash");
+		// avoid duplication for these
+		name.replace("dialog-toggle", "dialog-show");
 		names << name;
 
 		// then special default icon for some lfuns


More information about the lyx-cvs mailing list