Skip to content

Fix Granite Style deprecations #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 3 commits into from
Dec 13, 2025
Merged

Fix Granite Style deprecations #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8850719
Fix Granite Style deprecations
danirabbit Dec 13, 2025
d95c99e
Use Granite.BackButton
danirabbit Dec 13, 2025
6044eae
Merge branch 'main' into danirabbit/granite-deprecations
danirabbit Dec 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/Views/FirmwareReleaseView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ public class About.FirmwareReleaseView : Adw.NavigationPage {
private Gtk.Label install_duration_value_label;

construct {
var back_button = new Gtk.Button.with_label (_("All Updates")) {
action_name = "navigation.pop",
var back_button = new Granite.BackButton (_("All Updates")) {
halign = START
};
back_button.add_css_class (Granite.STYLE_CLASS_BACK_BUTTON);

title_label = new Gtk.Label ("") {
ellipsize = END,
Expand All @@ -40,7 +38,7 @@ public class About.FirmwareReleaseView : Adw.NavigationPage {
halign = END,
sensitive = false
};
update_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
update_button.add_css_class (Granite.CssClass.SUGGESTED);

update_button_revealer = new Gtk.Revealer () {
child = update_button
Expand Down Expand Up @@ -108,7 +106,7 @@ public class About.FirmwareReleaseView : Adw.NavigationPage {
margin_top = 12,
row_spacing = 3
};
key_val_grid.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
key_val_grid.add_css_class (Granite.CssClass.DIM);

key_val_grid.attach (version_label, 0, 0);
key_val_grid.attach (version_value_label, 1, 0);
Expand Down
8 changes: 4 additions & 4 deletions src/Views/FirmwareView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ public class About.FirmwareView : Switchboard.SettingsPage {
};

var suggested_button = (Gtk.Button) message_dialog.add_button (_("Continue"), Gtk.ResponseType.ACCEPT);
suggested_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
suggested_button.add_css_class (Granite.CssClass.SUGGESTED);

if (detach_image != null) {
var custom_widget = new Gtk.Image.from_file (detach_image);
Expand All @@ -379,7 +379,7 @@ public class About.FirmwareView : Switchboard.SettingsPage {
};

var suggested_button = (Gtk.Button) message_dialog.add_button (_("Restart"), Gtk.ResponseType.ACCEPT);
suggested_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
suggested_button.add_css_class (Granite.CssClass.SUGGESTED);

message_dialog.response.connect ((response) => {
if (response == Gtk.ResponseType.ACCEPT) {
Expand All @@ -403,7 +403,7 @@ public class About.FirmwareView : Switchboard.SettingsPage {
};

var suggested_button = (Gtk.Button) message_dialog.add_button (_("Shut Down"), Gtk.ResponseType.ACCEPT);
suggested_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);
suggested_button.add_css_class (Granite.CssClass.DESTRUCTIVE);

message_dialog.response.connect ((response) => {
if (response == Gtk.ResponseType.ACCEPT) {
Expand All @@ -428,7 +428,7 @@ public class About.FirmwareView : Switchboard.SettingsPage {
};

var continue_button = dialog.add_button (_("Restart"), Gtk.ResponseType.ACCEPT);
continue_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);
continue_button.add_css_class (Granite.CssClass.DESTRUCTIVE);

dialog.response.connect ((result) => {
dialog.destroy ();
Expand Down
2 changes: 1 addition & 1 deletion src/Views/HardwareView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public class About.HardwareView : Gtk.Box {
selectable = true,
xalign = 0
};
manufacturer_info.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
manufacturer_info.add_css_class (Granite.CssClass.DIM);

if (product_name != null) {
manufacturer_info.label += " <b>%s</b>".printf (product_name);
Expand Down
26 changes: 13 additions & 13 deletions src/Views/OperatingSystemView.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ public class About.OperatingSystemView : Gtk.Box {
xalign = 0,
hexpand = true
};
kernel_version_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
kernel_version_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
kernel_version_label.add_css_class (Granite.CssClass.SMALL);
kernel_version_label.add_css_class (Granite.CssClass.DIM);

packages = new Gtk.StringList (null);

Expand All @@ -199,15 +199,15 @@ public class About.OperatingSystemView : Gtk.Box {
use_markup = true,
wrap = true
};
updates_description.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
updates_description.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
updates_description.add_css_class (Granite.CssClass.SMALL);
updates_description.add_css_class (Granite.CssClass.DIM);

var progress_description_box = new Gtk.Box (VERTICAL, 3);
progress_description_box.append (update_progress_revealer);
progress_description_box.append (updates_description);

var update_button = new Gtk.Button.with_label (_("Download"));
update_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
update_button.add_css_class (Granite.CssClass.SUGGESTED);

var cancel_button = new Gtk.Button.with_label (_("Cancel"));

Expand All @@ -229,7 +229,7 @@ public class About.OperatingSystemView : Gtk.Box {
margin_top = 6
};
details_button.add_css_class ("link");
details_button.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
details_button.add_css_class (Granite.CssClass.SMALL);

details_button_revealer = new Gtk.Revealer () {
child = details_button
Expand Down Expand Up @@ -498,8 +498,8 @@ public class About.OperatingSystemView : Gtk.Box {
xalign = 0,
hexpand = true
};
based_off.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
based_off.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
based_off.add_css_class (Granite.CssClass.SMALL);
based_off.add_css_class (Granite.CssClass.DIM);
software_grid.attach (based_off, 1, 1, 3);
}
}
Expand Down Expand Up @@ -677,7 +677,7 @@ public class About.OperatingSystemView : Gtk.Box {
};

var continue_button = dialog.add_button (_("Restore Settings"), Gtk.ResponseType.ACCEPT);
continue_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);
continue_button.add_css_class (Granite.CssClass.DESTRUCTIVE);

dialog.response.connect ((response) => {
dialog.destroy ();
Expand Down Expand Up @@ -773,7 +773,7 @@ public class About.OperatingSystemView : Gtk.Box {
var image = new Gtk.Image.from_icon_name (icon_name) {
pixel_size = 16
};
image.add_css_class (Granite.STYLE_CLASS_ACCENT);
image.add_css_class (Granite.CssClass.ACCENT);
image.add_css_class (color);

var left_label = new Gtk.Label (label_string) {
Expand Down Expand Up @@ -818,7 +818,7 @@ public class About.OperatingSystemView : Gtk.Box {

construct {
var image = new Gtk.Image.from_icon_name ("face-heart-symbolic");
image.add_css_class (Granite.STYLE_CLASS_ACCENT);
image.add_css_class (Granite.CssClass.ACCENT);
image.add_css_class ("pink");

var main_label = new Gtk.Label (_("Sponsor Us")) {
Expand All @@ -829,8 +829,8 @@ public class About.OperatingSystemView : Gtk.Box {
target_label = new Gtk.Label (null) {
halign = START
};
target_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
target_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
target_label.add_css_class (Granite.CssClass.DIM);
target_label.add_css_class (Granite.CssClass.SMALL);

levelbar = new Gtk.LevelBar ();
levelbar.add_css_class (Granite.STYLE_CLASS_FLAT);
Expand Down