diff --git a/src/Views/CheckView.vala b/src/Views/CheckView.vala index 59fdc411c..cdfc326ee 100644 --- a/src/Views/CheckView.vala +++ b/src/Views/CheckView.vala @@ -42,7 +42,7 @@ public class Installer.CheckView : AbstractInstallerView { } construct { - var image = new Gtk.Image.from_icon_name ("io.elementary.installer.caution", Gtk.IconSize.DIALOG) { + var image = new Gtk.Image.from_icon_name ("io.elementary.installer.caution") { pixel_size = 128, valign = Gtk.Align.END }; @@ -176,7 +176,8 @@ public class Installer.CheckView : AbstractInstallerView { private class CheckView : Gtk.Grid { public CheckView (string title, string description, string icon_name) { - var image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DND) { + var image = new Gtk.Image.from_icon_name (icon_name) { + icon_size = LARGE, valign = Gtk.Align.START }; diff --git a/src/Views/DiskView.vala b/src/Views/DiskView.vala index e9917f514..b7f8cb809 100644 --- a/src/Views/DiskView.vala +++ b/src/Views/DiskView.vala @@ -27,11 +27,11 @@ public class Installer.DiskView : AbstractInstallerView { } construct { - var install_image = new Gtk.Image.from_icon_name ("drive-harddisk", Gtk.IconSize.DIALOG) { + var install_image = new Gtk.Image.from_icon_name ("drive-harddisk") { pixel_size = 128 }; - var install_badge = new Gtk.Image.from_icon_name ("io.elementary.installer.emblem-downloads", Gtk.IconSize.DND) { + var install_badge = new Gtk.Image.from_icon_name ("io.elementary.installer.emblem-downloads") { pixel_size = 64, halign = Gtk.Align.END, valign = Gtk.Align.END diff --git a/src/Views/DriversView.vala b/src/Views/DriversView.vala index f03340a94..2680d5be7 100644 --- a/src/Views/DriversView.vala +++ b/src/Views/DriversView.vala @@ -19,7 +19,7 @@ public signal void next_step (); construct { - var image = new Gtk.Image.from_icon_name ("application-x-firmware", Gtk.IconSize.INVALID) { + var image = new Gtk.Image.from_icon_name ("application-x-firmware") { pixel_size = 128, valign = Gtk.Align.END }; @@ -36,7 +36,9 @@ }; description_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL); - var warning_image = new Gtk.Image.from_icon_name ("security-low-symbolic", LARGE_TOOLBAR); + var warning_image = new Gtk.Image.from_icon_name ("security-low-symbolic") { + pixel_size = 24 + }; warning_image.add_css_class ("accent"); warning_image.add_css_class ("yellow"); @@ -47,7 +49,9 @@ xalign = 0 }; - var internet_image = new Gtk.Image.from_icon_name ("network-wireless-symbolic", LARGE_TOOLBAR); + var internet_image = new Gtk.Image.from_icon_name ("network-wireless-symbolic") { + pixel_size = 24 + }; internet_image.add_css_class ("accent"); internet_image.add_css_class ("blue"); @@ -58,7 +62,9 @@ xalign = 0 }; - var install_later_image = new Gtk.Image.from_icon_name ("system-software-install-symbolic", LARGE_TOOLBAR); + var install_later_image = new Gtk.Image.from_icon_name ("system-software-install-symbolic") { + pixel_size = 24 + }; install_later_image.add_css_class ("accent"); install_later_image.add_css_class ("purple"); diff --git a/src/Views/EncryptView.vala b/src/Views/EncryptView.vala index ec7bc1768..8c821bde8 100644 --- a/src/Views/EncryptView.vala +++ b/src/Views/EncryptView.vala @@ -30,11 +30,11 @@ public class EncryptView : AbstractInstallerView { } construct { - var image = new Gtk.Image.from_icon_name ("drive-harddisk", Gtk.IconSize.INVALID) { + var image = new Gtk.Image.from_icon_name ("drive-harddisk") { pixel_size = 128 }; - var overlay_image = new Gtk.Image.from_icon_name ("security-high", Gtk.IconSize.INVALID) { + var overlay_image = new Gtk.Image.from_icon_name ("security-high") { pixel_size = 64, halign = Gtk.Align.END, valign = Gtk.Align.END @@ -61,7 +61,9 @@ public class EncryptView : AbstractInstallerView { }; details_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL); - var protect_image = new Gtk.Image.from_icon_name ("security-high-symbolic", Gtk.IconSize.LARGE_TOOLBAR); + var protect_image = new Gtk.Image.from_icon_name ("security-high-symbolic") { + pixel_size = 24 + }; var protect_label = new Gtk.Label (_("Data will only be protected from others with physical access to this device when it is shut down.")) { hexpand = true, @@ -70,7 +72,9 @@ public class EncryptView : AbstractInstallerView { xalign = 0 }; - var restart_image = new Gtk.Image.from_icon_name ("system-reboot-symbolic", Gtk.IconSize.LARGE_TOOLBAR); + var restart_image = new Gtk.Image.from_icon_name ("system-reboot-symbolic") { + pixel_size = 24 + }; var restart_label = new Gtk.Label (_("The encryption password will be required each time this device is turned on. Store it somewhere safe.")) { hexpand = true, @@ -79,7 +83,9 @@ public class EncryptView : AbstractInstallerView { xalign = 0 }; - var keyboard_image = new Gtk.Image.from_icon_name ("input-keyboard-symbolic", Gtk.IconSize.LARGE_TOOLBAR); + var keyboard_image = new Gtk.Image.from_icon_name ("input-keyboard-symbolic") { + pixel_size = 24 + }; var keyboard_label = new Gtk.Label (_("A built-in or USB keyboard will be required to type the encryption password each time this device is turned on.")) { hexpand = true, diff --git a/src/Views/ErrorView.vala b/src/Views/ErrorView.vala index f74554d92..73347b26d 100644 --- a/src/Views/ErrorView.vala +++ b/src/Views/ErrorView.vala @@ -24,7 +24,7 @@ public class ErrorView : AbstractInstallerView { } construct { - var image = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG) { + var image = new Gtk.Image.from_icon_name ("dialog-error") { pixel_size = 128, valign = Gtk.Align.END }; @@ -41,7 +41,7 @@ public class ErrorView : AbstractInstallerView { xalign = 0 }; - var redo_image = new Gtk.Image.from_icon_name ("edit-undo-symbolic", Gtk.IconSize.MENU) { + var redo_image = new Gtk.Image.from_icon_name ("edit-undo-symbolic") { margin_start = 6 }; @@ -52,7 +52,7 @@ public class ErrorView : AbstractInstallerView { xalign = 0 }; - var demo_image = new Gtk.Image.from_icon_name ("document-properties-symbolic", Gtk.IconSize.MENU) { + var demo_image = new Gtk.Image.from_icon_name ("document-properties-symbolic") { margin_start = 6 }; @@ -62,7 +62,7 @@ public class ErrorView : AbstractInstallerView { xalign = 0 }; - var restart_image = new Gtk.Image.from_icon_name ("system-reboot-symbolic", Gtk.IconSize.MENU) { + var restart_image = new Gtk.Image.from_icon_name ("system-reboot-symbolic") { margin_start = 6 }; @@ -75,7 +75,7 @@ public class ErrorView : AbstractInstallerView { var terminal_button = new Gtk.ToggleButton () { always_show_image = true, halign = Gtk.Align.START, - image = new Gtk.Image.from_icon_name ("utilities-terminal-symbolic", Gtk.IconSize.SMALL_TOOLBAR), + image = new Gtk.Image.from_icon_name ("utilities-terminal-symbolic"), label = _("Details"), margin_top = 12 }; diff --git a/src/Views/KeyboardLayoutView.vala b/src/Views/KeyboardLayoutView.vala index c78163749..b9cad496a 100644 --- a/src/Views/KeyboardLayoutView.vala +++ b/src/Views/KeyboardLayoutView.vala @@ -22,7 +22,7 @@ public class KeyboardLayoutView : AbstractInstallerView { construct { keyboard_settings = new GLib.Settings ("org.gnome.desktop.input-sources"); - var image = new Gtk.Image.from_icon_name ("input-keyboard", Gtk.IconSize.DIALOG) { + var image = new Gtk.Image.from_icon_name ("input-keyboard") { pixel_size = 128, valign = Gtk.Align.END }; diff --git a/src/Views/LanguageView.vala b/src/Views/LanguageView.vala index 323c9ad17..0c95a521f 100644 --- a/src/Views/LanguageView.vala +++ b/src/Views/LanguageView.vala @@ -38,7 +38,7 @@ public class Installer.LanguageView : AbstractInstallerView { preferred_langs.add (lang); } - var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale", Gtk.IconSize.DIALOG) { + var image = new Gtk.Image.from_icon_name ("preferences-desktop-locale") { pixel_size = 128, valign = Gtk.Align.END }; @@ -315,7 +315,6 @@ public class Installer.LanguageView : AbstractInstallerView { image = new Gtk.Image (); image.hexpand = true; image.halign = Gtk.Align.END; - image.icon_size = Gtk.IconSize.BUTTON; var label = new Gtk.Label (lang_entry.name) { ellipsize = Pango.EllipsizeMode.END, @@ -362,7 +361,6 @@ public class Installer.LanguageView : AbstractInstallerView { image = new Gtk.Image (); image.hexpand = true; image.halign = Gtk.Align.END; - image.icon_size = Gtk.IconSize.BUTTON; var label = new Gtk.Label (country_entry.name); label.add_css_class (Granite.STYLE_CLASS_H3_LABEL); diff --git a/src/Views/ProgressView.vala b/src/Views/ProgressView.vala index 32a2f78a7..37526ebd3 100644 --- a/src/Views/ProgressView.vala +++ b/src/Views/ProgressView.vala @@ -72,7 +72,7 @@ public class ProgressView : AbstractInstallerView { var terminal_button = new Gtk.ToggleButton () { halign = Gtk.Align.END, - image = new Gtk.Image.from_icon_name ("utilities-terminal-symbolic", Gtk.IconSize.SMALL_TOOLBAR), + image = new Gtk.Image.from_icon_name ("utilities-terminal-symbolic"), tooltip_text = _("Show log") }; terminal_button.add_css_class (Granite.STYLE_CLASS_FLAT); diff --git a/src/Views/SuccessView.vala b/src/Views/SuccessView.vala index ae0bff262..883fc5689 100644 --- a/src/Views/SuccessView.vala +++ b/src/Views/SuccessView.vala @@ -21,7 +21,7 @@ public class SuccessView : AbstractInstallerView { private Gtk.Label secondary_label; construct { - var image = new Gtk.Image.from_icon_name ("process-completed", Gtk.IconSize.DIALOG) { + var image = new Gtk.Image.from_icon_name ("process-completed") { pixel_size = 128, valign = Gtk.Align.END }; diff --git a/src/Views/TryInstallView.vala b/src/Views/TryInstallView.vala index 6166eaec7..df9b969e5 100644 --- a/src/Views/TryInstallView.vala +++ b/src/Views/TryInstallView.vala @@ -20,7 +20,7 @@ public class Installer.TryInstallView : AbstractInstallerView { public signal void next_step (); construct { - var type_image = new Gtk.Image.from_icon_name (Application.get_default ().application_id, Gtk.IconSize.DIALOG) { + var type_image = new Gtk.Image.from_icon_name (Application.get_default ().application_id) { pixel_size = 128, valign = Gtk.Align.END }; diff --git a/src/Widgets/DecryptMenu.vala b/src/Widgets/DecryptMenu.vala index a0c9dfd47..ac9c7a09c 100644 --- a/src/Widgets/DecryptMenu.vala +++ b/src/Widgets/DecryptMenu.vala @@ -44,10 +44,14 @@ public class Installer.DecryptMenu: Gtk.Popover { } private void create_decrypt_view () { - var image = new Gtk.Image.from_icon_name ("drive-harddisk", Gtk.IconSize.DIALOG); + var image = new Gtk.Image.from_icon_name ("drive-harddisk") { + pixel_size = 48 + }; image.valign = Gtk.Align.START; - var overlay_image = new Gtk.Image.from_icon_name ("dialog-password", Gtk.IconSize.DND); + var overlay_image = new Gtk.Image.from_icon_name ("dialog-password") { + icon_size = LARGE + }; overlay_image.halign = Gtk.Align.END; overlay_image.valign = Gtk.Align.END; diff --git a/src/Widgets/DiskGrid.vala b/src/Widgets/DiskGrid.vala index 721bae2ab..5b53d0c6b 100644 --- a/src/Widgets/DiskGrid.vala +++ b/src/Widgets/DiskGrid.vala @@ -35,7 +35,8 @@ public class Installer.DiskButton : Gtk.CheckButton { construct { add_css_class ("image-button"); - var disk_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG) { + var disk_image = new Gtk.Image.from_icon_name (icon_name) { + pixel_size = 48, use_fallback = true }; diff --git a/src/Widgets/InstallTypeGrid.vala b/src/Widgets/InstallTypeGrid.vala index d3a1a69b9..8f28c6586 100644 --- a/src/Widgets/InstallTypeGrid.vala +++ b/src/Widgets/InstallTypeGrid.vala @@ -33,7 +33,9 @@ public class Installer.InstallTypeButton : Gtk.CheckButton { construct { add_css_class ("image-button"); - var image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG); + var image = new Gtk.Image.from_icon_name (icon_name) { + pixel_size = 48 + }; var title_label = new Gtk.Label (title) { hexpand = true,