Merge branch 'main' into libadwaita-1.4

data/gtk/details-window.blp

@@ -108,12 +108,24 @@ template $DetailsWindow : Adw.Window {
                     title: _("Executable");
 
                     [suffix]
-                    Gtk.MenuButton exec_info_button {
+                    Button file_chooser_button {
+                      valign: center;
+                      icon-name: "document-open-symbolic";
+                      tooltip-text: _("Select File");
+
+                      styles [
+                        "flat",
+                      ]
+                    }
+
+                    [suffix]
+                    MenuButton exec_info_button {
                     valign: center;
                     icon-name: "help-about-symbolic";
                     tooltip-text: _("More Info");
 
                     popover: Popover exec_info_popover {
+                        focusable: true;
 
                         Label exec_info_label {
                             use-markup: true;
@@ -125,7 +137,6 @@ template $DetailsWindow : Adw.Window {
                             margin-bottom: 6;
                             margin-start: 6;
                             margin-end: 6;
-                            selectable: true;
                         }
                     };
 

data/gtk/preferences.blp

@@ -60,7 +60,6 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           ]
         }
       }
-
     }
   }
 
@@ -90,6 +89,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button steam_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
       }
@@ -104,6 +106,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button lutris_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
 
@@ -113,6 +118,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button lutris_cache_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
 
@@ -135,6 +143,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button heroic_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
 
@@ -165,6 +176,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button bottles_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
       }
@@ -179,6 +193,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button itch_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
       }
@@ -193,6 +210,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button legendary_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
       }
@@ -207,6 +227,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button retroarch_config_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
       }
@@ -221,6 +244,9 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           Button flatpak_data_file_chooser_button {
             icon-name: "folder-symbolic";
             valign: center;
+            styles [
+              "flat"
+            ]
           }
         }
 
@@ -233,6 +259,15 @@ template $PreferencesWindow : Adw.PreferencesWindow {
           }
         }
       }
+
+      Adw.ActionRow {
+        title: _("Desktop Entries");
+        activatable-widget: desktop_switch;
+
+        Switch desktop_switch {
+          valign: center;
+        }
+      }
     }
   }
 

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist gettext-domain="cartridges">
+
   <schema id="@APP_ID@" path="@PREFIX@/">
     <key name="exit-after-launch" type="b">
       <default>false</default>
@@ -76,6 +77,9 @@
     <key name="retroarch-location" type="s">
       <default>"~/.var/app/org.libretro.RetroArch/config/retroarch/"</default>
     </key>
+    <key name="desktop" type="b">
+      <default>true</default>
+    </key>
     <key name="flatpak" type="b">
       <default>true</default>
     </key>
@@ -97,7 +101,11 @@
     <key name="sgdb-animated" type="b">
       <default>false</default>
     </key>
+    <key name="library-rows" type="u">
+      <default>0</default>
+    </key>
   </schema>
+
   <schema id="@APP_ID@.State" path="@PREFIX@/State/">
     <key name="width" type="i">
       <default>1170</default>

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

@@ -44,10 +44,23 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="2.1.1" date="2023-07-27">
+    <release version="2.3" date="2023-08-29">
       <description translatable="no">
         <ul>
-          <li>Fixes an issue with translations</li>
+          <li>New import source: desktop entries</li>
+          <li>Added the ability to pick executables via the file picker</li>
+          <li>Manually added covers are now padded if they are too short</li>
+          <li>Translations since 2.2</li>
+        </ul>
+      </description>
+    </release>
+    <release version="2.2" date="2023-08-17">
+      <description translatable="no">
+        <ul>
+          <li>New import source: RetroArch</li>
+          <li>Added the option to automatically remove uninstalled games on import</li>
+          <li>Added the ability to undo an import</li>
+          <li>Various UX improvements</li>
           <li>Translations since 2.1</li>
         </ul>
       </description>