From 169d8b7abf2322ba49e80d23c3904c9df74de0ae Mon Sep 17 00:00:00 2001
From: coderkun <olli@suruatoel.xyz>
Date: Wed, 10 Apr 2024 17:50:15 +0200
Subject: [PATCH] =?UTF-8?q?fixup!=20Port=20UI=20to=20GTK=E2=80=AF4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/ui/info-dialog.ui               | 46 ----------------------------
 data/ui/shortcuts-dialog.ui          | 21 ++-----------
 data/xyz.suruatoel.mcg.gresource.xml |  3 +-
 src/application.py                   | 18 +++++++----
 src/infodialog.py                    | 15 ---------
 src/librarypanel.py                  |  6 ----
 src/shortcutsdialog.py               |  4 +--
 src/window.py                        |  7 +++--
 8 files changed, 22 insertions(+), 98 deletions(-)
 delete mode 100644 data/ui/info-dialog.ui
 delete mode 100644 src/infodialog.py

diff --git a/data/ui/info-dialog.ui b/data/ui/info-dialog.ui
deleted file mode 100644
index 99b3524..0000000
--- a/data/ui/info-dialog.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
-<interface>
-  <requires lib="gtk+" version="3.10"/>
-  <template class="McgInfoDialog" parent="GtkAboutDialog">
-    <property name="can-focus">False</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="window-position">center</property>
-    <property name="type-hint">dialog</property>
-    <property name="gravity">center</property>
-    <property name="program-name">CoverGrid</property>
-    <property name="version">3.1</property>
-    <property name="comments" translatable="yes">CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.</property>
-    <property name="website">http://www.suruatoel.xyz/codes/mcg</property>
-    <property name="logo-icon-name">xyz.suruatoel.mcg</property>
-    <property name="license-type">gpl-3-0</property>
-    <child internal-child="vbox">
-      <object class="GtkBox">
-        <property name="can-focus">False</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox">
-            <property name="can-focus">False</property>
-            <property name="layout-style">end</property>
-            <child>
-              <placeholder/>
-            </child>
-            <child>
-              <placeholder/>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/data/ui/shortcuts-dialog.ui b/data/ui/shortcuts-dialog.ui
index 8109201..279c992 100644
--- a/data/ui/shortcuts-dialog.ui
+++ b/data/ui/shortcuts-dialog.ui
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.38.2 -->
 <interface>
-  <requires lib="gtk+" version="3.18"/>
+  <requires lib="gtk+" version="4.8"/>
+  <requires lib="adw" version="1.2" />
   <template class="McgShortcutsDialog" parent="GtkShortcutsWindow">
-    <property name="modal">True</property>
+    <property name="modal">1</property>
     <child>
       <object class="GtkShortcutsSection">
         <property name="visible">1</property>
@@ -11,53 +12,45 @@
         <property name="max-height">10</property>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">General</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_1</property>
                 <property name="title" translatable="yes">Switch to the Connection panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_2</property>
                 <property name="title" translatable="yes">Switch to the Cover panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_3</property>
                 <property name="title" translatable="yes">Switch to the Playlist panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;KP_4</property>
                 <property name="title" translatable="yes">Switch to the Library panel</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;k</property>
                 <property name="title" translatable="yes">Show the keyboard shortcuts</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;i</property>
                 <property name="title" translatable="yes">Open the info dialog</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;q</property>
                 <property name="title" translatable="yes">Quit the application</property>
               </object>
@@ -66,25 +59,21 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Player</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;c</property>
                 <property name="title" translatable="yes">Connect or disconnect</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;p</property>
                 <property name="title" translatable="yes">Switch between play and pause</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;r</property>
                 <property name="title" translatable="yes">Clear the playlist</property>
               </object>
@@ -93,11 +82,9 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Cover Panel</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">F11</property>
                 <property name="title" translatable="yes">Show the cover in fullscreen mode</property>
               </object>
@@ -106,11 +93,9 @@
         </child>
         <child>
           <object class="GtkShortcutsGroup">
-            <property name="visible">1</property>
             <property name="title" translatable="yes">Library Panel</property>
             <child>
               <object class="GtkShortcutsShortcut">
-                <property name="visible">1</property>
                 <property name="accelerator">&lt;primary&gt;f</property>
                 <property name="title" translatable="yes">Search the library</property>
               </object>
diff --git a/data/xyz.suruatoel.mcg.gresource.xml b/data/xyz.suruatoel.mcg.gresource.xml
index 3511840..243d7d3 100644
--- a/data/xyz.suruatoel.mcg.gresource.xml
+++ b/data/xyz.suruatoel.mcg.gresource.xml
@@ -6,9 +6,8 @@
         <file>ui/window.ui</file>
         <!--
         <file>ui/gtk.menu.ui</file>
