Skip to content

Commit

Permalink
Lose unused actions in AbstractDirectoryView; simplify (#2462)
Browse files Browse the repository at this point in the history 
Co-authored-by: Danielle Foré <danielle@elementary.io>
  • Loading branch information
@jeremypw @danirabbit
jeremypw and danirabbit authored Aug 28, 2024
1 parent 452d5ed commit 9c41d78
Showing 1 changed file with 30 additions and 48 deletions.
78 changes: 30 additions & 48 deletions src/View/AbstractDirectoryView.vala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ namespace Files {
{"sort-by", on_background_action_sort_by_changed, "s", "'name'"},
{"reverse", on_background_action_reverse_changed, null, "false"},
{"folders-first", on_background_action_folders_first_changed, null, "true"},
{"show-hidden", null, null, "false", change_state_show_hidden},
{"show-remote-thumbnails", null, null, "true", change_state_show_remote_thumbnails},
{"show-local-thumbnails", null, null, "true", change_state_show_local_thumbnails}
{"show-hidden", null, null, "false", change_state_show_hidden}
};

const GLib.ActionEntry [] COMMON_ENTRIES = {
Expand Down Expand Up @@ -192,7 +190,10 @@ namespace Files {
protected bool one_or_less = true;
protected bool should_activate = false;
protected bool should_deselect = false;
protected bool should_thumbnail = true;

public bool singleclick_select { get; set; }

protected bool should_select = false;
protected Gtk.TreePath? click_path = null;
protected uint click_zone = ClickZone.ICON;
Expand Down Expand Up @@ -258,8 +259,6 @@ namespace Files {
protected bool is_writable = false;
protected bool is_loading;
protected bool helpers_shown;
protected bool show_remote_thumbnails {get; set; default = true;}
protected bool show_local_thumbnails {get; set; default = false;}

private bool all_selected = false;

Expand Down Expand Up @@ -295,6 +294,7 @@ namespace Files {
recent = app.get_recent_manager ();
app.set_accels_for_action ("common.select-all", {"<Ctrl>A"});
app.set_accels_for_action ("selection.invert-selection", {"<Shift><Ctrl>A"});

thumbnailer = Thumbnailer.get ();
thumbnailer.finished.connect ((req) => {
if (req == thumbnail_request) {
Expand All @@ -304,12 +304,10 @@ namespace Files {
draw_when_idle ();
});

set_should_thumbnail ();

model = new Files.ListModel ();

Files.app_settings.bind ("show-remote-thumbnails",
this, "show_remote_thumbnails", SettingsBindFlags.GET);
Files.app_settings.bind ("show-local-thumbnails",
this, "show_local_thumbnails", SettingsBindFlags.GET);

/* Currently, "single-click rename" is disabled, matching existing UI
* Currently, "right margin unselects all" is disabled, matching existing UI
Expand Down Expand Up @@ -403,8 +401,8 @@ namespace Files {

var prefs = (Files.Preferences.get_default ());
prefs.notify["show-hidden-files"].connect (on_show_hidden_files_changed);
prefs.notify["show-remote-thumbnails"].connect (on_show_remote_thumbnails_changed);
prefs.notify["show-local-thumbnails"].connect (on_show_local_thumbnails_changed);
prefs.notify["show-remote-thumbnails"].connect (on_show_thumbnails_changed);
prefs.notify["show-local-thumbnails"].connect (on_show_thumbnails_changed);
prefs.notify["sort-directories-first"].connect (on_sort_directories_first_changed);
prefs.bind_property (
"singleclick-select", this, "singleclick_select", BindingFlags.DEFAULT | BindingFlags.SYNC_CREATE
Expand All @@ -428,15 +426,6 @@ namespace Files {
common_actions = new GLib.SimpleActionGroup ();
common_actions.add_action_entries (COMMON_ENTRIES, this);
insert_action_group ("common", common_actions);

action_set_state (background_actions, "show-hidden",
Files.app_settings.get_boolean ("show-hiddenfiles"));

action_set_state (background_actions, "show-remote-thumbnails",
Files.app_settings.get_boolean ("show-remote-thumbnails"));

action_set_state (background_actions, "show-local-thumbnails",
Files.app_settings.get_boolean ("show-local-thumbnails"));
}

public void zoom_in () {
Expand Down Expand Up @@ -1226,14 +1215,6 @@ namespace Files {
window.change_state_show_hidden (action);
}

private void change_state_show_remote_thumbnails (GLib.SimpleAction action) requires (window != null) {
window.change_state_show_remote_thumbnails (action);
}

private void change_state_show_local_thumbnails (GLib.SimpleAction action) {
window.change_state_show_local_thumbnails (action);
}

private void on_background_action_new (GLib.SimpleAction action, GLib.Variant? param) {
switch (param.get_string ()) {
case "FOLDER":
Expand Down Expand Up @@ -1402,18 +1383,14 @@ namespace Files {
}

private void on_directory_file_icon_changed (Directory dir, Files.File file) {
file.thumbnail_loaded = false;

if (is_frozen) {
return;
}

model.file_changed (file, dir);
Idle.add (() => {
update_icon_and_plugins (file);
if ((!slot.directory.is_network && show_local_thumbnails) ||
(show_remote_thumbnails && slot.directory.can_open_files)) {

if (should_thumbnail) {
thumbnailer.queue_file (file, null);
}

Expand Down Expand Up @@ -1505,15 +1482,17 @@ namespace Files {
action_set_state (background_actions, "show-hidden", show);
}

private void on_show_remote_thumbnails_changed (GLib.Object prefs, GLib.ParamSpec pspec) {
show_remote_thumbnails = ((Files.Preferences) prefs).show_remote_thumbnails;
action_set_state (background_actions, "show-remote-thumbnails", show_remote_thumbnails);
slot.reload ();
private void set_should_thumbnail () {
var prefs = Files.Preferences.get_default ();
if (slot.directory.is_network) {
should_thumbnail = slot.directory.can_open_files && prefs.show_remote_thumbnails;
} else {
should_thumbnail = prefs.show_local_thumbnails;
}
}

private void on_show_local_thumbnails_changed (GLib.Object prefs, GLib.ParamSpec pspec) {
show_local_thumbnails = ((Files.Preferences) prefs).show_local_thumbnails;
action_set_state (background_actions, "show-local-thumbnails", show_local_thumbnails);
private void on_show_thumbnails_changed () {
set_should_thumbnail ();
slot.reload ();
}

Expand Down Expand Up @@ -2779,11 +2758,15 @@ namespace Files {
if (file != null) {
update_icon_and_plugins (file);
/* Ask thumbnailer only if ThumbState UNKNOWN */
if (file.thumbstate == Files.File.ThumbState.UNKNOWN) {
visible_files.prepend (file);
if (path.compare (sp) >= 0 && path.compare (ep) <= 0) {
actually_visible++;
if (should_thumbnail) {
if (file.thumbstate == Files.File.ThumbState.UNKNOWN) {
visible_files.prepend (file);
if (path.compare (sp) >= 0 && path.compare (ep) <= 0) {
actually_visible++;
}
}
} else {
file.thumbstate = Files.File.ThumbState.NONE;
}
}
/* check if we've reached the end of the visible range */
Expand Down Expand Up @@ -2819,12 +2802,11 @@ namespace Files {
private void update_icon_and_plugins (Files.File file) requires (file != null) {
if (!file.is_gone) {
// Only update thumbnail if it is going to be shown
if ((slot.directory.is_network && show_remote_thumbnails) ||
(!slot.directory.is_network && show_local_thumbnails)) {

if (should_thumbnail) {
file.query_thumbnail_update ();
}
/* In any case, ensure color-tag info is correct */

/* In any case, ensure color-tag info is correct */
if (plugins != null) {
plugins.update_file_info (file);
}
Expand Down

0 comments on commit 9c41d78

Please sign in to comment.