Updating branch refs/heads/bluesabre/gtk3 to 470e540221a16b6fce29734e5df623d24a5e3999 (commit) from d5f64f8f184529d791fa737b62780fe67dcdb981 (commit)
commit 470e540221a16b6fce29734e5df623d24a5e3999 Author: Sean Davis <smd.seanda...@gmail.com> Date: Sun Sep 1 08:26:03 2013 -0400 Only show DVD menu when DVD loaded data/interfaces/parole.ui | 30 +++++++++++++++--------------- src/parole-player.c | 4 ++++ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 3d8e5c9..eef7ec4 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkImage" id="image10"> + <object class="GtkAdjustment" id="adjustment1"> + <property name="upper">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixel_size">16</property> - <property name="icon_name">face-sick-symbolic</property> + <property name="icon_name">media-optical-symbolic</property> <property name="use_fallback">True</property> </object> - <object class="GtkImage" id="image12"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixel_size">16</property> - <property name="icon_name">gtk-about-symbolic</property> + <property name="icon_name">face-sick-symbolic</property> <property name="use_fallback">True</property> </object> - <object class="GtkAdjustment" id="adjustment1"> - <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> - </object> - <object class="GtkImage" id="image1"> + <object class="GtkImage" id="image11"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixel_size">16</property> - <property name="icon_name">media-optical-symbolic</property> + <property name="icon_name">document-save-as-symbolic</property> <property name="use_fallback">True</property> </object> - <object class="GtkImage" id="image11"> + <object class="GtkImage" id="image12"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="pixel_size">16</property> - <property name="icon_name">document-save-as-symbolic</property> + <property name="icon_name">gtk-about-symbolic</property> <property name="use_fallback">True</property> </object> <object class="GtkImage" id="image2"> @@ -297,8 +297,8 @@ </child> <child> <object class="GtkMenuItem" id="dvd-menu"> - <property name="visible">True</property> <property name="can_focus">False</property> + <property name="no_show_all">True</property> <property name="label" translatable="yes">_DVD</property> <property name="use_underline">True</property> <child type="submenu"> @@ -422,8 +422,8 @@ <property name="use_underline">True</property> <property name="image">image3</property> <property name="use_stock">False</property> - <accelerator key="plus" signal="activate"/> <accelerator key="equal" signal="activate"/> + <accelerator key="plus" signal="activate"/> <signal name="activate" handler="parole_player_volume_up" swapped="no"/> </object> </child> diff --git a/src/parole-player.c b/src/parole-player.c index 2a66135..62f4c25 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -538,6 +538,7 @@ parole_player_reset (ParolePlayer *player) parole_gst_stop (PAROLE_GST (player->priv->gst)); player->priv->update_languages = TRUE; gtk_window_set_title (GTK_WINDOW (player->priv->window), _("Parole Media Player")); + gtk_widget_hide(GTK_WIDGET(player->priv->dvd_menu)); player->priv->audio_list = NULL; player->priv->subtitle_list = NULL; @@ -1068,7 +1069,10 @@ parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const gchar TRACE("END CLEAR PLAYLIST"); } else if ( player->priv->current_media_type == PAROLE_MEDIA_TYPE_DVD ) + { parole_media_list_set_playlist_view(player->priv->list, PAROLE_MEDIA_LIST_PLAYLIST_VIEW_DISC); + gtk_widget_show(GTK_WIDGET(player->priv->dvd_menu)); + } } static void _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits