summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-06-18 00:09:59 +0000
committerJabiertxof <jabier.arraiza@marker.es>2019-06-18 00:16:27 +0000
commite14bcc5770c46cc7e813bfcda6afdbe6d97bebe2 (patch)
tree231b1d2810c293dbe153600a1ee287777eb193d8
parentBase of theming refactor (diff)
downloadinkscape-e14bcc5770c46cc7e813bfcda6afdbe6d97bebe2.tar.gz
inkscape-e14bcc5770c46cc7e813bfcda6afdbe6d97bebe2.zip
Fix compiling issues
-rw-r--r--share/ui/style.css12
-rw-r--r--src/inkscape.cpp2
-rw-r--r--src/inkscape.h2
-rw-r--r--src/ui/dialog/inkscape-preferences.cpp7
-rw-r--r--src/ui/icon-loader.cpp2
5 files changed, 13 insertions, 12 deletions
diff --git a/share/ui/style.css b/share/ui/style.css
index 910e3353c..fac3e18a6 100644
--- a/share/ui/style.css
+++ b/share/ui/style.css
@@ -66,18 +66,18 @@
* ::::::: Color based
* ::::::: apply to colors
* ::::::: scope widget and all his childs
- * ".inversestyle" invert window colors
+ * ".invertstyle" invert window colors
* ".brightstyle" force bright colors no matter the UI is dark or bright
* ".darkstyle" same but dark
* ".defaultstyle" use default window color for child wigets inside a modified one
* :::::::: Icon Based.
- * ".iconsymbolic" Force icon symbolic
- * ".iconregular" Force colorful icons
+ * ".symbolic" Force icon symbolic
+ * ".regular" Force colorful icons
* :::::::: Combo box.
* "..combobright" Combo bright
*/
-* {
+image {
-gtk-icon-palette: default;
}
@@ -102,8 +102,8 @@
.bright .darkstyle *,
.dark .brightstyle,
.dark .brightstyle *,
-.inversestyle,
-.inversestyle * {
+.invertstyle,
+.invertstyle * {
color: @theme_bg_color;
background-color: @theme_fg_color;
background-image: image(@theme_fg_color);
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index 36ae48a38..11e446ca9 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -445,7 +445,7 @@ Application::add_gtk_css()
css_str += ";}";
css_str += ".dark .brightstyle image,";
css_str += ".bright .darkstyle image,";
- css_str += ".inversestyle image";
+ css_str += ".invertstyle image";
css_str += "{color:";
css_str += colornamed_inverse;
css_str += ";}";
diff --git a/src/inkscape.h b/src/inkscape.h
index 95c0f5296..86649e0cb 100644
--- a/src/inkscape.h
+++ b/src/inkscape.h
@@ -109,7 +109,7 @@ public:
Inkscape::UI::Tools::ToolBase * active_event_context();
SPDocument * active_document();
SPDesktop * active_desktop();
- Glib::RefPtr< Gtk::StyleProvider > colorizeprovider;
+ Glib::RefPtr< Gtk::CssProvider > colorizeprovider;
// Use this function to get selection model etc for a document
Inkscape::ActionContext action_context_for_document(SPDocument *doc);
Inkscape::ActionContext active_action_context();
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index e67a80c58..f3bba55c3 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -630,7 +630,7 @@ void InkscapePreferences::symbolicThemeCheck()
void InkscapePreferences::symbolicDefaultColor(){
auto const screen = Gdk::Screen::get_default();
- Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setBool("/theme/symbolicIconsDefaultColor", true);
}
@@ -638,11 +638,12 @@ void InkscapePreferences::symbolicDefaultColor(){
void InkscapePreferences::symbolicStyling()
{
auto const screen = Gdk::Screen::get_default();
- Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ Gtk::StyleContext::remove_provider_for_screen(screen, INKSCAPE.colorizeprovider);
using namespace Inkscape::IO::Resource;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
prefs->setBool("/theme/symbolicIconsDefaultColor", false);
Gtk::Window *window = SP_ACTIVE_DESKTOP->getToplevel();
+ Gtk::CssProvider::create();
Glib::ustring css_str = "";
if (prefs->getBool("/theme/symbolicIcons", false)) {
gchar colornamed[64];
@@ -675,7 +676,7 @@ void InkscapePreferences::symbolicStyling()
css_str += ";}";
css_str += ".dark .brightstyle image,";
css_str += ".bright .darkstyle image,";
- css_str += ".inversestyle image";
+ css_str += ".invertstyle image";
css_str += "{color:";
css_str += colornamed_inverse;
css_str += ";}";
diff --git a/src/ui/icon-loader.cpp b/src/ui/icon-loader.cpp
index 54cdd9e6b..f69d3148d 100644
--- a/src/ui/icon-loader.cpp
+++ b/src/ui/icon-loader.cpp
@@ -65,7 +65,7 @@ Glib::RefPtr<Gdk::Pixbuf> sp_get_icon_pixbuf(Glib::ustring icon_name, gint size)
if (iconinfo && SP_ACTIVE_DESKTOP->getToplevel()) {
bool was_symbolic = false;
Glib::RefPtr< Gtk::StyleContext > stylecontext = SP_ACTIVE_DESKTOP->getToplevel()->get_style_context();
- stylecontext->add_provider(INKSCAPE.colorizeprovider, 1);
+ stylecontext->add_provider(INKSCAPE.colorizeprovider, GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
_icon_pixbuf = iconinfo.load_symbolic(stylecontext, was_symbolic);
} else {
Gtk::IconInfo iconinfo = icon_theme->lookup_icon(icon_name, size, Gtk::ICON_LOOKUP_FORCE_SIZE);