From 5a9105c13eed05ede3936b210f2680426344a2d6 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 20 Jun 2019 22:10:11 +0200 Subject: Improvements to temming allow diferent on dark themes --- .../dialog-align-and-distribute-symbolic.svg | 109 ++++++++++--- share/icons/nextgen/highlights.css | 34 +++- .../nextgen/scalable/actions/tool-measure.svg | 174 +++++++++++---------- .../symbolic/actions/tool-measure-symbolic.svg | 174 +++++++++++---------- .../symbolic/actions/tool-spray-symbolic.svg | 116 +++++++------- .../symbolic/actions/tool-tweak-symbolic.svg | 93 +++++------ src/object/sp-style-elem.cpp | 6 +- src/ui/dialog/inkscape-preferences.cpp | 119 +++++--------- src/ui/dialog/inkscape-preferences.h | 2 - 9 files changed, 461 insertions(+), 366 deletions(-) diff --git a/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg b/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg index 62ea80d4e..911996f7e 100644 --- a/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg +++ b/share/icons/hicolor/symbolic/actions/dialog-align-and-distribute-symbolic.svg @@ -1,20 +1,91 @@ - - - - + + + + + + image/svg+xml + + + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/share/icons/nextgen/highlights.css b/share/icons/nextgen/highlights.css index e171edde0..64031dfdc 100644 --- a/share/icons/nextgen/highlights.css +++ b/share/icons/nextgen/highlights.css @@ -1,15 +1,43 @@ +/* +* Change only colors, do not add more class, order or remove +* also dont chage selectors definition +*/ + .base { fill: #333333; } .success { - fill: rgb(213, 74, 201); + fill: #d54ac9; } .warning { - fill: rgb(9, 61, 63); + fill: #177579; } .error { - fill: #6dcc00; + fill: #457211; +} + +.dark .base { + fill: #CCCCCC; +} + +.dark .success { + fill: #fa85f2; +} + +.dark .warning { + fill: #8fecf0; +} + +.dark .error { + fill: #c1f08c; +} + + +/* do not change */ + +.dark #background { + opacity: 0.8 !important; } \ No newline at end of file diff --git a/share/icons/nextgen/scalable/actions/tool-measure.svg b/share/icons/nextgen/scalable/actions/tool-measure.svg index 1005334cc..94f8b4d5e 100644 --- a/share/icons/nextgen/scalable/actions/tool-measure.svg +++ b/share/icons/nextgen/scalable/actions/tool-measure.svg @@ -7,20 +7,22 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="svg1" - width="16" - height="16" - viewBox="0 0 16 16" + inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)" sodipodi:docname="tool-measure-symbolic.svg" - inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)"> - - + viewBox="0 0 16 16" + height="16" + width="16" + id="svg1" + version="1.1"> + + @@ -35,103 +37,111 @@ + inkscape:window-maximized="1" + inkscape:window-y="27" + inkscape:window-x="0" + inkscape:window-height="1016" + inkscape:window-width="1920" + inkscape:cy="14.577103" + inkscape:cx="16.362103" + inkscape:zoom="15.839192" + showgrid="true" + id="namedview" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10"> + id="grid" + type="xygrid" /> - - + id="tool-measure"> + style="opacity:0;" + d="M 0,0 H 16 V 16 H 0 Z" + id="background" /> + + + d="M 4.4389041,0.81600537 V 15.172249 H 12.592518 V 3.4655915 c 0,-1.2849296 -0.76438,-2.64958613 -2.52138,-2.64958613 z M 5.8064324,2.1835337 h 4.1857307 c 0.8974399,0 1.2393219,0.5543276 1.2393219,1.3247931 V 13.786122 H 5.8064324 Z" + style="opacity:1" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> diff --git a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg index 1005334cc..94f8b4d5e 100644 --- a/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg +++ b/share/icons/nextgen/symbolic/actions/tool-measure-symbolic.svg @@ -7,20 +7,22 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="svg1" - width="16" - height="16" - viewBox="0 0 16 16" + inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)" sodipodi:docname="tool-measure-symbolic.svg" - inkscape:version="1.0alpha2 (92053aa9ea, 2019-06-13)"> - - + viewBox="0 0 16 16" + height="16" + width="16" + id="svg1" + version="1.1"> + + @@ -35,103 +37,111 @@ + inkscape:window-maximized="1" + inkscape:window-y="27" + inkscape:window-x="0" + inkscape:window-height="1016" + inkscape:window-width="1920" + inkscape:cy="14.577103" + inkscape:cx="16.362103" + inkscape:zoom="15.839192" + showgrid="true" + id="namedview" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10"> + id="grid" + type="xygrid" /> - - + id="tool-measure"> + style="opacity:0;" + d="M 0,0 H 16 V 16 H 0 Z" + id="background" /> + + + d="M 4.4389041,0.81600537 V 15.172249 H 12.592518 V 3.4655915 c 0,-1.2849296 -0.76438,-2.64958613 -2.52138,-2.64958613 z M 5.8064324,2.1835337 h 4.1857307 c 0.8974399,0 1.2393219,0.5543276 1.2393219,1.3247931 V 13.786122 H 5.8064324 Z" + style="opacity:1" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" /> diff --git a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg index 28c6d443e..c787b0d20 100644 --- a/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg +++ b/share/icons/nextgen/symbolic/actions/tool-spray-symbolic.svg @@ -7,13 +7,13 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - version="1.1" - id="svg1" - width="16" - height="16" - viewBox="0 0 16 16" + inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)" sodipodi:docname="tool-spray-symbolic.svg" - inkscape:version="1.0alpha2 (33a359e035, 2019-06-16, custom)"> + viewBox="0 0 16 16" + height="16" + width="16" + id="svg1" + version="1.1"> @@ -28,59 +28,67 @@ + inkscape:window-y="27" + inkscape:window-x="0" + inkscape:window-height="1016" + inkscape:window-width="1920" + inkscape:cy="15.435688" + inkscape:cx="12.187594" + inkscape:zoom="24.685134" + showgrid="true" + id="namedview" + guidetolerance="10" + gridtolerance="10" + objecttolerance="10"> + id="grid" + type="xygrid" /> - - + + + id="tool-spray"> + - - - - + style="opacity:0;" + d="M 0,0 H 16 V 16 H 0 Z" + id="background" /> + + + + + diff --git a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg index a8e997ee3..f69251303 100644 --- a/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg +++ b/share/icons/nextgen/symbolic/actions/tool-tweak-symbolic.svg @@ -7,7 +7,7 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - inkscape:version="1.0alpha2 (33a359e035, 2019-06-16, custom)" + inkscape:version="1.0alpha2 (a0e047e17e, 2019-06-20, custom)" sodipodi:docname="tool-tweak-symbolic.svg" viewBox="0 0 16 16" height="16" @@ -27,33 +27,35 @@ - + - - + + - - + id="tool-tweak"> + + style="opacity:0;" + d="M 0,0 H 16 V 16 H 0 Z" + id="background" /> + + + diff --git a/src/object/sp-style-elem.cpp b/src/object/sp-style-elem.cpp index 3b93ff190..dc9712938 100644 --- a/src/object/sp-style-elem.cpp +++ b/src/object/sp-style-elem.cpp @@ -203,14 +203,14 @@ import_style_cb (CRDocHandler *a_handler, CRStatus const parse_status = cr_parser_parse_file (parser, reinterpret_cast(import_file.c_str()), CR_UTF_8); if (parse_status == CR_OK) { - if (!document->getStyleSheet()) { + if(!document->getStyleSheet()) { // if the style is the first style sheet that we've seen, set the document's // first style sheet to this style and create a cascade object with it. document->setStyleSheet(stylesheet); - cr_cascade_set_sheet(document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); + cr_cascade_set_sheet (document->getStyleCascade(), document->getStyleSheet(), ORIGIN_AUTHOR); } else { // If not the first, then chain up this style_sheet - cr_stylesheet_append_import(document->getStyleSheet(), stylesheet); + cr_stylesheet_append_import (document->getStyleSheet(), stylesheet); } } else { std::cerr << "import_style_cb: Could not parse: " << import_file << std::endl; diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 669d39c2d..50edd7622 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -628,16 +628,15 @@ void InkscapePreferences::symbolicThemeCheck() _symbolic_base_colors.get_parent()->hide(); _symbolic_base_color.get_parent()->get_parent()->hide(); _symbolic_success_color.get_parent()->get_parent()->hide(); - _theme_decide_color.get_parent()->hide(); } else { _symbolic_icons.get_parent()->show(); _symbolic_base_colors.get_parent()->show(); _symbolic_base_color.get_parent()->get_parent()->show(); _symbolic_success_color.get_parent()->get_parent()->show(); - _theme_decide_color.get_parent()->show(); } } + changeIconsColors(); } void InkscapePreferences::resetIconsColors() @@ -649,7 +648,6 @@ void InkscapePreferences::resetIconsColors() _symbolic_success_color.setSensitive(false); _symbolic_warning_color.setSensitive(false); _symbolic_error_color.setSensitive(false); - _theme_decide_color.set_sensitive(false); } else if (prefs->getBool("/theme/symbolicDefaultColors", true)) { Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); Gdk::RGBA normal_color = _symbolic_base_color.get_style_context()->get_color(); @@ -664,6 +662,7 @@ void InkscapePreferences::resetIconsColors() guint32 colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha()); guint32 colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha()); guint32 colorseterror = error_color_sp.toRGBA32(error_color.get_alpha()); + get_highlight_colors(colorsetbase, colorsetsuccess, colorsetwarning, colorseterror); _symbolic_base_color.setRgba32(colorsetbase); _symbolic_success_color.setRgba32(colorsetsuccess); _symbolic_warning_color.setRgba32(colorsetwarning); @@ -672,21 +671,16 @@ void InkscapePreferences::resetIconsColors() prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess); prefs->setInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning); prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror); - auto const screen = Gdk::Screen::get_default(); - if (INKSCAPE.colorizeprovider) { - Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider); - } _symbolic_base_color.setSensitive(false); _symbolic_success_color.setSensitive(false); _symbolic_warning_color.setSensitive(false); _symbolic_error_color.setSensitive(false); - _theme_decide_color.set_sensitive(false); + changeIconsColors(); } else { _symbolic_base_color.setSensitive(true); _symbolic_success_color.setSensitive(true); _symbolic_warning_color.setSensitive(true); _symbolic_error_color.setSensitive(true); - _theme_decide_color.set_sensitive(true); } } @@ -700,12 +694,16 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c if (themeiconname == prefs->getString("/theme/defaultIconTheme")) { themeiconname = "hicolor"; } + Glib::ustring prefix = ""; + if (prefs->getBool("/theme/darkTheme", false)) { + prefix = ".dark "; + } Glib::ustring higlight = get_filename(ICONS, Glib::ustring(themeiconname + "/highlights.css").c_str(), false, true); if (!higlight.empty()) { std::ifstream ifs(higlight); std::string content((std::istreambuf_iterator(ifs)), (std::istreambuf_iterator())); Glib::ustring result; - size_t startpos = content.find(".base"); + size_t startpos = content.find(prefix + ".base"); size_t endpos = content.find("}"); if (startpos != std::string::npos) { result = content.substr(startpos, endpos - startpos); @@ -717,8 +715,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c SPColor base_color_sp(base_color.get_red(), base_color.get_green(), base_color.get_blue()); colorsetbase = base_color_sp.toRGBA32(base_color.get_alpha()); } - content.erase(startpos, endpos - startpos + 1); - startpos = content.find(".success"); + content.erase(0, endpos + 1); + startpos = content.find(prefix + ".success"); endpos = content.find("}"); if (startpos != std::string::npos) { result = content.substr(startpos, endpos - startpos); @@ -730,8 +728,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c SPColor success_color_sp(success_color.get_red(), success_color.get_green(), success_color.get_blue()); colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha()); } - content.erase(startpos, endpos - startpos + 1); - startpos = content.find(".warning"); + content.erase(0, endpos + 1); + startpos = content.find(prefix + ".warning"); endpos = content.find("}"); if (startpos != std::string::npos) { result = content.substr(startpos, endpos - startpos); @@ -743,8 +741,8 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c SPColor warning_color_sp(warning_color.get_red(), warning_color.get_green(), warning_color.get_blue()); colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha()); } - content.erase(startpos, endpos - startpos + 1); - startpos = content.find(".error"); + content.erase(0, endpos + 1); + startpos = content.find(prefix + ".error"); endpos = content.find("}"); if (startpos != std::string::npos) { result = content.substr(startpos, endpos - startpos); @@ -759,67 +757,35 @@ void InkscapePreferences::get_highlight_colors(guint32 &colorsetbase, guint32 &c } } -void InkscapePreferences::themeIconsColors() -{ - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (!prefs->getBool("/theme/symbolicDefaultColors", true)) { - Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); - Gdk::RGBA normal_color = _symbolic_base_color.get_style_context()->get_color(); - Gdk::RGBA success_color = _symbolic_success_color.get_style_context()->get_color(); - Gdk::RGBA warning_color = _symbolic_warning_color.get_style_context()->get_color(); - Gdk::RGBA error_color = _symbolic_error_color.get_style_context()->get_color(); - SPColor normal_color_sp(normal_color.get_red(), normal_color.get_green(), normal_color.get_blue()); - SPColor success_color_sp(success_color.get_red(), success_color.get_green(), success_color.get_blue()); - SPColor warning_color_sp(warning_color.get_red(), warning_color.get_green(), warning_color.get_blue()); - SPColor error_color_sp(error_color.get_red(), error_color.get_green(), error_color.get_blue()); - guint32 colorsetbase = normal_color_sp.toRGBA32(normal_color.get_alpha()); - guint32 colorsetsuccess = success_color_sp.toRGBA32(success_color.get_alpha()); - guint32 colorsetwarning = warning_color_sp.toRGBA32(warning_color.get_alpha()); - guint32 colorseterror = error_color_sp.toRGBA32(error_color.get_alpha()); - get_highlight_colors(colorsetbase, colorsetsuccess, colorsetwarning, colorseterror); - _symbolic_base_color.setRgba32(colorsetbase); - _symbolic_success_color.setRgba32(colorsetsuccess); - _symbolic_warning_color.setRgba32(colorsetwarning); - _symbolic_error_color.setRgba32(colorseterror); - prefs->setInt("/theme/" + themeiconname + "/symbolicBaseColor", colorsetbase); - prefs->setInt("/theme/" + themeiconname + "/symbolicSuccessColor", colorsetsuccess); - prefs->setInt("/theme/" + themeiconname + "/symbolicWarningColor", colorsetwarning); - prefs->setInt("/theme/" + themeiconname + "/symbolicErrorColor", colorseterror); - changeIconsColors(); - } -} - void InkscapePreferences::changeIconsColors() { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - if (!prefs->getBool("/theme/symbolicDefaultColors", true)) { - Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); - guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff); - guint32 colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff); - guint32 colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff); - guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff); - _symbolic_base_color.setRgba32(colorsetbase); - _symbolic_success_color.setRgba32(colorsetsuccess); - _symbolic_warning_color.setRgba32(colorsetwarning); - _symbolic_error_color.setRgba32(colorseterror); - auto const screen = Gdk::Screen::get_default(); - if (INKSCAPE.colorizeprovider) { - Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider); - } - Gtk::CssProvider::create(); - Glib::ustring css_str = ""; - if (prefs->getBool("/theme/symbolicIcons", false)) { - css_str = INKSCAPE.get_symbolic_colors(); - } - try { - INKSCAPE.colorizeprovider->load_from_data(css_str); - } catch (const Gtk::CssProviderError &ex) { - g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), - ex.what().c_str()); - } - Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, - GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + Glib::ustring themeiconname = prefs->getString("/theme/iconTheme"); + guint32 colorsetbase = prefs->getInt("/theme/" + themeiconname + "/symbolicBaseColor", 0x2E3436ff); + guint32 colorsetsuccess = prefs->getInt("/theme/" + themeiconname + "/symbolicSuccessColor", 0x4AD589ff); + guint32 colorsetwarning = prefs->getInt("/theme/" + themeiconname + "/symbolicWarningColor", 0xF57900ff); + guint32 colorseterror = prefs->getInt("/theme/" + themeiconname + "/symbolicErrorColor", 0xcc0000ff); + _symbolic_base_color.setRgba32(colorsetbase); + _symbolic_success_color.setRgba32(colorsetsuccess); + _symbolic_warning_color.setRgba32(colorsetwarning); + _symbolic_error_color.setRgba32(colorseterror); + auto const screen = Gdk::Screen::get_default(); + if (INKSCAPE.colorizeprovider) { + Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider); + } + Gtk::CssProvider::create(); + Glib::ustring css_str = ""; + if (prefs->getBool("/theme/symbolicIcons", false)) { + css_str = INKSCAPE.get_symbolic_colors(); } + try { + INKSCAPE.colorizeprovider->load_from_data(css_str); + } catch (const Gtk::CssProviderError &ex) { + g_critical("CSSProviderError::load_from_data(): failed to load '%s'\n(%s)", css_str.c_str(), + ex.what().c_str()); + } + Gtk::StyleContext::add_provider_for_screen(screen, INKSCAPE.colorizeprovider, + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } void InkscapePreferences::toggleSymbolic() @@ -866,12 +832,15 @@ void InkscapePreferences::themeChange() } } if (dark) { + prefs->setBool("/theme/darkTheme", true); window->get_style_context()->add_class("dark"); window->get_style_context()->remove_class("bright"); } else { + prefs->setBool("/theme/darkTheme", false); window->get_style_context()->add_class("bright"); window->get_style_context()->remove_class("dark"); } + resetIconsColors(); INKSCAPE.signal_change_theme.emit(); } } @@ -1145,10 +1114,6 @@ void InkscapePreferences::initPageUI() _("Highlights colors, some symbolic icon themes use it. Some icons changes need reload"), false); Gtk::Box *icon_buttons_def = Gtk::manage(new Gtk::Box()); - _theme_decide_color.set_label(_("Theme default colors")); - _theme_decide_color.set_tooltip_text(_("Defaul colors from theme)")); - _theme_decide_color.signal_clicked().connect(sigc::mem_fun(*this, &InkscapePreferences::themeIconsColors)); - icon_buttons_def->pack_start(_theme_decide_color, true, true, 4); resetIconsColors(); _page_theme.add_line(false, "", *icon_buttons_def, "", _("Reset theme colors, some symbolic icon themes use it. Some icons changes need reload"), diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 592877796..c0b7f3938 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -250,7 +250,6 @@ protected: UI::Widget::PrefColorPicker _symbolic_warning_color; UI::Widget::PrefColorPicker _symbolic_error_color; UI::Widget::PrefColorPicker _symbolic_success_color; - Gtk::Button _theme_decide_color; UI::Widget::PrefCombo _misc_small_toolbar; UI::Widget::PrefCombo _misc_small_secondary; UI::Widget::PrefCombo _misc_small_tools; @@ -597,7 +596,6 @@ private: void toggleSymbolic(); void changeIconsColors(); void resetIconsColors(); - void themeIconsColors(); void changeIconsColor(guint32 /*color*/) { changeIconsColors(); } void get_highlight_colors(guint32 &colorsetbase, guint32 &colorsetsuccess, guint32 &colorsetwarning, guint32 &colorseterror); -- cgit v1.2.3