Manage accels for remaining dialogs and windows.

toolstack · toolstack · commit 9646eea3e86e · 2024-12-21T20:32:40.000-05:00
diff --git a/src/Application.vala b/src/Application.vala
@@ -370,6 +370,14 @@ namespace Tuba {
 			set_accels_for_action ("app.scroll-page-to-top", {});
 		}
 
+		public void enable_home_accel () {
+			set_accels_for_action ("app.scroll-page-to-top", {"Home"});
+		}
+
+		public void disable_home_accel () {
+			set_accels_for_action ("app.scroll-page-to-top", {});
+		}
+
 		private void on_proxy_change (bool recover = false) {
 			if (settings.proxy != "") {
 				try {
@@ -675,6 +683,11 @@ namespace Tuba {
 			// Static functions seem to avoid this peculiar behavior.
 			//  dialog.translator_credits = Build.TRANSLATOR != " " ? Build.TRANSLATOR : null;
 
+			app.disable_window_accels ();
+			app.disable_nav_accels ();
+
+			dialog.closed.connect (on_about_closed);
+
 			dialog.present (main_window);
 
 			GLib.Idle.add (() => {
@@ -685,6 +698,11 @@ namespace Tuba {
 			});
 		}
 
+		public void on_about_closed () {
+			app.enable_window_accels ();
+			app.enable_nav_accels ();
+		}
+
 		public Adw.AlertDialog inform (string text, string? msg = null) {
 			var dlg = new Adw.AlertDialog (
 				text,
diff --git a/src/Dialogs/NewAccount.vala b/src/Dialogs/NewAccount.vala
@@ -62,10 +62,23 @@ public class Tuba.Dialogs.NewAccount: Adw.Window {
 		manual_auth_label.activate_link.connect (on_manual_auth);
 
 		reset ();
+
+		app.disable_window_accels ();
+		app.disable_nav_accels ();
+
+		this.close_request.connect (on_new_account_closed);
+
 		present ();
 		instance_entry.grab_focus ();
 	}
 
+	public bool on_new_account_closed () {
+		app.enable_window_accels ();
+		app.enable_nav_accels ();
+
+		return false;
+	}
+
 	private void add_toast (string content, uint timeout = 0) {
 		toast_overlay.add_toast (new Adw.Toast (content) {
 			timeout = timeout
diff --git a/src/Dialogs/Preferences.vala b/src/Dialogs/Preferences.vala
@@ -205,6 +205,8 @@ public class Tuba.Dialogs.Preferences : Adw.PreferencesDialog {
 		setup_notification_mutes ();
 		setup_filters ();
 		bind ();
+		app.disable_window_accels ();
+		app.disable_nav_accels ();
 		closed.connect (on_window_closed);
 	}
 
@@ -393,6 +395,9 @@ public class Tuba.Dialogs.Preferences : Adw.PreferencesDialog {
 
 		if (settings.analytics) app.update_analytics.begin ();
 		app.update_contributors.begin ();
+
+		app.enable_window_accels ();
+		app.enable_nav_accels ();
 	}
 
 	protected class AnalyticsDialog : Adw.Dialog {
diff --git a/src/Dialogs/ProfileEdit.vala b/src/Dialogs/ProfileEdit.vala
@@ -1,6 +1,9 @@
 [GtkTemplate (ui = "/dev/geopjr/Tuba/ui/dialogs/profile_edit.ui")]
 public class Tuba.Dialogs.ProfileEdit : Adw.Dialog {
 	~ProfileEdit () {
+		app.enable_window_accels ();
+		app.enable_nav_accels ();
+
 		debug (@"Destroying ProfileEdit for $(profile.handle)");
 	}
 
@@ -106,6 +109,10 @@ public class Tuba.Dialogs.ProfileEdit : Adw.Dialog {
 			cepbtn.visible = true;
 			bio_row.bind_property ("expanded", cepbtn, "sensitive", GLib.BindingFlags.SYNC_CREATE);
 		}
+
+		app.disable_window_accels ();
+		app.disable_nav_accels ();
+
 	}
 
 	protected void update_style_scheme () {
diff --git a/src/Views/Lists.vala b/src/Views/Lists.vala
@@ -251,11 +251,11 @@ public class Tuba.Views.Lists : Views.Timeline {
 	}
 
 	private void on_entry_focus_enter () {
-		app.disable_nav_accels ();
+		app.disable_home_accel ();
 	}
 
 	private void on_entry_focus_leave () {
-		app.enable_nav_accels ();
+		app.enable_home_accel ();
 	}
 
 	~Lists () {
diff --git a/src/Views/Search.vala b/src/Views/Search.vala
@@ -61,11 +61,11 @@ public class Tuba.Views.Search : Views.TabbedBase {
 		}
 
 		private void on_entry_focus_enter () {
-			app.disable_nav_accels ();
+			app.disable_home_accel ();
 		}
 
 		private void on_entry_focus_leave () {
-			app.enable_nav_accels ();
+			app.enable_home_accel ();
 		}
 
 		private void on_entry_activated () {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`[GtkTemplate (ui = "/dev/geopjr/Tuba/ui/dialogs/profile_edit.ui")]`
`2`	`2`	`public class Tuba.Dialogs.ProfileEdit : Adw.Dialog {`
`3`	`3`	`~ProfileEdit () {`
	`4`	`+ app.enable_window_accels ();`
	`5`	`+ app.enable_nav_accels ();`
	`6`	`+`
`4`	`7`	`debug (@"Destroying ProfileEdit for $(profile.handle)");`
`5`	`8`	`}`
`6`	`9`
`@@ -106,6 +109,10 @@ public class Tuba.Dialogs.ProfileEdit : Adw.Dialog {`
`106`	`109`	`cepbtn.visible = true;`
`107`	`110`	`bio_row.bind_property ("expanded", cepbtn, "sensitive", GLib.BindingFlags.SYNC_CREATE);`
`108`	`111`	`}`
	`112`	`+`
	`113`	`+ app.disable_window_accels ();`
	`114`	`+ app.disable_nav_accels ();`
	`115`	`+`
`109`	`116`	`}`
`110`	`117`
`111`	`118`	`protected void update_style_scheme () {`
Original file line number	Diff line number	Diff line change
`@@ -251,11 +251,11 @@ public class Tuba.Views.Lists : Views.Timeline {`
`251`	`251`	`}`
`252`	`252`
`253`	`253`	`private void on_entry_focus_enter () {`
`254`		`- app.disable_nav_accels ();`
	`254`	`+ app.disable_home_accel ();`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`private void on_entry_focus_leave () {`
`258`		`- app.enable_nav_accels ();`
	`258`	`+ app.enable_home_accel ();`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`~Lists () {`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@ public class Tuba.Views.Search : Views.TabbedBase {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private void on_entry_focus_enter () {`
`64`		`- app.disable_nav_accels ();`
	`64`	`+ app.disable_home_accel ();`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private void on_entry_focus_leave () {`
`68`		`- app.enable_nav_accels ();`
	`68`	`+ app.enable_home_accel ();`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`private void on_entry_activated () {`