Merge branch 'master' into danirabbit/refactor-keyboardlayoutvariant

.github/workflows/release.yml

@@ -29,4 +29,4 @@ jobs:
         GIT_USER_NAME: "elementaryBot"
         GIT_USER_EMAIL: "[email protected]"
       with:
-        release_branch: "horus"
+        release_branch: "noble"

data/installer.metainfo.xml.in

@@ -14,25 +14,25 @@
 
   <screenshots>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-language.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-language.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-keyboard.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-keyboard.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-try-install.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-try-install.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-custom.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-custom.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-encrypt.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-encrypt.png</image>
     </screenshot>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-progress.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-progress.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-success.png</image>
+      <image>https://raw.githubusercontent.com/elementary/installer/8.0.0/data/screenshot-success.png</image>
     </screenshot>
   </screenshots>
 
@@ -56,7 +56,7 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
-    <release version="8.0.0" date="2024-05-19" urgency="medium">
+    <release version="8.0.0" date="2024-07-25" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>

meson.build

@@ -2,7 +2,7 @@ project(
     'io.elementary.installer',
     'vala', 'c',
     meson_version : '>= 0.56.0',
-    version: '1.2.0'
+    version: '8.0.0'
 )
 
 add_global_arguments('-DGETTEXT_PACKAGE="' + meson.project_name() + '"', language:'c')

po/es.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2024-06-11 15:16+0000\n"
-"Last-Translator: Walter Walls <windowsfan589@gmail.com>\n"
+"PO-Revision-Date: 2024-06-25 03:16+0000\n"
+"Last-Translator: Italo Felipe Capasso Ballesteros <edwood.grant@gmail.com>\n"
 "Language-Team: Spanish <https://l10n.elementary.io/projects/installer/"
 "installer/es/>\n"
 "Language: es\n"
@@ -485,7 +485,7 @@ msgid ""
 "up a new user later."
 msgstr ""
 "Después de reiniciar, puede configurar una cuenta de usuario nueva, o puede "
-"apagar ahora y configurar la cuenta más tarde."
+"apagar ahora y configurarla más tarde."
 
 #: src/Widgets/DecryptMenu.vala:63
 msgid "Decrypt This Partition"

po/extra/ka.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2023-12-22 19:35+0000\n"
+"PO-Revision-Date: 2024-06-19 05:16+0000\n"
 "Last-Translator: NorwayFun <[email protected]>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/installer/extra/"
 "ka/>\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.5.5\n"
 
 #: data/installer.metainfo.xml.in:9
 msgid "Installer"
@@ -37,7 +37,7 @@ msgstr "გაუმჯობესებები:"
 
 #: data/installer.metainfo.xml.in:63
 msgid "Keyboard layout preview is now in a resizable window"
-msgstr ""
+msgstr "კლავიატურის განლაგების მინიატურა ახლა ზომაშეცვლადი ფანჯარაა"
 
 #: data/installer.metainfo.xml.in:64 data/installer.metainfo.xml.in:78
 #: data/installer.metainfo.xml.in:91 data/installer.metainfo.xml.in:107

po/extra/sk.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: pantheon-calculator\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2023-05-09 19:06+0000\n"
+"PO-Revision-Date: 2024-07-11 09:16+0000\n"
 "Last-Translator: JohnDumpling <[email protected]>\n"
 "Language-Team: Slovak <https://l10n.elementary.io/projects/installer/extra/"
 "sk/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:42+0000\n"
 
 #: data/installer.metainfo.xml.in:9
@@ -44,7 +44,7 @@ msgstr "Vylepšenia:"
 
 #: data/installer.metainfo.xml.in:63
 msgid "Keyboard layout preview is now in a resizable window"
-msgstr ""
+msgstr "Ukážka rozloženia klávesnice je teraz okno s meniteľnou veľkosťou"
 
 #: data/installer.metainfo.xml.in:64 data/installer.metainfo.xml.in:78
 #: data/installer.metainfo.xml.in:91 data/installer.metainfo.xml.in:107
@@ -54,27 +54,27 @@ msgstr "Aktualizované preklady"
 
 #: data/installer.metainfo.xml.in:77
 msgid "Swipe to navigate back"
-msgstr ""
+msgstr "Potiahnite pre navigáciu späť"
 
 #: data/installer.metainfo.xml.in:105
 msgid "Use large icons in views"
-msgstr ""
+msgstr "Používať veľké ikonky v zobrazeniach"
 
 #: data/installer.metainfo.xml.in:106
 msgid "Add a custom icon for Before Installing view"
-msgstr ""
+msgstr "Pridaná vlastná ikonka pre zobrazenie Pred inštaláciou"
 
 #: data/installer.metainfo.xml.in:116
 msgid "Show an infobar on battery instead of switching to a different page"
