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
This commit is contained in:
parent
d0743ef359
commit
5b2dc59fbf
@ -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(),
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
return surf;
|
||||
}
|
||||
@ -130,10 +126,8 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
return surf;
|
||||
}
|
||||
@ -230,10 +224,8 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
return surf;
|
||||
}
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user