fix: adw>1.5,PreferencesDialog

ldrfy · Sep 20, 2024 · 8cb40c8 · 8cb40c8
1 parent 3c1e97a
commit 8cb40c8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/data/resources/lfy.cmb b/data/resources/lfy.cmb
@@ -43,7 +43,7 @@
 	(1,187,"(item)","app_preferences",186,None,None,None,None,None,None),
 	(1,188,"(item)","win_show-help-overlay",186,None,None,None,1,None,None),
 	(1,189,"(item)","app_about",186,None,None,None,2,None,None),
-	(2,2,"AdwPreferencesWindow","PreferencesWindow",None,None,None,None,-1,None,None),
+	(2,2,"AdwPreferencesDialog","PreferencesDialog",None,None,None,None,-1,None,None),
 	(2,5,"AdwPreferencesPage",None,2,None,None,None,-1,None,None),
 	(2,14,"AdwPreferencesGroup",None,5,None,None,None,None,None,None),
 	(2,15,"AdwComboRow","acr_server",14,None,None,None,None,None,None),

diff --git a/data/resources/preference.ui b/data/resources/preference.ui
@@ -2,8 +2,8 @@
 <!-- Created with Cambalache 0.90.4 -->
 <interface>
   <requires lib="gtk" version="4.12"/>
-  <requires lib="libadwaita" version="1.4"/>
-  <template class="PreferencesWindow" parent="AdwPreferencesWindow">
+  <requires lib="libadwaita" version="1.5"/>
+  <template class="PreferencesDialog" parent="AdwPreferencesDialog">
     <child>
       <object class="AdwPreferencesPage">
         <child>

diff --git a/lfy/main.py b/lfy/main.py
@@ -13,7 +13,7 @@
 from lfy.api.utils.bak import backup_gsettings
 from lfy.api.utils.check_update import main as check_update
 from lfy.api.utils.debug import get_log_handler
-from lfy.preference import PreferenceWindow
+from lfy.preference import PreferencesDialog
 from lfy.settings import Settings
 from lfy.translate import TranslateWindow
 
@@ -143,7 +143,7 @@ def on_preferences_action(self, _widget, _w):
             w (_type_): _description_
         """
         # pylint: disable=E1101
-        PreferenceWindow(transient_for=self.props.active_window).present()
+        PreferencesDialog().present()
 
     def on_action_trans_now(self, action, value):
         """临时设置不相应复制行为

diff --git a/lfy/preference.py b/lfy/preference.py
@@ -15,13 +15,13 @@
 
 
 @Gtk.Template(resource_path='/cool/ldr/lfy/preference.ui')
-class PreferenceWindow(Adw.PreferencesWindow):
+class PreferencesDialog(Adw.PreferencesDialog):
     """设置
 
     Args:
         Adw (_type_): _description_
     """
-    __gtype_name__ = 'PreferencesWindow'
+    __gtype_name__ = 'PreferencesDialog'
 
     acr_server: Adw.ComboRow = Gtk.Template.Child()
     acr_server_ocr: Adw.ComboRow = Gtk.Template.Child()