-msgstr ""
+msgstr "Zobraziť infolištu pre batériu namiesto prepnutia na inú stránku"
 
 #: data/installer.metainfo.xml.in:117
 msgid "Show all system requirements warnings on a single page"
-msgstr ""
+msgstr "Zobraziť všetky varovania na systémové požiadavky na jednej stránke"
 
 #: data/installer.metainfo.xml.in:118
 msgid "Warn about installing developer builds"
-msgstr ""
+msgstr "Varovať o inštalácii vývojárskych zostáv"
 
 #: data/io.elementary.installer.desktop.in:4
 msgid "Install the system"

po/ka.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2024-03-08 08:12+0000\n"
+"PO-Revision-Date: 2024-06-19 05:16+0000\n"
 "Last-Translator: NorwayFun <[email protected]>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/installer/"
 "installer/ka/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.5.5\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"
 
 #: src/Application.vala:55
@@ -332,12 +332,12 @@ msgstr "სულ ცოტა, <b>საწყისი (/)</b> დანაყ
 
 #. Device is in EFI mode, so we also require a boot partition
 #: src/Views/PartitioningView.vala:69
-#, fuzzy
-#| msgid "You must at least select a <b>Root (/)</b> partition."
 msgid ""
 "You must at least select a <b>Root (/)</b> partition and an optional <b>Boot "
 "(/boot/efi)</b> partition."
-msgstr "სულ ცოტა, <b>საწყისი (/)</b> დანაყოფი უნდა შექმნათ."
+msgstr ""
+"სულ ცოტა, <b>საწყისი (/)</b>, და არასავალდებულო <b>ჩატვირთვადი (/boot/efi)</"
+"b> დანაყოფები უნდა შექმნათ."
 
 #: src/Views/PartitioningView.vala:80
 msgid "It is also recommended to select a <b>Swap</b> partition."

po/sk.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-05-24 17:31+0000\n"
-"PO-Revision-Date: 2023-05-09 19:06+0000\n"
+"PO-Revision-Date: 2024-07-11 09:16+0000\n"
 "Last-Translator: JohnDumpling <[email protected]>\n"
 "Language-Team: Slovak <https://l10n.elementary.io/projects/installer/"
 "installer/sk/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.6.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
 
 #: src/Application.vala:55
@@ -21,10 +21,8 @@ msgid "Install %s"
 msgstr "Inštalovať %s"
 
 #: src/Application.vala:74
-#, fuzzy
-#| msgid "%s has been installed"
 msgid "operating system is being installed"
-msgstr "%s bol nainštalovaný"
+msgstr "operačný systém sa inštaluje"
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
@@ -140,39 +138,48 @@ msgid "Next"
 msgstr "Ďalej"
 
 #: src/Views/DriversView.vala:27
-#, fuzzy
-#| msgid "Partitioning Drive"
 msgid "Additional Drivers"
-msgstr "Vytvárajú sa oddiely na jednotke"
+msgstr "Dodatočné ovládače"
 
 #: src/Views/DriversView.vala:32
 msgid ""
 "Broadcom® Wi-Fi adapters, NVIDIA® graphics, and some virtual machines may "
 "not function properly without additional drivers. Most devices do not "
 "require additional drivers."
 msgstr ""
+"Broadcom® Wi-Fi adaptéry, NVIDIA® grafiky a niektoré virtuálne zariadenia "
+"nemusia správne fungovať bez dodatočných ovládačov. Väčšina zariadení "
+"nepotrebuje dodatočné ovládače."
 
 #: src/Views/DriversView.vala:43
 msgid ""
 "Proprietary drivers contain private code that can't be reviewed. Security "
 "and other updates are dependent on the driver vendor."
 msgstr ""
+"Proprietárne ovládače obsahujú súkromný kód, ktorý sa nedá preveriť. "
+"Bezpečnosť a ďalšie aktualizácie závisia na dodávateľovi ovládača."
 
 #: src/Views/DriversView.vala:54
 msgid "An Internet connection is required to install NVIDIA® graphics drivers."
 msgstr ""
+"Pre inštaláciu NVIDIA® grafických ovládačov je potrebné pripojenie na "
+"internet."
 
 #: src/Views/DriversView.vala:65
 msgid ""
 "Proprietary drivers can be installed later through AppCenter, but an "
 "Internet connection will be required for all drivers."
 msgstr ""
+"Proprietárne ovládače môžu byť nainštalované neskôr cez AppCentrum, pre "
+"všetky však bude vyžadované internetové pripojenie."
 
 #: src/Views/DriversView.vala:72
 msgid ""
 "Include third-party proprietary drivers when installing. I agree to their "
 "respective licenses and terms of use."
 msgstr ""
