[dconf-editor] Introduce the paste-force keyboard action.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Introduce the paste-force keyboard action.
- Date: Fri, 30 Nov 2018 12:13:51 +0000 (UTC)
commit cacc45f0c78576380612ab25918520d7333caf3a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Thu Nov 29 16:20:40 2018 +0100
Introduce the paste-force keyboard action.
editor/dconf-editor.vala | 3 ++-
editor/dconf-window.vala | 25 +++++++++++++++++++++----
2 files changed, 23 insertions(+), 5 deletions(-)
---
diff --git a/editor/dconf-editor.vala b/editor/dconf-editor.vala
index 1f6a4bc..ae840f3 100644
--- a/editor/dconf-editor.vala
+++ b/editor/dconf-editor.vala
@@ -310,7 +310,8 @@ private class ConfigurationEditor : Gtk.Application
set_accels_for_action ("kbd.edit-path-last", { "<Shift><Primary>l" });
set_accels_for_action ("app.quit", { "<Primary>q" });
set_accels_for_action ("app.apply-and-quit", { "<Shift><Primary>q" });
- set_accels_for_action ("kbd.paste", { "<Primary>v" }); // TODO
<Shift><Primary>v something? // https://bugzilla.gnome.org/show_bug.cgi?id=762257 is WONTFIX
+ set_accels_for_action ("kbd.paste", { "<Primary>v" }); //
https://bugzilla.gnome.org/show_bug.cgi?id=762257 is WONTFIX
+ set_accels_for_action ("kbd.paste-force", { "<Shift><Primary>v" });
set_accels_for_action ("kbd.open-root", { "<Shift><Alt>Up" });
set_accels_for_action ("kbd.open-parent", { "<Alt>Up" });
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 7d6b9cb..5992617 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -1032,6 +1032,7 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
{ "edit-path-end", edit_path_end }, // <P>l
{ "edit-path-last", edit_path_last }, // <P>L
{ "paste", paste }, // <P>v
+ { "paste-force", paste_force }, // <P>V
{ "open-root", open_root }, // <S><A>Up
{ "open-parent", open_current_parent }, // <A>Up
@@ -1268,6 +1269,10 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
}
}
+ search_clipboard_content ();
+ }
+ private void search_clipboard_content ()
+ {
Gdk.Display? display = Gdk.Display.get_default ();
if (display == null) // ?
return;
@@ -1279,6 +1284,18 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
request_search (true, PathEntry.SearchMode.SEARCH);
}
+ private void paste_force (/* SimpleAction action, Variant? variant */)
+ {
+ if (browser_view.in_window_bookmarks)
+ hide_in_window_bookmarks ();
+ else if (browser_view.in_window_modifications)
+ hide_in_window_modifications ();
+ else if (browser_view.in_window_about)
+ hide_in_window_about ();
+
+ search_clipboard_content ();
+ }
+
private void open_root (/* SimpleAction action, Variant? variant */)
{
if (browser_view.in_window_bookmarks)
@@ -1645,13 +1662,11 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
if (browser_view.in_window_about)
return false;
- Widget? focus = get_focus ();
- bool focus_is_text_widget = focus != null && (((!) focus is Entry) || ((!) focus is TextView));
-
/* don't use "else if", or some widgets will not be hidden on <ctrl>F10 or such things */
if (name == "F10" && (event.state & Gdk.ModifierType.SHIFT_MASK) != 0)
{
- if (focus_is_text_widget) // && browser_view.current_view != ViewType.SEARCH
+ Widget? focus = get_focus ();
+ if (focus != null && (((!) focus is Entry) || ((!) focus is TextView))) // &&
browser_view.current_view != ViewType.SEARCH
return false;
headerbar.toggle_pathbar_menu ();
@@ -1685,6 +1700,8 @@ private class DConfWindow : AdaptativeWindow, AdaptativeWidget
name == "space" || name == "KP_Space"))
return false;
+ Widget? focus = get_focus ();
+ bool focus_is_text_widget = focus != null && (((!) focus is Entry) || ((!) focus is TextView));
if ((!focus_is_text_widget)
&& (event.is_modifier == 0)
&& (event.length != 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]