Use GAction for thumbnail popup menu actions

2 files changed, 2 insertions, 82 deletions

diff --git a/data/cheese-actions.ui b/data/cheese-actions.ui
deleted file mode 100644
index 6ac996f1..00000000
--- a/data/cheese-actions.ui
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0"?>
-<interface>
-  <requires lib="gtk+" version="2.16"/>
-  <object class="GtkUIManager" id="menu_ui_man">
-    <child>
-      <object class="GtkActionGroup" id="file_actions">
-        <child>
-          <object class="GtkAction" id="open">
-            <property name="name">Open</property>
-            <property name="stock-id">gtk-open</property>
-            <signal name="activate" handler="cheese_main_window_on_file_open"/>
-          </object>
-          <accelerator key="O" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="save_as">
-            <property name="name">SaveAs</property>
-            <property name="label" translatable="yes">Save _As…</property>
-            <property name="stock-id">gtk-save-as</property>
-            <signal name="activate" handler="cheese_main_window_on_file_save_as"/>
-          </object>
-          <accelerator key="S" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="move_to_trash">
-            <property name="name">MoveToTrash</property>
-            <property name="label" translatable="yes">Move to _Trash</property>
-            <property name="icon-name">user-trash</property>
-            <signal name="activate" handler="cheese_main_window_on_file_move_to_trash"/>
-          </object>
-          <accelerator key="Delete" modifiers=""/>
-        </child>
-        <child>
-          <object class="GtkAction" id="delete">
-            <property name="name">Delete</property>
-            <property name="stock-id">gtk-delete</property>
-            <signal name="activate" handler="cheese_main_window_on_file_delete"/>
-          </object>
-          <accelerator key="Delete" modifiers="GDK_SHIFT_MASK"/>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkActionGroup" id="effects_actions">
-        <child>
-          <object class="GtkAction" id="effects_page_prev">
-            <property name="name">Previous Effects</property>
-            <property name="label" translatable="yes">P_revious Effects</property>
-            <property name="sensitive">false</property>
-            <signal name="activate" handler="cheese_main_window_on_prev_effects_page"/>
-          </object>
-          <accelerator key="j" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-        <child>
-          <object class="GtkAction" id="effects_page_next">
-            <property name="name">Next Effects</property>
-            <property name="label" translatable="yes">Ne_xt Effects</property>
-            <property name="sensitive">false</property>
-            <signal name="activate" handler="cheese_main_window_on_next_effects_page"/>
-          </object>
-          <accelerator key="k" modifiers="GDK_CONTROL_MASK"/>
-        </child>
-      </object>
-    </child>
-    <ui>
-      <popup name="thumbnail_popup" id="thumbnail_popup">
-        <menuitem action="open"/>
-        <separator/>
-        <menuitem action="save_as"/>
-        <separator/>
-        <menuitem action="move_to_trash"/>
-        <menuitem action="delete"/>
-      </popup>
-    </ui>
-  </object>
-  <object class="GtkMenu" id="thumbnail_popup" constructor="menu_ui_man">
-  </object>
-</interface>
diff --git a/data/cheese-main-window.ui b/data/cheese-main-window.ui
index c5623040..df18d530 100644
--- a/data/cheese-main-window.ui
+++ b/data/cheese-main-window.ui
@@ -120,8 +120,7 @@
                         <property name="column-spacing">0</property>
                         <child>
                           <object class="GtkButton" id="effects_prev_page_button">
-                            <property name="use-action-appearance">False</property>
-                            <property name="related-action">effects_page_prev</property>
+                            <property name="action-name">win.effects-previous</property>
                             <property name="width-request">32</property>
                             <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="tooltip_text" translatable="yes">Navigate to the previous page of effects</property>
@@ -136,7 +135,6 @@
                           <object class="GtkToggleButton" id="effects_toggle_button">
                             <property name="vexpand">False</property>
                             <property name="hexpand">False</property>
-                            <property name="use-action-appearance">False</property>
                             <property name="action-name">app.effects</property>
                             <property name="tooltip_text" translatable="yes">Effects</property>
                             <child>
@@ -162,7 +160,7 @@
                         <child>
                           <object class="GtkButton" id="effects_next_page_button">
                             <property name="use-action-appearance">False</property>
-                            <property name="related-action">effects_page_next</property>
+                            <property name="action-name">win.effects-next</property>
                             <property name="width-request">32</property>
                             <property name="relief">GTK_RELIEF_NONE</property>
                             <property name="tooltip_text" translatable="yes">Navigate to the next page of effects</property>