[Xfce4-commits] <parole:master> Version bump for UI files to 2.24. Cleared some of the warnings displayed while running.
Christoph Mende
noreply at xfce.org
Mon Jul 23 01:25:35 CEST 2012
Updating branch refs/heads/master
to 52fea68f3851b53e7226d8c7755794b771ccd25f (commit)
from b61cca662b464dd2b7397a16a06bf4b4f6e10f14 (commit)
commit 52fea68f3851b53e7226d8c7755794b771ccd25f
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Fri Jul 13 07:22:46 2012 -0400
Version bump for UI files to 2.24. Cleared some of the warnings displayed while running.
INSTALL | 9 ++-
configure.ac.in | 4 +-
data/interfaces/mediachooser.ui | 164 +++++++++++++++++++---------------
data/interfaces/open-location.ui | 174 ++++++++++++++++++++----------------
data/interfaces/parole-settings.ui | 173 ++++++++++++++++++++++++------------
data/interfaces/parole.ui | 2 +-
data/interfaces/playlist.ui | 4 +-
data/interfaces/plugins.ui | 122 +++++++++++++++----------
data/interfaces/save-playlist.ui | 131 ++++++++++++++-------------
gst/parole-gst.c | 7 ++-
src/parole-player.c | 24 +-----
11 files changed, 466 insertions(+), 348 deletions(-)
diff --git a/INSTALL b/INSTALL
index 7d1c323..a1e89e1 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
+Inc.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
@@ -226,6 +226,11 @@ order to use an ANSI C compiler:
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+ HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved. Use GNU `make'
+instead.
+
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
diff --git a/configure.ac.in b/configure.ac.in
index d1b65b0..43bcf52 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -66,8 +66,8 @@ XDT_I18N([@LINGUAS@])
#==================================================== #
# Check for required packages #
#=====================================================#
-m4_define([gtk_minimum_version], [2.16.0])
-m4_define([glib_minimum_version], [2.16.0])
+m4_define([gtk_minimum_version], [2.24.0])
+m4_define([glib_minimum_version], [2.24.0])
m4_define([gstreamer_minimum_version], [0.10.11])
m4_define([dbus_minimum_version], [0.60])
diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui
index ac62ab2..d77d01b 100644
--- a/data/interfaces/mediachooser.ui
+++ b/data/interfaces/mediachooser.ui
@@ -1,36 +1,112 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy project-wide -->
<object class="XfceTitledDialog" id="chooser">
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Parole Media Chooser</property>
<property name="default_width">680</property>
<property name="default_height">480</property>
<property name="icon_name">audio-x-generic</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Open media files</property>
- <signal name="destroy" handler="parole_media_chooser_destroy_cb"/>
+ <signal name="destroy" handler="parole_media_chooser_destroy_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">edge</property>
+ <child>
+ <object class="GtkHBox" id="info">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <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="use_stock">True</property>
+ <signal name="clicked" handler="parole_media_chooser_close_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="open">
+ <property name="label" translatable="yes">Add</property>
+ <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="image">image1</property>
+ <signal name="clicked" handler="parole_media_chooser_add_clicked" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkFileChooserWidget" id="filechooserwidget">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="orientation">vertical</property>
<property name="spacing">1</property>
- <signal name="file_activated" handler="media_chooser_file_activate_cb"/>
- <signal name="current_folder_changed" handler="media_chooser_folder_changed_cb"/>
+ <signal name="file-activated" handler="media_chooser_file_activate_cb" swapped="no"/>
+ <signal name="current-folder-changed" handler="media_chooser_folder_changed_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -40,8 +116,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_media_chooser_recursive_toggled_cb"/>
+ <signal name="toggled" handler="parole_media_chooser_recursive_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -55,8 +132,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_media_chooser_replace_toggled_cb"/>
+ <signal name="toggled" handler="parole_media_chooser_replace_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -70,8 +148,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="start_playing_toggled_cb"/>
+ <signal name="toggled" handler="start_playing_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -81,74 +160,17 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">edge</property>
- <child>
- <object class="GtkHBox" id="info">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="parole_media_chooser_close_clicked"/>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="open">
- <property name="label" translatable="yes">Add</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image1</property>
- <signal name="clicked" handler="parole_media_chooser_add_clicked"/>
- </object>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-add</property>
</object>
</interface>
diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index 7c41108..36893d1 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -1,66 +1,63 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy project-wide -->
- <object class="XfceTitledDialog" id="open-location">
- <property name="title" translatable="yes">Open Location</property>
- <property name="default_width">400</property>
- <property name="icon_name">gtk-network</property>
+ <object class="GtkDialog" id="dialog1">
+ <property name="can_focus">False</property>
+ <property name="border_width">5</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <property name="subtitle" translatable="yes">Open location of media file or live stream</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
- <child>
- <object class="GtkVBox" id="vbox1">
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkHBox" id="hbox2">
- <property name="visible">True</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkEntry" id="entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- </object>
- <packing>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="clear-history">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">image2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-clear</property>
+ </object>
+ <object class="XfceTitledDialog" id="open-location">
+ <property name="can_focus">False</property>
+ <property name="title" translatable="yes">Open Location</property>
+ <property name="default_width">400</property>
+ <property name="icon_name">gtk-network</property>
+ <property name="type_hint">normal</property>
+ <property name="subtitle" translatable="yes">Open location of media file or live stream</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="cancel">
@@ -68,6 +65,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="use_stock">True</property>
</object>
<packing>
@@ -83,6 +81,7 @@
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -94,51 +93,70 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget response="-6">cancel</action-widget>
- <action-widget response="-5">open</action-widget>
- </action-widgets>
- </object>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="stock">gtk-clear</property>
- </object>
- <object class="GtkDialog" id="dialog1">
- <property name="border_width">5</property>
- <property name="type_hint">normal</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
- <property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">2</property>
<child>
- <placeholder/>
- </child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
+ <object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <placeholder/>
- </child>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
<child>
- <placeholder/>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">5</property>
+ <child>
+ <object class="GtkEntry" id="entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="primary_icon_sensitive">True</property>
+ <property name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="clear-history">
+ <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="image">image2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
+ <action-widgets>
+ <action-widget response="-6">cancel</action-widget>
+ <action-widget response="-5">open</action-widget>
+ </action-widgets>
</object>
</interface>
diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui
index 6be698c..b0fe623 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -1,42 +1,85 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy project-wide -->
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-undo</property>
+ </object>
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="XfceTitledDialog" id="settings-dialog">
- <property name="border_width">0</property>
+ <property name="can_focus">False</property>
<property name="title" translatable="yes">Parole Settings</property>
<property name="icon_name">parole</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Media Player Settings</property>
- <signal name="response" handler="parole_conf_dialog_response_cb"/>
+ <signal name="response" handler="parole_conf_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <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="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkFrame" id="frame-display">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkTable" id="table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="column_spacing">5</property>
@@ -44,6 +87,7 @@
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Brightness:</property>
</object>
<packing>
@@ -54,6 +98,7 @@
<child>
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Contrast:</property>
</object>
<packing>
@@ -69,7 +114,7 @@
<property name="can_focus">True</property>
<property name="update_policy">discontinuous</property>
<property name="draw_value">False</property>
- <signal name="value_changed" handler="brightness_value_changed_cb"/>
+ <signal name="value-changed" handler="brightness_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -82,7 +127,7 @@
<property name="can_focus">True</property>
<property name="update_policy">discontinuous</property>
<property name="draw_value">False</property>
- <signal name="value_changed" handler="contrast_value_changed_cb"/>
+ <signal name="value-changed" handler="contrast_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -94,6 +139,7 @@
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Hue:</property>
</object>
<packing>
@@ -106,6 +152,7 @@
<child>
<object class="GtkLabel" id="label10">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Saturation:</property>
</object>
<packing>
@@ -121,7 +168,7 @@
<property name="can_focus">True</property>
<property name="update_policy">discontinuous</property>
<property name="draw_value">False</property>
- <signal name="value_changed" handler="hue_value_changed_cb"/>
+ <signal name="value-changed" handler="hue_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -136,7 +183,7 @@
<property name="can_focus">True</property>
<property name="update_policy">discontinuous</property>
<property name="draw_value">False</property>
- <signal name="value_changed" handler="saturation_value_changed_cb"/>
+ <signal name="value-changed" handler="saturation_value_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -147,12 +194,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset-color">
@@ -160,8 +210,9 @@
<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="image">image1</property>
- <signal name="clicked" handler="reset_color_clicked_cb"/>
+ <signal name="clicked" handler="reset_color_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -171,6 +222,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -181,23 +234,28 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Display</b></property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="reset-saver">
@@ -205,8 +263,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_conf_dialog_reset_saver_changed_cb"/>
+ <signal name="toggled" handler="parole_conf_dialog_reset_saver_changed_cb" swapped="no"/>
</object>
</child>
</object>
@@ -214,28 +273,33 @@
<child type="label">
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Video</b></property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="enable-vis">
@@ -243,20 +307,25 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_conf_dialog_enable_vis_changed_cb"/>
+ <signal name="toggled" handler="parole_conf_dialog_enable_vis_changed_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Visualization type:</property>
</object>
<packing>
@@ -268,8 +337,9 @@
<child>
<object class="GtkComboBox" id="vis-combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore1</property>
- <signal name="changed" handler="parole_conf_dialog_vis_plugin_changed_cb"/>
+ <signal name="changed" handler="parole_conf_dialog_vis_plugin_changed_cb" swapped="no"/>
<child>
<object class="GtkCellRendererText" id="cellrenderertext1"/>
<attributes>
@@ -278,11 +348,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -293,28 +367,33 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Audio</b></property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkCheckButton" id="enable-subtitle">
@@ -322,16 +401,20 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="draw_indicator">True</property>
- <signal name="toggled" handler="parole_conf_dialog_enable_subtitle_changed_cb"/>
+ <signal name="toggled" handler="parole_conf_dialog_enable_subtitle_changed_cb" swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
<property name="column_spacing">2</property>
@@ -339,6 +422,7 @@
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Font:</property>
</object>
<packing>
@@ -350,7 +434,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="font_set" handler="parole_conf_dialog_font_set_cb"/>
+ <property name="use_action_appearance">False</property>
+ <signal name="font-set" handler="parole_conf_dialog_font_set_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -360,6 +445,7 @@
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Encoding: </property>
</object>
<packing>
@@ -371,7 +457,8 @@
<child>
<object class="GtkComboBox" id="encoding">
<property name="visible">True</property>
- <signal name="changed" handler="parole_conf_dialog_subtitle_encoding_changed_cb"/>
+ <property name="can_focus">False</property>
+ <signal name="changed" handler="parole_conf_dialog_subtitle_encoding_changed_cb" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -382,6 +469,8 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -392,61 +481,29 @@
<child type="label">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Subtitles</b></property>
<property name="use_markup">True</property>
</object>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
<action-widget response="-7">close</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-undo</property>
- </object>
</interface>
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 5eb7fc1..ba51c4e 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index 3dc9f3e..8b09d5f 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkImage" id="image1">
<property name="visible">True</property>
@@ -54,10 +54,10 @@
<property name="has_tooltip">True</property>
<property name="headers_visible">False</property>
<property name="rules_hint">True</property>
+ <signal name="drag-data-received" handler="parole_media_list_drag_data_received_cb" swapped="no"/>
<signal name="key-press-event" handler="parole_media_list_key_press" swapped="no"/>
<signal name="row-activated" handler="parole_media_list_row_activated_cb" swapped="no"/>
<signal name="button-release-event" handler="parole_media_list_button_release_event" swapped="no"/>
- <signal name="drag-data-received" handler="parole_media_list_drag_data_received_cb" swapped="no"/>
<signal name="query-tooltip" handler="parole_media_list_query_tooltip" swapped="no"/>
</object>
</child>
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index 8eb352f..bfdcfa3 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -1,20 +1,10 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
+ <!-- interface-requires libxfce4ui 4.5 -->
<!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="liststore">
- <columns>
- <!-- column-name toggle -->
- <column type="gboolean"/>
- <!-- column-name plugin -->
- <column type="gchararray"/>
- <!-- column-name module -->
- <column type="GObject"/>
- <!-- column-name info -->
- <column type="gpointer"/>
- </columns>
- </object>
<object class="XfceTitledDialog" id="dialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Parole Plugins</property>
<property name="default_width">500</property>
@@ -24,21 +14,53 @@
<property name="type_hint">normal</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="has_separator">False</property>
<property name="subtitle" translatable="yes">Media Player plugins</property>
- <signal name="response" handler="parole_plugins_manager_pref_response_cb"/>
+ <signal name="response" handler="parole_plugins_manager_pref_response_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkButton" id="close">
+ <property name="label">gtk-close</property>
+ <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="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="resize_mode">queue</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
@@ -53,7 +75,7 @@
<property name="model">liststore</property>
<property name="headers_clickable">False</property>
<property name="search_column">0</property>
- <signal name="cursor_changed" handler="parole_plugins_manager_tree_cursor_changed_cb"/>
+ <signal name="cursor-changed" handler="parole_plugins_manager_tree_cursor_changed_cb" swapped="no"/>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="resizable">True</property>
@@ -61,7 +83,7 @@
<property name="clickable">True</property>
<child>
<object class="GtkCellRendererToggle" id="cellrenderertoggle">
- <signal name="toggled" handler="parole_plugins_manager_cell_toggled_cb"/>
+ <signal name="toggled" handler="parole_plugins_manager_cell_toggled_cb" swapped="no"/>
</object>
<attributes>
<attribute name="active">0</attribute>
@@ -86,17 +108,20 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkTable" id="table1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<property name="column_spacing">4</property>
@@ -104,6 +129,7 @@
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Description:</b></property>
<property name="use_markup">True</property>
</object>
@@ -115,6 +141,7 @@
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Author:</b></property>
<property name="use_markup">True</property>
</object>
@@ -128,6 +155,7 @@
<child>
<object class="GtkLabel" id="description">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@@ -139,6 +167,7 @@
<child>
<object class="GtkLabel" id="author">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="use_markup">True</property>
</object>
<packing>
@@ -151,6 +180,7 @@
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes"><b>Site:</b></property>
<property name="use_markup">True</property>
</object>
@@ -164,6 +194,7 @@
<child>
<object class="GtkHBox" id="site-box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -178,12 +209,14 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">10</property>
<child>
<object class="GtkButton" id="configure">
@@ -191,11 +224,13 @@
<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="use_stock">True</property>
- <signal name="clicked" handler="parole_plugins_manager_show_configure"/>
+ <signal name="clicked" handler="parole_plugins_manager_show_configure" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -205,52 +240,41 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton" id="close">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
<action-widget response="0">close</action-widget>
</action-widgets>
</object>
+ <object class="GtkListStore" id="liststore">
+ <columns>
+ <!-- column-name toggle -->
+ <column type="gboolean"/>
+ <!-- column-name plugin -->
+ <column type="gchararray"/>
+ <!-- column-name module -->
+ <column type="GObject"/>
+ <!-- column-name info -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
</interface>
diff --git a/data/interfaces/save-playlist.ui b/data/interfaces/save-playlist.ui
index bc754f3..68bb6b8 100644
--- a/data/interfaces/save-playlist.ui
+++ b/data/interfaces/save-playlist.ui
@@ -1,36 +1,64 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.16"/>
+ <requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkListStore" id="liststore">
- <columns>
- <!-- column-name filetype -->
- <column type="gchararray"/>
- <!-- column-name extension -->
- <column type="gchararray"/>
- <!-- column-name extension_id -->
- <column type="guint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">By Extension</col>
- <col id="1" translatable="yes"></col>
- <col id="2">0</col>
- </row>
- </data>
- </object>
<object class="GtkFileChooserDialog" id="filechooserdialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">normal</property>
- <property name="has_separator">False</property>
<property name="action">save</property>
<property name="do_overwrite_confirmation">True</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="button2">
+ <property name="label">gtk-close</property>
+ <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="use_stock">True</property>
+ <signal name="clicked" handler="parole_media_list_close_save_dialog_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="button1">
+ <property name="label">gtk-save</property>
+ <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="use_stock">True</property>
+ <signal name="clicked" handler="parole_media_list_save_playlist_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkExpander" id="expander1">
<property name="visible">True</property>
@@ -40,7 +68,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="model">liststore</property>
- <signal name="cursor_changed" handler="parole_media_list_format_cursor_changed_cb"/>
+ <signal name="cursor-changed" handler="parole_media_list_format_cursor_changed_cb" swapped="no"/>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
<property name="title">File Type</property>
@@ -69,6 +97,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Select File Types (By Extension)</property>
</object>
</child>
@@ -79,47 +108,6 @@
<property name="position">2</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area1">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="button2">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="parole_media_list_close_save_dialog_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="button1">
- <property name="label">gtk-save</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked" handler="parole_media_list_save_playlist_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
@@ -127,4 +115,21 @@
<action-widget response="0">button1</action-widget>
</action-widgets>
</object>
+ <object class="GtkListStore" id="liststore">
+ <columns>
+ <!-- column-name filetype -->
+ <column type="gchararray"/>
+ <!-- column-name extension -->
+ <column type="gchararray"/>
+ <!-- column-name extension_id -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">By Extension</col>
+ <col id="1" translatable="yes"></col>
+ <col id="2">0</col>
+ </row>
+ </data>
+ </object>
</interface>
diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index db1d683..4b519c3 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -157,7 +157,10 @@ parole_gst_finalize (GObject *object)
parole_stream_init_properties (gst->priv->stream);
+ if ( gst->priv->stream )
g_object_unref (gst->priv->stream);
+
+ if ( gst->priv->logo )
g_object_unref (gst->priv->logo);
if ( gst->priv->device )
@@ -472,7 +475,7 @@ parole_gst_set_video_color_balance (ParoleGst *gst)
"hue", hue_value,
"saturation", saturation_value,
NULL);
-
+
g_object_unref (G_OBJECT (video_sink));
gst->priv->update_color_balance = FALSE;
@@ -2032,10 +2035,12 @@ void parole_gst_shutdown (ParoleGst *gst)
if ( g_signal_handler_is_connected (gst->priv->playbin, gst->priv->sig2) )
g_signal_handler_disconnect (gst->priv->playbin, gst->priv->sig2);
+ if ( gst->priv->bus )
g_object_unref (gst->priv->bus);
gst_element_set_state (gst->priv->playbin, GST_STATE_VOID_PENDING);
+ if ( gst->priv->playbin )
g_object_unref (gst->priv->playbin);
}
diff --git a/src/parole-player.c b/src/parole-player.c
index 9f33004..6d00dc6 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -124,6 +124,7 @@ void parole_player_range_value_changed (GtkRange *range,
void parole_player_play_pause_clicked (GtkButton *button,
ParolePlayer *player);
+
void parole_player_stop_clicked (GtkButton *button,
ParolePlayer *player);
@@ -256,7 +257,6 @@ struct ParolePlayerPrivate
GtkWidget *main_nt; /*Main notebook*/
GtkWidget *show_hide_playlist;
GtkWidget *play_pause;
- GtkWidget *stop;
GtkWidget *seekf;
GtkWidget *seekb;
GtkWidget *range;
@@ -276,7 +276,6 @@ struct ParolePlayerPrivate
GtkWidget *main_box;
GtkWidget *volume;
- /*GtkWidget *volume_image;*/
GtkWidget *menu_bar;
GtkWidget *play_box;
@@ -501,8 +500,6 @@ parole_player_media_activated_cb (ParoleMediaList *list, GtkTreeRowReference *ro
TRACE ("Trying to play media file %s", uri);
TRACE ("File content type %s", parole_file_get_content_type (file));
- gtk_widget_set_sensitive (player->priv->stop, TRUE);
-
parole_gst_play_uri (PAROLE_GST (player->priv->gst),
parole_file_get_uri (file),
sub);
@@ -519,7 +516,6 @@ static void
parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const gchar *device, ParolePlayer *player)
{
parole_player_reset (player);
- gtk_widget_set_sensitive (player->priv->stop, TRUE);
parole_gst_play_device_uri (PAROLE_GST (player->priv->gst), uri, device);
}
@@ -528,7 +524,6 @@ static void
parole_player_uri_opened_cb (ParoleMediaList *list, const gchar *uri, ParolePlayer *player)
{
parole_player_reset (player);
- gtk_widget_set_sensitive (player->priv->stop, TRUE);
parole_gst_play_uri (PAROLE_GST (player->priv->gst), uri, NULL);
}
@@ -663,7 +658,6 @@ parole_player_playing (ParolePlayer *player, const ParoleStream *stream)
NULL);
gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
- gtk_widget_set_sensitive (player->priv->stop, TRUE);
parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PAUSE);
@@ -716,7 +710,6 @@ parole_player_paused (ParolePlayer *player)
parole_media_list_set_row_pixbuf (player->priv->list, player->priv->row, pix);
gtk_widget_set_sensitive (player->priv->play_pause, TRUE);
- gtk_widget_set_sensitive (player->priv->stop, TRUE);
if ( player->priv->user_seeking == FALSE)
parole_player_set_playpause_button_image (player->priv->play_pause, GTK_STOCK_MEDIA_PLAY);
@@ -750,10 +743,6 @@ parole_player_stopped (ParolePlayer *player)
* state, this give the possibility to press on it if the media get stuck
* for some reason.
*/
- if ( parole_gst_get_gst_target_state (PAROLE_GST (player->priv->gst)) != GST_STATE_PLAYING)
- {
- gtk_widget_set_sensitive (player->priv->stop, FALSE);
- }
parole_player_change_range_value (player, 0);
gtk_widget_set_sensitive (player->priv->range, FALSE);
@@ -1100,12 +1089,6 @@ parole_player_play_menu_item_activate (ParolePlayer *player)
}
static void
-parole_player_stop_menu_item_activate (ParolePlayer *player)
-{
- gtk_widget_activate (player->priv->stop);
-}
-
-static void
parole_player_next_menu_item_activate (ParolePlayer *player)
{
parole_disc_menu_seek_next (player->priv->disc_menu);
@@ -1262,9 +1245,9 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
gtk_widget_set_sensitive (mi, player->priv->state == PAROLE_STATE_PLAYING);
gtk_widget_show (mi);
- g_signal_connect_swapped (mi, "activate",
+ /*g_signal_connect_swapped (mi, "activate",
G_CALLBACK (parole_player_stop_menu_item_activate), player);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);*/
/*
* Next chapter menu item
@@ -1990,7 +1973,6 @@ parole_player_init (ParolePlayer *player)
player->priv->label_duration = GTK_WIDGET(gtk_builder_get_object(builder, "label_duration"));
player->priv->label_elapsed = GTK_WIDGET(gtk_builder_get_object(builder, "label_elapsed"));
player->priv->play_pause = GTK_WIDGET (gtk_builder_get_object (builder, "play-pause"));
- player->priv->stop = GTK_WIDGET (gtk_builder_get_object (builder, "stop"));
player->priv->seekf = GTK_WIDGET (gtk_builder_get_object (builder, "forward"));
player->priv->seekb = GTK_WIDGET (gtk_builder_get_object (builder, "back"));
More information about the Xfce4-commits
mailing list