[Xfce4-commits] <parole:master> GTK+3 Parole interface.
Sean Davis
noreply at xfce.org
Fri Oct 11 11:50:10 CEST 2013
Updating branch refs/heads/master
to 44bbee42bb9e5279181af96c4c98f398e3e25685 (commit)
from 5172df1b1d530b7ecccee022e397fa055ae3d207 (commit)
commit 44bbee42bb9e5279181af96c4c98f398e3e25685
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Sun Feb 17 15:44:26 2013 -0500
GTK+3 Parole interface.
data/interfaces/Makefile.am | 4 +-
data/interfaces/{parole.ui => parole-3.ui} | 250 ++++++++++------------------
data/interfaces/parole.ui | 10 +-
data/interfaces/playlist-3.ui | 2 +-
4 files changed, 98 insertions(+), 168 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 14d7218..5a2c446 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -13,7 +13,7 @@ interfaces_h = \
if ENABLE_GTK3
interfaces = \
- parole.ui \
+ parole-3.ui \
parole-settings-3.ui \
playlist-3.ui \
mediachooser-3.ui \
@@ -24,7 +24,7 @@ interfaces = \
if MAINTAINER_MODE
BUILT_SOURCES = $(interfaces_h)
-parole_ui.h: parole.ui
+parole_ui.h: parole-3.ui
xdt-csource --static --strip-comments --strip-content --name=parole_ui $< > $@
parole-settings_ui.h: parole-settings-3.ui
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole-3.ui
similarity index 86%
copy from data/interfaces/parole.ui
copy to data/interfaces/parole-3.ui
index fdc099a..a30c833 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole-3.ui
@@ -1,27 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="stock">gtk-network</property>
+ <property name="icon-size">1</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">parole-extension</property>
</object>
- <object class="GtkImage" id="image_cd_rom">
+ <object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">media-optical</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">audio-volume-high</property>
</object>
- <object class="GtkImage" id="image_fullscreen">
+ <object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-fullscreen</property>
- <property name="icon-size">3</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">audio-volume-low</property>
</object>
- <object class="GtkImage" id="image_network">
+ <object class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-network</property>
+ <property name="pixel_size">16</property>
+ <property name="icon_name">audio-volume-muted</property>
+ </object>
+ <object class="GtkImage" id="image_fullscreen">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Fullscreen</property>
+ <property name="stock">gtk-fullscreen</property>
+ <property name="icon-size">3</property>
</object>
<object class="GtkImage" id="image_play_next">
<property name="visible">True</property>
@@ -41,35 +56,7 @@
<property name="stock">gtk-media-previous</property>
<property name="icon-size">3</property>
</object>
- <object class="GtkImage" id="image_volume_down">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">audio-volume-low</property>
- </object>
- <object class="GtkImage" id="image_volume_mute">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">audio-volume-muted</property>
- </object>
- <object class="GtkImage" id="image_volume_up">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">audio-volume-high</property>
- </object>
- <object class="GtkListStore" id="liststore_audiotrack">
- <columns>
- <!-- column-name track_title -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="liststore_subtitles">
- <columns>
- <!-- column-name subtitle_name -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkWindow" id="main-window">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">Parole Media Player</property>
<property name="window_position">center</property>
@@ -77,11 +64,12 @@
<signal name="destroy" handler="parole_player_destroy_cb" swapped="no"/>
<signal name="configure-event" handler="parole_player_configure_event_cb" swapped="no"/>
<signal name="key-press-event" handler="parole_player_key_press" swapped="no"/>
- <signal name="delete-event" handler="parole_player_delete_event_cb" after="yes" swapped="no"/>
+ <signal name="delete-event" handler="parole_player_delete_event_cb" swapped="no"/>
<child>
- <object class="GtkVBox" id="vbox1">
+ <object class="GtkBox" id="vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkMenuBar" id="menubar">
<property name="visible">True</property>
@@ -90,11 +78,10 @@
<object class="GtkMenuItem" id="media-menu-item">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Media</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="media-menu">
+ <object class="GtkMenu" id="menu1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -102,7 +89,6 @@
<property name="label">gtk-open</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -114,9 +100,8 @@
<property name="label" translatable="yes">Open _Location</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="image">image_network</property>
+ <property name="image">image1</property>
<property name="use_stock">False</property>
<accelerator key="l" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="parole_player_menu_open_location_cb" swapped="no"/>
@@ -126,7 +111,6 @@
<object class="GtkMenuItem" id="recent_menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Open Recent</property>
<property name="use_underline">True</property>
</object>
@@ -139,17 +123,15 @@
</child>
<child>
<object class="GtkImageMenuItem" id="menu-open-disc">
- <property name="label" translatable="yes">Insert Disc</property>
+ <property name="label">gtk-cdrom</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="image">image_cd_rom</property>
- <property name="use_stock">False</property>
+ <property name="use_underline">True</property>
+ <property name="use_stock">True</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -159,7 +141,6 @@
<property name="label">gtk-quit</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
@@ -174,18 +155,16 @@
<object class="GtkMenuItem" id="edit-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu4">
+ <object class="GtkMenu" id="menu2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem" id="repeat">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Repeat</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="parole_player_repeat_toggled_cb" swapped="no"/>
@@ -195,14 +174,13 @@
<object class="GtkCheckMenuItem" id="shuffle">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Shuffle</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="parole_player_shuffle_toggled_cb" swapped="no"/>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="separatormenuitem2">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -212,8 +190,7 @@
<property name="label" translatable="yes">Plugins</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
- <property name="image">image1</property>
+ <property name="image">image2</property>
<property name="use_stock">False</property>
</object>
</child>
@@ -222,7 +199,6 @@
<property name="label">gtk-preferences</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="parole_player_open_preferences_cb" swapped="no"/>
@@ -236,11 +212,10 @@
<object class="GtkMenuItem" id="view-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu2">
+ <object class="GtkMenu" id="menu3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -248,7 +223,6 @@
<property name="label">gtk-fullscreen</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="F11" signal="activate"/>
@@ -256,7 +230,7 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="separatormenuitem3">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem4">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -265,18 +239,16 @@
<object class="GtkMenuItem" id="menuitem1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Aspect Ratio</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu5">
+ <object class="GtkMenu" id="menu4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkRadioMenuItem" id="ratio_none">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">None</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -287,7 +259,6 @@
<object class="GtkRadioMenuItem" id="ratio_auto">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Auto</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -299,7 +270,6 @@
<object class="GtkRadioMenuItem" id="ratio_square">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Square</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -311,7 +281,6 @@
<object class="GtkRadioMenuItem" id="ratio_4_3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">4:3 (TV)</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -323,7 +292,6 @@
<object class="GtkRadioMenuItem" id="ratio_16_9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">16:9 (Widescreen)</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -335,7 +303,6 @@
<object class="GtkRadioMenuItem" id="ratio_20_9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">20:9 (DVB)</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
@@ -348,17 +315,15 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem3">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
</object>
</child>
<child>
- <object class="GtkMenuItem" id="menuitem4">
+ <object class="GtkMenuItem" id="menuitem2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Subtitles</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -369,34 +334,29 @@
<object class="GtkRadioMenuItem" id="subtitles-menu-none">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">None</property>
<property name="use_underline">True</property>
<property name="draw_as_radio">True</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem7">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
</object>
</child>
<child>
<object class="GtkMenuItem" id="subtitles-menu-custom">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Select Text Subtitles...</property>
<property name="use_underline">True</property>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem9">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
</object>
</child>
</object>
@@ -404,21 +364,19 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem5">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">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="use_action_appearance">False</property>
<property name="label" translatable="yes">Show _playlist</property>
<property name="use_underline">True</property>
<accelerator key="F9" signal="activate"/>
- <signal name="activate" handler="parole_player_show_hide_playlist" swapped="no"/>
+ <signal name="toggled" handler="parole_player_show_hide_playlist" swapped="no"/>
</object>
</child>
</object>
@@ -429,18 +387,16 @@
<object class="GtkMenuItem" id="sound">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Audio</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu1">
+ <object class="GtkMenu" id="menu5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkMenuItem" id="menuitem10">
+ <object class="GtkMenuItem" id="menuitem3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Languages</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -452,7 +408,6 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">Empty</property>
<property name="use_underline">True</property>
</object>
@@ -462,10 +417,9 @@
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem" id="menuitem12">
+ <object class="GtkSeparatorMenuItem" id="separatormenuitem9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
</object>
</child>
<child>
@@ -473,13 +427,11 @@
<property name="label" translatable="yes">Volume _Up</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="image">image_volume_up</property>
+ <property name="image">image3</property>
<property name="use_stock">False</property>
- <accelerator key="plus" signal="activate"/>
<accelerator key="equal" signal="activate"/>
- <accelerator key="KP_Add" signal="activate"/>
+ <accelerator key="plus" signal="activate"/>
<signal name="activate" handler="parole_player_volume_up" swapped="no"/>
</object>
</child>
@@ -488,11 +440,9 @@
<property name="label" translatable="yes">Volume _Down</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="image">image_volume_down</property>
+ <property name="image">image4</property>
<property name="use_stock">False</property>
- <accelerator key="KP_Subtract" signal="activate"/>
<accelerator key="minus" signal="activate"/>
<signal name="activate" handler="parole_player_volume_down" swapped="no"/>
</object>
@@ -502,9 +452,8 @@
<property name="label" translatable="yes">_Mute</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="image">image_volume_mute</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"/>
@@ -518,11 +467,10 @@
<object class="GtkMenuItem" id="help-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
- <object class="GtkMenu" id="menu3">
+ <object class="GtkMenu" id="menu6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -530,7 +478,6 @@
<property name="label">gtk-about</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="parole_show_about" swapped="no"/>
@@ -554,31 +501,33 @@
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<property name="scrollable">True</property>
- <property name="group_id">0</property>
<child>
- <object class="GtkVBox" id="main-box">
+ <object class="GtkBox" id="main-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
- <object class="GtkHPaned" id="hpaned">
+ <object class="GtkPaned" id="hpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkVBox" id="vbox_player">
+ <object class="GtkBox" id="vbox_player">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox_infobar">
+ <object class="GtkBox" id="hbox_infobar">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="infobar_contents">
+ <object class="GtkBox" id="infobar_contents">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -586,7 +535,6 @@
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Audio Track:</property>
</object>
<packing>
@@ -599,7 +547,6 @@
<object class="GtkComboBox" id="combobox_audiotrack">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore_audiotrack</property>
<signal name="changed" handler="parole_player_combo_box_audiotrack_changed_cb" swapped="no"/>
</object>
<packing>
@@ -610,13 +557,13 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox4">
+ <object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@@ -624,7 +571,6 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
<property name="label" translatable="yes">Subtitles:</property>
</object>
<packing>
@@ -637,7 +583,6 @@
<object class="GtkComboBox" id="combobox_subtitles">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="model">liststore_subtitles</property>
<signal name="changed" handler="parole_player_combo_box_subtitles_changed_cb" swapped="no"/>
</object>
<packing>
@@ -648,7 +593,7 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -671,9 +616,10 @@
<object class="GtkEventBox" id="eventbox_output">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<signal name="button-press-event" handler="parole_player_gst_widget_button_press" swapped="no"/>
<child>
- <object class="GtkHBox" id="output">
+ <object class="GtkBox" id="output">
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">False</property>
@@ -693,9 +639,10 @@
<object class="GtkEventBox" id="audiobox">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
<signal name="button-press-event" handler="parole_player_gst_widget_button_press" swapped="no"/>
<child>
- <object class="GtkHBox" id="hbox_audiobox">
+ <object class="GtkBox" id="hbox_audiobox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">24</property>
@@ -715,9 +662,10 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="vbox3">
+ <object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="audiobox_title">
@@ -727,7 +675,6 @@
<property name="yalign">1</property>
<property name="label" translatable="yes"><span color='#F4F4F4'><b><big>Unknown Song</big></b></span></property>
<property name="use_markup">True</property>
- <property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">True</property>
@@ -742,7 +689,6 @@
<property name="xalign">0</property>
<property name="label" translatable="yes"><big><span color='#BBBBBB'><i>on</i></span> <span color='#F4F4F4'>Unknown Album</span></big></property>
<property name="use_markup">True</property>
- <property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
@@ -758,7 +704,6 @@
<property name="yalign">0</property>
<property name="label" translatable="yes"><big><span color='#BBBBBB'><i>by</i></span> <span color='#F4F4F4'>Unknown Artist</span></big></property>
<property name="use_markup">True</property>
- <property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">True</property>
@@ -783,20 +728,23 @@
</packing>
</child>
<child>
- <object class="GtkVBox" id="control">
+ <object class="GtkBox" id="control">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">end</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkVBox" id="play-box">
+ <object class="GtkBox" id="play-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkHBox" id="hbox6">
+ <object class="GtkBox" id="hbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkHBox" id="playback_buttons">
+ <object class="GtkBox" id="playback_buttons">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -806,7 +754,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Previous</property>
- <property name="use_action_appearance">False</property>
<property name="image">image_play_prev</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
@@ -821,15 +768,11 @@
<child>
<object class="GtkButton" id="play-pause">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Play</property>
- <property name="use_action_appearance">False</property>
<property name="image">image_play_pause</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
- <signal name="clicked" handler="parole_player_play_pause_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -844,7 +787,6 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Next</property>
- <property name="use_action_appearance">False</property>
<property name="image">image_play_next</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
@@ -864,14 +806,14 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="playing_box">
+ <object class="GtkBox" id="playing_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkLabel" id="label_elapsed">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">00:00</property>
+ <property name="label" translatable="yes">00:00</property>
<property name="single_line_mode">True</property>
</object>
<packing>
@@ -882,10 +824,11 @@
</packing>
</child>
<child>
- <object class="GtkHScale" id="scale">
+ <object class="GtkScale" id="scale">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="button-press-event" handler="parole_player_range_button_press" swapped="no"/>
<signal name="button-release-event" handler="parole_player_range_button_release" swapped="no"/>
@@ -902,7 +845,7 @@
<object class="GtkLabel" id="label_duration">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label">00:00</property>
+ <property name="label" translatable="yes">00:00</property>
<property name="single_line_mode">True</property>
</object>
<packing>
@@ -923,8 +866,8 @@
<object class="GtkProgressBar" id="progressbar_buffering">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="show_text">True</property>
<property name="text" translatable="yes">Buffering (0%)</property>
+ <property name="show_text">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -933,7 +876,7 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="extra_controls">
+ <object class="GtkBox" id="extra_controls">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -941,7 +884,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="has_tooltip">True</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<property name="orientation">vertical</property>
@@ -964,11 +907,9 @@ audio-volume-medium</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="no_show_all">True</property>
- <property name="tooltip_text" translatable="yes">Fullscreen</property>
- <property name="use_action_appearance">False</property>
<property name="image">image_fullscreen</property>
<property name="relief">none</property>
+ <property name="focus_on_click">False</property>
<signal name="clicked" handler="parole_player_full_screen_activated_cb" swapped="no"/>
</object>
<packing>
@@ -983,9 +924,9 @@ audio-volume-medium</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="relief">none</property>
<property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
<signal name="clicked" handler="parole_player_leave_fs_cb" swapped="no"/>
</object>
<packing>
@@ -1000,7 +941,6 @@ audio-volume-medium</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="no_show_all">True</property>
- <property name="use_action_appearance">False</property>
<property name="image">show-hide-list-image</property>
<property name="relief">none</property>
<property name="focus_on_click">False</property>
@@ -1036,7 +976,7 @@ audio-volume-medium</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
<property name="position">3</property>
</packing>
</child>
@@ -1078,18 +1018,6 @@ audio-volume-medium</property>
<property name="tab_fill">False</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child type="tab">
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child type="tab">
- <placeholder/>
- </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index fdc099a..9f6f895 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -477,9 +477,9 @@
<property name="use_underline">True</property>
<property name="image">image_volume_up</property>
<property name="use_stock">False</property>
- <accelerator key="plus" signal="activate"/>
- <accelerator key="equal" signal="activate"/>
<accelerator key="KP_Add" signal="activate"/>
+ <accelerator key="equal" signal="activate"/>
+ <accelerator key="plus" signal="activate"/>
<signal name="activate" handler="parole_player_volume_up" swapped="no"/>
</object>
</child>
@@ -492,8 +492,8 @@
<property name="use_underline">True</property>
<property name="image">image_volume_down</property>
<property name="use_stock">False</property>
- <accelerator key="KP_Subtract" signal="activate"/>
<accelerator key="minus" signal="activate"/>
+ <accelerator key="KP_Subtract" signal="activate"/>
<signal name="activate" handler="parole_player_volume_down" swapped="no"/>
</object>
</child>
@@ -886,6 +886,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="round_digits">1</property>
<property name="draw_value">False</property>
<signal name="button-press-event" handler="parole_player_range_button_press" swapped="no"/>
<signal name="button-release-event" handler="parole_player_range_button_release" swapped="no"/>
@@ -1036,7 +1037,8 @@ audio-volume-medium</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
<property name="position">3</property>
</packing>
</child>
diff --git a/data/interfaces/playlist-3.ui b/data/interfaces/playlist-3.ui
index 30b5b09..99b23c4 100644
--- a/data/interfaces/playlist-3.ui
+++ b/data/interfaces/playlist-3.ui
@@ -87,7 +87,7 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkNotebook" id="notebook1">
+ <object class="GtkNotebook" id="playlist_notebook">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tab_pos">bottom</property>
More information about the Xfce4-commits
mailing list