Merge branch 'main' into libadwaita-1.4

data/gtk/details-window.blp

@@ -2,7 +2,7 @@ using Gtk 4.0;
 using Adw 1;
 
 template $DetailsWindow : Adw.Window {
-    default-width: 500;
+    default-width: 480; // Same as Nautilus' properties window
     default-height: -1;
     modal: true;
 
@@ -97,34 +97,20 @@ template $DetailsWindow : Adw.Window {
                 }
             }
 
-            Adw.PreferencesGroup title_group {
-                title: _("Title");
-                description: _("The title of the game");
-
-                Entry name {
-                    accessibility {
-                        label: _("Title");
-                    }
+            Adw.PreferencesGroup {
+                Adw.EntryRow name {
+                    title: _("Title");
+                }
+                Adw.EntryRow developer {
+                    title: _("Developer (optional)");
                 }
             }
+            Adw.PreferencesGroup {
+                Adw.EntryRow executable {
+                    title: _("Executable");
 
-            Adw.PreferencesGroup developer_group {
-                title: _("Developer");
-                description: _("The developer or publisher (optional)");
-
-                Entry developer {
-                    accessibility {
-                        label: _("Developer");
-                    }
-                }
-            }
-
-            Adw.PreferencesGroup exec_group {
-                title: _("Executable");
-                description: _("File to open or command to run when launching the game");
-
-                [header-suffix]
-                Gtk.MenuButton exec_info_button {
+                    [suffix]
+                    Gtk.MenuButton exec_info_button {
                     valign: center;
                     icon-name: "help-about-symbolic";
                     tooltip-text: _("More Info");
@@ -150,10 +136,6 @@ template $DetailsWindow : Adw.Window {
                     ]
                 }
 
-                Entry executable {
-                    accessibility {
-                        label: _("Executable");
-                    }
                 }
             }
         }

data/gtk/preferences.blp

@@ -138,6 +138,10 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           title: _("Import GOG Games");
         }
 
+        Adw.SwitchRow heroic_import_amazon_switch  {
+          title: _("Import Amazon Games");
+        }
+
         Adw.SwitchRow heroic_import_sideload_switch {
           title: _("Import Sideloaded Games");
         }
@@ -185,6 +189,20 @@ template $PreferencesWindow : Adw.PreferencesWindow {
         }
       }
 
+      Adw.ExpanderRow retroarch_expander_row {
+        title: _("RetroArch");
+        show-enable-switch: true;
+
+        Adw.ActionRow retroarch_config_action_row {
+          title: _("Install Location");
+
+          Button retroarch_config_file_chooser_button {
+            icon-name: "folder-symbolic";
+            valign: center;
+          }
+        }
+      }
+
       Adw.ExpanderRow flatpak_expander_row {
         title: _("Flatpak");
         show-enable-switch: true;

data/hu.kramo.Cartridges.desktop.in

@@ -7,5 +7,5 @@ Icon=@APP_ID@
 Terminal=false
 Type=Application
 Categories=GNOME;GTK;Game;
-Keywords=gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;
+Keywords=gaming;launcher;steam;lutris;heroic;bottles;itch;flatpak;legendary;retroarch;
 StartupNotify=true

data/hu.kramo.Cartridges.gschema.xml.in

@@ -43,6 +43,9 @@
     <key name="heroic-import-gog" type="b">
       <default>true</default>
     </key>
+    <key name="heroic-import-amazon" type="b">
+      <default>true</default>
+    </key>
     <key name="heroic-import-sideload" type="b">
       <default>true</default>
     </key>
@@ -64,6 +67,12 @@
     <key name="legendary-location" type="s">
       <default>"~/.config/legendary/"</default>
     </key>
+    <key name="retroarch" type="b">
+      <default>true</default>
+    </key>
+    <key name="retroarch-location" type="s">
+      <default>"~/.var/app/org.libretro.RetroArch/config/retroarch/"</default>
+    </key>
     <key name="flatpak" type="b">
       <default>true</default>
     </key>
@@ -113,4 +122,4 @@
       <default>"[]"</default>
     </key>
   </schema>
-</schemalist>
+</schemalist>

data/hu.kramo.Cartridges.metainfo.xml.in

@@ -44,10 +44,19 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="2.0.6" date="2023-07-21">
+    <release version="2.1.1" date="2023-07-27">
       <description translatable="no">
         <ul>
-          <li>Fixes an issue with Steam mods not importing properly</li>
+          <li>Fixes an issue with translations</li>
+          <li>Translations since 2.1</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.1" date="2023-07-25">
+      <description translatable="no">
+        <ul>
+          <li>Added support for Amazon Games in the Heroic importer</li>
+          <li>Translations since 2.0</li>
         </ul>
       </description>
     </release>