Merge pull request #200 from DaPigGuy/adw-dialog

Port to Adw.Dialog
TenderOwl · May 3, 2024 · 63a3c59 · 63a3c59
2 parents 42996ea + d2ead4c
commit 63a3c59
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 154 deletions.
diff --git a/data/com.github.tenderowl.frog.gresource.xml b/data/com.github.tenderowl.frog.gresource.xml
@@ -9,7 +9,7 @@
         <file preprocess="xml-stripblanks">ui/language_dialog.ui</file>
         <file preprocess="xml-stripblanks">ui/language_row.ui</file>
         <file preprocess="xml-stripblanks">ui/shortcuts.ui</file>
-        <file preprocess="xml-stripblanks">ui/preferences_window.ui</file>
+        <file preprocess="xml-stripblanks">ui/preferences_dialog.ui</file>
         <file preprocess="xml-stripblanks">ui/preferences_general.ui</file>
         <file preprocess="xml-stripblanks">ui/preferences_languages.ui</file>
         <file preprocess="xml-stripblanks">ui/share_row.ui</file>

diff --git a/data/meson.build b/data/meson.build
@@ -55,8 +55,7 @@ subdir('icons')
 
 blueprints = custom_target('blueprints',
   input: files(
-    'ui/language_dialog.blp',
-    'ui/preferences_window.blp',
+    'ui/preferences_dialog.blp',
     'ui/preferences_general.blp',
     'ui/preferences_languages.blp',
     'ui/shortcuts.blp',

diff --git a/data/ui/language_dialog.blp b/data/ui/language_dialog.blp
diff --git a/data/ui/preferences_window.blp → data/ui/preferences_dialog.blp b/data/ui/preferences_window.blp → data/ui/preferences_dialog.blp
@@ -1,12 +1,11 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $PreferencesWindow : Adw.PreferencesWindow {
-  default-height: 480;
-  default-width: 640;
+template $PreferencesDialog : Adw.PreferencesDialog {
+  content-height: 480;
+  content-width: 640;
   width-request: 360;
   height-request: 300;
-  modal: true;
   search-enabled: false;
 
   $PreferencesGeneralPage general_page {}

diff --git a/flatpak/com.github.tenderowl.frog.json b/flatpak/com.github.tenderowl.frog.json
@@ -1,7 +1,7 @@
 {
     "app-id" : "com.github.tenderowl.frog",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "45",
+    "runtime-version" : "46",
     "sdk" : "org.gnome.Sdk",
     "command" : "frog",
     "finish-args" : [

diff --git a/frog/main.py b/frog/main.py
@@ -163,7 +163,7 @@ def on_github_star(self, _action, _param) -> None:
 
     def on_about(self, _action, _param):
         telemetry.capture('about activated')
-        about_window = Adw.AboutWindow(
+        about_window = Adw.AboutDialog(
             application_name="Frog",
             application_icon=APP_ID,
             version=self.version,
@@ -183,10 +183,9 @@ def on_about(self, _action, _param):
                 </ul>
                 <p>Full list of changes you may find in the repository.</p>
                 <p>We hope you enjoy our work!</p>
-            """,
-            transient_for=self.props.active_window
+            """
         )
-        about_window.present()
+        about_window.present(self.props.active_window)
 
     def on_shortcuts(self, _action, _param):
         telemetry.capture('shortcuts activated')

diff --git a/frog/widgets/language_dialog.py b/frog/widgets/language_dialog.py
diff --git a/frog/widgets/preferences_window.py → frog/widgets/preferences_dialog.py b/frog/widgets/preferences_window.py → frog/widgets/preferences_dialog.py
@@ -1,4 +1,4 @@
-# preferences_window.py
+# preferences_dialog.py
 #
 # Copyright 2021-2023 Andrey Maksimov
 #
@@ -35,16 +35,15 @@
 from frog.widgets.preferences_languages_page import PreferencesLanguagesPage
 
 
-@Gtk.Template(resource_path=f'{RESOURCE_PREFIX}/ui/preferences_window.ui')
-class PreferencesWindow(Adw.PreferencesWindow):
-    __gtype_name__ = 'PreferencesWindow'
+@Gtk.Template(resource_path=f'{RESOURCE_PREFIX}/ui/preferences_dialog.ui')
+class PreferencesDialog(Adw.PreferencesDialog):
+    __gtype_name__ = 'PreferencesDialog'
 
     general_page: PreferencesGeneralPage = Gtk.Template.Child()
     languages_page: PreferencesLanguagesPage = Gtk.Template.Child()
 
-    def __init__(self, settings: Settings, parent: Adw.Window = None):
+    def __init__(self):
         super().__init__()
-        self.set_transient_for(parent)
 
         self.connect('show', lambda x: telemetry.capture_page_view('preferences'))
 

diff --git a/frog/window.py b/frog/window.py
@@ -42,7 +42,7 @@
 from frog.services.share_service import ShareService
 from frog.widgets.extracted_page import ExtractedPage
 from frog.widgets.list_menu_row import ListMenuRow
-from frog.widgets.preferences_window import PreferencesWindow
+from frog.widgets.preferences_dialog import PreferencesDialog
 from frog.widgets.welcome_page import WelcomePage
 
 
@@ -294,9 +294,8 @@ def on_copy_to_clipboard(self, sender) -> None:
         self.show_toast(_("Text copied"))
 
     def show_preferences(self):
-        # dialog = LanguagePacksDialog(self)
-        dialog = PreferencesWindow(settings=self.settings, parent=self)
-        dialog.present()
+        dialog = PreferencesDialog()
+        dialog.present(self)
 
     def show_welcome_page(self, *_):
         self.split_view.set_show_content(False)