From 5b2dc59fbf553e7f5f61914e479feadae4938dd1 Mon Sep 17 00:00:00 2001
From: Pandagrapher <pierre.cab@gmail.com>
Date: Sat, 12 Aug 2023 18:20:27 +0200
Subject: [PATCH] Fix incorrect icon names

- Some icon names still had file extension indicated in their names
- This commit also enable icon name debug messages on console
---
 rtgui/editorpanel.cc   |  2 +-
 rtgui/rtscalable.cc    | 16 ++++------------
 rtgui/toneequalizer.cc |  2 +-
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index fd6acc185..4880ae0a8 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -904,7 +904,7 @@ EditorPanel::EditorPanel (FilePanel* filePanel)
 
     send_to_external = Gtk::manage(new PopUpButton("", false));
     send_to_external->set_tooltip_text(M("MAIN_BUTTON_SENDTOEDITOR_TOOLTIP"));
-    send_to_external->setEmptyImage("palette-brush.png");
+    send_to_external->setEmptyImage("palette-brush");
     setExpandAlignProperties(send_to_external->buttonGroup, false, false, Gtk::ALIGN_CENTER, Gtk::ALIGN_FILL);
     updateExternalEditorWidget(
         options.externalEditorIndex >= 0 ? options.externalEditorIndex : options.externalEditors.size(),
diff --git a/rtgui/rtscalable.cc b/rtgui/rtscalable.cc
index 0e90d34ad..b58da6d12 100644
--- a/rtgui/rtscalable.cc
+++ b/rtgui/rtscalable.cc
@@ -70,9 +70,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromIcon(const Glib::u
     const auto iconInfo = theme->lookup_icon(iconName, size);
 
     if (!iconInfo) {
-        if (rtengine::settings->verbose) {
-            std::cerr << "Failed to load icon \"" << iconName << "\" for size " << size << "px" << std::endl;
-        }
+        std::cerr << "Failed to load icon \"" << iconName << "\" for size " << size << "px" << std::endl;
 
         return surf;
     }
@@ -80,9 +78,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromIcon(const Glib::u
     const auto iconPath = iconInfo.get_filename();
 
     if (iconPath.empty()) {
-        if (rtengine::settings->verbose) {
-            std::cerr << "Failed to load icon \"" << iconName << "\" for size " << size << "px" << std::endl;
-        }
+        std::cerr << "Failed to load icon \"" << iconName << "\" for size " << size << "px" << std::endl;
 
         return surf;
     }
@@ -130,9 +126,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromPNG(const Glib::us
     if (Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS)) {
         surf = Cairo::ImageSurface::create_from_png(path);
     } else {
-        if (rtengine::settings->verbose) {
-            std::cerr << "Failed to load PNG file \"" << fname << "\"" << std::endl;
-        }
+        std::cerr << "Failed to load PNG file \"" << fname << "\"" << std::endl;
     }
 
     return surf;
@@ -230,9 +224,7 @@ Cairo::RefPtr<Cairo::ImageSurface> RTScalable::loadSurfaceFromSVG(const Glib::us
             static_cast<double>(RTScalable::getScale()),
             static_cast<double>(RTScalable::getScale()));
     } else {
-        if (rtengine::settings->verbose) {
-            std::cerr << "Failed to load SVG file \"" << fname << "\"" << std::endl;
-        }
+        std::cerr << "Failed to load SVG file \"" << fname << "\"" << std::endl;
     }
 
     return surf;
diff --git a/rtgui/toneequalizer.cc b/rtgui/toneequalizer.cc
index d524bdc05..34c1c8a4e 100644
--- a/rtgui/toneequalizer.cc
+++ b/rtgui/toneequalizer.cc
@@ -44,7 +44,7 @@ ToneEqualizer::ToneEqualizer(): FoldableToolPanel(this, TOOL_NAME, M("TP_TONE_EQ
         "red"
     };
     for (size_t i = 0; i < bands.size(); ++i) {
-        bands[i] = Gtk::manage(new Adjuster(M("TP_TONE_EQUALIZER_BAND_" + std::to_string(i)), -100, 100, 1, 0, Gtk::manage(new RTImage(Glib::ustring("circle-") + images[i] + "-small.png"))));
+        bands[i] = Gtk::manage(new Adjuster(M("TP_TONE_EQUALIZER_BAND_" + std::to_string(i)), -100, 100, 1, 0, Gtk::manage(new RTImage(Glib::ustring("circle-") + images[i] + "-small"))));
         bands[i]->setAdjusterListener(this);
         pack_start(*bands[i]);
         bands[i]->showIcons(false);