-        <file>ui/info-dialog.ui</file>
-        <file>ui/shortcuts-dialog.ui</file>
         -->
+        <file>ui/shortcuts-dialog.ui</file>
         <file>ui/connection-panel.ui</file>
         <file>ui/album-headerbar.ui</file>
         <file>ui/server-panel.ui</file>
diff --git a/src/application.py b/src/application.py
index a7b522e..ecef96b 100644
--- a/src/application.py
+++ b/src/application.py
@@ -26,7 +26,9 @@ class Application(Gtk.Application):
         self._window = None
         self._info_dialog = None
         self._verbosity = logging.WARNING
-        #self.create_action('quit', self.quit, ['<primary>q'])
+        self.set_accels_for_action('window.close', ['<primary>q'])
+        self.set_accels_for_action('win.show-help-overlay', ['<primary>k'])
+        self.set_accels_for_action('app.info', ['<primary>i'])
         #self.create_action('about', self.on_about_action)
         #self.create_action('preferences', self.on_preferences_action)
 
@@ -51,11 +53,15 @@ class Application(Gtk.Application):
 
     def on_menu_info(self, action, value):
         # FIXME Info dialog
-        #if not self._info_dialog:
-        #    self._info_dialog = InfoDialog()
-        #self._info_dialog.run()
-        #self._info_dialog.hide()
-        pass
+        if not self._info_dialog:
+            self._info_dialog = Adw.AboutDialog()
+            self._info_dialog.set_application_icon("xyz.suruatoel.mcg")
+            self._info_dialog.set_application_name("CoverGrid")
+            self._info_dialog.set_version("3.1")
+            self._info_dialog.set_comments("CoverGrid is a client for the Music Player Daemon, focusing on albums instead of single tracks.")
+            self._info_dialog.set_website("https://www.suruatoel.xyz/codes/mcg")
+            self._info_dialog.set_license_type(Gtk.License.GPL_3_0)
+        self._info_dialog.present()
 
 
     def on_menu_quit(self, action, value):
diff --git a/src/infodialog.py b/src/infodialog.py
deleted file mode 100644
index f6421e6..0000000
--- a/src/infodialog.py
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-
-import gi
-gi.require_version('Gtk', '3.0')
-import logging
-
-from gi.repository import Gtk, GdkPixbuf
-
-
-
-
-@Gtk.Template(resource_path='/xyz/suruatoel/mcg/ui/info-dialog.ui')
-class InfoDialog(Gtk.AboutDialog):
-    __gtype_name__ = 'McgInfoDialog'
diff --git a/src/librarypanel.py b/src/librarypanel.py
index 70efc8c..5201b5c 100644
--- a/src/librarypanel.py
+++ b/src/librarypanel.py
@@ -232,12 +232,6 @@ class LibraryPanel(Adw.Bin):
         self.select_button.set_active(False)
 
 
-    # FIXME on_standalone_scroll_size_allocate()
-    #@Gtk.Template.Callback()
-    def on_standalone_scroll_size_allocate(self, widget, allocation):
-        self._resize_standalone_image()
-
-
     @Gtk.Template.Callback()
     def on_standalone_play_clicked(self, widget):
         self.emit('play', self._selected_albums[0].get_id())
diff --git a/src/shortcutsdialog.py b/src/shortcutsdialog.py
index f73864e..6bf16e5 100644
--- a/src/shortcutsdialog.py
+++ b/src/shortcutsdialog.py
@@ -2,8 +2,8 @@
 
 
 import gi
-gi.require_version('Gtk', '3.0')
-
+gi.require_version('Gtk', '4.0')
+gi.require_version('Adw', '1')
 from gi.repository import Gtk
 
 
diff --git a/src/window.py b/src/window.py
index 430bcb7..ae2a2e8 100644
--- a/src/window.py
+++ b/src/window.py
@@ -9,13 +9,14 @@ try:
     use_keyring = True
 except:
     use_keyring = False
+use_keyring = False
 import locale
 import logging
 
 from gi.repository import Gtk, Adw, Gdk, GObject, GLib, Gio
 
 from . import client
-#from .shortcutsdialog import ShortcutsDialog
+from .shortcutsdialog import ShortcutsDialog
 from .connectionpanel import ConnectionPanel
 from .serverpanel import ServerPanel
 from .coverpanel import CoverPanel
@@ -87,8 +88,8 @@ class Window(Adw.ApplicationWindow):
         self._headerbar_connection_button_active = True
         self._headerbar_playpause_button_active = True
 
-        # FIXME Help/Shortcuts dialog
-        #self.set_help_overlay(ShortcutsDialog())
+        # Help/Shortcuts dialog
+        self.set_help_overlay(ShortcutsDialog())
 
         # Login screen
         self._connection_panel = ConnectionPanel()