[shotwell] Remove old CSS



commit 8bac537b7424547c6e2773f7499633be7d19a1ae
Author: Jens Georg <mail jensge org>
Date:   Sat May 5 08:02:04 2018 +0200

    Remove old CSS

 src/AppWindow.vala |    8 ++------
 src/Resources.vala |   37 -------------------------------------
 src/main.vala      |    4 ----
 3 files changed, 2 insertions(+), 47 deletions(-)
---
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index d950c51..b746ebb 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -441,12 +441,8 @@ public abstract class AppWindow : PageWindow {
         add_actions ();
         
         Gtk.CssProvider provider = new Gtk.CssProvider();
-        try {
-            provider.load_from_data(Resources.CUSTOM_CSS, -1);
-            Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, 
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        } catch (Error err) {
-            debug("Unable to load custom CSS: %s", err.message);
-        }
+        provider.load_from_resource("/org/gnome/Shotwell/misc/org.gnome.Shotwell.css");
+        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, 
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
     private const GLib.ActionEntry[] common_actions = {
diff --git a/src/Resources.vala b/src/Resources.vala
index 2aa32c7..dcb6534 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1042,33 +1042,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public const int ALL_DATA = -1;
     
-    private static Gee.Map<Gtk.Widget, Gtk.CssProvider> providers = null;
-    
-    public static void style_widget(Gtk.Widget widget, string stylesheet) {
-        if (providers == null)
-            providers = new Gee.HashMap<Gtk.Widget, Gtk.CssProvider>();
-
-        if (providers.has_key(widget))
-            widget.get_style_context().remove_provider(providers.get(widget));
-
-        Gtk.CssProvider styler = new Gtk.CssProvider();
-        
-        try {
-            styler.load_from_data(stylesheet, ALL_DATA);
-        } catch (Error e) {
-            warning("couldn't parse widget stylesheet '%s': %s", stylesheet,
-                e.message);
-            // short-circuit return -- if the stylesheet couldn't be interpreted
-            // then we can't do anything more
-            return;
-        }
-        
-        widget.get_style_context().add_provider(styler,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-        providers.set(widget, styler);
-    }
-
     public static int use_header_bar() {
         if (Environment.get_variable("SHOTWELL_USE_HEADERBARS") != null) {
             return 0;
@@ -1080,16 +1053,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return use_header ? 1 : 0;
     }
 
-    public const string CUSTOM_CSS =
-         """LibraryWindow .pane-separator {
-               background-color: @borders;
-            }
-            SearchFilterToolbar {
-               border-width: 0 0 1px 0;
-               border-style: solid;
-               border-color: @borders;
-            }""";
-
     public const string ONIMAGE_FONT_COLOR = "#000000";
     public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
 }
diff --git a/src/main.vala b/src/main.vala
index 1dda0cb..b25b909 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -362,10 +362,6 @@ void main(string[] args) {
         return;
     }
 
-    var provider = new Gtk.CssProvider();
-    provider.load_from_resource("/org/gnome/Shotwell/misc/org.gnome.Shotwell.css");
-    Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, 
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-    
     if (CommandlineOptions.show_version) {
         if (Resources.GIT_VERSION != null)
             print("%s %s (%s)\n", Resources.APP_TITLE, Resources.APP_VERSION, Resources.GIT_VERSION);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]