Fix easy style class deprecations (#327)

Author: danirabbit

README.md

@@ -13,7 +13,7 @@ You'll need the following dependencies:
 * libecal1.2-dev
 * libedataserver1.2-dev
 * libical-dev
-* libgranite-7-dev >= 7.6.0
+* libgranite-7-dev >= 7.7.0
 * libwingpanel-9-dev
 * meson (>= 0.57.0)
 * valac >= 0.40.3

meson.build

@@ -64,7 +64,7 @@ shared_module(
     dependencies: [
         dependency('glib-2.0'),
         dependency('gobject-2.0'),
-        dependency('granite-7', version: '>=7.6.0'),
+        dependency('granite-7', version: '>=7.7.0'),
         dependency('gtk4'),
         libecal_dep,
         dependency('libedataserver-1.2'),

src/Indicator.vala

@@ -71,10 +71,8 @@ public class DateTime.Indicator : Wingpanel.Indicator {
                 max_width_chars = 20,
                 justify = Gtk.Justification.CENTER
             };
-
-            var placeholder_style_context = placeholder_label.get_style_context ();
-            placeholder_style_context.add_class (Granite.STYLE_CLASS_DIM_LABEL);
-            placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL);
+            placeholder_label.add_css_class (Granite.CssClass.DIM);
+            placeholder_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);
 
             component_listbox = new Gtk.ListBox () {
                 selection_mode = Gtk.SelectionMode.NONE

src/Widgets/ComponentRow.vala

@@ -90,9 +90,7 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
         component_image = new Gtk.Image.from_icon_name (icon_name) {
             valign = Gtk.Align.START
         };
-
-        unowned var component_image_context = component_image.get_style_context ();
-        component_image_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        component_image.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         name_label = new Gtk.Label (component.get_summary ()) {
             hexpand = true,
@@ -103,16 +101,14 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
             wrap_mode = Pango.WrapMode.WORD_CHAR,
             xalign = 0
         };
-
-        var name_label_context = name_label.get_style_context ();
-        name_label_context.add_class ("title");
-        name_label_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        name_label.add_css_class ("title");
+        name_label.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         time_label = new Gtk.Label (null) {
             use_markup = true,
             xalign = 0,
         };
-        time_label.get_style_context ().add_class (Granite.STYLE_CLASS_DIM_LABEL);
+        time_label.add_css_class (Granite.CssClass.DIM);
 
         grid = new Gtk.Grid () {
             column_spacing = 6,
@@ -127,9 +123,8 @@ public class DateTime.ComponentRow : Gtk.ListBoxRow {
             grid.attach (time_label, 1, 1);
         }
 
-        unowned var grid_context = grid.get_style_context ();
-        grid_context.add_class ("event");
-        grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        grid.add_css_class ("event");
+        grid.get_style_context ().add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         child = grid;
 

src/Widgets/calendar/CalendarView.vala

@@ -46,22 +46,21 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid {
         var provider = new Gtk.CssProvider ();
         provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/ControlHeader.css");
 
-        unowned var label_style_context = label.get_style_context ();
-        label_style_context.add_class (Granite.STYLE_CLASS_ACCENT);
-        label_style_context.add_class ("header-label");
-        label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        label.add_css_class (Granite.CssClass.ACCENT);
+        label.add_css_class ("header-label");
+
+        label.get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic");
         var center_button = new Gtk.Button.from_icon_name ("office-calendar-symbolic") {
             tooltip_text = _("Go to today's date")
         };
         var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic");
 
-        var box_buttons = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
+        var box_buttons = new Granite.Box (HORIZONTAL, LINKED) {
             margin_end = 6,
-            valign = Gtk.Align.CENTER
+            valign = CENTER
         };
-        box_buttons.get_style_context ().add_class (Granite.STYLE_CLASS_LINKED);
         box_buttons.append (left_button);
         box_buttons.append (center_button);
         box_buttons.append (right_button);

src/Widgets/calendar/Grid.vala

@@ -51,7 +51,7 @@ namespace DateTime.Widgets {
             header_labels = new Gtk.Label[7];
             for (int c = 0; c < 7; c++) {
                 header_labels[c] = new Gtk.Label (null);
-                header_labels[c].get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);
+                header_labels[c].add_css_class (Granite.STYLE_CLASS_H4_LABEL);
 
                 attach (header_labels[c], c + 2, 0);
             }
@@ -248,7 +248,7 @@ namespace DateTime.Widgets {
                     margin_bottom = 6,
                     width_chars = 2
                 };
-                week_label.get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);
+                week_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL);
 
                 week_labels[c] = new Gtk.Revealer () {
                     transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT,
@@ -280,11 +280,11 @@ namespace DateTime.Widgets {
         private void update_today_style (GridDay day, GLib.DateTime date, GLib.DateTime today) {
             if (date.get_day_of_year () == today.get_day_of_year () && date.get_year () == today.get_year ()) {
                 day.name = "today";
-                day.get_style_context ().add_class (Granite.STYLE_CLASS_ACCENT);
+                day.add_css_class (Granite.CssClass.ACCENT);
                 day.receives_default = true;
             } else if (day.name == "today") {
                 day.name = "";
-                day.get_style_context ().remove_class (Granite.STYLE_CLASS_ACCENT);
+                day.remove_css_class (Granite.CssClass.ACCENT);
                 day.receives_default = false;
             }
         }

src/Widgets/calendar/GridDay.vala

@@ -48,9 +48,8 @@ public class DateTime.Widgets.GridDay : Granite.Bin {
     construct {
         label = new Gtk.Label (null);
 
-        unowned var label_style_context = label.get_style_context ();
-        label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-        label_style_context.add_class ("circular");
+        label.get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        label.add_css_class (Granite.CssClass.CIRCULAR);
 
         event_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0) {
             halign = Gtk.Align.CENTER,
@@ -101,10 +100,8 @@ public class DateTime.Widgets.GridDay : Granite.Bin {
                 gicon = new ThemedIcon ("pager-checked-symbolic"),
                 pixel_size = 6
             };
-
-            unowned var style_context = event_dot.get_style_context ();
-            style_context.add_class (Granite.STYLE_CLASS_ACCENT);
-            style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+            event_dot.add_css_class (Granite.CssClass.ACCENT);
+            event_dot.get_style_context ().add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
             unowned E.SourceSelectable? source_selectable = null;
             if (source.has_extension (E.SOURCE_EXTENSION_TASK_LIST)) {

src/Widgets/calendar/Util.vala

@@ -120,8 +120,7 @@ namespace Util {
             providers[color] = style_provider;
         }
 
-        unowned Gtk.StyleContext style_context = widget.get_style_context ();
-        style_context.add_provider (providers[color], Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        widget.get_style_context ().add_provider (providers[color], Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
     }
 
     /*