Merge branch 'master' into danirabbit/updatemanager-handlenotification

.github/workflows/main.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y gettext libappstream-dev libflatpak-dev libportal-dev libportal-gtk3-dev libgee-0.8-dev libgranite-dev libgtk-3-dev libhandy-1-dev libjson-glib-dev libpackagekit-glib2-dev libsoup-3.0-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
+        apt install -y gettext libadwaita-1-dev libappstream-dev libflatpak-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libjson-glib-dev libpackagekit-glib2-dev libportal-dev libportal-gtk4-dev libsoup-3.0-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
     - name: Build and Test
       env:
         DESTDIR: out

README.md

@@ -9,12 +9,12 @@ An open, pay-what-you-want app store for indie developers.
 
 You'll need the following dependencies:
 * gettext
-* libappstream-dev (>= 0.10)
-* libflatpak-dev
+* libadwaita-1-dev
+* libappstream-dev (>= 0.15.2)
+* libflatpak-dev (>= 1.0.7)
 * libgee-0.8-dev
-* libgranite-dev (>=5.2.5)
-* libgtk-3-dev
-* libhandy-1-dev (>=1.3.0)
+* libgranite-7-dev (>=7.1.0)
+* libgtk-4-dev
 * libjson-glib-dev
 * libpackagekit-glib2-dev
 * libpolkit-gobject-1-dev

data/io.elementary.appcenter.gresource.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/appcenter">
-    <file alias="application.css" compressed="true">styles/application.css</file>
+    <file alias="Application.css" compressed="true">styles/application.css</file>
     <file alias="AppInfoView.css" compressed="true">styles/AppInfoView.css</file>
     <file alias="AppListUpdateView.css" compressed="true">styles/AppListUpdateView.css</file>
     <file alias="arrow.css" compressed="true">styles/arrow.css</file>
     <file alias="badge.css" compressed="true">styles/badge.css</file>
     <file alias="banner.css" compressed="true">styles/banner.css</file>
     <file alias="categories.css" compressed="true">styles/categories.css</file>
-    <file alias="fallback.css" compressed="true">styles/fallback.css</file>
     <file alias="loading.css" compressed="true">styles/loading.css</file>
     <file alias="ProgressButton.css" compressed="true">styles/ProgressButton.css</file>
   </gresource>

data/styles/arrow.css

@@ -29,6 +29,7 @@
     margin: 12px;
     padding: 6px;
     color: @text_color;
+    -gtk-icon-size: 24px;
 }
 
 .arrow:active,

data/styles/banner.css

@@ -77,7 +77,7 @@
 
 /*Hack to make the button square-ish*/
 .banner button.image-button.raised {
-    padding: 0.333rem 0.444rem;
+    padding: 0 0.333em;
 }
 
 .banner button:not(.suggested-action) {

data/styles/categories.css

@@ -599,7 +599,7 @@
         radial-gradient(
             circle,
             alpha(@STRAWBERRY_900, 0) 65%,
-            alpha(shade(@STRAWBERRY_900, 0.6), 0.35) 4%
+            alpha(shade(@STRAWBERRY_900, 0.6), 0.35) 66%
         ),
         linear-gradient(
             to bottom,
@@ -651,19 +651,19 @@
     background-image:
         linear-gradient(
             to right,
-            transparent 42px,
-            alpha(@STRAWBERRY_100, 0.25) 42px,
-            alpha(@STRAWBERRY_100, 0.25) 44px,
-            transparent 44px
+            transparent 1.3em,
+            alpha(@STRAWBERRY_100, 0.25) 1.3em,
+            alpha(@STRAWBERRY_100, 0.25) calc(1.3em + 2px),
+            transparent calc(1.3em + 2px)
         ),
         linear-gradient(
             to bottom,
-            white 90%,
-            alpha(@BLUEBERRY_100, 0.2) 90%
+            transparent 0.9em,
+            alpha(@BLUEBERRY_100, 0.2) 0.9em
         );
-    background-position: center center;
-    background-repeat: repeat-y;
-    background-size: 100% 1em;
+    background-position: center center, center 0.7em;
+    background-repeat: no-repeat, repeat-y;
+    background-size: auto auto, 110% 1em; /* Gtk.CSS bug requiring over 100% width maybe? */
     color: @BLACK_300;
     font-size: 24px;
 }

meson.build

@@ -11,7 +11,6 @@ i18n = import('i18n')
 
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
-    '-DHANDY_USE_UNSTABLE_API',
     '-DI_KNOW_THE_PACKAGEKIT_GLIB2_API_IS_SUBJECT_TO_CHANGE',
     language:'c'
 )
