Updating branch refs/heads/bluesabre/gtk3 to e2d530fe571cef6dd37aa0a780d9468b804c452c (commit) from 36aea8b31d94c49d657cd4e0ddd92f56d9c48e51 (commit)
commit e2d530fe571cef6dd37aa0a780d9468b804c452c Author: Sean Davis <smd.seanda...@gmail.com> Date: Sat Aug 24 06:17:37 2013 -0400 Rearrange and update menu data/interfaces/parole.ui | 267 +++++++++++++++++++++++++-------------------- src/parole-disc.c | 2 +- src/parole-player.c | 2 +- 3 files changed, 151 insertions(+), 120 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 953585c..364c698 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -6,6 +6,43 @@ <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">media-optical-symbolic</property> + </object> + <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">face-sick-symbolic</property> + </object> + <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">document-save-as-symbolic</property> + </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixel_size">16</property> + <property name="icon_name">folder-remote-symbolic</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixel_size">16</property> + <property name="icon_name">audio-volume-high-symbolic</property> + </object> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="pixel_size">16</property> + <property name="icon_name">audio-volume-low-symbolic</property> + </object> <object class="GtkImage" id="image5"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -72,37 +109,6 @@ <property name="pixel_size">16</property> <property name="icon_name">system-shutdown-symbolic</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">media-optical-symbolic</property> - </object> - <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">face-sick-symbolic</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixel_size">16</property> - <property name="icon_name">folder-remote-symbolic</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixel_size">16</property> - <property name="icon_name">audio-volume-high-symbolic</property> - </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="pixel_size">16</property> - <property name="icon_name">audio-volume-low-symbolic</property> - </object> <object class="GtkWindow" id="main-window"> <property name="can_focus">False</property> <property name="title" translatable="yes">Parole Media Player</property> @@ -122,7 +128,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="media-menu-item"> + <object class="GtkMenuItem" id="media-menu"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">_Media</property> @@ -133,7 +139,7 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="menu-add"> - <property name="label">_Open...</property> + <property name="label">_Open…</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -145,7 +151,7 @@ </child> <child> <object class="GtkImageMenuItem" id="menu-open-location"> - <property name="label" translatable="yes">Open _Location...</property> + <property name="label" translatable="yes">Open _Location…</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> @@ -170,6 +176,22 @@ </object> </child> <child> + <object class="GtkImageMenuItem" id="menu-save-playlist"> + <property name="label" translatable="yes">_Save Playlist…</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="image">image11</property> + <property name="use_stock">False</property> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="menuitem4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> <object class="GtkImageMenuItem" id="menu-open-disc"> <property name="label">Insert Disk</property> <property name="visible">True</property> @@ -202,10 +224,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="edit-menu"> + <object class="GtkMenuItem" id="playback-menu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Edit</property> + <property name="label" translatable="yes">_Playback</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="menu2"> @@ -236,24 +258,93 @@ </object> </child> <child> - <object class="GtkImageMenuItem" id="plugins-menu-item"> - <property name="label" translatable="yes">P_lugins</property> + <object class="GtkCheckMenuItem" id="show-hide-list"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="label" translatable="yes">Show _playlist</property> <property name="use_underline">True</property> - <property name="image">image8</property> + <accelerator key="F9" signal="activate"/> + <signal name="toggled" handler="parole_player_show_hide_playlist" swapped="no"/> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkMenuItem" id="audio-menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Audio</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="menu5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="menuitem3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">_Audio Track</property> + <property name="use_underline">True</property> + <child type="submenu"> + <object class="GtkMenu" id="languages-menu"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuItem" id="menuitem11"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Empty</property> + <property name="use_underline">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> + <object class="GtkSeparatorMenuItem" id="separatormenuitem9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="volume-up-menu"> + <property name="label" translatable="yes">Volume _Up</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="image">image3</property> <property name="use_stock">False</property> + <accelerator key="equal" signal="activate"/> + <accelerator key="plus" signal="activate"/> + <signal name="activate" handler="parole_player_volume_up" swapped="no"/> </object> </child> <child> - <object class="GtkImageMenuItem" id="preferences"> - <property name="label">_Preferences</property> + <object class="GtkImageMenuItem" id="volume-down-menu"> + <property name="label" translatable="yes">Volume _Down</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="image">image9</property> + <property name="image">image4</property> <property name="use_stock">False</property> - <signal name="activate" handler="parole_player_open_preferences_cb" swapped="no"/> + <accelerator key="minus" signal="activate"/> + <signal name="activate" handler="parole_player_volume_down" swapped="no"/> + </object> + </child> + <child> + <object class="GtkImageMenuItem" id="volume-mute-menu"> + <property name="label" translatable="yes">_Mute</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="image">image5</property> + <property name="use_stock">False</property> + <accelerator key="0" signal="activate"/> + <signal name="activate" handler="parole_player_volume_mute" swapped="no"/> </object> </child> </object> @@ -261,10 +352,10 @@ </object> </child> <child> - <object class="GtkMenuItem" id="view-menu"> + <object class="GtkMenuItem" id="video-menu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_View</property> + <property name="label" translatable="yes">_Video</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="menu3"> @@ -403,7 +494,7 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Select Text Subtitles...</property> + <property name="label" translatable="yes">Select Text Subtitles…</property> <property name="use_underline">True</property> </object> </child> @@ -417,100 +508,39 @@ </child> </object> </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="show-hide-list"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Show _playlist</property> - <property name="use_underline">True</property> - <accelerator key="F9" signal="activate"/> - <signal name="toggled" handler="parole_player_show_hide_playlist" swapped="no"/> - </object> - </child> </object> </child> </object> </child> <child> - <object class="GtkMenuItem" id="sound"> + <object class="GtkMenuItem" id="tools-menu"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Audio</property> + <property name="label" translatable="yes">_Tools</property> <property name="use_underline">True</property> <child type="submenu"> - <object class="GtkMenu" id="menu5"> + <object class="GtkMenu" id="menu7"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuItem" id="menuitem3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Languages</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="languages-menu"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="menuitem11"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Empty</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem9"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="volume-up-menu"> - <property name="label" translatable="yes">Volume _Up</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <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"/> - <signal name="activate" handler="parole_player_volume_up" swapped="no"/> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="volume-down-menu"> - <property name="label" translatable="yes">Volume _Down</property> + <object class="GtkImageMenuItem" id="plugins-menu-item"> + <property name="label" translatable="yes">P_lugins</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="image">image4</property> + <property name="image">image8</property> <property name="use_stock">False</property> - <accelerator key="minus" signal="activate"/> - <signal name="activate" handler="parole_player_volume_down" swapped="no"/> </object> </child> <child> - <object class="GtkImageMenuItem" id="volume-mute-menu"> - <property name="label" translatable="yes">_Mute</property> + <object class="GtkImageMenuItem" id="preferences"> + <property name="label">_Preferences</property> <property name="visible">True</property> <property name="can_focus">False</property> <property name="use_underline">True</property> - <property name="image">image5</property> + <property name="image">image9</property> <property name="use_stock">False</property> - <accelerator key="0" signal="activate"/> - <signal name="activate" handler="parole_player_volume_mute" swapped="no"/> + <signal name="activate" handler="parole_player_open_preferences_cb" swapped="no"/> </object> </child> </object> @@ -529,9 +559,10 @@ <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="bug-report"> - <property name="label" translatable="yes">Report a bug...</property> + <property name="label" translatable="yes">_Report a bug…</property> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="use_underline">True</property> <property name="image">image10</property> <property name="use_stock">False</property> </object> diff --git a/src/parole-disc.c b/src/parole-disc.c index fca07b8..de70051 100644 --- a/src/parole-disc.c +++ b/src/parole-disc.c @@ -580,7 +580,7 @@ parole_disc_init (ParoleDisc *disc) disc->priv->disc_menu_item = GTK_WIDGET (gtk_builder_get_object (builder, "menu-open-disc")); - g_signal_connect (gtk_builder_get_object (builder, "media-menu-item"), "select", + g_signal_connect (gtk_builder_get_object (builder, "media-menu"), "select", G_CALLBACK (parole_disc_select_cb), disc); g_object_unref (builder); diff --git a/src/parole-player.c b/src/parole-player.c index caf0c53..5643556 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -3085,7 +3085,7 @@ parole_player_init (ParolePlayer *player) gtk_menu_shell_append(GTK_MENU_SHELL(player->priv->recent_menu), recent_separator); /* Clear Recent Menu Item */ - clear_recent = gtk_image_menu_item_new_with_mnemonic (_("_Clear recent items...")); + clear_recent = gtk_image_menu_item_new_with_mnemonic (_("_Clear recent items…")); icon = gtk_image_new_from_icon_name ("edit-clear-symbolic", GTK_ICON_SIZE_MENU); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(clear_recent), GTK_WIDGET(icon)); g_signal_connect (clear_recent, "activate", _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits