[Xfce4-commits] <parole:bluesabre/gtk3> Move DVD menu code to glade
Sean Davis
noreply at xfce.org
Mon Sep 16 05:42:01 CEST 2013
Updating branch refs/heads/bluesabre/gtk3
to 080c0cc842363c01880d8ebc91be73ceb6ff1cd5 (commit)
from 6df307e49d45b7b4a0c8b7d7c1babfb1d1135eed (commit)
commit 080c0cc842363c01880d8ebc91be73ceb6ff1cd5
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Sep 15 23:41:42 2013 -0400
Move DVD menu code to glade
data/interfaces/parole.ui | 5 +++++
src/parole-player.c | 47 +++++++++++++++++++--------------------------
2 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ee9cc58..ad5240b 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -306,6 +306,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_DVD Menu</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="parole_player_dvd_menu_activated" swapped="no"/>
</object>
</child>
<child>
@@ -314,6 +315,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Title Menu</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="parole_player_dvd_title_activated" swapped="no"/>
</object>
</child>
<child>
@@ -322,6 +324,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Audio Menu</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="parole_player_dvd_audio_activated" swapped="no"/>
</object>
</child>
<child>
@@ -330,6 +333,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">A_ngle Menu</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="parole_player_dvd_angle_activated" swapped="no"/>
</object>
</child>
<child>
@@ -354,6 +358,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Chapter Menu</property>
<property name="use_underline">True</property>
+ <signal name="activate" handler="parole_player_dvd_chapter_activated" swapped="no"/>
</object>
</child>
<child>
diff --git a/src/parole-player.c b/src/parole-player.c
index 8a87a77..d6f70bc 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -294,6 +294,21 @@ parole_player_dvd_chapter_count_change_cb (ParoleGst *gst,
static void parole_player_dvd_chapter_change_cb (ParoleGst *gst,
gint chapter_count,
ParolePlayer *player);
+
+void parole_player_dvd_menu_activated (GtkMenuItem *widget,
+ ParolePlayer *player);
+
+void parole_player_dvd_title_activated (GtkMenuItem *widget,
+ ParolePlayer *player);
+
+void parole_player_dvd_audio_activated (GtkMenuItem *widget,
+ ParolePlayer *player);
+
+void parole_player_dvd_angle_activated (GtkMenuItem *widget,
+ ParolePlayer *player);
+
+void parole_player_dvd_chapter_activated (GtkMenuItem *widget,
+ ParolePlayer *player);
gboolean parole_player_key_press (GtkWidget *widget,
GdkEventKey *ev,
@@ -581,32 +596,32 @@ parole_player_dvd_reset (ParolePlayer *player)
}
}
-static void
+void
parole_player_dvd_menu_activated (GtkMenuItem *widget, ParolePlayer *player)
{
parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_ROOT_MENU);
}
-static void
+void
parole_player_dvd_title_activated (GtkMenuItem *widget, ParolePlayer *player)
{
parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_TITLE_MENU);
}
-static void
+void
parole_player_dvd_audio_activated (GtkMenuItem *widget, ParolePlayer *player)
{
parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_AUDIO_MENU);
}
-static void
+void
parole_player_dvd_angle_activated (GtkMenuItem *widget, ParolePlayer *player)
{
parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_ANGLE_MENU);
}
-static void
+void
parole_player_dvd_chapter_activated (GtkMenuItem *widget, ParolePlayer *player)
{
parole_gst_send_navigation_command (PAROLE_GST(player->priv->gst), GST_DVD_CHAPTER_MENU);
@@ -2838,8 +2853,6 @@ parole_player_init (ParolePlayer *player)
GtkWidget *clear_recent;
GtkWidget *recent_separator;
- GtkMenuItem *dvd_menu, *title_menu, *audio_menu, *angle_menu, *chapter_menu;
-
GtkWidget *bug_report;
gboolean repeat, shuffle;
@@ -3043,26 +3056,6 @@ parole_player_init (ParolePlayer *player)
/* DVD Menu */
player->priv->dvd_menu = GTK_WIDGET(gtk_builder_get_object (builder, "dvd-menu"));
- dvd_menu = GTK_MENU_ITEM (gtk_builder_get_object (builder, "dvd_dvd-menu"));
- g_signal_connect (dvd_menu, "activate",
- G_CALLBACK (parole_player_dvd_menu_activated), player);
-
- title_menu = GTK_MENU_ITEM (gtk_builder_get_object (builder, "dvd_title-menu"));
- g_signal_connect (title_menu, "activate",
- G_CALLBACK (parole_player_dvd_title_activated), player);
-
- audio_menu = GTK_MENU_ITEM (gtk_builder_get_object (builder, "dvd_audio-menu"));
- g_signal_connect (audio_menu, "activate",
- G_CALLBACK (parole_player_dvd_audio_activated), player);
-
- angle_menu = GTK_MENU_ITEM (gtk_builder_get_object (builder, "dvd_angle-menu"));
- g_signal_connect (angle_menu, "activate",
- G_CALLBACK (parole_player_dvd_angle_activated), player);
-
- chapter_menu = GTK_MENU_ITEM (gtk_builder_get_object (builder, "dvd_chapter-menu"));
- g_signal_connect (chapter_menu, "activate",
- G_CALLBACK (parole_player_dvd_chapter_activated), player);
-
player->priv->chapters_menu = GTK_WIDGET (gtk_builder_get_object (builder, "chapters-menu"));
/* Language Menus */
More information about the Xfce4-commits
mailing list