From bc0395d4ce75d46a3ece1b14dda724d31c770eb1 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 28 Jun 2026 14:02:57 +0100 Subject: [PATCH 1/5] run () -> show () in action_revert --- src/MainWindow.vala | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index dcd34dbc3..c4c21f078 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -1155,13 +1155,18 @@ namespace Scratch { private void action_revert () { var confirmation_dialog = new Scratch.Dialogs.RestoreConfirmationDialog (this); - if (confirmation_dialog.run () == Gtk.ResponseType.ACCEPT) { - var doc = get_current_document (); - if (doc != null) { - doc.revert (); + confirmation_dialog.response.connect ((res) => { + if (res == Gtk.ResponseType.ACCEPT) { + var doc = get_current_document (); + if (doc != null) { + doc.revert (); + } } - } - confirmation_dialog.destroy (); + + confirmation_dialog.destroy (); + }); + + confirmation_dialog.show (); } private void action_duplicate () { From ad401d15cb7198d83be4bffe8b733984adba62c0 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 28 Jun 2026 14:08:52 +0100 Subject: [PATCH 2/5] run () -> show () in choose_folder --- src/MainWindow.vala | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index c4c21f078..8f3ce6e82 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -1031,14 +1031,18 @@ namespace Scratch { chooser.select_multiple = true; - if (chooser.run () == Gtk.ResponseType.ACCEPT) { - chooser.get_files ().foreach ((glib_file) => { - var foldermanager_file = new FolderManager.File (glib_file.get_path ()); - folder_manager_view.open_folder (foldermanager_file); - }); - } + chooser.response.connect ((res) => { + var files = chooser.get_files (); + chooser.destroy (); + if (res == Gtk.ResponseType.ACCEPT) { + files.foreach ((glib_file) => { + var foldermanager_file = new FolderManager.File (glib_file.get_path ()); + folder_manager_view.open_folder (foldermanager_file); + }); + } + }); - chooser.destroy (); + chooser.show (); } private void action_open_folder (SimpleAction action, Variant? param) { From a29a61c13f340c39462f015ddb4ed4a8ba0342d6 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 28 Jun 2026 14:12:15 +0100 Subject: [PATCH 3/5] run () -> show () in action_open --- src/MainWindow.vala | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 8f3ce6e82..17427dbb1 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -989,19 +989,22 @@ namespace Scratch { file_chooser.select_multiple = true; file_chooser.set_current_folder_uri (Utils.last_path ?? GLib.Environment.get_home_dir ()); - var response = file_chooser.run (); - file_chooser.destroy (); // Close now so it does not stay open during lengthy or failed loading - - if (response == Gtk.ResponseType.ACCEPT) { - foreach (string uri in file_chooser.get_uris ()) { - // Update last visited path - Utils.last_path = Path.get_dirname (uri); - // Open the file - var file = File.new_for_uri (uri); - var doc = new Scratch.Services.Document (actions, file); - open_document.begin (doc); + file_chooser.response.connect ((res) => { + var uris = file_chooser.get_uris (); + file_chooser.destroy (); // Close now so it does not stay open during lengthy or failed loading + if (res == Gtk.ResponseType.ACCEPT) { + foreach (string uri in file_chooser.get_uris ()) { + // Update last visited path + Utils.last_path = Path.get_dirname (uri); + // Open the file + var file = File.new_for_uri (uri); + var doc = new Scratch.Services.Document (actions, file); + open_document.begin (doc); + } } - } + }); + + file_chooser.show (); } private void action_open_in_new_window (SimpleAction action, Variant? param) { From 093ce8bfaf4232eb26cef9470e211f8ec916b5eb Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 28 Jun 2026 15:24:29 +0100 Subject: [PATCH 4/5] MainWindow: preferences dialog run () -> show () --- src/Dialogs/PreferencesDialog.vala | 2 ++ src/MainWindow.vala | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Dialogs/PreferencesDialog.vala b/src/Dialogs/PreferencesDialog.vala index 36a67a8d9..ee38c43a6 100644 --- a/src/Dialogs/PreferencesDialog.vala +++ b/src/Dialogs/PreferencesDialog.vala @@ -182,6 +182,8 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog { realize.connect (() => { stack.set_visible_child_name ("behavior"); }); + + show_all (); } private class SettingSwitch : Gtk.Grid { diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 17427dbb1..0917d69fe 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -951,13 +951,12 @@ namespace Scratch { private void action_preferences () { var preferences_dialog = new Scratch.Dialogs.Preferences (this, plugins); - preferences_dialog.show_all (); preferences_dialog.response.connect (() => { preferences_dialog.destroy (); }); - preferences_dialog.present (); + preferences_dialog.show (); } private void action_close_window () { From eec8f3541b6d44b9ca4d5f6f7b8c02950432ec75 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Tue, 30 Jun 2026 09:12:51 +0100 Subject: [PATCH 5/5] Used cached files --- src/MainWindow.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 0917d69fe..af21235fd 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -992,7 +992,7 @@ namespace Scratch { var uris = file_chooser.get_uris (); file_chooser.destroy (); // Close now so it does not stay open during lengthy or failed loading if (res == Gtk.ResponseType.ACCEPT) { - foreach (string uri in file_chooser.get_uris ()) { + foreach (string uri in uris) { // Update last visited path Utils.last_path = Path.get_dirname (uri); // Open the file