@@ -23,17 +22,17 @@ glib = dependency ('glib-2.0')
 gobject = dependency ('gobject-2.0')
 gio = dependency ('gio-2.0')
 gee = dependency ('gee-0.8')
-gtk = dependency ('gtk+-3.0', version: '>=3.10')
-granite = dependency ('granite', version: '>=6.0.0')
-handy = dependency('libhandy-1', version: '>=1.4.0')
+gtk = dependency ('gtk4')
+granite = dependency ('granite-7', version: '>=7.3.0')
+adwaita = dependency('libadwaita-1')
 appstream = dependency ('appstream', version: '>=0.15.2')
 libsoup = dependency ('libsoup-3.0')
 json = dependency ('json-glib-1.0')
 flatpak = dependency ('flatpak')
 xml = dependency ('libxml-2.0')
 polkit = dependency ('polkit-gobject-1')
 portal = dependency('libportal')
-portal_gtk3 = dependency('libportal-gtk3')
+portal_gtk4 = dependency('libportal-gtk4')
 posix = meson.get_compiler('vala').find_library('posix')
 
 dbus = dependency ('dbus-1')
@@ -49,13 +48,13 @@ core_deps = [
 dependencies = core_deps + [
     gtk,
     granite,
-    handy,
+    adwaita,
     appstream,
     flatpak,
     xml,
     polkit,
     portal,
-    portal_gtk3,
+    portal_gtk4,
     posix
 ]
 

po/de.po

@@ -3,7 +3,7 @@
 # Tucan Holmes <[email protected]>, 2018.
 # Pascal Matthiesen <[email protected]>, 2018.
 # Tim Krueger <[email protected]>, 2019.
-# Uwe S <[email protected]>, 2019, 2020, 2021, 2022, 2023.
+# Uwe S <[email protected]>, 2019, 2020, 2021, 2022, 2023, 2024.
 # Christoph Matthies <[email protected]>, 2019.
 # Allan Nordhøy <[email protected]>, 2021.
 # supaeasy <[email protected]>, 2021.
@@ -13,9 +13,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-11 12:29+0000\n"
-"PO-Revision-Date: 2023-10-24 15:10+0000\n"
+"PO-Revision-Date: 2024-02-12 23:41+0000\n"
 "Last-Translator: Uwe S <[email protected]>\n"
-"Language-Team: German <https://l10n.elementary.io/projects/appcenter/appcenter/de/>\n"
+"Language-Team: German <https://l10n.elementary.io/projects/appcenter/"
+"appcenter/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -67,16 +68,12 @@ msgid "Search Apps"
 msgstr "Anwendungen suchen"
 
 #: src/MainWindow.vala:176
-#, fuzzy
-#| msgid "Automatically update free and paid-for curated apps"
 msgid "Automatically Update Free & Purchased Apps"
-msgstr "Kostenlose und kostenpflichtige betreute Anwendungen automatisch aktualisieren"
+msgstr "Kostenlose und gekaufte Anwendungen automatisch aktualisieren"
 
 #: src/MainWindow.vala:177
-#, fuzzy
-#| msgid "System updates and unpaid apps will not update automatically"
 msgid "Apps being tried for free will not update automatically"
-msgstr "Betriebssystem und kostenlose Anwendungen werden nicht automatisch aktualisiert"
+msgstr "Kostenlos getestete Anwendungen werden nicht automatisch aktualisiert"
 
 #: src/MainWindow.vala:181
 msgid "Check for Updates"
@@ -320,13 +317,11 @@ msgstr[0] "Aktualisierung verfügbar"
 msgstr[1] "Aktualisierungen verfügbar"
 
 #: src/Core/Client.vala:77
-#, fuzzy, c-format
-#| msgid "%u update is available."
-#| msgid_plural "%u updates are available."
+#, c-format
 msgid "%u app update is available"
 msgid_plural "%u app updates are available"
-msgstr[0] "%u Aktualisierung verfügbar."
-msgstr[1] "%u Aktualisierungen verfügbar."
+msgstr[0] "%u Anwendungsaktualisierung verfügbar"
+msgstr[1] "%u Anwendungsaktualisierungen verfügbar"
 
 #: src/Core/FlatpakBackend.vala:44
 #, c-format

po/he.po

@@ -1,12 +1,13 @@
-# Yaron Shahrabani <[email protected]>, 2018, 2019, 2020, 2021, 2022, 2023.
+# Yaron Shahrabani <[email protected]>, 2018, 2019, 2020, 2021, 2022, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-11 12:29+0000\n"
-"PO-Revision-Date: 2023-11-04 13:10+0000\n"
+"PO-Revision-Date: 2024-02-12 23:41+0000\n"
 "Last-Translator: Yaron Shahrabani <[email protected]>\n"
-"Language-Team: Hebrew <https://l10n.elementary.io/projects/appcenter/appcenter/he/>\n"
+"Language-Team: Hebrew <https://l10n.elementary.io/projects/appcenter/"
+"appcenter/he/>\n"
 "Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,16 +59,12 @@ msgid "Search Apps"
 msgstr "חיפוש יישומים"
 
 #: src/MainWindow.vala:176
-#, fuzzy
-#| msgid "Automatically update free and paid-for curated apps"
 msgid "Automatically Update Free & Purchased Apps"
-msgstr "לעדכן יישומים חופשיים ובתשלום שנאספו אוטומטית"
+msgstr "לעדכן יישומים בחינם ובתשלום אוטומטית"
 
 #: src/MainWindow.vala:177
-#, fuzzy
-#| msgid "System updates and unpaid apps will not update automatically"
 msgid "Apps being tried for free will not update automatically"
-msgstr "עדכוני מערכת ויישומונים שלא נרכשו לא יתעדכנו אוטומטית"
+msgstr "יישומים שניסית בחינם לא יתעדכנו אוטומטית"
 
 #: src/MainWindow.vala:181
 msgid "Check for Updates"
@@ -311,13 +308,11 @@ msgstr[0] "עדכון זמין"
 msgstr[1] "עדכונים זמינים"
 
 #: src/Core/Client.vala:77
-#, fuzzy, c-format
-#| msgid "%u Update Available"
-#| msgid_plural "%u Updates Available"
+#, c-format
 msgid "%u app update is available"
 msgid_plural "%u app updates are available"
-msgstr[0] "עדכון זמין"
-msgstr[1] "%u עדכונים זמינים"
+msgstr[0] "עדכון זמין ליישום"
+msgstr[1] "%u עדכונים זמינים ליישומים"
 
 #: src/Core/FlatpakBackend.vala:44
 #, c-format

po/ja.po

@@ -4,9 +4,10 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-02-11 12:29+0000\n"
-"PO-Revision-Date: 2024-02-11 12:29+0000\n"
+"PO-Revision-Date: 2024-02-12 23:41+0000\n"
 "Last-Translator: Ryo Nakano <[email protected]>\n"
-"Language-Team: Japanese <https://l10n.elementary.io/projects/appcenter/appcenter/ja/>\n"
+"Language-Team: Japanese <https://l10n.elementary.io/projects/appcenter/"
+"appcenter/ja/>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -58,16 +59,12 @@ msgid "Search Apps"
 msgstr "アプリを検索"
 
 #: src/MainWindow.vala:176
-#, fuzzy
-#| msgid "Automatically update free and paid-for curated apps"
 msgid "Automatically Update Free & Purchased Apps"
-msgstr "キュレーションされたアプリのうち、無料あるいは購入済みのものを自動的にアップデートします"
+msgstr "無料・購入済みアプリを自動的にアップデート"
 
 #: src/MainWindow.vala:177
-#, fuzzy
-#| msgid "System updates and unpaid apps will not update automatically"
 msgid "Apps being tried for free will not update automatically"
-msgstr "システムのアップデートと未購入のアプリは対象外です"
+msgstr "無料試用中のアプリは対象外です"
 
 #: src/MainWindow.vala:181
 msgid "Check for Updates"
@@ -310,12 +307,10 @@ msgid_plural "Updates Available"
 msgstr[0] "アップデートが利用可能です"
 
 #: src/Core/Client.vala:77
-#, fuzzy, c-format
-#| msgid "%u Update Available"
-#| msgid_plural "%u Updates Available"
+#, c-format
 msgid "%u app update is available"
 msgid_plural "%u app updates are available"
-msgstr[0] "%u件のアップデートが利用可能です"
+msgstr[0] "%u個のアプリのアップデートが利用可能です"
 
 #: src/Core/FlatpakBackend.vala:44
 #, c-format