From: Corey Daley <cdaley@redhat.com>
Date: Mon, 12 Mar 2018 16:05:25 +0000 (-0400)
Subject: Adds Load Queue File to main Queue menu (#1223)
X-Git-Tag: 1.1.0~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c03887672673ffd9b03cddf0f6b1317fbf5b1eaa;p=handbrake

Adds Load Queue File to main Queue menu (#1223)

Add a Load Queue File menu item to the main Queue menu for ease of use.
---

diff --git a/gtk/src/ghb.m4 b/gtk/src/ghb.m4
index 3d8c892f8..854edad5b 100644
--- a/gtk/src/ghb.m4
+++ b/gtk/src/ghb.m4
@@ -882,6 +882,15 @@ libx264 authors:
                         <property name="action-name">app.queue-save</property>
                       </object>
                     </child>
+                    <child>
+                      <object class="GtkMenuItem" id="queue_open_menu">
+                        <property name="label" translatable="yes">_Load Queue File</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="action-name">app.queue-open</property>
+                      </object>
+                    </child>
                   </object>
                 </child>
               </object>
diff --git a/gtk/src/main.c b/gtk/src/main.c
index da0d85478..9f6b8f7f7 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -851,6 +851,8 @@ queue_pause_action_cb(GSimpleAction *action, GVariant *param, gpointer ud);
 G_MODULE_EXPORT void
 queue_save_action_cb(GSimpleAction *action, GVariant *param, gpointer ud);
 G_MODULE_EXPORT void
+queue_open_action_cb(GSimpleAction *action, GVariant *param, gpointer ud);
+G_MODULE_EXPORT void
 show_presets_action_cb(GSimpleAction *action, GVariant *value, gpointer ud);
 G_MODULE_EXPORT void
 hbfd_action_cb(GSimpleAction *action, GVariant *value, gpointer ud);
@@ -899,6 +901,7 @@ static void map_actions(GApplication * app, signal_user_data_t * ud)
         { "queue-start",    queue_start_action_cb           },
         { "queue-pause",    queue_pause_action_cb           },
         { "queue-save",     queue_save_action_cb            },
+        { "queue-open",     queue_open_action_cb            },
         { "hbfd",           NULL,
           NULL, "false",    hbfd_action_cb                  },
         { "show-presets",   NULL,
diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index 75fe204d2..0bb216a41 100644
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -979,6 +979,13 @@ queue_save_action_cb(GSimpleAction *action, GVariant *param,
     save_queue_file(ud);
 }
 
+G_MODULE_EXPORT void
+queue_open_action_cb(GSimpleAction *action, GVariant *param,
+                     signal_user_data_t *ud)
+{
+    open_queue_file(ud);
+}
+
 G_MODULE_EXPORT void
 queue_open_clicked_cb(GtkWidget *widget, signal_user_data_t *ud)
 {