[dconf-editor] Use a private ActionGroup.



commit 545e743cac960202f03faf5eb6a4e800bd97c74a
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Fri Dec 15 16:25:23 2017 +0100

    Use a private ActionGroup.

 editor/dconf-window.vala |   12 +++++++-----
 editor/pathbar-item.ui   |    2 +-
 editor/pathbar.ui        |    2 +-
 editor/pathbar.vala      |    2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index edc3021..d00330d 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -74,6 +74,10 @@ class DConfWindow : ApplicationWindow
 
     public DConfWindow (bool disable_warning, string? schema, string? path, string? key_name)
     {
+        SimpleActionGroup action_group = new SimpleActionGroup ();
+        action_group.add_action_entries (action_entries, this);
+        insert_action_group ("ui", action_group);
+
         modifications_handler = new ModificationsHandler ();
         browser_view.modifications_handler = modifications_handler;
         model = new SettingsModel (settings);
@@ -93,8 +97,6 @@ class DConfWindow : ApplicationWindow
         if (!disable_warning && settings.get_boolean ("show-warning"))
             show.connect (show_initial_warning);
 
-        add_action_entries (action_entries, this);
-
         set_default_size (settings.get_int ("window-width"), settings.get_int ("window-height"));
         if (settings.get_boolean ("window-is-maximized"))
             maximize ();
@@ -377,8 +379,8 @@ class DConfWindow : ApplicationWindow
         else
         {
             section = new GLib.Menu ();
-            section.append (_("Reset visible keys"), "win.reset-visible");
-            section.append (_("Reset view recursively"), "win.reset-recursive");
+            section.append (_("Reset visible keys"), "ui.reset-visible");
+            section.append (_("Reset view recursively"), "ui.reset-recursive");
             section.freeze ();
             menu.append_section (null, section);
         }
@@ -386,7 +388,7 @@ class DConfWindow : ApplicationWindow
         if (!modifications_handler.get_current_delay_mode ())
         {
             section = new GLib.Menu ();
-            section.append (_("Enter delay mode"), "win.enter-delay-mode");
+            section.append (_("Enter delay mode"), "ui.enter-delay-mode");
             section.freeze ();
             menu.append_section (null, section);
         }
diff --git a/editor/pathbar-item.ui b/editor/pathbar-item.ui
index 4858233..d2fdfe2 100644
--- a/editor/pathbar-item.ui
+++ b/editor/pathbar-item.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <template class="PathBarItem" parent="GtkButton">
     <property name="focus-on-click">False</property>
-    <property name="action-name">win.open-path</property>
+    <property name="action-name">ui.open-path</property>
     <signal name="clicked" handler="update_cursor"/>
     <child>
       <object class="GtkLabel" id="text_label">
diff --git a/editor/pathbar.ui b/editor/pathbar.ui
index 61e62d5..ea214f0 100644
--- a/editor/pathbar.ui
+++ b/editor/pathbar.ui
@@ -9,7 +9,7 @@
     <child>
       <object class="PathBarItem" id="root_button">
         <property name="visible">True</property>
-        <property name="action-name">win.open-path</property>
+        <property name="action-name">ui.open-path</property>
         <property name="action-target">'/'</property>
         <style>
           <class name="root-button"/>
diff --git a/editor/pathbar.vala b/editor/pathbar.vala
index 0fc3326..9837acf 100644
--- a/editor/pathbar.vala
+++ b/editor/pathbar.vala
@@ -163,7 +163,7 @@ public class PathBar : Box, PathElement
         else
         {
             item.cursor_type = PathBarItem.CursorType.POINTER;
-            item.set_action_name ("win.open-path");
+            item.set_action_name ("ui.open-path");
             context.remove_class ("active");
         }
     }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]