+"Zahrnúť proprietárne ovládače tretích strán pri inštalácii. Súhlasím s ich "
+"licenciami a podmienkami použitia."
 
 #: src/Views/DriversView.vala:101 src/Views/EncryptView.vala:164
 #: src/Views/KeyboardLayoutView.vala:55 src/Views/PartitioningView.vala:140
@@ -332,21 +339,13 @@ msgid "Currently active language"
 msgstr "Práve používaný jazyk"
 
 #: src/Views/PartitioningView.vala:52
-#, fuzzy
-#| msgid "Use Partition"
 msgid "Select Partitions"
-msgstr "Použiť oddiel"
+msgstr "Vybrať oddiely"
 
 #: src/Views/PartitioningView.vala:56
-#, fuzzy
-#| msgid ""
-#| "Select which partitions to use across all drives. <b>Selecting \"Format\" "
-#| "will erase ALL data on the selected partition.</b>"
 msgid ""
 "Selecting “Format” will erase <i>all</i> data on the selected partition."
-msgstr ""
-"Vyberte z jednotiek tie oddiely, ktoré sa majú použiť. <b>Výberom "
-"„Formátovať“ vymažete VŠETKY údaje na vybranom oddieli.</b>"
+msgstr "Výberom „Formátovať“ vymažete <i>všetky</i> údaje na vybranom oddieli."
 
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:65
@@ -355,16 +354,12 @@ msgstr "Je potrebné vybrať aspoň <b>Root (/)</b> oddiel."
 
 #. Device is in EFI mode, so we also require a boot partition
 #: src/Views/PartitioningView.vala:69
-#, fuzzy
-#| msgid ""
-#| "You must at least select a <b>Root (/)</b> partition and a <b>Boot (/boot/"
-#| "efi)</b> partition."
 msgid ""
 "You must at least select a <b>Root (/)</b> partition and an optional <b>Boot "
 "(/boot/efi)</b> partition."
 msgstr ""
-"Je potrebné vybrať aspoň <b>Root (/)</b> oddiel a <b>Boot (/boot/efi)</b> "
-"oddiel."
+"Je potrebné vybrať aspoň <b>Root (/)</b> oddiel a voliteľný <b>Boot (/boot/"
+"efi)</b> oddiel."
 
 #: src/Views/PartitioningView.vala:80
 msgid "It is also recommended to select a <b>Swap</b> partition."

src/Views/ProgressView.vala

@@ -210,7 +210,9 @@ public class ProgressView : Gtk.Box {
     }
 
     private void fake_status (Distinst.Step step) {
+        unowned var log_helper = LogHelper.get_default ();
         for (var percent = 0; percent <= 100; percent++) {
+            log_helper.log_func (INFO, "I'm faking it!");
             Distinst.Status status = Distinst.Status () {
                 step = step,
                 percent = percent

src/Widgets/Terminal.vala

@@ -17,12 +17,13 @@
  * Authored by: Michael Aaron Murphy <[email protected]>
  */
 
-public class Installer.Terminal : Gtk.ScrolledWindow {
+public class Installer.Terminal : Gtk.Box {
     public signal void toggled (bool active);
     public Gtk.TextBuffer buffer { get; construct; }
 
     private Gtk.TextView view;
     private double prev_upper_adj = 0;
+    private Gtk.ScrolledWindow scrolled_window;
 
     public string log {
         owned get {
@@ -46,23 +47,29 @@ public class Installer.Terminal : Gtk.ScrolledWindow {
         };
         view.get_style_context ().remove_class (Gtk.STYLE_CLASS_VIEW);
 
-        hscrollbar_policy = Gtk.PolicyType.NEVER;
-        hexpand = true;
-        vexpand = true;
-        min_content_height = 120;
-        add (view);
-        get_style_context ().add_class (Granite.STYLE_CLASS_TERMINAL);
+        scrolled_window = new Gtk.ScrolledWindow (null, null) {
+            child = view,
+            hexpand = true,
+            vexpand = true,
+            hscrollbar_policy = NEVER,
+            min_content_height = 120
+        };
+        scrolled_window.get_style_context ().add_class (Granite.STYLE_CLASS_TERMINAL);
+
+        add (scrolled_window);
 
-        view.size_allocate.connect (() => attempt_scroll ());
+        Idle.add (() => {
+            attempt_scroll ();
+            return GLib.Source.CONTINUE;
+        });
     }
 
     public void attempt_scroll () {
-        var adj = vadjustment;
-
+        var adj = scrolled_window.vadjustment;
         var units_from_end = prev_upper_adj - adj.page_size - adj.value;
-        var view_size_difference = adj.upper - prev_upper_adj;
-        if (view_size_difference < 0) {
-            view_size_difference = 0;
+
+        if (adj.upper - prev_upper_adj <= 0) {
+            return;
         }
 
         if (prev_upper_adj <= adj.page_size || units_from_end <= 50) {