Merge branch 'master' into optional-esp

elementary · Nov 12, 2023 · 6375f76 · 6375f76
2 parents e4f4bff + 3584aa1
commit 6375f76
Show file tree

Hide file tree

Showing 217 changed files with 12,146 additions and 8,746 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build-deb.yml b/.github/workflows/build-deb.yml
@@ -9,18 +9,18 @@ on:
 jobs:
   build-deb:
     runs-on: ubuntu-latest
-    
+
     container:
-      image: elementary/docker:odin-unstable
-      
+      image: ghcr.io/elementary/docker:horus-unstable
+
     steps:
       - name: Install dependencies
         run: |
           apt update
           apt install -y git
 
       - name: Checkout main
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -40,7 +40,7 @@ jobs:
           cp ../*.deb output/
 
       - name: Save .deb package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: deb-files
           path: output/*.deb
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,12 +10,16 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
+
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [stable, unstable, development-target]
     container:
-      image: elementary/docker:odin-unstable
-    
+      image: ghcr.io/elementary/docker:${{ matrix.version }}
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install Dependencies
       run: |
         apt update
@@ -27,11 +31,11 @@ jobs:
 
   lint:
     runs-on: ubuntu-latest
-    
+
     container:
       image: valalang/lint
-      
+
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Lint
       run: io.elementary.vala-lint -d .
diff --git a/.github/workflows/gettext.yml b/.github/workflows/gettext.yml
@@ -2,13 +2,13 @@ name: Gettext Updates
 
 on:
   push:
-    branches: master
+    branches: [master]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:next-unstable
 
     steps:
     - name: Install git
@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,14 +2,14 @@ name: Release
 
 on:
   pull_request:
-    branches: master
-    types: closed
+    branches: [master]
+    types: [closed]
 
 jobs:
   release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:next-unstable
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
     steps:
     - name: Install git
@@ -18,7 +18,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

diff --git a/data/installer.appdata.xml.in → data/installer.metainfo.xml.in b/data/installer.appdata.xml.in → data/installer.metainfo.xml.in
@@ -1,98 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2021 elementary, Inc. <[email protected]> -->
-<component>
+<component type="desktop-application">
   <id>io.elementary.installer</id>
+  <translation type="gettext">io.elementary.installer</translation>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
+
   <name>Installer</name>
   <summary>Install elementary OS</summary>
   <description>
     <p>Step by step installer for elementary OS itself.</p>
   </description>
 
+  <screenshots>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-language.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-keyboard.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-try-install.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-custom.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.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>
+    </screenshot>
+    <screenshot>
+      <image>https://raw.githubusercontent.com/elementary/installer/1.1.0/data/screenshot-success.png</image>
+    </screenshot>
+  </screenshots>
+
+  <content_rating type="oars-1.1" />
+
+  <provides>
+    <binary>io.elementary.installer</binary>
+    <binary>io.elementary.installer-daemon</binary>
+  </provides>
+
+  <url type="bugtracker">https://github.com/elementary/installer/issues</url>
+  <url type="donation">https://elementary.io/get-involved#funding</url>
+  <url type="help">https://github.com/elementary/installer/discussions</url>
+  <url type="homepage">https://elementary.io/</url>
+  <url type="translate">https://l10n.elementary.io/projects/installer</url>
+
+  <developer_name>elementary, Inc.</developer_name>
+  <project_group>elementary</project_group>
+  <update_contact>contact_at_elementary.io</update_contact>
+
   <releases>
-    <release version="1.0.7" date="2023-01-11" urgency="medium">
+    <release version="1.2.0" date="2023-08-24" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
-          <li>Use large icons in views</li>
-          <li>Add a custom icon for Before Installing view</li>
+          <li>Swipe to navigate back</li>
           <li>Updated translations</li>
         </ul>
       </description>
+      <issues>
+        <issue url="https://github.com/elementary/installer/issues/418">No option to install proprietary drivers</issue>
+        <issue url="https://github.com/elementary/installer/issues/718">"Enable Drive Encription" icon is smaller than the others</issue>
+      </issues>
     </release>
 
-    <release version="1.0.6" date="2022-12-05" urgency="medium">
+    <release version="1.1.0" date="2023-07-21" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
-          <li>Show an infobar on battery instead of switching to a different page</li>
-          <li>Show all system requirements warnings on a single page</li>
-          <li>Warn about installing developer builds</li>
           <li>Updated translations</li>
         </ul>
       </description>
       <issues>
-        <issue url="https://github.com/elementary/installer/issues/491">Installer too big in VirtualBox</issue>
+        <issue url="https://github.com/elementary/installer/issues/471">Automatically prompt for screen reader after a timeout</issue>
+        <issue url="https://github.com/elementary/installer/issues/590">Laptop goes to standby during installation process</issue>
+        <issue url="https://github.com/elementary/installer/issues/617">Installer not showing disk or partitions, can't install</issue>
       </issues>
     </release>
 
-    <release version="1.0.5" date="2021-12-17" urgency="medium">
+    <release version="1.0.7" date="2023-01-11" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
-          <li>Double the boot partition size for encrypted installs</li>
+          <li>Use large icons in views</li>
+          <li>Add a custom icon for Before Installing view</li>
           <li>Updated translations</li>
-       </ul>
+        </ul>
       </description>
     </release>
 
-    <release version="1.0.4" date="2021-12-13" urgency="medium">
+    <release version="1.0.6" date="2022-12-05" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
-          <li>Warn about installing in a VM</li>
+          <li>Show an infobar on battery instead of switching to a different page</li>
+          <li>Show all system requirements warnings on a single page</li>
+          <li>Warn about installing developer builds</li>
           <li>Updated translations</li>
         </ul>
       </description>
+      <issues>
+        <issue url="https://github.com/elementary/installer/issues/491">Installer too big in VirtualBox</issue>
+      </issues>
     </release>
 
-    <release version="1.0.3" date="2021-08-25" urgency="medium">
+    <release version="1.0.5" date="2021-12-17" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>
-          <li>Avoid political naming of certain locales</li>
-          <li>Fix styles for "Unused" disk partitions</li>
+          <li>Double the boot partition size for encrypted installs</li>
           <li>Updated translations</li>
-        </ul>
+       </ul>
       </description>
     </release>
-  </releases>
 
-  <screenshots>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/1.0.7/data/screenshot-language.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-keyboard.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-try-install.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-custom.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-encrypt.png</image>
-    </screenshot>
-    <screenshot>
-      <image type="default">https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-progress.png</image>
-    </screenshot>
-    <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/installer/master/data/screenshot-success.png</image>
-    </screenshot>
-  </screenshots>
-  <developer_name>elementary, Inc.</developer_name>
-  <url type="homepage">https://elementary.io</url>
-  <url type="bugtracker">https://github.com/elementary/installer/issues</url>
+    <release version="1.0.4" date="2021-12-13" />
+    <release version="1.0.3" date="2021-08-25" />
+  </releases>
 </component>
diff --git a/data/meson.build b/data/meson.build
@@ -4,19 +4,19 @@ schemadir = join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
 i18n.merge_file(
     input: meson.project_name() + '.desktop.in',
     output: meson.project_name() + '.desktop',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'desktop',
     install_dir: join_paths(get_option('datadir'), 'applications'),
     install: true
 )
 
 i18n.merge_file(
-    input: 'installer.appdata.xml.in',
-    output: meson.project_name() + '.appdata.xml',
-    po_dir: join_paths(meson.source_root (), 'po', 'extra'),
+    input: 'installer.metainfo.xml.in',
+    output: meson.project_name() + '.metainfo.xml',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
-    install_dir: join_paths(get_option('datadir'), 'metainfo'),
+    install_dir: get_option('datadir') / 'metainfo',
 )
 
 install_data(

diff --git a/meson.build b/meson.build
@@ -1,7 +1,8 @@
 project(
     'io.elementary.installer',
     'vala', 'c',
-    version: '1.0.7'
+    meson_version : '>= 0.56.0',
+    version: '1.2.0'
 )
 
 add_global_arguments('-DGETTEXT_PACKAGE="' + meson.project_name() + '"', language:'c')

diff --git a/po/POTFILES b/po/POTFILES
@@ -1,7 +1,6 @@
 src/Application.vala
 src/MainWindow.vala
 src/Utils.vala
-src/Helpers/Inhibitor.vala
 src/Helpers/KeyboardLayoutHelper.vala
 src/Helpers/LocaleHelper.vala
 src/Helpers/LogHelper.vala
@@ -10,6 +9,7 @@ src/Objects/Mount.vala
 src/Views/AbstractInstallerView.vala
 src/Views/CheckView.vala
 src/Views/DiskView.vala
+src/Views/DriversView.vala
 src/Views/EncryptView.vala
 src/Views/ErrorView.vala
 src/Views/KeyboardLayoutView.vala