Skip to content

Commit c8e6548

Browse files
authored
Discontinue help action and shortcut (#2664)
Fixes #1475 Other elementary core apps do not implement a help action with F1 shortcut (although many third-party apps do). Pending implementation of a consistent pattern for help/info across elementary core apps this PR removes the F1 shortcut and action from Files.
1 parent 39dd140 commit c8e6548

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

libcore/Resources.vala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ namespace Files {
2020
public const string APP_ID = "io.elementary.files";
2121
public const string APP_DESKTOP = APP_ID + ".desktop";
2222
public const string APP_TITLE = N_("Files");
23-
public const string HELP_URL = "https://elementaryos.stackexchange.com/questions/tagged/pantheon-files";
2423
public const string BUG_URL = "https://github.com/elementary/files/issues/new";
2524
public const string INVALID_TAB_NAME = "----";
2625

src/View/Window.vala

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
3535
{"tab", action_tab, "s"},
3636
{"go-to", action_go_to, "s"},
3737
{"zoom", action_zoom, "s"},
38-
{"info", action_info, "s"},
3938
{"view-mode", action_view_mode, "u", "0" },
4039
{"show-hidden", null, null, "false", change_state_show_hidden},
4140
{"singleclick-select", null, null, "false", change_state_single_click_select},
@@ -163,7 +162,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
163162
marlin_app.set_accels_for_action ("win.go-to::UP", {"<Alt>Up"});
164163
marlin_app.set_accels_for_action ("win.forward(1)", {"<Alt>Right", "XF86Forward"});
165164
marlin_app.set_accels_for_action ("win.back(1)", {"<Alt>Left", "XF86Back"});
166-
marlin_app.set_accels_for_action ("win.info::HELP", {"F1"});
167165
marlin_app.set_accels_for_action ("win.tab::TAB", {"<Shift><Ctrl>K"});
168166
marlin_app.set_accels_for_action ("win.tab::WINDOW", {"<Ctrl><Alt>N"});
169167
marlin_app.set_accels_for_action ("win.focus-sidebar", {"<Ctrl>Left"});
@@ -1014,16 +1012,7 @@ public class Files.View.Window : Hdy.ApplicationWindow {
10141012
}
10151013
}
10161014

1017-
private void action_info (GLib.SimpleAction action, GLib.Variant? param) {
1018-
switch (param.get_string ()) {
1019-
case "HELP":
1020-
show_app_help ();
1021-
break;
10221015

1023-
default:
1024-
break;
1025-
}
1026-
}
10271016

10281017
private void action_undo (GLib.SimpleAction action, GLib.Variant? param) {
10291018
if (doing_undo_redo) { /* Guard against rapid pressing of Ctrl-Z */
@@ -1126,15 +1115,6 @@ public class Files.View.Window : Hdy.ApplicationWindow {
11261115
dialog.present ();
11271116
}
11281117

1129-
void show_app_help () {
1130-
AppInfo.launch_default_for_uri_async.begin (Files.HELP_URL, null, null, (obj, res) => {
1131-
try {
1132-
AppInfo.launch_default_for_uri_async.end (res);
1133-
} catch (Error e) {
1134-
warning ("Could not open help: %s", e.message);
1135-
}
1136-
});
1137-
}
11381118

11391119
public GLib.SimpleAction? get_action (string action_name) {
11401120
return (GLib.SimpleAction?)(lookup_action (action_name));

0 commit comments

Comments
 (0)