From fbef5e687aa009dd55c677e080f7bce8c593bd21 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Fri, 12 Feb 2021 12:18:51 +0100 Subject: [PATCH] Use dialog-show in icon names (and search for them also with dialog-toggle counterpart lfuns) Fixes #12137 --- lib/Makefile.am | 12 ++++++------ ...eplaceadv.png => dialog-show_findreplaceadv.png} | Bin .../{dialog-toggle_toc.png => dialog-show_toc.png} | Bin ...laceadv.svgz => dialog-show_findreplaceadv.svgz} | Bin ...{dialog-toggle_toc.svgz => dialog-show_toc.svgz} | Bin ...laceadv.svgz => dialog-show_findreplaceadv.svgz} | Bin ...{dialog-toggle_toc.svgz => dialog-show_toc.svgz} | Bin src/frontends/qt/GuiApplication.cpp | 2 ++ 8 files changed, 8 insertions(+), 6 deletions(-) rename lib/images/classic/{dialog-toggle_findreplaceadv.png => dialog-show_findreplaceadv.png} (100%) rename lib/images/classic/{dialog-toggle_toc.png => dialog-show_toc.png} (100%) rename lib/images/{dialog-toggle_findreplaceadv.svgz => dialog-show_findreplaceadv.svgz} (100%) rename lib/images/{dialog-toggle_toc.svgz => dialog-show_toc.svgz} (100%) rename lib/images/oxygen/{dialog-toggle_findreplaceadv.svgz => dialog-show_findreplaceadv.svgz} (100%) rename lib/images/oxygen/{dialog-toggle_toc.svgz => dialog-show_toc.svgz} (100%) diff --git a/lib/Makefile.am b/lib/Makefile.am index c73bcd25e5..18761f0438 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-toggle_findreplaceadv.png b/lib/images/classic/dialog-show_findreplaceadv.png similarity index 100% rename from lib/images/classic/dialog-toggle_findreplaceadv.png rename to lib/images/classic/dialog-show_findreplaceadv.png diff --git a/lib/images/classic/dialog-toggle_toc.png b/lib/images/classic/dialog-show_toc.png similarity index 100% rename from lib/images/classic/dialog-toggle_toc.png rename to lib/images/classic/dialog-show_toc.png diff --git a/lib/images/dialog-toggle_findreplaceadv.svgz b/lib/images/dialog-show_findreplaceadv.svgz similarity index 100% rename from lib/images/dialog-toggle_findreplaceadv.svgz rename to lib/images/dialog-show_findreplaceadv.svgz diff --git a/lib/images/dialog-toggle_toc.svgz b/lib/images/dialog-show_toc.svgz similarity index 100% rename from lib/images/dialog-toggle_toc.svgz rename to lib/images/dialog-show_toc.svgz diff --git a/lib/images/oxygen/dialog-toggle_findreplaceadv.svgz b/lib/images/oxygen/dialog-show_findreplaceadv.svgz similarity index 100% rename from lib/images/oxygen/dialog-toggle_findreplaceadv.svgz rename to lib/images/oxygen/dialog-show_findreplaceadv.svgz diff --git a/lib/images/oxygen/dialog-toggle_toc.svgz b/lib/images/oxygen/dialog-show_toc.svgz similarity index 100% rename from lib/images/oxygen/dialog-toggle_toc.svgz rename to lib/images/oxygen/dialog-show_toc.svgz diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index 104aa00c54..dc996a55dd 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