Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions daemon/DistinstBackend.vala
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,8 @@ public class InstallerDaemon.DistinstBackend : GLib.Object {
start = disk.get_sector (ref efi_sector);
}

break;
case Distinst.PartitionTable.NONE:
break;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Views/AbstractInstallerView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public abstract class AbstractInstallerView : Adw.NavigationPage {

if (Installer.App.test_mode) {
var test_label = new Gtk.Label (_("Test Mode"));
test_label.add_css_class (Granite.STYLE_CLASS_ERROR);
test_label.add_css_class (Granite.CssClass.ERROR);

action_area.append (test_label);
}
Expand Down
4 changes: 1 addition & 3 deletions src/Views/CheckView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public class Installer.CheckView : AbstractInstallerView {
content_area.append (message_box);

var ignore_button = new Gtk.Button.with_label (_("Install Anyway"));
ignore_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);
ignore_button.add_css_class (Granite.CssClass.DESTRUCTIVE);
ignore_button.clicked.connect (() => next_step ());

action_box_end.append (ignore_button);
Expand Down Expand Up @@ -180,8 +180,6 @@ public class Installer.CheckView : AbstractInstallerView {
public string description { get; construct; }
public string icon_name { get; construct; }

private Gtk.Grid grid;

public CheckView (string title, string description, string icon_name) {
Object (
title: title,
Expand Down
2 changes: 1 addition & 1 deletion src/Views/DiskView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class Installer.DiskView : AbstractInstallerView {
// Make sure we can skip this view in Test Mode
sensitive = Installer.App.test_mode
};
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);
next_button.clicked.connect (() => next_step ());

action_box_end.append (next_button);
Expand Down
2 changes: 1 addition & 1 deletion src/Views/DriversView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
};

var next_button = new Gtk.Button.with_label (_("Erase and Install"));
next_button.add_css_class (Granite.STYLE_CLASS_DESTRUCTIVE_ACTION);
next_button.add_css_class (Granite.CssClass.DESTRUCTIVE);
next_button.clicked.connect (() => next_step ());

action_box_end.append (back_button);
Expand Down
8 changes: 4 additions & 4 deletions src/Views/EncryptView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public class EncryptView : AbstractInstallerView {
message_box.append (keyboard_row);

pw_error_revealer = new ErrorRevealer (".");
pw_error_revealer.label_widget.add_css_class (Granite.STYLE_CLASS_WARNING);
pw_error_revealer.label_widget.add_css_class (Granite.CssClass.WARNING);

pw_entry = new ValidatedEntry ();

Expand All @@ -108,7 +108,7 @@ public class EncryptView : AbstractInstallerView {
};

confirm_entry_revealer = new ErrorRevealer (".");
confirm_entry_revealer.label_widget.add_css_class (Granite.STYLE_CLASS_ERROR);
confirm_entry_revealer.label_widget.add_css_class (Granite.CssClass.ERROR);

var password_box = new Gtk.Box (VERTICAL, 6);
password_box.append (pw_label);
Expand All @@ -133,7 +133,7 @@ public class EncryptView : AbstractInstallerView {
next_button = new Gtk.Button.with_label (_(SKIP_STRING)) {
receives_default = true
};
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);

action_box_end.append (encrypt_button);
action_box_end.append (next_button);
Expand Down Expand Up @@ -289,7 +289,7 @@ public class EncryptView : AbstractInstallerView {
wrap = true,
xalign = 1
};
label_widget.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
label_widget.add_css_class (Granite.CssClass.SMALL);

var revealer = new Gtk.Revealer () {
child = label_widget,
Expand Down
2 changes: 1 addition & 1 deletion src/Views/ErrorView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public class ErrorView : AbstractInstallerView {
var demo_button = new Gtk.Button.with_label (_("Try Demo Mode"));

var install_button = new Gtk.Button.with_label (_("Try Installing Again"));
install_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
install_button.add_css_class (Granite.CssClass.SUGGESTED);

action_box_end.append (restart_button);
action_box_end.append (demo_button);
Expand Down
2 changes: 1 addition & 1 deletion src/Views/KeyboardLayoutView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public class KeyboardLayoutView : AbstractInstallerView {
var next_button = new Gtk.Button.with_label (_("Select")) {
sensitive = false
};
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);

action_box_end.append (back_button);
action_box_end.append (next_button);
Expand Down
2 changes: 1 addition & 1 deletion src/Views/LanguageView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public class Installer.LanguageView : AbstractInstallerView {
next_button = new Gtk.Button.with_label (_("Select")) {
sensitive = false
};
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);

action_box_end.append (next_button);

Expand Down
4 changes: 3 additions & 1 deletion src/Views/PartitioningView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public class Installer.PartitioningView : AbstractInstallerView {
};

next_button = new Gtk.Button.with_label (_("Next"));
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);
next_button.sensitive = false;

action_box_start.append (modify_partitions_button);
Expand Down Expand Up @@ -237,6 +237,8 @@ public class Installer.PartitioningView : AbstractInstallerView {
break;
case GPT:
break;
case NONE:
break;
}

string layout_debug = "";
Expand Down
7 changes: 4 additions & 3 deletions src/Views/ProgressView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,8 @@ public class ProgressView : Adw.NavigationPage {
progressbar_label = new Gtk.Label (null) {
xalign = 0
};
progressbar_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
// FIXME: use granite constant when Granite 7.7.0 is released
progressbar_label.add_css_class ("numeric");
progressbar_label.add_css_class (Granite.CssClass.DIM);
progressbar_label.add_css_class (Granite.CssClass.NUMERIC);

progressbar = new Gtk.ProgressBar () {
hexpand = true
Expand Down Expand Up @@ -239,6 +238,8 @@ public class ProgressView : Adw.NavigationPage {
///TRANSLATORS: The current step of the installer back-end
step_string = _("Finishing the Installation");
break;
default:
break;
}

progressbar_label.label = "%s (%d%%)".printf (step_string, status.percent);
Expand Down
2 changes: 1 addition & 1 deletion src/Views/SuccessView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public class SuccessView : AbstractInstallerView {
shutdown_button.clicked.connect (Utils.shutdown);

var restart_button = new Gtk.Button.with_label (_("Restart Device"));
restart_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
restart_button.add_css_class (Granite.CssClass.SUGGESTED);
restart_button.clicked.connect (Utils.restart);

action_box_end.append (shutdown_button);
Expand Down
2 changes: 1 addition & 1 deletion src/Views/TryInstallView.vala
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public class Installer.TryInstallView : AbstractInstallerView {
var next_button = new Gtk.Button.with_label (_("Next")) {
sensitive = false
};
next_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
next_button.add_css_class (Granite.CssClass.SUGGESTED);

action_box_end.append (back_button);
action_box_end.append (next_button);
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/DecryptMenu.vala
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public class Installer.DecryptMenu: Gtk.Popover {
decrypt_button = new Gtk.Button.with_label (_("Decrypt"));
decrypt_button.halign = Gtk.Align.END;
decrypt_button.sensitive = false;
decrypt_button.add_css_class (Granite.STYLE_CLASS_SUGGESTED_ACTION);
decrypt_button.add_css_class (Granite.CssClass.SUGGESTED);
decrypt_button.clicked.connect (() => {
decrypt.begin (pv_entry.get_text ());
});
Expand Down
2 changes: 1 addition & 1 deletion src/Widgets/DescriptionRow.vala
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class DescriptionRow : Gtk.Box {
pixel_size = 24,
valign = START
};
image.add_css_class (Granite.STYLE_CLASS_ACCENT);
image.add_css_class (Granite.CssClass.ACCENT);
image.add_css_class (color);

var description_label = new Gtk.Label (description) {
Expand Down
4 changes: 2 additions & 2 deletions src/Widgets/DiskBar.vala
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ public class Installer.DiskBar: Gtk.Box {
) {
halign = START,
};
info.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
info.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
info.add_css_class (Granite.CssClass.DIM);
info.add_css_class (Granite.CssClass.SMALL);
info.use_markup = true;

var path = new Gtk.Label (ppath) {
Expand Down