Port to Gtk 4

data/com.github.davidmhewitt.torrential.gschema.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <schemalist>
-  <enum id="com.github.davidmhewitt.torrential.windowstate">
-    <value value="0" nick="normal"/>
-    <value value="1" nick="maximized"/>
-  </enum>
   <schema path="/com/github/davidmhewitt/torrential/settings/" id="com.github.davidmhewitt.torrential.settings">
     <key type="i" name="window-width">
       <default>1100</default>
@@ -15,10 +11,10 @@
       <summary>Window height</summary>
       <description>Window height</description>
     </key>
-    <key enum="com.github.davidmhewitt.torrential.windowstate" name="window-state">
-      <default>'normal'</default>
-      <summary>The saved state of the window</summary>
-      <description>The saved state of the window</description>
+    <key name="window-maximized" type="b">
+      <default>false</default>
+      <summary>Open window maximized.</summary>
+      <description>Whether the main window of the application should open maximized or not.</description>
     </key>
     <key type="s" name="download-folder">
       <default>""</default>

meson.build

@@ -12,9 +12,9 @@ vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
 add_project_arguments(['--vapidir', vapi_dir], language: 'vala')
 
 dependencies = [
-    dependency('gtk+-3.0'),
+    dependency('gtk4'),
     dependency('gee-0.8'),
-    dependency('granite'),
+    dependency('granite-7'),
     dependency('threads'),
     meson.get_compiler('vala').find_library('posix'),
     meson.get_compiler('vala').find_library('transmission-2.0', dirs: vapi_dir),
@@ -28,6 +28,7 @@ dependencies = [
     meson.get_compiler('c').find_library('curl'),
     meson.get_compiler('c').find_library('ssl'),
     meson.get_compiler('c').find_library('crypto'),
+    meson.get_compiler('c').find_library('z'),
 ]
 
 subdir('data')

src/Application.vala

@@ -47,7 +47,7 @@ public class Torrential.Application : Gtk.Application {
         Intl.bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         Intl.textdomain (GETTEXT_PACKAGE);
 
-        Gtk.IconTheme.get_default ().add_resource_path ("/com/github/davidmhewitt/torrential");
+        Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/com/github/davidmhewitt/torrential");
 
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
@@ -69,7 +69,7 @@ public class Torrential.Application : Gtk.Application {
             return;
         }
 
-        var file_list = new SList<File> ();
+        var file_list = new ListStore (typeof (File));
         foreach (unowned var file in files) {
             file_list.append (file);
         }
@@ -82,9 +82,24 @@ public class Torrential.Application : Gtk.Application {
         if (active_window == null) {
             var window = new MainWindow (this, torrent_manager);
             add_window (window);
-        } else {
-            active_window.present ();
+
+            /*
+            * This is very finicky. Bind size after present else set_titlebar gives us bad sizes
+            * Set maximize after height/width else window is min size on unmaximize
+            * Bind maximize as SET else get get bad sizes
+            */
+            var settings = new Settings ("com.github.davidmhewitt.torrential.settings");
+            settings.bind ("window-height", window, "default-height", SettingsBindFlags.DEFAULT);
+            settings.bind ("window-width", window, "default-width", SettingsBindFlags.DEFAULT);
+
+            if (settings.get_boolean ("window-maximized")) {
+                window.maximize ();
+            }
+
+            settings.bind ("window-maximized", window, "maximized", SettingsBindFlags.SET);
         }
+
+        active_window.present ();
     }
 
     public override int command_line (GLib.ApplicationCommandLine command_line) {
@@ -93,6 +108,7 @@ public class Torrential.Application : Gtk.Application {
         if (options.contains ("quit")) {
             if (active_window != null) {
                 ((MainWindow) active_window).quit ();
+                return Posix.EXIT_SUCCESS;
             }
         }
 

src/Dialogs/FileSelectDialog.vala

@@ -38,18 +38,17 @@ public class Torrential.Dialogs.FileSelectDialog : Granite.Dialog {
 
         var view = new Widgets.FileSelectTreeView (torrent);
 
-        var scrolled = new Gtk.ScrolledWindow (null, null) {
+        var scrolled = new Gtk.ScrolledWindow () {
+            child = view,
             hexpand = true,
             vexpand = true,
             margin_end = 10,
             margin_bottom = 9,
             margin_start = 10
         };
-        scrolled.add (view);
-        scrolled.get_style_context ().add_class (Gtk.STYLE_CLASS_FRAME);
-        scrolled.show_all ();
+        scrolled.add_css_class (Granite.STYLE_CLASS_FRAME);
 
-        get_content_area ().add (scrolled);
+        get_content_area ().append (scrolled);
 
         add_button (_("Close"), 0);