diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-11-06 22:38:59 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-11-06 22:38:59 +0000 |
| commit | fe2ff1decd47e6ba50e71b3a4b50fdc6f6f6326a (patch) | |
| tree | 09e46febf010d01b3cb44896d3f71517f50b6659 /src/ui | |
| parent | Remove delete that is causing crash. (diff) | |
| download | inkscape-fe2ff1decd47e6ba50e71b3a4b50fdc6f6f6326a.tar.gz inkscape-fe2ff1decd47e6ba50e71b3a4b50fdc6f6f6326a.zip | |
Fix icon loader to allow inverse color in symbolic icons. Also added searching.svg for loading symbols
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/symbols.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp index 0b70ee4bb..ce1e4863b 100644 --- a/src/ui/dialog/symbols.cpp +++ b/src/ui/dialog/symbols.cpp @@ -221,11 +221,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) : overlay_opacity->set_halign(Gtk::ALIGN_START ); overlay_opacity->set_valign(Gtk::ALIGN_START ); //No results - iconsize = Gtk::IconSize().from_name(Glib::ustring("ICON_SIZE_DIALOG_EXTRA")); - if (!iconsize) { - iconsize = Gtk::IconSize().register_new(Glib::ustring("ICON_SIZE_DIALOG_EXTRA"), 110, 110); - } - overlay_icon = new Gtk::Image(); + overlay_icon = sp_get_icon_image("searching", 110, true); overlay_icon->set_halign(Gtk::ALIGN_CENTER ); overlay_icon->set_valign(Gtk::ALIGN_START ); overlay_icon->set_margin_top(45); @@ -466,11 +462,11 @@ void SymbolsDialog::rebuild() { void SymbolsDialog::showOverlay() { #if GTKMM_CHECK_VERSION(3,14,0) Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text()); - overlay_icon = sp_get_icon_image("none", iconsize); if (current == ALLDOCS && !l.size()) { + overlay_icon->hide(); if (!all_docs_processed ) { - overlay_icon = sp_get_icon_image("searching", iconsize); + overlay_icon->show(); overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("</span>")); overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + @@ -479,7 +475,7 @@ void SymbolsDialog::showOverlay() { overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("No results found")) + Glib::ustring("</span>")); overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("Try a different search term.")) + Glib::ustring("</span>")); } else { - overlay_icon = sp_get_icon_image("searching", iconsize); + overlay_icon->show(); overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("</span>")); overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + |