[dconf-editor] Add reload_folder and reload_object.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Add reload_folder and reload_object.
- Date: Fri, 19 Jan 2018 03:14:36 +0000 (UTC)
commit 0ff7fe216291d644c571def961ae01774e434375
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri Jan 19 04:13:35 2018 +0100
Add reload_folder and reload_object.
editor/browser-view.vala | 4 ++--
editor/dconf-window.vala | 24 ++++++++++++++++--------
2 files changed, 18 insertions(+), 10 deletions(-)
---
diff --git a/editor/browser-view.vala b/editor/browser-view.vala
index 1facfca..040b141 100644
--- a/editor/browser-view.vala
+++ b/editor/browser-view.vala
@@ -59,9 +59,9 @@ class BrowserView : Grid
info_bar.add_label ("soft-reload-folder", _("Sort preferences have changed. Do you want to refresh
the view?"),
_("Refresh"), "bro.refresh-folder");
info_bar.add_label ("hard-reload-folder", _("This folder content has changed. Do you want to reload
the view?"),
- _("Reload"), "ui.open-folder('')");
+ _("Reload"), "ui.reload-folder");
info_bar.add_label ("hard-reload-object", _("This key properties have changed. Do you want to reload
the view?"),
- _("Reload"), "ui.open-object('')"); // TODO also for key
removing?
+ _("Reload"), "ui.reload-object"); // TODO also for key
removing?
sorting_options.notify.connect (() => {
if (!current_view_is_browse_view ())
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index dc05e8b..185ec2c 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -362,6 +362,8 @@ class DConfWindow : ApplicationWindow
{ "open-object", open_object, "s" },
{ "open-parent", open_parent, "s" },
+ { "reload-folder", reload_folder },
+ { "reload-object", reload_object },
{ "reload-search", reload_search },
{ "reset-recursive", reset_recursively, "s" },
@@ -379,10 +381,8 @@ class DConfWindow : ApplicationWindow
bookmarks_button.active = false;
string full_name = ((!) path_variant).get_string ();
- if (full_name == "") // reload
- request_folder_path (current_path, browser_view.get_selected_row_name ());
- else
- request_folder_path (full_name, "");
+
+ request_folder_path (full_name, "");
}
private void open_object (SimpleAction action, Variant? path_variant)
@@ -392,10 +392,8 @@ class DConfWindow : ApplicationWindow
bookmarks_button.active = false;
string full_name = ((!) path_variant).get_string ();
- if (full_name == "") // reload
- request_object_path (current_path);
- else
- request_object_path (full_name);
+
+ request_object_path (full_name);
}
private void open_parent (SimpleAction action, Variant? path_variant)
@@ -405,6 +403,16 @@ class DConfWindow : ApplicationWindow
request_folder_path (SettingsModel.get_parent_path (full_name), full_name);
}
+ private void reload_folder (/* SimpleAction action, Variant? path_variant */)
+ {
+ request_folder_path (current_path, browser_view.get_selected_row_name ());
+ }
+
+ private void reload_object (/* SimpleAction action, Variant? path_variant */)
+ {
+ request_object_path (current_path);
+ }
+
private void reload_search (/* SimpleAction action, Variant? path_variant */)
{
reload_search_action.set_enabled (false);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]