[Xfce4-commits] parole:master Update changelog, version numbers
Updating branch refs/heads/master to 95a790fd29464c436bea321847419f562741a9fe (commit) from 1d321b222ed3f13a6fff00d679c5967f124bdb7d (commit) commit 95a790fd29464c436bea321847419f562741a9fe Author: Sean Davis smd.seanda...@gmail.com Date: Sat Jan 25 12:53:50 2014 -0500 Update changelog, version numbers ChangeLog |7 +++ configure.ac.in |6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c99c1e7..e42e03f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-01-25: bluesa...@xfce.org +* Stable release 0.6.0 +* Fix bug with DIR handles not being closed (bug #10600) +* Fix crash for m3u files with all absolute paths +* Added 128px appicon +* Added Contents menu-item to Help menu + 2013-12-29: bluesa...@xfce.org * Development release 0.5.91 * Fix untranslatable strings (bug #10418) diff --git a/configure.ac.in b/configure.ac.in index 8990738..6cdffe7 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:91]) +m4_define([parole_verinfo], [0:6:0]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) -m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [91]) +m4_define([parole_version_minor], [6]) +m4_define([parole_version_micro], [0]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole|0.6.0 Creating annotated tag 0.6.0
Updating annotated tag refs/tags/0.6.0 as new annotated tag to 75de578ad99495a6e7d63e5d13a1b5fd96801f16 (tag) succeeds 0.5.91-15-g1d321b2 tagged by Sean Davis smd.seanda...@gmail.com on 2014-01-25 18:54 +0100 Sean Davis (1): Update changelog, version numbers ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Updated NEWS
Updating branch refs/heads/master to daef92ee8c09a0009ffb8d96e657b3984ffc3a3a (commit) from 95a790fd29464c436bea321847419f562741a9fe (commit) commit daef92ee8c09a0009ffb8d96e657b3984ffc3a3a Author: Sean Davis smd.seanda...@gmail.com Date: Sat Jan 25 13:07:14 2014 -0500 Updated NEWS NEWS | 46 ++ 1 file changed, 46 insertions(+) diff --git a/NEWS b/NEWS index 56acce4..de8cf19 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,49 @@ +0.6.0 +=== +- Completed port to GTK+3 + - Remove deprecated GTK+2 items + - Use GtkOverlay for player controls + - Use symbolic icons for menus, plugins +- Improved window maximization + - Window dimensions are no longer saved when maximizing + - Added window-maximized setting to xfconf to keep maximization across sessions +- Rearranged and improved menubar + - Renamed Edit menu to Playback + - Renamed Languages menu item to Audio Track + - Added Tools menu + - Moved Plugins and Preferences to Tools menu + - Added DVD menu (visible only when a DVD or DVD ISO is being played) + - Added Save Playlist item to Media menu + - Added Contents item to Help menu + - Added Report Bug item to Help menu +- Improved playlist + - Use symbolic icons in an inline toolbar + - Removed redundant settings button + - Added Move Up/Down buttons + - Improved search +- Plugin updates + - Added Previous/Next Track menu items to Tray plugin + - Added Previous/Next Track menu items to Notification plugin + - Added NEW MPRIS2 plugin +- Other improvements + - Updated artwork (background image, icons) + - Fixed GStreamer 1.0 support + - Added ability to play DVD ISOs from the Open dialog + - Plugins now correctly report when they fail to load + - Plugin API documentation updates +- Bugs fixed + - Fixed missing option to open DVD from iso (bug #10300) + - Fixed allowing a playlist to be sorted and/or items to be moved (bug #10066) + - Fixed Remember playlist option in GUI not working (bug #10269) + - Fixed Parole showing irritating edge (bug #10081) + - Fixed untranslatable strings (bug #10418) + - Fixed loading of playlists with relative paths (bug #10436) + - Added realmedia video to supported video mimetypes (bug #10434) + - Fixed IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) + - Fixed building with enable-debug=full on some platforms (bug #10525) + - Fixed crash for m3u files with all absolute paths + - Fixed Remove Duplicates functionality. + 0.5.0 === - Fixed potential file name clash in parole extension (bug #9728) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Show/hide display popups with focus
Updating branch refs/heads/bluesabre/display-settings2
to 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit)
from 8f95e0836365e62d052cc000f3b7a0145cd2c81c (commit)
commit 3e3106903d3d2cc877390c3ff438bfe957fb1e77
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Dec 10 10:32:22 2013 +
Show/hide display popups with focus
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), focus-out-event, G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), focus-in-event, G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Add hotplug checkbox to plug dialog
Updating branch refs/heads/bluesabre/display-settings2 to 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit) from 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit) commit 3c2a9784feea5f9cd549e5b5b1167aad453eb839 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 11 02:13:34 2013 + Add hotplug checkbox to plug dialog Signed-off-by: Sean Davis smd.seanda...@gmail.com dialogs/display-settings/display-dialog.glade | 454 + 1 file changed, 232 insertions(+), 222 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index db0dcf5..b4bbd80 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -18,241 +18,275 @@ property name=can_focusFalse/property property name=spacing2/property child - object class=GtkHBox id=plug-child + object class=GtkVBox id=plug-child property name=visibleTrue/property property name=can_focusFalse/property property name=border_width12/property -property name=spacing12/property +property name=spacing6/property child - object class=GtkScrolledWindow id=scrolledwindow1 -property name=width_request200/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hscrollbar_policyautomatic/property -property name=vscrollbar_policyautomatic/property -property name=shadow_typeetched-in/property -child - object class=GtkTreeView id=randr-outputs -property name=visibleTrue/property -property name=can_focusTrue/property -property name=headers_visibleFalse/property -property name=enable_searchFalse/property -property name=show_expandersFalse/property - /object -/child - /object - packing -property name=expandTrue/property -property name=fillTrue/property -property name=position0/property - /packing -/child -child - object class=GtkTable id=table1 + object class=GtkHBox id=display-settings property name=visibleTrue/property property name=can_focusFalse/property -property name=n_rows7/property -property name=n_columns2/property -property name=column_spacing12/property -property name=row_spacing6/property -child - object class=GtkComboBox id=randr-reflection -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach6/property -property name=bottom_attach7/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-rotation -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach5/property -property name=bottom_attach6/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-refresh-rate -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach4/property -property name=bottom_attach5/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-resolution -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach3/property
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Make mirror button insensitive if not possible
Updating branch refs/heads/bluesabre/display-settings2
to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit)
from 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
commit 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 10:56:51 2013 +
Make mirror button insensitive if not possible
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr-friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr-mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr-mode[0] != None xfce_randr-mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Fix display mirroring
Updating branch refs/heads/bluesabre/display-settings2
to 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
from 18af539c96d36b5464901b12f528768478b898fd (commit)
commit 14f6f4320815330bd8ed1095d80e8dd1fc12a61f
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 10:43:00 2013 +
Fix display mirroring
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, buttons);
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n xfce_randr-noutput; ++n)
{
if (xfce_randr-mode[n] == None)
-{
-xfce_randr-mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, Default, display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr-relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr-related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, Default, display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr-mode[n] = mode;
+xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr-related_to[n] = 0;
+xfce_randr-rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, Default, display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Creating branch bluesabre/display-settings2
Updating branch refs/heads/bluesabre/display-settings2 as new branch to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/bluesabre/display-settings2 for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings2 Identify Displays button
Updating branch refs/heads/bluesabre/display-settings2
to 18af539c96d36b5464901b12f528768478b898fd (commit)
from 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit)
commit 18af539c96d36b5464901b12f528768478b898fd
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 02:36:52 2013 +
Identify Displays button
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
property name=visibleTrue/property
property name=can_focusFalse/property
child
- object class=GtkCheckButton id=minimal-autoshow
-property name=label translatable=yesConfigure _new
displays when connected/property
+ object class=GtkHBox id=hbox2
property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
-property name=use_underlineTrue/property
-property name=draw_indicatorTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkCheckButton id=minimal-autoshow
+property name=label translatable=yesConfigure
_new displays when connected/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkToggleButton id=identify-displays
+property name=label translatable=yesIdentify
Displays/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position1/property
+ /packing
+/child
/object
/child
/object
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection
[Xfce4-commits] xfce4-settings:master Fix display mirroring
Updating branch refs/heads/master
to 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
from 18af539c96d36b5464901b12f528768478b898fd (commit)
commit 14f6f4320815330bd8ed1095d80e8dd1fc12a61f
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 10:43:00 2013 +
Fix display mirroring
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, buttons);
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n xfce_randr-noutput; ++n)
{
if (xfce_randr-mode[n] == None)
-{
-xfce_randr-mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, Default, display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr-relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr-related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, Default, display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr-mode[n] = mode;
+xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr-related_to[n] = 0;
+xfce_randr-rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, Default, display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Identify Displays button
Updating branch refs/heads/master
to 18af539c96d36b5464901b12f528768478b898fd (commit)
from 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit)
commit 18af539c96d36b5464901b12f528768478b898fd
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 02:36:52 2013 +
Identify Displays button
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
property name=visibleTrue/property
property name=can_focusFalse/property
child
- object class=GtkCheckButton id=minimal-autoshow
-property name=label translatable=yesConfigure _new
displays when connected/property
+ object class=GtkHBox id=hbox2
property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
-property name=use_underlineTrue/property
-property name=draw_indicatorTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkCheckButton id=minimal-autoshow
+property name=label translatable=yesConfigure
_new displays when connected/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkToggleButton id=identify-displays
+property name=label translatable=yesIdentify
Displays/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position1/property
+ /packing
+/child
/object
/child
/object
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GObject *combobox
[Xfce4-commits] xfce4-settings:master Add hotplug checkbox to plug dialog
Updating branch refs/heads/master to 3c2a9784feea5f9cd549e5b5b1167aad453eb839 (commit) from 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit) commit 3c2a9784feea5f9cd549e5b5b1167aad453eb839 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 11 02:13:34 2013 + Add hotplug checkbox to plug dialog Signed-off-by: Sean Davis smd.seanda...@gmail.com dialogs/display-settings/display-dialog.glade | 454 + 1 file changed, 232 insertions(+), 222 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index db0dcf5..b4bbd80 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -18,241 +18,275 @@ property name=can_focusFalse/property property name=spacing2/property child - object class=GtkHBox id=plug-child + object class=GtkVBox id=plug-child property name=visibleTrue/property property name=can_focusFalse/property property name=border_width12/property -property name=spacing12/property +property name=spacing6/property child - object class=GtkScrolledWindow id=scrolledwindow1 -property name=width_request200/property -property name=visibleTrue/property -property name=can_focusTrue/property -property name=hscrollbar_policyautomatic/property -property name=vscrollbar_policyautomatic/property -property name=shadow_typeetched-in/property -child - object class=GtkTreeView id=randr-outputs -property name=visibleTrue/property -property name=can_focusTrue/property -property name=headers_visibleFalse/property -property name=enable_searchFalse/property -property name=show_expandersFalse/property - /object -/child - /object - packing -property name=expandTrue/property -property name=fillTrue/property -property name=position0/property - /packing -/child -child - object class=GtkTable id=table1 + object class=GtkHBox id=display-settings property name=visibleTrue/property property name=can_focusFalse/property -property name=n_rows7/property -property name=n_columns2/property -property name=column_spacing12/property -property name=row_spacing6/property -child - object class=GtkComboBox id=randr-reflection -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach6/property -property name=bottom_attach7/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-rotation -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach5/property -property name=bottom_attach6/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-refresh-rate -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach4/property -property name=bottom_attach5/property -property name=y_optionsGTK_FILL/property - /packing -/child -child - object class=GtkComboBox id=randr-resolution -property name=visibleTrue/property -property name=can_focusFalse/property - /object - packing -property name=left_attach1/property -property name=right_attach2/property -property name=top_attach3/property -property name
[Xfce4-commits] xfce4-settings:master Make mirror button insensitive if not possible
Updating branch refs/heads/master
to 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e (commit)
from 14f6f4320815330bd8ed1095d80e8dd1fc12a61f (commit)
commit 85831c2b33f50f7e3fa2e1a62fcbc03477635f8e
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 10:56:51 2013 +
Make mirror button insensitive if not possible
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr-friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr-mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr-mode[0] != None xfce_randr-mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:master Show/hide display popups with focus
Updating branch refs/heads/master
to 3e3106903d3d2cc877390c3ff438bfe957fb1e77 (commit)
from 8f95e0836365e62d052cc000f3b7a0145cd2c81c (commit)
commit 3e3106903d3d2cc877390c3ff438bfe957fb1e77
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Dec 10 10:32:22 2013 +
Show/hide display popups with focus
Signed-off-by: Sean Davis smd.seanda...@gmail.com
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), focus-out-event, G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), focus-in-event, G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Bump version numbers, change bug icon to face-sad-symbolic by request
Updating branch refs/heads/master to e77655f0928d1939f327c88d677a1f3d2b3f606e (commit) from f617bb65411e63a64ca1f5f4a4030d687bcbf1ab (commit) commit e77655f0928d1939f327c88d677a1f3d2b3f606e Author: Sean Davis smd.seanda...@gmail.com Date: Sun Dec 29 21:46:25 2013 -0500 Bump version numbers, change bug icon to face-sad-symbolic by request ChangeLog |4 +++- configure.ac.in |4 ++-- data/interfaces/parole.ui |2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e5734d..c99c1e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ -2013-10-30: bluesa...@xfce.org +2013-12-29: bluesa...@xfce.org +* Development release 0.5.91 * Fix untranslatable strings (bug #10418) * Fix loading of playlists with relative paths (bug #10436) * Add realmedia video to supported video mimetypes (bug #10434) @@ -7,6 +8,7 @@ * Fix Remove Duplicates functionality. * Plugin API documentation updates * Fixed playlist search +* New MPRIS2 plugin 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 diff --git a/configure.ac.in b/configure.ac.in index fb759e2..22b7c9d 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:90]) +m4_define([parole_verinfo], [0:5:91]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [90]) +m4_define([parole_version_micro], [91]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index e2fd011..a9c0856 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -24,7 +24,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_nameface-sick-symbolic/property +property name=icon_nameface-sad-symbolic/property property name=use_fallbackTrue/property /object object class=GtkImage id=image_media_fullscreen ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole|0.5.91 Creating annotated tag 0.5.91
Updating annotated tag refs/tags/0.5.91 as new annotated tag to 66fb10744c4ca7a2eaff84dda869e2872c6ebe5b (tag) succeeds 0.5.90-156-gf617bb6 tagged by Sean Davis smd.seanda...@gmail.com on 2013-12-30 05:27 +0100 Sean Davis (1): Bump version numbers, change bug icon to face-sad-symbolic by request ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Plugin API updates, fix playlist search
Updating branch refs/heads/master to 09df777859122dda720f61512d27739b70fb4d09 (commit) from 17127defa0f564a3bf506292858ef9bed435f187 (commit) commit 09df777859122dda720f61512d27739b70fb4d09 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 18 21:15:29 2013 -0500 Plugin API updates, fix playlist search ChangeLog|2 + docs/plugin-api/Makefile.am |5 + docs/plugin-api/Parole-Plugins-docs.sgml | 30 +++ docs/plugin-api/Parole-Plugins-sections.txt | 22 ++- docs/plugin-api/tmpl/Parole-Plugins-unused.sgml | 223 +- docs/plugin-api/tmpl/parole-file.sgml| 59 +- docs/plugin-api/tmpl/parole-provider-player.sgml | 74 +++ docs/plugin-api/tmpl/parole-provider-plugin.sgml | 10 - docs/plugin-api/tmpl/parole-stream.sgml |7 - docs/plugin-api/tmpl/parole.sgml | 18 ++ src/misc/parole-file.c |6 +- src/misc/parole-pl-parser.c |4 +- src/misc/parole-provider-player.c| 12 +- src/misc/parole-stream.c | 10 + src/parole-medialist.c |4 + 15 files changed, 240 insertions(+), 246 deletions(-) diff --git a/ChangeLog b/ChangeLog index 182954c..8e5734d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) * Fix building with enable-debug=full on some platforms (bug #10525) * Fix Remove Duplicates functionality. +* Plugin API documentation updates +* Fixed playlist search 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 diff --git a/docs/plugin-api/Makefile.am b/docs/plugin-api/Makefile.am index e7b022b..731b054 100644 --- a/docs/plugin-api/Makefile.am +++ b/docs/plugin-api/Makefile.am @@ -79,6 +79,11 @@ GTKDOC_LIBS=\ if ENABLE_GTK_DOC include $(top_srcdir)/gtk-doc.make +doccheck: $(GTKDOC_CHECK) + $(AM_V_GEN)ln -s $ $@ + +MOSTLYCLEANFILES = doccheck +TESTS = doccheck else EXTRA_DIST= endif diff --git a/docs/plugin-api/Parole-Plugins-docs.sgml b/docs/plugin-api/Parole-Plugins-docs.sgml index 3462610..27a4fc9 100644 --- a/docs/plugin-api/Parole-Plugins-docs.sgml +++ b/docs/plugin-api/Parole-Plugins-docs.sgml @@ -76,5 +76,35 @@ titleAPI Index/title xi:include href=xml/api-index-full.xmlxi:fallback //xi:include /index + + index id=api-index-0.2 +titleAPI Index - 0.2/title +xi:include href=xml/api-index-0.2.xmlxi:fallback //xi:include + /index + + index id=api-index-0.4 +titleAPI Index - 0.4/title +xi:include href=xml/api-index-0.4.xmlxi:fallback //xi:include + /index + + index id=api-index-0.6 +titleAPI Index - 0.6/title +xi:include href=xml/api-index-0.6.xmlxi:fallback //xi:include + /index + + index id=api-index-deprecated +titleAPI Index - Deprecated Symbols/title +xi:include href=xml/api-index-deprecated.xmlxi:fallback //xi:include + /index + + index id=parole-enum-types +titleParole Enum Types/title +xi:include href=xml/parole-enum-types.xmlxi:fallback //xi:include + /index + + index id=parole-marshal +titleParole Marshal/title +xi:include href=xml/parole-marshal.xmlxi:fallback //xi:include + /index /book diff --git a/docs/plugin-api/Parole-Plugins-sections.txt b/docs/plugin-api/Parole-Plugins-sections.txt index 7ff537a..9f4ee8e 100644 --- a/docs/plugin-api/Parole-Plugins-sections.txt +++ b/docs/plugin-api/Parole-Plugins-sections.txt @@ -6,12 +6,20 @@ ParolePluginContainer ParoleState parole_provider_player_get_main_window parole_provider_player_pack +parole_provider_player_get_action +parole_provider_player_set_fullscreen +parole_provider_player_get_fullscreen +parole_stream_set_image +parole_stream_get_image parole_provider_player_get_state parole_provider_player_get_stream +parole_provider_player_get_stream_position parole_provider_player_play_uri parole_provider_player_pause parole_provider_player_resume parole_provider_player_stop +parole_provider_player_play_next +parole_provider_player_play_previous parole_provider_player_seek parole_provider_player_open_media_chooser SUBSECTION Standard @@ -24,12 +32,12 @@ parole_provider_player_get_type SECTION FILEparole-provider-plugin/FILE -ParoleProviderPluginIface ParoleProviderPlugin parole_provider_plugin_get_is_configurable parole_provider_plugin_configure parole_provider_plugin_set_player SUBSECTION Standard +ParoleProviderPluginIface PAROLE_PROVIDER_PLUGIN PAROLE_IS_PROVIDER_PLUGIN PAROLE_TYPE_PROVIDER_PLUGIN @@ -41,15 +49,21 @@ parole_provider_plugin_get_type FILEparole-file/FILE TITLEParoleFile/TITLE ParoleFile -ParoleFileClass parole_file_new parole_file_new_with_display_name +parole_file_new_cdda_track +parole_file_new_dvd_chapter parole_file_get_file_name
[Xfce4-commits] parole:master Fix build issues
Updating branch refs/heads/master to 0e38dedb0f4523389b6208cdd7b0ecc8ed724748 (commit) from b2d6681ea42a4d4c12f9e0b047695282badd0ae9 (commit) commit 0e38dedb0f4523389b6208cdd7b0ecc8ed724748 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Dec 17 19:41:54 2013 -0500 Fix build issues po/POTFILES.in |2 ++ src/plugins/mpris2/Makefile.am |2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index aa47f17..dde9b7f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -28,3 +28,5 @@ src/plugins/tray/tray-plugin.c src/plugins/tray/tray-provider.c src/plugins/tray/tray-provider.h src/plugins/tray/system-tray.desktop.in +src/plugins/mpris2/mpris2-provider.c +src/plugins/mpris2/mpris2.desktop.in diff --git a/src/plugins/mpris2/Makefile.am b/src/plugins/mpris2/Makefile.am index ba9f37d..1e5e8d5 100644 --- a/src/plugins/mpris2/Makefile.am +++ b/src/plugins/mpris2/Makefile.am @@ -20,7 +20,7 @@ parole_mpris2_la_SOURCES =\ parole_mpris2_la_CFLAGS = \ $(PLATFORM_CFLAGS) \ $(GTK_CFLAGS) \ -$(GST_INTERFACES_CFLAGS) \ +$(GST_BASE_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) parole_mpris2_la_LDFLAGS = \ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Documentation and interface fixes
Updating branch refs/heads/master
to 87a5f7448a7219008f01e8a8b239607eeeca7957 (commit)
from f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a (commit)
commit 87a5f7448a7219008f01e8a8b239607eeeca7957
Author: Sean Davis smd.seanda...@gmail.com
Date: Fri Dec 13 06:54:49 2013 -0500
Documentation and interface fixes
docs/plugin-api/tmpl/parole-provider-player.sgml |8
docs/plugin-api/tmpl/parole-stream.sgml | 15 +++
src/misc/parole-provider-player.c| 13 +++--
src/misc/parole-provider-player.h|5 -
src/parole-plugin-player.c |6 ++
5 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/docs/plugin-api/tmpl/parole-provider-player.sgml
b/docs/plugin-api/tmpl/parole-provider-player.sgml
index c9706e5..49a31cc 100644
--- a/docs/plugin-api/tmpl/parole-provider-player.sgml
+++ b/docs/plugin-api/tmpl/parole-provider-player.sgml
@@ -28,6 +28,14 @@ playback status.
/para
+!-- # SIGNAL ParoleProviderPlayerIface::seeked # --
+para
+
+/para
+
+@paroleproviderplayeriface: the object which received the signal.
+@arg1:
+
!-- # SIGNAL ParoleProviderPlayerIface::state-changed # --
para
diff --git a/docs/plugin-api/tmpl/parole-stream.sgml
b/docs/plugin-api/tmpl/parole-stream.sgml
index 55dfd9b..e8a862d 100644
--- a/docs/plugin-api/tmpl/parole-stream.sgml
+++ b/docs/plugin-api/tmpl/parole-stream.sgml
@@ -58,6 +58,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
/para
+!-- # ARG ParoleStream:bitrate # --
+para
+
+/para
+
!-- # ARG ParoleStream:comment # --
para
@@ -78,6 +83,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
/para
+!-- # ARG ParoleStream:genre # --
+para
+
+/para
+
!-- # ARG ParoleStream:has-audio # --
para
@@ -88,6 +98,11 @@ signal of the player, the plugin shouldn't take reference
and all the properties
/para
+!-- # ARG ParoleStream:image-uri # --
+para
+
+/para
+
!-- # ARG ParoleStream:live # --
para
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 4496170..d3c7c03 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -469,7 +469,16 @@ void parole_provider_player_open_media_chooser
(ParoleProviderPlayer *player)
**/
GtkAction *parole_provider_player_get_action(ParoleProviderPlayer *player,
ParolePlayerAction action)
{
-return parole_player_get_action(action);
+GtkAction *ret = NULL;;
+
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_action )
+{
+ret = (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_action)
(player, action);
+}
+
+return ret;
}
/**
@@ -484,7 +493,7 @@ gboolean
parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
{
g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
-if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_stream )
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_fullscreen )
{
return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)-get_fullscreen) (player);
}
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 0c93d8e..7551276 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -88,7 +88,10 @@ struct _ParoleProviderPlayerIface
gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
gboolean fullscreen);
-void (*open_media_chooser) (ParoleProviderPlayer *player);
+void (*open_media_chooser) (ParoleProviderPlayer *player);
+
+GtkAction* (*get_action) (ParoleProviderPlayer *player,
+ ParolePlayerAction action);
/* signals */
void (*tag_message) (ParoleProviderPlayer *player,
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 191f190..91c5f82 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -223,6 +223,11 @@ static void parole_plugin_player_open_media_chooser
(ParoleProviderPlayer *provi
g_object_unref (list);
}
+static GtkAction* parole_plugin_player_get_action (ParoleProviderPlayer
*provider, ParolePlayerAction action)
+{
+return parole_player_get_action (action);
+}
+
static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer
*provider)
{
ParolePluginPlayer *player;
@@ -261,6 +266,7 @@ static void parole_plugin_player_iface_init
(ParoleProviderPlayerIface *iface)
iface-seek = parole_plugin_player_seek;
iface
[Xfce4-commits] parole:master Update parole-plugin-doc copyrights
Updating branch refs/heads/master to bea3896aa96ad8abc509dc15db2c3033e3cf5553 (commit) from 87a5f7448a7219008f01e8a8b239607eeeca7957 (commit) commit bea3896aa96ad8abc509dc15db2c3033e3cf5553 Author: Sean Davis smd.seanda...@gmail.com Date: Fri Dec 13 07:10:13 2013 -0500 Update parole-plugin-doc copyrights docs/plugin-api/Parole-Plugins-docs.sgml |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/plugin-api/Parole-Plugins-docs.sgml b/docs/plugin-api/Parole-Plugins-docs.sgml index 55baf32..3462610 100644 --- a/docs/plugin-api/Parole-Plugins-docs.sgml +++ b/docs/plugin-api/Parole-Plugins-docs.sgml @@ -5,7 +5,7 @@ !ENTITY % local.common.attrib xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude' !ENTITY version SYSTEM version.xml !ENTITY plugin-tut SYSTEM parole-plugins-tut.sgml - !ENTITY date July 2009 + !ENTITY date December 2013 ] book id=index bookinfo @@ -16,9 +16,13 @@ pubdatedate;/pubdate copyright - year2009/year + year2009-2011/year holderAli Abdallah/holder /copyright +copyright + year2012-2013/year + holderSean Davis, Simon Steinbeiss/holder +/copyright legalnotice id=legalnotice para ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix display mirroring
Updating branch refs/heads/bluesabre/display-settings
to 6bc31cbbc3d19b44887b98db0060a98740e52c03 (commit)
from 7b6795076e0befd9d4796a6643d8c623414fa1c9 (commit)
commit 6bc31cbbc3d19b44887b98db0060a98740e52c03
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 05:43:00 2013 -0500
Fix display mirroring
dialogs/display-settings/main.c | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b48c9e9..0789517 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1632,8 +1632,8 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
GtkBuilder *builder)
{
GObject *buttons;
-
-guint n;
+guintn;
+RRMode mode;
if (!gtk_toggle_button_get_active(button))
return;
@@ -1646,23 +1646,23 @@ display_settings_minimal_mirror_displays_toggled
(GtkToggleButton *button,
buttons = gtk_builder_get_object (builder, buttons);
gtk_widget_set_sensitive (GTK_WIDGET(buttons), FALSE);
-
-/* Activate all inactive displays */
+
+/* Activate mirror-mode with a single mode for all of them */
+mode = xfce_randr_clonable_mode (xfce_randr);
+/* Configure each available display for mirroring */
for (n = 0; n xfce_randr-noutput; ++n)
{
if (xfce_randr-mode[n] == None)
-{
-xfce_randr-mode[n] = xfce_randr_preferred_mode (xfce_randr, n);
-}
-}
-
-/* Save changes to primary display */
-xfce_randr_save_output (xfce_randr, Default, display_channel, 0, FALSE);
+continue;
-/* Save changes to secondary display */
-xfce_randr-relation[1] = XFCE_RANDR_PLACEMENT_MIRROR;
-xfce_randr-related_to[1] = 0;
-xfce_randr_save_output (xfce_randr, Default, display_channel, 1, TRUE);
+if (mode != None)
+xfce_randr-mode[n] = mode;
+xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR;
+xfce_randr-related_to[n] = 0;
+xfce_randr-rotation[n] = RR_Rotate_0;
+xfce_randr_save_output (xfce_randr, Default, display_channel,
+n, TRUE);
+}
/* Apply all changes */
xfce_randr_apply (xfce_randr, Default, display_channel);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Make mirror button insensitive if not possible
Updating branch refs/heads/bluesabre/display-settings
to 6250ac8a0617357dd8555b31fb8489caf06a38a5 (commit)
from 6bc31cbbc3d19b44887b98db0060a98740e52c03 (commit)
commit 6250ac8a0617357dd8555b31fb8489caf06a38a5
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 11 05:56:51 2013 -0500
Make mirror button insensitive if not possible
dialogs/display-settings/main.c |7 +++
1 file changed, 7 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 0789517..a6f90a2 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1869,6 +1869,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
GObject*only_display1, *only_display2, *mirror_displays;
GObject*extend_right, *advanced, *fake_button, *label;
GError *error = NULL;
+RRMode mode;
builder = gtk_builder_new ();
@@ -1911,6 +1912,12 @@ display_settings_show_minimal_dialog (GdkDisplay
*display)
gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr-friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr-mode[1] != None);
+
+/* Can outputs be cloned? */
+if (display_settings_get_n_active_outputs () 1)
+mode = xfce_randr_clonable_mode (xfce_randr);
+
+gtk_widget_set_sensitive (GTK_WIDGET (mirror_displays), mode !=
None);
if (xfce_randr-mode[0] != None xfce_randr-mode[1] != None)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master test
Updating branch refs/heads/master to bb3adcf5d17aadd31663ea0c305b760b4501e3a8 (commit) from 8baaf5b81080e101095ec63e48254e2fa3de5da7 (commit) commit bb3adcf5d17aadd31663ea0c305b760b4501e3a8 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 11 07:15:38 2013 -0500 test TODO |1 + 1 file changed, 1 insertion(+) diff --git a/TODO b/TODO index 4f79584..feb3d6c 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ + === Media player === * Support scale ratio view. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Tweak spacing and tab sizes
Updating branch refs/heads/master
to 3d390a079a60891db42c3c9c154a69c448430326 (commit)
from 5bddac966a1fcd33dc3e4e26465e921142096a02 (commit)
commit 3d390a079a60891db42c3c9c154a69c448430326
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Dec 8 07:24:43 2013 -0500
Tweak spacing and tab sizes
src/plugins/mpris2/mpris2-provider.c | 226 +-
src/plugins/mpris2/mpris2-provider.h |2 +-
2 files changed, 114 insertions(+), 114 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index c543aaa..25b3b86 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -27,7 +27,7 @@
#include gst/tag/tag.h
static void mpris2_provider_iface_init (ParoleProviderPluginIface
*iface);
-static void mpris2_provider_finalize (GObject
*object);
+static void mpris2_provider_finalize (GObject
*object);
#define MPRIS_NAME org.mpris.MediaPlayer2.parole
#define MPRIS_PATH /org/mpris/MediaPlayer2
@@ -66,67 +66,67 @@ PAROLE_DEFINE_TYPE_WITH_CODE (Mpris2Provider,
static const gchar mpris2xml[] =
node
-interface name='org.mpris.MediaPlayer2'
-method name='Raise'/
-method name='Quit'/
-property name='CanQuit' type='b' access='read'/
-property name='CanRaise' type='b' access='read'/
-property name='HasTrackList' type='b' access='read'/
-property name='Identity' type='s' access='read'/
-property name='DesktopEntry' type='s' access='read'/
-property name='SupportedUriSchemes' type='as'
access='read'/
-property name='SupportedMimeTypes' type='as' access='read'/
-property name='Fullscreen' type='b' access='readwrite'/
-property name='CanSetFullscreen' type='b' access='read'/
-/interface
-interface name='org.mpris.MediaPlayer2.Player'
-method name='Next'/
-method name='Previous'/
-method name='Pause'/
-method name='PlayPause'/
-method name='Stop'/
-method name='Play'/
-method name='Seek'
- arg direction='in'
name='Offset' type='x'/
- /method
-method name='SetPosition'
- arg direction='in'
name='TrackId' type='o'/
- arg direction='in'
name='Position' type='x'/
-/method
-method name='OpenUri'
- arg direction='in' name='Uri'
type='s'/
- /method
-signal name='Seeked'arg name='Position'
type='x'//signal
-property name='PlaybackStatus' type='s' access='read'/
-property name='LoopStatus' type='s' access='readwrite'/
-property name='Rate' type='d' access='readwrite'/
-property name='Shuffle' type='b' access='readwrite'/
-property name='Metadata' type='a{sv}' access='read'/
-property name='Volume' type='d' access='readwrite'/
-property name='Position' type='x' access='read'/
-property name='MinimumRate' type='d' access='read'/
-property name='MaximumRate' type='d' access='read'/
-property name='CanGoNext' type='b' access='read'/
-property name='CanGoPrevious' type='b' access='read'/
-property name='CanPlay' type='b' access='read'/
-property name='CanPause' type='b' access='read'/
-property name='CanSeek' type='b' access='read'/
-property name='CanControl' type='b' access='read'/
-/interface
+interface name='org.mpris.MediaPlayer2'
+method name='Raise'/
+method name='Quit'/
+property name='CanQuit' type='b' access='read'/
+property name='CanRaise' type='b' access='read'/
+property name='HasTrackList' type='b' access='read'/
+property name='Identity' type='s' access='read'/
+property name='DesktopEntry' type='s' access='read'/
+property name='SupportedUriSchemes' type='as' access='read'/
+property name='SupportedMimeTypes' type='as' access='read'/
+property name='Fullscreen' type='b' access='readwrite'/
+property name='CanSetFullscreen' type='b' access='read'/
+/interface
+interface name='org.mpris.MediaPlayer2.Player'
+method name='Next'/
+method name='Previous'/
+method name='Pause'/
+method name='PlayPause'/
+method name='Stop'/
+method name='Play'/
+method name='Seek'
+arg direction='in' name='Offset
[Xfce4-commits] parole:master Fix GetCanSeek check and GetPosition
Updating branch refs/heads/master
to 0b59cbffe41e539f763fd05978c54697e875676a (commit)
from 8aa1d5eec7b7e089de47c0592e7d638a7e0e83c4 (commit)
commit 0b59cbffe41e539f763fd05978c54697e875676a
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Dec 7 08:30:15 2013 -0500
Fix GetCanSeek check and GetPosition
src/parole-plugin-player.c |3 ++-
src/plugins/mpris2/mpris2-provider.c |4 +---
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 121dc23..5966ed1 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -207,7 +207,8 @@ parole_plugin_player_get_stream_position
(ParoleProviderPlayer *provider)
position = parole_gst_get_stream_position (PAROLE_GST (player-priv-gst));
-return position;
+/* Return as microseconds */
+return position*100.0;
}
static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer
*provider)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index f707fe5..1fc8a7e 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -579,7 +579,6 @@ static GVariant* mpris_Player_get_CanGoPrevious (GError
**error, Mpris2Provider
static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider
*provider)
{
-// TODO: this can cause a UI-lock
/* The CanPlay property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider-player;
gint state = parole_provider_player_get_state (player);
@@ -588,7 +587,6 @@ static GVariant* mpris_Player_get_CanPlay (GError **error,
Mpris2Provider *provi
static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider
*provider)
{
-// TODO: this can cause a UI-lock
/* The CanPause property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider-player;
gint state = parole_provider_player_get_state (player);
@@ -612,7 +610,6 @@ static GVariant* mpris_Player_get_CanSeek (GError **error,
Mpris2Provider *provi
static GVariant* mpris_Player_get_CanControl (GError **error, Mpris2Provider
*provider)
{
-// always?
return g_variant_new_boolean(TRUE);
}
@@ -656,6 +653,7 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
g_variant_builder_add (b, {sv}, PlaybackStatus,
mpris_Player_get_PlaybackStatus (NULL, provider));
g_variant_builder_add (b, {sv}, CanPlay,
mpris_Player_get_CanPlay(NULL, provider));
g_variant_builder_add (b, {sv}, CanPause,
mpris_Player_get_CanPause(NULL, provider));
+g_variant_builder_add (b, {sv}, CanSeek,
mpris_Player_get_CanSeek(NULL, provider));
}
g_object_get (G_OBJECT (provider-conf), repeat, repeat, NULL);
if(provider-saved_playbackstatus != repeat)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix setting volume with mpris2
Updating branch refs/heads/master
to ff441e3e265ef10dc0dca7f17e8666f3571a77d6 (commit)
from c96da1b170d495e9313206cad4821ee22b213d70 (commit)
commit ff441e3e265ef10dc0dca7f17e8666f3571a77d6
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Dec 7 10:40:07 2013 -0500
Fix setting volume with mpris2
data/interfaces/parole.ui|5 +++--
src/gst/parole-gst.c | 30 --
src/parole-player.c | 16
src/plugins/mpris2/mpris2-provider.c |3 +--
4 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index f3472d0..9918f05 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -422,8 +422,8 @@
property name=use_underlineTrue/property
property name=imageimage_volume_up/property
property name=use_stockFalse/property
-accelerator key=plus signal=activate/
accelerator key=equal signal=activate/
+accelerator key=plus signal=activate/
signal name=activate
handler=parole_player_volume_up swapped=no/
/object
/child
@@ -932,7 +932,7 @@
property name=show_textTrue/property
/object
packing
-property name=expandFalse/property
+property name=expandTrue/property
property name=fillTrue/property
property name=position4/property
/packing
@@ -990,6 +990,7 @@ audio-volume-low-symbolic
audio-volume-medium-symbolic/property
property name=use_symbolicTrue/property
signal name=value-changed
handler=parole_player_volume_value_changed_cb swapped=no/
+signal name=scroll-event
handler=parole_player_volume_scroll_event_cb swapped=no/
/object
packing
property name=expandFalse/property
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index b18f425..ea61a0e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2028,6 +2028,18 @@ parole_gst_conf_notify_cb (GObject *object, GParamSpec
*spec, ParoleGst *gst)
}
}
+static void
+parole_gst_conf_notify_volume_cb (GObject *conf, GParamSpec *pspec, ParoleGst
*gst)
+{
+gint volume;
+
+g_object_get (G_OBJECT (gst-priv-conf),
+ volume, volume,
+ NULL);
+
+parole_gst_set_volume (gst, (double)(volume / 100.0));
+}
+
static void parole_gst_get_property(GObject *object,
guint prop_id,
GValue *value,
@@ -2081,6 +2093,8 @@ static void parole_gst_set_property(GObject *object,
g_signal_connect (G_OBJECT (gst-priv-conf), notify,
G_CALLBACK (parole_gst_conf_notify_cb), gst);
+g_signal_connect (G_OBJECT (gst-priv-conf), notify::volume,
+G_CALLBACK (parole_gst_conf_notify_volume_cb), gst);
}
break;
default:
@@ -2618,13 +2632,17 @@ void parole_gst_seek (ParoleGst *gst, gdouble seek)
void parole_gst_set_volume (ParoleGst *gst, gdouble volume)
{
-gst_stream_volume_set_volume (GST_STREAM_VOLUME (gst-priv-playbin),
-GST_STREAM_VOLUME_FORMAT_CUBIC,
-volume);
volume = CLAMP (volume, 0.0, 1.0);
-gst-priv-volume = volume;
-
-g_object_notify (G_OBJECT (gst), volume);
+if (gst-priv-volume != volume)
+{
+gst_stream_volume_set_volume (GST_STREAM_VOLUME (gst-priv-playbin),
+GST_STREAM_VOLUME_FORMAT_CUBIC,
+volume);
+
+gst-priv-volume = volume;
+
+g_object_notify (G_OBJECT (gst), volume);
+}
}
gdouble parole_gst_get_volume (ParoleGst *gst)
diff --git a/src/parole-player.c b/src/parole-player.c
index a9fd374..bf0a340 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -345,6 +345,8 @@ struct ParolePlayerPrivate
GtkFileFilter *video_filter;
GtkRecentManager *recent;
+
+gdouble last_volume;
GtkWidget *window;
GtkWidget *playlist_nt;
@@ -2239,10 +2241,16 @@ void
parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value,
ParolePlayer *player)
{
parole_player_change_volume (player, value);
-if ( value 0.0 )
-g_object_set (G_OBJECT (player
[Xfce4-commits] parole:master Fix Genre
Updating branch refs/heads/master
to 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2 (commit)
from 28472fbc56401e120bdd9747c2cb1e703920b872 (commit)
commit 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 14:50:10 2013 -0500
Fix Genre
src/gst/parole-gst.c | 11 +++
src/misc/parole-stream.c | 24
src/plugins/mpris2/mpris2-provider.c |6 --
3 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 3dc1191..e6528b0 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1280,6 +1280,7 @@ parole_gst_get_meta_data_cdda (ParoleGst *gst, GstTagList
*tag)
year, NULL,
album, _(Audio CD),
comment, NULL,
+ genre, NULL,
NULL);
parole_stream_set_image (G_OBJECT (gst-priv-stream), NULL);
@@ -1349,6 +1350,15 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
g_free (str);
}
+if ( gst_tag_list_get_string_index (tag, GST_TAG_GENRE, 0, str) )
+{
+TRACE (genre:%s, str);
+g_object_set (G_OBJECT (gst-priv-stream),
+ genre, str,
+ NULL);
+g_free (str);
+}
+
if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, integer) )
{
TRACE (track:%i, integer);
@@ -1380,6 +1390,7 @@ parole_gst_get_meta_data_unknown (ParoleGst *gst)
year, NULL,
album, NULL,
comment, NULL,
+ genre, NULL,
NULL);
parole_stream_set_image (G_OBJECT (gst-priv-stream), NULL);
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2c22120..2744f06 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -71,6 +71,7 @@ struct _ParoleStreamPrivate
gchar *year;
gchar *album;
gchar *comment;
+gchar *genre;
GdkPixbuf *image;
gchar *image_uri, *previous_image;
@@ -101,6 +102,7 @@ enum
PROP_YEAR,
PROP_ALBUM,
PROP_COMMENT,
+PROP_GENRE,
PROP_IMAGE_URI
};
@@ -225,6 +227,9 @@ static void parole_stream_set_property (GObject *object,
case PROP_COMMENT:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)-comment, value);
break;
+case PROP_GENRE:
+PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)-genre, value);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -307,6 +312,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_COMMENT:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-comment);
break;
+case PROP_GENRE:
+g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-genre);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -713,6 +721,21 @@ parole_stream_class_init (ParoleStreamClass *klass)
G_PARAM_READWRITE));
/**
+ * ParoleStream:genre:
+ *
+ * Genre.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_GENRE,
+ g_param_spec_string (genre,
+ Genre,
+ Genre,
+ NULL,
+ G_PARAM_READWRITE));
+
+/**
* ParoleStream:image_uri:
*
* URI for the currently playing album's artwork.
@@ -772,6 +795,7 @@ void parole_stream_init_properties (ParoleStream *stream)
PAROLE_STREAM_FREE_STR_PROP (priv-year);
PAROLE_STREAM_FREE_STR_PROP (priv-album);
PAROLE_STREAM_FREE_STR_PROP (priv-comment);
+PAROLE_STREAM_FREE_STR_PROP (priv-genre);
PAROLE_STREAM_FREE_STR_PROP (priv-image_uri);
/* Remove the previous image if it exists */
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 3a37389..58dbee4 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -441,7 +441,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gchar *tag, const g
static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder
*b)
{
-gchar *title, *album, *artist, *year, *comment, *stream_uri, *image_uri;
+gchar *title, *album, *artist, *year, *comment
[Xfce4-commits] parole:master Add fullscreen mpris2 functionality
Updating branch refs/heads/master
to e48f090c7c9c047e00a6b95dff84713599658adc (commit)
from 0e5fd5f87afcd5622ad8af083708a543fbfe7a45 (commit)
commit e48f090c7c9c047e00a6b95dff84713599658adc
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 06:55:20 2013 -0500
Add fullscreen mpris2 functionality
src/misc/parole-provider-player.c| 43 ++
src/misc/parole-provider-player.h| 10 +++
src/parole-player.c |2 +-
src/parole-plugin-player.c | 47 +
src/plugins/mpris2/mpris2-provider.c | 55 --
5 files changed, 154 insertions(+), 3 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 0dff22d..659ee71 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -434,3 +434,46 @@ GtkAction
*parole_provider_player_get_action(ParoleProviderPlayer *player, Parol
{
return parole_player_get_action(action);
}
+
+/**
+ * parole_provider_player_get_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ *
+ * Get fullscreen status for Parole.
+ *
+ * Since: 0.6
+ **/
+gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_stream )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)-get_fullscreen) (player);
+}
+
+return FALSE;
+}
+
+/**
+ * parole_provider_player_set_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ * @fullscreen: TRUE for fullscreen, FALSE for unfullscreen
+ *
+ * Set fullscreen status for Parole.
+ *
+ * Returns: TRUE if the fullscreen command succeeded, FALSE otherwise.
+ *
+ * Since: 0.6
+ **/
+gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player,
gboolean fullscreen)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_stream )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)-set_fullscreen) (player, fullscreen);
+}
+
+return FALSE;
+}
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 98bee2d..2ee85f6 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -80,6 +80,11 @@ struct _ParoleProviderPlayerIface
gboolean (*seek)(ParoleProviderPlayer *player,
gdouble pos);
+
+gboolean (*get_fullscreen) (ParoleProviderPlayer *player);
+
+gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
+ gboolean fullscreen);
void (*open_media_chooser) (ParoleProviderPlayer *player);
@@ -129,6 +134,11 @@ parole_provider_player_open_media_chooser
(ParoleProviderPlayer *player);
GtkAction *parole_provider_player_get_action(ParoleProviderPlayer *player,
ParolePlayerAction action);
+gbooleanparole_provider_player_get_fullscreen(ParoleProviderPlayer
*player);
+
+gbooleanparole_provider_player_set_fullscreen(ParoleProviderPlayer
*player,
+ gboolean fullscreen);
+
G_END_DECLS
#endif /* __PAROLE_PLUGIN_IFACE_H__ */
diff --git a/src/parole-player.c b/src/parole-player.c
index ddd8561..4764c0e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3027,7 +3027,7 @@ parole_player_init (ParolePlayer *player)
*/
/* ParolePlayer Window */
player-priv-window = GTK_WIDGET (gtk_builder_get_object (builder,
main-window));
-g_signal_connect( G_OBJECT(player-priv-window),
+g_signal_connect_after( G_OBJECT(player-priv-window),
window-state-event,
G_CALLBACK(parole_player_window_state_event),
PAROLE_PLAYER(player) );
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 2700cd8..8bd0922 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -52,6 +52,8 @@ struct ParolePluginPlayerPrivate
gulong state_changed;
gulong tag_message;
gboolean packed;
+
+gboolean fullscreen;
};
@@ -205,6 +207,29 @@ static void parole_plugin_player_open_media_chooser
(ParoleProviderPlayer *provi
g_object_unref (list);
}
+static gboolean parole_plugin_player_get_fullscreen (ParoleProviderPlayer
*provider)
+{
+ParolePluginPlayer *player;
+
+player = PAROLE_PLUGIN_PLAYER (provider);
+
+return player-priv-fullscreen;
+}
+
+static gboolean parole_plugin_player_set_fullscreen (ParoleProviderPlayer
*provider, gboolean
[Xfce4-commits] parole:master Patch to parole-master
Updating branch refs/heads/master
to f28e424562abfd1afdbb32e0023c9879b95e35ba (commit)
from 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7 (commit)
commit f28e424562abfd1afdbb32e0023c9879b95e35ba
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Nov 11 22:00:00 2013 -0500
Patch to parole-master
src/parole-conf-dialog.c | 166 --
src/parole-player.c | 30 ++---
2 files changed, 34 insertions(+), 162 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 9074e7e..63cc3d3 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -44,16 +44,6 @@
voidparole_conf_dialog_response_cb (GtkDialog *dialog,
gint response_id,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-void
-parole_conf_dialog_reset_saver_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget,
@@ -61,9 +51,8 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_subtitle_changed_cb (GObject *object,
+
+void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
GParamSpec *pspec,
gpointer *data);
@@ -85,26 +74,6 @@ voidsaturation_value_changed_cb
(GtkRange *range,
voidreset_color_clicked_cb (GtkButton *button,
ParoleConfDialog *self);
-
-voidreplace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremove_duplicated_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidstart_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremember_playlist_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidmultimedia_keys_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
/*
* End of GtkBuilder callbacks
@@ -139,65 +108,6 @@ parole_conf_dialog_destroy (GtkWidget *widget,
ParoleConfDialog *self)
gtk_widget_hide(widget);
}
-/* Replace the playlist with newly opened files */
-void replace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self-priv-conf),
- replace-playlist, gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Remove duplicate entries from the playlist FIXME */
-void remove_duplicated_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self-priv-conf),
- remove-duplicated, gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Automatically start playing opened files (vs. just adding them to the
playlist) */
-void start_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data
[Xfce4-commits] parole:master Add seeked signal
Updating branch refs/heads/master to d42144f794328c30c1662a40f950a10bd5e9446e (commit) from 3d390a079a60891db42c3c9c154a69c448430326 (commit) commit d42144f794328c30c1662a40f950a10bd5e9446e Author: Sean Davis smd.seanda...@gmail.com Date: Sun Dec 8 16:55:46 2013 -0500 Add seeked signal src/gst/gstmarshal.list |2 +- src/gst/parole-gst.c | 13 + src/gst/parole-gst.h |4 src/misc/parole-provider-player.c| 17 + src/misc/parole-provider-player.h|3 +++ src/parole-plugin-player.c | 13 + src/plugins/mpris2/mpris2-provider.c | 14 ++ 7 files changed, 65 insertions(+), 1 deletion(-) diff --git a/src/gst/gstmarshal.list b/src/gst/gstmarshal.list index 4447534..8c09ebc 100644 --- a/src/gst/gstmarshal.list +++ b/src/gst/gstmarshal.list @@ -1,4 +1,4 @@ VOID:OBJECT,ENUM VOID:OBJECT,INT64 VOID:OBJECT,INT - +VOID:OBJECT,DOUBLE diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index ea61a0e..e59112e 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -147,6 +147,7 @@ enum MEDIA_STATE, MEDIA_PROGRESSED, MEDIA_TAG, +MEDIA_SEEKED, BUFFERING, ERROR, DVD_CHAPTER_CHANGE, @@ -2312,6 +2313,16 @@ parole_gst_class_init (ParoleGstClass *klass) _gmarshal_VOID__OBJECT_INT64, G_TYPE_NONE, 2, G_TYPE_OBJECT, G_TYPE_INT64); + +signals[MEDIA_SEEKED] = +g_signal_new (media-seeked, +PAROLE_TYPE_GST, +G_SIGNAL_RUN_LAST, +G_STRUCT_OFFSET (ParoleGstClass, media_seeked), +NULL, NULL, +_gmarshal_VOID__OBJECT_DOUBLE, +G_TYPE_NONE, 1, +G_TYPE_DOUBLE); signals [MEDIA_TAG] = g_signal_new (media-tag, @@ -2628,6 +2639,8 @@ void parole_gst_seek (ParoleGst *gst, gdouble seek) GST_SEEK_FLAG_KEY_UNIT | GST_SEEK_FLAG_FLUSH, GST_SEEK_TYPE_SET, (int) seek * GST_SECOND, GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE)); + +g_signal_emit (G_OBJECT (gst), signals [MEDIA_SEEKED], 0, seek); } void parole_gst_set_volume (ParoleGst *gst, gdouble volume) diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h index 1584339..efb596c 100644 --- a/src/gst/parole-gst.h +++ b/src/gst/parole-gst.h @@ -76,6 +76,10 @@ typedef struct void(*media_progressed) (ParoleGst *gst, const ParoleStream *stream, gint64 value); + +void(*media_seeked) (ParoleGst *gst, + const ParoleStream *stream, + gdouble value); void(*buffering)(ParoleGst *gst, const ParoleStream *stream, diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c index 7ee95eb..4496170 100644 --- a/src/misc/parole-provider-player.c +++ b/src/misc/parole-provider-player.c @@ -101,6 +101,23 @@ static void parole_provider_player_base_init (gpointer klass) NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, PAROLE_TYPE_STREAM); + +/** + * ParoleProviderPlayerIface::seeked: + * @player: the object which received the signal. + * @value: the seeked position. + * + * Notifies when the stream has been manually advanced. + * + * Since: 0.6 + **/ +g_signal_new (seeked, +G_TYPE_FROM_INTERFACE (klass), +G_SIGNAL_RUN_LAST, +G_STRUCT_OFFSET (ParoleProviderPlayerIface, seeked), +NULL, NULL, +g_cclosure_marshal_VOID__DOUBLE, +G_TYPE_NONE, 1, G_TYPE_DOUBLE); initialized = TRUE; } diff --git a/src/misc/parole-provider-player.h b/src/misc/parole-provider-player.h index 73ddc5f..0c93d8e 100644 --- a/src/misc/parole-provider-player.h +++ b/src/misc/parole-provider-player.h @@ -93,6 +93,9 @@ struct _ParoleProviderPlayerIface /* signals */ void (*tag_message) (ParoleProviderPlayer *player, const ParoleStream *stream); + +void (*seeked) (ParoleProviderPlayer *player, + gdouble
[Xfce4-commits] parole:master Populate uri schemes and uri schemes
Updating branch refs/heads/master
to 6d9c6fa9b028e6292650eba664426baebbb81666 (commit)
from f28e424562abfd1afdbb32e0023c9879b95e35ba (commit)
commit 6d9c6fa9b028e6292650eba664426baebbb81666
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Nov 16 20:56:12 2013 -0500
Populate uri schemes and uri schemes
src/plugins/mpris2/mpris2-provider.c | 44 +++---
1 file changed, 35 insertions(+), 9 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 612193f..37986c1 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -177,21 +177,47 @@ static GVariant* mpris_Root_get_DesktopEntry (GError
**error, Mpris2Provider *pr
static GVariant* mpris_Root_get_SupportedUriSchemes (GError **error,
Mpris2Provider *provider)
{
-// TODO Complete uris schemes
return g_variant_parse(G_VARIANT_TYPE(as),
-['file', 'cdda'], NULL, NULL, NULL);
+['cdda', 'dvd', 'file', 'icy', 'icyx', 'mms', 'mmsh', net',
+'pnm', 'rtmp', 'rtp', 'rtsp', 'uvox'], NULL, NULL, NULL);
}
static GVariant* mpris_Root_get_SupportedMimeTypes (GError **error,
Mpris2Provider *provider)
{
-// TODO Fixs mime tyme. This are of Pragha
return g_variant_parse(G_VARIANT_TYPE(as),
-['audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg', 'audio/mpeg3',
-'audio/mp3', 'application/ogg', 'application/x-ogg', 'audio/vorbis',
-'audio/x-vorbis', 'audio/ogg', 'audio/x-ogg', 'audio/x-flac',
-'video/x-ms-asf', 'audio/x-ms-wma', 'audio/x-m4a',
-'application/x-ape', 'audio/ape', 'audio/x-ape',
-'application/x-flac', 'audio/flac', 'audio/x-wav'], NULL, NULL,
NULL);
+['application/mxf', 'application/ogg', 'application/ram',
+'application/sdp', 'application/vnd.apple.mpegurl',
+'application/vnd.ms-wpl', 'application/vnd.rn-realmedia',
+'application/vnd.rn-realmedia', 'application/x-extension-m4a',
+'application/x-extension-mp4', 'application/x-flac',
+'application/x-flash-video', 'application/x-matroska',
+'application/x-netshow-channel', 'application/x-ogg',
+'application/x-quicktimeplayer', 'application/x-shorten',
+'audio/3gpp', 'audio/ac3', 'audio/AMR', 'audio/AMR-WB',
+'audio/basic', 'audio/flac', 'audio/midi', 'audio/mp2', 'audio/mp4',
+'audio/mpeg', 'audio/ogg', 'audio/prs.sid', 'audio/vnd.rn-realaudio',
+'audio/x-aiff', 'audio/x-ape', 'audio/x-flac', 'audio/x-gsm',
+'audio/x-it', 'audio/x-m4a', 'audio/x-matroska', 'audio/x-mod',
+'audio/x-mp3', 'audio/x-mpeg', 'audio/x-ms-asf', 'audio/x-ms-asx',
+'audio/x-ms-wax', 'audio/x-ms-wma', 'audio/x-musepack',
+'audio/x-pn-aiff', 'audio/x-pn-au', 'audio/x-pn-realaudio',
+'audio/x-pn-wav', 'audio/x-pn-windows-acm', 'audio/x-real-audio',
+'audio/x-realaudio', 'audio/x-s3m', 'audio/x-sbc', 'audio/x-speex',
+'audio/x-stm', 'audio/x-tta', 'audio/x-vorbis', 'audio/x-vorbis+ogg',
+'audio/x-wav', 'audio/x-wavpack', 'audio/x-xm',
+'image/vnd.rn-realpix', 'image/x-pict', 'misc/ultravox',
+'text/x-google-video-pointer', 'video/3gp', 'video/3gpp',
+'video/divx', 'video/dv', 'video/fli', 'video/flv', 'video/mp2t',
+'video/mp4', 'video/mp4v-es', 'video/mpeg', 'video/msvideo',
+'video/ogg', 'video/quicktime', 'video/vivo', 'video/vnd.divx',
+'video/vnd.mpegurl', 'video/vnd.rn-realvideo', 'video/vnd.vivo',
+'video/webm', 'video/x-anim', 'video/x-avi', 'video/x-flc',
+'video/x-fli', 'video/x-flic', 'video/x-flv', 'video/x-m4v',
+'video/x-matroska', 'video/x-mpeg', 'video/x-mpeg2',
+'video/x-ms-asf', 'video/x-ms-asx', 'video/x-msvideo',
+'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wmx',
+'video/x-ms-wvx', 'video/x-nsv', 'video/x-ogm+ogg',
+'video/x-theora+ogg', 'video/x-totem-stream'], NULL, NULL, NULL);
}
/*
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add album art functionality
Updating branch refs/heads/master
to d132bc7880c30ceedcb1aaf5ed1752929680d1ee (commit)
from 9276bc68d7dca3d68590bad6ae217346b59776ae (commit)
commit d132bc7880c30ceedcb1aaf5ed1752929680d1ee
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 11:08:56 2013 -0500
Add album art functionality
src/misc/parole-stream.c | 53 +-
src/plugins/mpris2/mpris2-provider.c |7 +++--
2 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index dc403f9..2c22120 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -29,6 +29,7 @@
#include string.h
#include glib.h
+#include glib/gstdio.h
#include parole-stream.h
#include parole-enum-types.h
@@ -71,6 +72,7 @@ struct _ParoleStreamPrivate
gchar *album;
gchar *comment;
GdkPixbuf *image;
+gchar *image_uri, *previous_image;
ParoleMediaType media_type;
};
@@ -98,7 +100,8 @@ enum
PROP_ARTIST,
PROP_YEAR,
PROP_ALBUM,
-PROP_COMMENT
+PROP_COMMENT,
+PROP_IMAGE_URI
};
G_DEFINE_TYPE (ParoleStream, parole_stream, G_TYPE_OBJECT)
@@ -149,6 +152,11 @@ static void parole_stream_set_property (GObject *object,
parole_stream_get_media_type_from_uri (stream, priv-uri);
break;
}
+case PROP_IMAGE_URI:
+{
+PAROLE_STREAM_GET_PRIVATE (stream)-image_uri = g_value_dup_string
(value);
+break;
+}
case PROP_SUBTITLES:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)-subtitles, value);
break;
@@ -236,6 +244,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_URI:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-uri);
break;
+case PROP_IMAGE_URI:
+g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-image_uri);
+break;
case PROP_SUBTITLES:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-subtitles);
break;
@@ -318,6 +329,8 @@ void
parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
{
ParoleStream *stream;
+gchar *filename = NULL;
+gint fid;
stream = PAROLE_STREAM (object);
@@ -325,9 +338,24 @@ parole_stream_set_image (GObject *object, GdkPixbuf
*pixbuf)
g_object_unref(G_OBJECT(PAROLE_STREAM_GET_PRIVATE (stream)-image));
if (pixbuf)
+{
PAROLE_STREAM_GET_PRIVATE (stream)-image = gdk_pixbuf_copy(pixbuf);
+
+/* Create a jpeg of the artwork for other components to easily access
*/
+fid = g_file_open_tmp (parole-art-XX.jpg, filename, NULL);
+close(fid);
+gdk_pixbuf_save (pixbuf, filename, jpeg, NULL, quality, 100,
NULL);
+
+PAROLE_STREAM_GET_PRIVATE (stream)-previous_image =
g_strdup(filename);
+PAROLE_STREAM_GET_PRIVATE (stream)-image_uri =
g_strdup_printf(file://%s, filename);
+g_free(filename);
+}
else
+{
PAROLE_STREAM_GET_PRIVATE (stream)-image = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)-previous_image = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)-image_uri = NULL;
+}
}
GdkPixbuf *
@@ -683,6 +711,21 @@ parole_stream_class_init (ParoleStreamClass *klass)
Comment,
NULL,
G_PARAM_READWRITE));
+
+/**
+ * ParoleStream:image_uri:
+ *
+ * URI for the currently playing album's artwork.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_IMAGE_URI,
+ g_param_spec_string (image_uri,
+ Image URI,
+ URI for the album artwork,
+ NULL,
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
@@ -729,4 +772,12 @@ void parole_stream_init_properties (ParoleStream *stream)
PAROLE_STREAM_FREE_STR_PROP (priv-year);
PAROLE_STREAM_FREE_STR_PROP (priv-album);
PAROLE_STREAM_FREE_STR_PROP (priv-comment);
+PAROLE_STREAM_FREE_STR_PROP (priv-image_uri);
+
+/* Remove the previous image if it exists */
+if ( PAROLE_STREAM_GET_PRIVATE (stream)-previous_image )
+{
+g_remove (PAROLE_STREAM_GET_PRIVATE (stream)-previous_image);
+}
+PAROLE_STREAM_GET_PRIVATE (stream)-previous_image = NULL;
}
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 465ef59..ebc34c5 100644
[Xfce4-commits] parole:master Implement SeekBy and SetPosition
Updating branch refs/heads/master
to ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686 (commit)
from ff441e3e265ef10dc0dca7f17e8666f3571a77d6 (commit)
commit ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Dec 7 16:27:07 2013 -0500
Implement SeekBy and SetPosition
src/misc/parole-provider-player.c|4 +--
src/plugins/mpris2/Makefile.am |2 ++
src/plugins/mpris2/mpris2-provider.c | 52 --
3 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index e82303e..7ee95eb 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -403,10 +403,10 @@ gboolean parole_provider_player_seek
(ParoleProviderPlayer *player, gdouble pos)
}
/**
- * parole_provider_player_get_fullscreen:
+ * parole_provider_player_get_stream_position:
* @player: a #ParoleProviderPlayer
*
- * Get fullscreen status for Parole.
+ * Get stream position (microseconds) for Parole.
*
* Since: 0.6
**/
diff --git a/src/plugins/mpris2/Makefile.am b/src/plugins/mpris2/Makefile.am
index df747d1..ba9f37d 100644
--- a/src/plugins/mpris2/Makefile.am
+++ b/src/plugins/mpris2/Makefile.am
@@ -20,6 +20,7 @@ parole_mpris2_la_SOURCES =\
parole_mpris2_la_CFLAGS = \
$(PLATFORM_CFLAGS) \
$(GTK_CFLAGS) \
+$(GST_INTERFACES_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS)
parole_mpris2_la_LDFLAGS = \
@@ -31,6 +32,7 @@ parole_mpris2_la_LDFLAGS =\
parole_mpris2_la_LIBADD = \
$(top_builddir)/src/misc/libparole.la \
$(GTK_LIBS) \
+ $(GST_LIBS) \
$(LIBXFCE4UTIL_LIBS)
#
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 3b5fb35..5b5f12a 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -24,6 +24,8 @@
#include mpris2-provider.h
+#include gst/tag/tag.h
+
static void mpris2_provider_iface_init (ParoleProviderPluginIface
*iface);
static void mpris2_provider_finalize (GObject
*object);
@@ -329,13 +331,59 @@ static void mpris_Player_Stop (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant*
parameters, Mpris2Provider *provider)
{
-// TODO: Implement seek..
+ParoleProviderPlayer *player = provider-player;
+
+if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+g_dbus_method_invocation_return_error_literal (invocation,
+G_DBUS_ERROR, G_DBUS_ERROR_FAILED, Nothing to seek);
+return;
+}
+
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+
+gint64 param;
+g_variant_get(parameters, (x), param);
+
+gint64 curr_pos = parole_provider_player_get_stream_position (player);
+gint64 seek = (curr_pos + param) / GST_MSECOND;
+
+gint64 duration;
+g_object_get (G_OBJECT (stream), duration, duration, NULL);
+
+seek = CLAMP (seek, 0, duration);
+
+parole_provider_player_seek (player, seek);
+
g_dbus_method_invocation_return_value (invocation, NULL);
}
static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation,
GVariant* parameters, Mpris2Provider *provider)
{
-// TODO: Implement set position..
+ParoleProviderPlayer *player = provider-player;
+
+if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
+g_dbus_method_invocation_return_error_literal (invocation,
+G_DBUS_ERROR, G_DBUS_ERROR_FAILED, Nothing to seek);
+return;
+}
+
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gchar *track_id = NULL;
+
+/* Do we need to do anything with track_id? */
+gint64 param;
+g_variant_get(parameters, (ox), track_id, param);
+g_free(track_id);
+
+gint64 seek = param / GST_MSECOND;
+
+gint64 duration;
+g_object_get (G_OBJECT (stream), duration, duration, NULL);
+
+seek = CLAMP (seek, 0, duration);
+
+parole_provider_player_seek (player, seek);
+
g_dbus_method_invocation_return_value (invocation, NULL);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Ignore artwork if video
Updating branch refs/heads/master
to 5bbb38b777f6ab613880e8ad786c8535912a8e1a (commit)
from 20f5473559b4c560985a211c1741ec9bc4e97fdf (commit)
commit 5bbb38b777f6ab613880e8ad786c8535912a8e1a
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Dec 8 17:40:12 2013 -0500
Ignore artwork if video
src/plugins/mpris2/mpris2-provider.c |8
1 file changed, 8 insertions(+)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 106c08c..1d99bce 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -506,6 +506,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre,
*image_uri;
gint track_id, bitrate;
gint64 duration;
+gboolean has_video;
g_object_get (G_OBJECT (stream),
title, title,
@@ -519,7 +520,14 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
image_uri, image_uri,
track, track_id,
bitrate, bitrate,
+ has-video, has_video,
NULL);
+
+if (has_video)
+{
+g_free(image_uri);
+image_uri = NULL;
+}
g_variant_builder_add (b, {sv}, mpris:trackid,
handle_get_trackid(stream));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix OpenUri to append the track to the playlist and play
Updating branch refs/heads/master
to 20f5473559b4c560985a211c1741ec9bc4e97fdf (commit)
from d42144f794328c30c1662a40f950a10bd5e9446e (commit)
commit 20f5473559b4c560985a211c1741ec9bc4e97fdf
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Dec 8 17:21:33 2013 -0500
Fix OpenUri to append the track to the playlist and play
src/parole-medialist.c | 16 +++-
src/parole-medialist.h |3 +++
src/parole-plugin-player.c |9 +
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 7cd1653..0501e29 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -437,23 +437,29 @@ parole_media_list_files_opened_cb (ParoleMediaChooser
*chooser,
parole_media_list_files_open (list, files, FALSE, play);
}
-static void
-parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar
*location, ParoleMediaList *list)
+void
+parole_media_list_open_uri (ParoleMediaList *list, const gchar *uri)
{
ParoleFile *file;
-if ( parole_is_uri_disc (location) )
+if ( parole_is_uri_disc (uri) )
{
-g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, location);
+g_signal_emit (G_OBJECT (list), signals [URI_OPENED], 0, uri);
}
else
{
-file = parole_file_new (location);
+file = parole_file_new (uri);
parole_media_list_add (list, file, FALSE, TRUE, TRUE);
}
}
static void
+parole_media_list_location_opened_cb (ParoleOpenLocation *obj, const gchar
*location, ParoleMediaList *list)
+{
+parole_media_list_open_uri(list, location);
+}
+
+static void
parole_media_list_iso_opened_cb (ParoleMediaChooser *chooser,
gchar *filename,
ParoleMediaList *list)
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 649d4f6..548b986 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -156,6 +156,9 @@ voidparole_media_list_open
(ParoleMediaList *list);
voidparole_media_list_open_location (ParoleMediaList *list);
+voidparole_media_list_open_uri (ParoleMediaList *list,
+ const gchar *uri);
+
gbooleanparole_media_list_add_files (ParoleMediaList *list,
gchar **filenames,
gboolean enqueue);
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index ba5634f..3f22619 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -125,11 +125,12 @@ parole_plugin_player_get_stream (ParoleProviderPlayer
*provider)
static gboolean
parole_plugin_player_play_uri (ParoleProviderPlayer *provider, const gchar
*uri)
{
-ParolePluginPlayer *player;
-
-player = PAROLE_PLUGIN_PLAYER (provider);
+ParoleMediaList *list;
+
+list = PAROLE_MEDIA_LIST (parole_media_list_get ());
+parole_media_list_open_uri (list, uri);
-parole_gst_play_uri (PAROLE_GST (player-priv-gst), uri, NULL);
+g_object_unref (list);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Use G_BINDING_SYNC_CREATE for binding settings and initial values
Updating branch refs/heads/master
to 91e44144a932fbe91966d630f37a42348e609a96 (commit)
from 60f9808d30af676995c04c8553b1ac5c874ee301 (commit)
commit 91e44144a932fbe91966d630f37a42348e609a96
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 22:42:48 2013 -0500
Use G_BINDING_SYNC_CREATE for binding settings and initial values
src/parole-conf-dialog.c | 91 --
src/parole-player.c | 15 +---
2 files changed, 10 insertions(+), 96 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 63cc3d3..45c10a4 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -305,87 +305,17 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel
*model, GtkTreePath *pat
return ret;
}
-/* Load the default playlist settings */
-static void
-parole_conf_dialog_set_defaults_playlist (ParoleConfDialog *self, GtkBuilder
*builder)
-{
-GtkWidget *widget;
-gboolean option;
-
-/**
- * Replace playlist with opened files.
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder, replace-playlist));
-
-g_object_get (G_OBJECT (self-priv-conf),
- replace-playlist, option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Start playing opened files
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
start-playing-opened));
-
-g_object_get (G_OBJECT (self-priv-conf),
- play-opened-files, option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remove duplicated playlist entries
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
remove-duplicated));
-
-g_object_get (G_OBJECT (self-priv-conf),
- remove-duplicated, option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-
- /**
- * Remember playlist
- **/
-widget = GTK_WIDGET (gtk_builder_get_object (builder,
remember-playlist));
-
-g_object_get (G_OBJECT (self-priv-conf),
- remember-playlist, option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
-/* Load the multimedia-button default settings */
-static void
-parole_conf_dialog_set_defaults_general (ParoleConfDialog *self, GtkBuilder
*builder)
-{
-GtkWidget *widget;
-gboolean option;
-
-widget = GTK_WIDGET (gtk_builder_get_object (builder, multimedia-keys));
-
-g_object_get (G_OBJECT (self-priv-conf),
- multimedia-keys, option,
- NULL);
-
-gtk_switch_set_active (GTK_SWITCH (widget), option);
-}
-
/* Load the rest of the settings stored in the rc file */
static void
parole_conf_dialog_set_defaults (ParoleConfDialog *self)
{
GtkTreeModel *model;
gboolean vis_enabled;
-gboolean subtitle;
gchar *subtitle_font;
gchar *subtitle_encoding;
g_object_get (G_OBJECT (self-priv-conf),
vis-enabled, vis_enabled,
- enable-subtitle, subtitle,
subtitle-font, subtitle_font,
subtitle-encoding, subtitle_encoding,
NULL);
@@ -393,9 +323,6 @@ parole_conf_dialog_set_defaults (ParoleConfDialog *self)
/* Update widget-states according to settings */
gtk_widget_set_sensitive (self-priv-vis_combox, vis_enabled);
-gtk_switch_set_active (GTK_SWITCH (self-priv-toggle_vis), vis_enabled);
-gtk_switch_set_active (GTK_SWITCH (self-priv-toggle_subtitle), subtitle);
-
model = gtk_combo_box_get_model (GTK_COMBO_BOX (self-priv-vis_combox));
gtk_tree_model_foreach (model,
@@ -446,8 +373,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
self-priv-vis_combox = combox;
parole_conf_dialog_set_defaults (self);
-parole_conf_dialog_set_defaults_general (self, builder);
-parole_conf_dialog_set_defaults_playlist (self, builder);
with_display = parole_gst_get_is_xvimage_sink (PAROLE_GST (parole_gst_get
()));
@@ -494,50 +419,50 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder,
reset-saver));
g_object_bind_property(G_OBJECT (self-priv-conf), reset-saver,
switch_widget, active,
- G_BINDING_BIDIRECTIONAL);
+ G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
/* General/Audio/Enable visualization while playing audio file */
switch_widget = GTK_WIDGET (gtk_builder_get_object (builder,
enable-vis));
g_object_bind_property(G_OBJECT (self-priv-conf), vis-enabled,
switch_widget, active
[Xfce4-commits] parole:master Fix xfconf notify when property changes
Updating branch refs/heads/master
to 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7 (commit)
from 38f53010485fc03c737ffd0b0144a2538bd5a7c8 (commit)
commit 4dcd29ac684c91d9dfdee42a74c992e6fc5bafd7
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Nov 11 21:52:20 2013 -0500
Fix xfconf notify when property changes
src/parole-conf.c | 77 +
1 file changed, 66 insertions(+), 11 deletions(-)
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 092ff45..ccee601 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -91,6 +91,8 @@ static void parole_conf_get_property(GObject
*object,
guint prop_id,
GValue *value,
GParamSpec *pspec);
+gchar
+*parole_conf_map_xfconf_property_name (const gchar *prop_name);
static void parole_conf_set_property(GObject*object,
guint prop_id,
const GValue *value,
@@ -257,6 +259,69 @@ static void parole_conf_get_property (GObject *object,
}
}
+/* Facilitate the conversion from xfconf property name to parole property name
*/
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+{
+gchar *value = NULL;
+if (g_strcmp0(prop_name, /audio/visualization-enabled) == 0)
+value = g_strdup(vis-enabled);
+if (g_strcmp0(prop_name, /audio/visualization-name) == 0)
+value = g_strdup(vis-name);
+if (g_strcmp0(prop_name, /audio/volume) == 0)
+value = g_strdup(volume);
+if (g_strcmp0(prop_name, /folders/last-used-media) == 0)
+value = g_strdup(media-chooser-folder);
+if (g_strcmp0(prop_name, /parole/multimedia-keys) == 0)
+value = g_strdup(multimedia-keys);
+if (g_strcmp0(prop_name, /parole/plugins) == 0)
+value = g_strdup(plugins);
+if (g_strcmp0(prop_name, scan-recursive) == 0)
+value = g_strdup(/parole/scan-recursive);
+if (g_strcmp0(prop_name, /playlist/remember-playlist) == 0)
+value = g_strdup(remember-playlist);
+if (g_strcmp0(prop_name, /playlist/remove-duplicates) == 0)
+value = g_strdup(remove-duplicated);
+if (g_strcmp0(prop_name, /playlist/repeat) == 0)
+value = g_strdup(repeat);
+if (g_strcmp0(prop_name, /playlist/replace-playlist) == 0)
+value = g_strdup(replace-playlist);
+if (g_strcmp0(prop_name, /playlist/show-playlist) == 0)
+value = g_strdup(showhide-playlist);
+if (g_strcmp0(prop_name, /playlist/shuffle) == 0)
+value = g_strdup(shuffle);
+if (g_strcmp0(prop_name, /playlist/play-opened-files) == 0)
+value = g_strdup(play-opened-files);
+if (g_strcmp0(prop_name, /subtitles/enabled) == 0)
+value = g_strdup(enable-subtitle);
+if (g_strcmp0(prop_name, /subtitles/encoding) == 0)
+value = g_strdup(subtitle-encoding);
+if (g_strcmp0(prop_name, /subtitles/font) == 0)
+value = g_strdup(subtitle-font);
+if (g_strcmp0(prop_name, /video/aspect-ratio) == 0)
+value = g_strdup(aspect-ratio);
+if (g_strcmp0(prop_name, /video/brightness) == 0)
+value = g_strdup(brightness);
+if (g_strcmp0(prop_name, /video/contrast) == 0)
+value = g_strdup(contrast);
+if (g_strcmp0(prop_name, /video/disable-screensaver) == 0)
+value = g_strdup(reset-saver);
+if (g_strcmp0(prop_name, /video/enable-xv) == 0)
+value = g_strdup(enable-xv);
+if (g_strcmp0(prop_name, /video/hue) == 0)
+value = g_strdup(hue);
+if (g_strcmp0(prop_name, /video/saturation) == 0)
+value = g_strdup(saturation);
+if (g_strcmp0(prop_name, /window/height) == 0)
+value = g_strdup(window-height);
+if (g_strcmp0(prop_name, /window/minimized) == 0)
+value = g_strdup(minimized);
+if (g_strcmp0(prop_name, /window/maximized) == 0)
+value = g_strdup(window-maximized);
+if (g_strcmp0(prop_name, /window/width) == 0)
+value = g_strdup(window-width);
+return value;
+}
+
/**
* parole_conf_prop_changed:
* @channel : the #XfconfChannel where settings are stored.
@@ -274,17 +339,7 @@ static void parole_conf_prop_changed(XfconfChannel
*channel,
GParamSpec *pspec;
/* check if the property exists and emit change */
-pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf), prop_name
+ 1);
-if (!pspec)
-{
- /* sometimes only the pure property name works, e.g. 'repeat' */
- const gchar *base_name = strrchr(prop_name, '/');
- if(base_name)
- {
- base_name++; /* 'repeat', not '/repeat' */
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf),
base_name);
- }
-}
+pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf
[Xfce4-commits] parole:master Fix warning for CanPause being False when the player is currently paused
Updating branch refs/heads/master
to 9276bc68d7dca3d68590bad6ae217346b59776ae (commit)
from e48f090c7c9c047e00a6b95dff84713599658adc (commit)
commit 9276bc68d7dca3d68590bad6ae217346b59776ae
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 07:03:59 2013 -0500
Fix warning for CanPause being False when the player is currently paused
src/plugins/mpris2/mpris2-provider.c |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 1dd8195..465ef59 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -570,15 +570,19 @@ static GVariant* mpris_Player_get_CanGoPrevious (GError
**error, Mpris2Provider
static GVariant* mpris_Player_get_CanPlay (GError **error, Mpris2Provider
*provider)
{
// TODO: this can cause a UI-lock
+/* The CanPlay property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider-player;
-return g_variant_new_boolean(parole_provider_player_get_state (player) ==
PAROLE_STATE_PAUSED);
+gint state = parole_provider_player_get_state (player);
+return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state ==
PAROLE_STATE_PLAYING);
}
static GVariant* mpris_Player_get_CanPause (GError **error, Mpris2Provider
*provider)
{
// TODO: this can cause a UI-lock
+/* The CanPause property should be true when the player is playing or
paused. */
ParoleProviderPlayer *player = provider-player;
-return g_variant_new_boolean(parole_provider_player_get_state (player) ==
PAROLE_STATE_PLAYING);
+gint state = parole_provider_player_get_state (player);
+return g_variant_new_boolean (state == PAROLE_STATE_PAUSED || state ==
PAROLE_STATE_PLAYING);
}
static GVariant* mpris_Player_get_CanSeek (GError **error, Mpris2Provider
*provider)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix genre for real
Updating branch refs/heads/master
to 01c98b546a494d63225b8101ff17b3f01df62277 (commit)
from 026ed6b8ad4fd15293b00c2c47e83bfe4165b5e2 (commit)
commit 01c98b546a494d63225b8101ff17b3f01df62277
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 14:52:24 2013 -0500
Fix genre for real
src/plugins/mpris2/mpris2-provider.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 58dbee4..2d6709e 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -469,8 +469,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
handle_strings_request(b, xesam:artist, artist);
g_variant_builder_add (b, {sv}, xesam:album,
g_variant_new_string(album));
-g_variant_builder_add (b, xesam:genre,
-g_variant_new_string(genre));
+handle_strings_request(b, xesam:genre, genre);
g_variant_builder_add (b, {sv}, xesam:contentCreated,
g_variant_new_string(year));
g_variant_builder_add (b, {sv}, xesam:trackNumber,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix Track ID
Updating branch refs/heads/master
to 28472fbc56401e120bdd9747c2cb1e703920b872 (commit)
from d132bc7880c30ceedcb1aaf5ed1752929680d1ee (commit)
commit 28472fbc56401e120bdd9747c2cb1e703920b872
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 14:31:28 2013 -0500
Fix Track ID
src/gst/parole-gst.c | 10 ++
src/plugins/mpris2/mpris2-provider.c | 12 +++-
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 7fc18cd..3dc1191 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1297,6 +1297,8 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
{
gchar *str;
GDate *date;
+guint integer;
+
GdkPixbuf *pixbuf;
if ( gst_tag_list_get_string_index (tag, GST_TAG_TITLE, 0, str) )
@@ -1347,6 +1349,14 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
g_free (str);
}
+if ( gst_tag_list_get_uint (tag, GST_TAG_TRACK_NUMBER, integer) )
+{
+TRACE (track:%i, integer);
+g_object_set (G_OBJECT (gst-priv-stream),
+ track, integer,
+ NULL);
+}
+
pixbuf = parole_gst_tag_list_get_cover (gst, tag);
if (pixbuf)
{
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index ebc34c5..3a37389 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -442,6 +442,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gchar *tag, const g
static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder
*b)
{
gchar *title, *album, *artist, *year, *comment, *stream_uri, *image_uri;
+gint track_id;
gint64 duration;
g_object_get (G_OBJECT (stream),
@@ -453,6 +454,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
duration, duration,
uri, stream_uri,
image_uri, image_uri,
+ track, track_id,
NULL);
g_variant_builder_add (b, {sv}, mpris:trackid,
@@ -466,19 +468,19 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
handle_strings_request(b, xesam:artist, artist);
g_variant_builder_add (b, {sv}, xesam:album,
g_variant_new_string(album));
-handle_strings_request(b, xesam:genre, unknown); // FIXME: genre was
mandatory?
+handle_strings_request(b, xesam:genre, unknown);//
GST_TAG_GENRE
g_variant_builder_add (b, {sv}, xesam:contentCreated,
g_variant_new_string(year));
g_variant_builder_add (b, {sv}, xesam:trackNumber,
-g_variant_new_int32(0));
+g_variant_new_int32(track_id));
handle_strings_request(b, xesam:comment, comment);
g_variant_builder_add (b, {sv}, mpris:length,
g_variant_new_int64((gint64)duration * 100));
-g_variant_builder_add (b, {sv}, audio-bitrate, // TODO: How get audio
properties?
+g_variant_builder_add (b, {sv}, audio-bitrate, //
GST_TAG_BITRATE
g_variant_new_int32(0));
-g_variant_builder_add (b, {sv}, audio-channels,
+g_variant_builder_add (b, {sv}, audio-channels, // No GST_TAG
g_variant_new_int32(0));
-g_variant_builder_add (b, {sv}, audio-samplerate,
+g_variant_builder_add (b, {sv}, audio-samplerate, // No GST_TAG
g_variant_new_int32(0));
g_free(title);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add bitrate
Updating branch refs/heads/master
to 5a131b68acad5f22e0e56f1c8814a8747c6d54ac (commit)
from 01c98b546a494d63225b8101ff17b3f01df62277 (commit)
commit 5a131b68acad5f22e0e56f1c8814a8747c6d54ac
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 15:19:44 2013 -0500
Add bitrate
src/gst/parole-gst.c |8
src/misc/parole-stream.c | 25 +
src/plugins/mpris2/mpris2-provider.c |8 +---
3 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index e6528b0..b18f425 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -1367,6 +1367,14 @@ parole_gst_get_meta_data_local_file (ParoleGst *gst,
GstTagList *tag)
NULL);
}
+if ( gst_tag_list_get_uint (tag, GST_TAG_BITRATE, integer) )
+{
+TRACE (bitrate:%i, integer);
+g_object_set (G_OBJECT (gst-priv-stream),
+ bitrate, integer,
+ NULL);
+}
+
pixbuf = parole_gst_tag_list_get_cover (gst, tag);
if (pixbuf)
{
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 2744f06..82d8e32 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -72,6 +72,7 @@ struct _ParoleStreamPrivate
gchar *album;
gchar *comment;
gchar *genre;
+guint bitrate;
GdkPixbuf *image;
gchar *image_uri, *previous_image;
@@ -103,6 +104,7 @@ enum
PROP_ALBUM,
PROP_COMMENT,
PROP_GENRE,
+PROP_BITRATE,
PROP_IMAGE_URI
};
@@ -230,6 +232,9 @@ static void parole_stream_set_property (GObject *object,
case PROP_GENRE:
PAROLE_STREAM_DUP_GVALUE_STRING (PAROLE_STREAM_GET_PRIVATE
(stream)-genre, value);
break;
+case PROP_BITRATE:
+PAROLE_STREAM_GET_PRIVATE (stream)-bitrate = g_value_get_uint
(value);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -315,6 +320,9 @@ static void parole_stream_get_property (GObject *object,
case PROP_GENRE:
g_value_set_string (value, PAROLE_STREAM_GET_PRIVATE
(stream)-genre);
break;
+case PROP_BITRATE:
+g_value_set_uint (value, PAROLE_STREAM_GET_PRIVATE
(stream)-bitrate);
+break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -749,6 +757,22 @@ parole_stream_class_init (ParoleStreamClass *klass)
URI for the album artwork,
NULL,
G_PARAM_READWRITE));
+
+/**
+ * ParoleStream:bitrate:
+ *
+ * Current bitrate in bits/s.
+ *
+ * Since: 0.6
+ **/
+g_object_class_install_property (object_class,
+ PROP_BITRATE,
+ g_param_spec_uint (bitrate,
+ Bitrate,
+ Bitrate,
+ 0, 2147483647,
+ 0,
+ G_PARAM_READWRITE));
g_type_class_add_private (klass, sizeof (ParoleStreamPrivate));
}
@@ -787,6 +811,7 @@ void parole_stream_init_properties (ParoleStream *stream)
priv-track = 1;
priv-disp_par_n = 1;
priv-disp_par_d = 1;
+priv-bitrate = 0;
PAROLE_STREAM_FREE_STR_PROP (priv-title);
PAROLE_STREAM_FREE_STR_PROP (priv-uri);
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 2d6709e..01c0bea 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -442,7 +442,7 @@ static void handle_strings_request(GVariantBuilder *b,
const gchar *tag, const g
static void handle_get_metadata (const ParoleStream *stream, GVariantBuilder
*b)
{
gchar *title, *album, *artist, *year, *comment, *stream_uri, *genre,
*image_uri;
-gint track_id;
+gint track_id, bitrate;
gint64 duration;
g_object_get (G_OBJECT (stream),
@@ -456,6 +456,7 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
genre, genre,
image_uri, image_uri,
track, track_id,
+ bitrate, bitrate,
NULL);
g_variant_builder_add (b, {sv}, mpris:trackid,
@@ -477,8 +478,8 @@ static void handle_get_metadata (const ParoleStream
*stream, GVariantBuilder *b)
handle_strings_request(b, xesam:comment, comment);
g_variant_builder_add (b, {sv}, mpris:length,
g_variant_new_int64((gint64
[Xfce4-commits] parole:master Fix debug builds, enable no-cover albumart
Updating branch refs/heads/master
to 5bddac966a1fcd33dc3e4e26465e921142096a02 (commit)
from ed2adfb6e94944cb2a19bf8f9e3dd0e92afcb686 (commit)
commit 5bddac966a1fcd33dc3e4e26465e921142096a02
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Dec 8 07:02:37 2013 -0500
Fix debug builds, enable no-cover albumart
data/pixmaps/Makefile.am |3 ++-
data/pixmaps/no-cover.png| Bin 0 - 11327 bytes
src/misc/parole-stream.c |2 +-
src/plugins/mpris2/mpris2-provider.c | 28 ++--
4 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am
index 44c3121..ec31ae3 100644
--- a/data/pixmaps/Makefile.am
+++ b/data/pixmaps/Makefile.am
@@ -1,5 +1,6 @@
pixmaps = \
- parole.png
+ parole.png \
+ no-cover.png
pixmaps_DATA = \
$(pixmaps)
diff --git a/data/pixmaps/no-cover.png b/data/pixmaps/no-cover.png
new file mode 100644
index 000..2ff85ba
Binary files /dev/null and b/data/pixmaps/no-cover.png differ
diff --git a/src/misc/parole-stream.c b/src/misc/parole-stream.c
index 82d8e32..3db0b61 100644
--- a/src/misc/parole-stream.c
+++ b/src/misc/parole-stream.c
@@ -370,7 +370,7 @@ parole_stream_set_image (GObject *object, GdkPixbuf *pixbuf)
{
PAROLE_STREAM_GET_PRIVATE (stream)-image = NULL;
PAROLE_STREAM_GET_PRIVATE (stream)-previous_image = NULL;
-PAROLE_STREAM_GET_PRIVATE (stream)-image_uri = NULL;
+PAROLE_STREAM_GET_PRIVATE (stream)-image_uri = g_strdup_printf
(file://%s/no-cover.png, PIXMAPS_DIR);
}
}
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 5b5f12a..c543aaa 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -64,7 +64,6 @@ PAROLE_DEFINE_TYPE_WITH_CODE (Mpris2Provider,
PAROLE_IMPLEMENT_INTERFACE
(PAROLE_TYPE_PROVIDER_PLUGIN,
mpris2_provider_iface_init));
-
static const gchar mpris2xml[] =
node
interface name='org.mpris.MediaPlayer2'
@@ -332,22 +331,23 @@ static void mpris_Player_Stop (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_Seek (GDBusMethodInvocation *invocation, GVariant*
parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider-player;
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gint64 param;
+gint64 curr_pos;
+gint64 seek;
+gint64 duration;
if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, Nothing to seek);
return;
}
-
-const ParoleStream *stream = parole_provider_player_get_stream(player);
-gint64 param;
g_variant_get(parameters, (x), param);
-gint64 curr_pos = parole_provider_player_get_stream_position (player);
-gint64 seek = (curr_pos + param) / GST_MSECOND;
+curr_pos = parole_provider_player_get_stream_position (player);
+seek = (curr_pos + param) / GST_MSECOND;
-gint64 duration;
g_object_get (G_OBJECT (stream), duration, duration, NULL);
seek = CLAMP (seek, 0, duration);
@@ -360,24 +360,24 @@ static void mpris_Player_Seek (GDBusMethodInvocation
*invocation, GVariant* para
static void mpris_Player_SetPosition (GDBusMethodInvocation *invocation,
GVariant* parameters, Mpris2Provider *provider)
{
ParoleProviderPlayer *player = provider-player;
+const ParoleStream *stream = parole_provider_player_get_stream(player);
+gchar *track_id = NULL;
+gint64 param;
+gint64 seek;
+gint64 duration;
if(parole_provider_player_get_state (player) == PAROLE_STATE_STOPPED) {
g_dbus_method_invocation_return_error_literal (invocation,
G_DBUS_ERROR, G_DBUS_ERROR_FAILED, Nothing to seek);
return;
}
-
-const ParoleStream *stream = parole_provider_player_get_stream(player);
-gchar *track_id = NULL;
/* Do we need to do anything with track_id? */
-gint64 param;
g_variant_get(parameters, (ox), track_id, param);
g_free(track_id);
-gint64 seek = param / GST_MSECOND;
-
-gint64 duration;
+seek = param / GST_MSECOND;
+
g_object_get (G_OBJECT (stream), duration, duration, NULL);
seek = CLAMP (seek, 0, duration);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add parole_provider_player_get_stream_position
Updating branch refs/heads/master
to 60f9808d30af676995c04c8553b1ac5c874ee301 (commit)
from 5a131b68acad5f22e0e56f1c8814a8747c6d54ac (commit)
commit 60f9808d30af676995c04c8553b1ac5c874ee301
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 17 16:45:12 2013 -0500
Add parole_provider_player_get_stream_position
src/misc/parole-provider-player.c| 20
src/misc/parole-provider-player.h|4
src/parole-plugin-player.c | 16 +++-
src/plugins/mpris2/mpris2-provider.c |9 ++---
4 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/src/misc/parole-provider-player.c
b/src/misc/parole-provider-player.c
index 659ee71..e82303e 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -402,6 +402,26 @@ gboolean parole_provider_player_seek (ParoleProviderPlayer
*player, gdouble pos)
return ret;
}
+/**
+ * parole_provider_player_get_fullscreen:
+ * @player: a #ParoleProviderPlayer
+ *
+ * Get fullscreen status for Parole.
+ *
+ * Since: 0.6
+ **/
+gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer
*player)
+{
+g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), 0);
+
+if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)-get_stream_position )
+{
+return (*PAROLE_PROVIDER_PLAYER_GET_INTERFACE
(player)-get_stream_position) (player);
+}
+
+return FALSE;
+}
+
/**
* parole_provider_player_open_media_chooser:
diff --git a/src/misc/parole-provider-player.h
b/src/misc/parole-provider-player.h
index 2ee85f6..73ddc5f 100644
--- a/src/misc/parole-provider-player.h
+++ b/src/misc/parole-provider-player.h
@@ -81,6 +81,8 @@ struct _ParoleProviderPlayerIface
gboolean (*seek)(ParoleProviderPlayer *player,
gdouble pos);
+gdouble (*get_stream_position) (ParoleProviderPlayer *player);
+
gboolean (*get_fullscreen) (ParoleProviderPlayer *player);
gboolean (*set_fullscreen) (ParoleProviderPlayer *player,
@@ -128,6 +130,8 @@ gbooleanparole_provider_player_play_next
(ParoleProviderPlayer *player);
gbooleanparole_provider_player_seek (ParoleProviderPlayer *player,
gdouble pos);
+
+gdouble parole_provider_player_get_stream_position(ParoleProviderPlayer
*player);
void
parole_provider_player_open_media_chooser (ParoleProviderPlayer *player);
diff --git a/src/parole-plugin-player.c b/src/parole-plugin-player.c
index 8bd0922..121dc23 100644
--- a/src/parole-plugin-player.c
+++ b/src/parole-plugin-player.c
@@ -197,6 +197,19 @@ parole_plugin_player_seek (ParoleProviderPlayer *provider,
gdouble pos)
return TRUE;
}
+static gdouble
+parole_plugin_player_get_stream_position (ParoleProviderPlayer *provider)
+{
+ParolePluginPlayer *player;
+gdouble position = 0;
+
+player = PAROLE_PLUGIN_PLAYER (provider);
+
+position = parole_gst_get_stream_position (PAROLE_GST (player-priv-gst));
+
+return position;
+}
+
static void parole_plugin_player_open_media_chooser (ParoleProviderPlayer
*provider)
{
ParoleMediaList *list;
@@ -243,6 +256,7 @@ static void parole_plugin_player_iface_init
(ParoleProviderPlayerIface *iface)
iface-play_previous = parole_plugin_player_play_previous;
iface-play_next = parole_plugin_player_play_next;
iface-seek = parole_plugin_player_seek;
+iface-get_stream_position = parole_plugin_player_get_stream_position;
iface-open_media_chooser = parole_plugin_player_open_media_chooser;
iface-get_fullscreen = parole_plugin_player_get_fullscreen;
iface-set_fullscreen = parole_plugin_player_set_fullscreen;
@@ -302,7 +316,7 @@ parole_plugin_player_init (ParolePluginPlayer *player)
g_signal_connect( G_OBJECT(window),
window-state-event,
G_CALLBACK(parole_plugin_player_window_state_event),
-PAROLE_PLAYER(player) );
+player );
player-priv-packed = FALSE;
player-priv-box = NULL;
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 01c0bea..d57b2cc 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -538,15 +538,10 @@ static void mpris_Player_put_Volume (GVariant *value,
GError **error, Mpris2Prov
static GVariant* mpris_Player_get_Position (GError **error, Mpris2Provider
*provider)
{
+ParoleProviderPlayer *player = provider-player;
gdouble position = 0;
-/* TODO: How get position?
-gdouble position = parole_gst_get_stream_position (PAROLE_GST
(player
[Xfce4-commits] parole:master Fix Identifier, mimetypes, and CanPlay/CanPause status
Updating branch refs/heads/master
to 0e5fd5f87afcd5622ad8af083708a543fbfe7a45 (commit)
from 6d9c6fa9b028e6292650eba664426baebbb81666 (commit)
commit 0e5fd5f87afcd5622ad8af083708a543fbfe7a45
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Nov 16 21:55:58 2013 -0500
Fix Identifier, mimetypes, and CanPlay/CanPause status
src/plugins/mpris2/mpris2-provider.c |6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 37986c1..04dcc5c 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -167,7 +167,7 @@ static GVariant* mpris_Root_get_HasTrackList (GError
**error, Mpris2Provider *pr
static GVariant* mpris_Root_get_Identity (GError **error, Mpris2Provider
*provider)
{
// This is OK
-return g_variant_new_string(Parole);
+return g_variant_new_string(_(Parole Media Player));
}
static GVariant* mpris_Root_get_DesktopEntry (GError **error, Mpris2Provider
*provider)
@@ -205,7 +205,7 @@ static GVariant* mpris_Root_get_SupportedMimeTypes (GError
**error, Mpris2Provid
'audio/x-realaudio', 'audio/x-s3m', 'audio/x-sbc', 'audio/x-speex',
'audio/x-stm', 'audio/x-tta', 'audio/x-vorbis', 'audio/x-vorbis+ogg',
'audio/x-wav', 'audio/x-wavpack', 'audio/x-xm',
-'image/vnd.rn-realpix', 'image/x-pict', 'misc/ultravox',
+'image/vnd.rn-realpix', 'image/x-pict',
'text/x-google-video-pointer', 'video/3gp', 'video/3gpp',
'video/divx', 'video/dv', 'video/fli', 'video/flv', 'video/mp2t',
'video/mp4', 'video/mp4v-es', 'video/mpeg', 'video/msvideo',
@@ -614,6 +614,8 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
change_detected = TRUE;
provider-state = parole_provider_player_get_state (player);
g_variant_builder_add (b, {sv}, PlaybackStatus,
mpris_Player_get_PlaybackStatus (NULL, provider));
+g_variant_builder_add (b, {sv}, CanPlay,
mpris_Player_get_CanPlay(NULL, provider));
+g_variant_builder_add (b, {sv}, CanPause,
mpris_Player_get_CanPause(NULL, provider));
}
g_object_get (G_OBJECT (provider-conf), repeat, repeat, NULL);
if(provider-saved_playbackstatus != repeat)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Handle volume updates from conf
Updating branch refs/heads/master
to c96da1b170d495e9313206cad4821ee22b213d70 (commit)
from 0b59cbffe41e539f763fd05978c54697e875676a (commit)
commit c96da1b170d495e9313206cad4821ee22b213d70
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Dec 7 08:49:12 2013 -0500
Handle volume updates from conf
src/plugins/mpris2/mpris2-provider.c | 22 --
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/plugins/mpris2/mpris2-provider.c
b/src/plugins/mpris2/mpris2-provider.c
index 1fc8a7e..34752ed 100644
--- a/src/plugins/mpris2/mpris2-provider.c
+++ b/src/plugins/mpris2/mpris2-provider.c
@@ -523,13 +523,20 @@ static GVariant* mpris_Player_get_Metadata (GError
**error, Mpris2Provider *prov
return g_variant_builder_end(b);
}
-static GVariant* mpris_Player_get_Volume (GError **error, Mpris2Provider
*provider)
+static gdouble handle_get_volume (Mpris2Provider *provider)
{
-gdouble volume = 0;
-
-g_object_get (G_OBJECT (provider-conf), volume, volume, NULL);
+gint volume_int = 0;
+gdouble volume_double;
+
+g_object_get (G_OBJECT (provider-conf), volume, volume_int, NULL);
+volume_double = (double)volume_int / 100.0;
+
+return volume_double;
+}
-return g_variant_new_double(volume / 100.0);
+static GVariant* mpris_Player_get_Volume (GError **error, Mpris2Provider
*provider)
+{
+return g_variant_new_double(handle_get_volume(provider));
}
static void mpris_Player_put_Volume (GVariant *value, GError **error,
Mpris2Provider *provider)
@@ -662,7 +669,7 @@ static void parole_mpris_update_any (Mpris2Provider
*provider)
provider-saved_playbackstatus = repeat;
g_variant_builder_add (b, {sv}, LoopStatus,
mpris_Player_get_LoopStatus (NULL, provider));
}
-//curr_vol = pragha_backend_get_volume (backend);
+curr_vol = handle_get_volume(provider);
if(provider-volume != curr_vol)
{
change_detected = TRUE;
@@ -953,6 +960,9 @@ mpris2_provider_set_player (ParoleProviderPlugin *plugin,
ParoleProviderPlayer *
g_signal_connect ( provider-conf, notify::repeat,
G_CALLBACK (conf_changed_cb), plugin);
+g_signal_connect ( provider-conf, notify::volume,
+ G_CALLBACK (conf_changed_cb), plugin);
+
window = parole_provider_player_get_main_window(provider-player);
g_signal_connect( G_OBJECT(window),
window-state-event,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Update licenses
Updating branch refs/heads/master to f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a (commit) from a2eed21e9c2c6404f7ee17d8bd9a722109220c92 (commit) commit f9e8ef589a0530c6f4bfadfc5fbf990a66277e8a Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 11 19:48:50 2013 -0500 Update licenses src/plugins/mpris2/mpris2-plugin.c |2 ++ src/plugins/mpris2/mpris2-provider.c |2 ++ src/plugins/mpris2/mpris2-provider.h |2 ++ src/plugins/mpris2/mpris2.desktop.in |2 +- src/plugins/notify/notify-plugin.c |2 ++ src/plugins/notify/notify-provider.c |2 ++ src/plugins/notify/notify-provider.h |2 ++ src/plugins/sample/sample-plugin.c |2 ++ src/plugins/sample/sample-provider.c |2 ++ src/plugins/sample/sample-provider.h |2 ++ src/plugins/tray/tray-plugin.c |2 ++ src/plugins/tray/tray-provider.c |2 ++ src/plugins/tray/tray-provider.h |2 ++ 13 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/plugins/mpris2/mpris2-plugin.c b/src/plugins/mpris2/mpris2-plugin.c index 80d70d1..b55f5f2 100644 --- a/src/plugins/mpris2/mpris2-plugin.c +++ b/src/plugins/mpris2/mpris2-plugin.c @@ -1,5 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org + * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/mpris2/mpris2-provider.c b/src/plugins/mpris2/mpris2-provider.c index ef9d979..df991da 100644 --- a/src/plugins/mpris2/mpris2-provider.c +++ b/src/plugins/mpris2/mpris2-provider.c @@ -1,5 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org + * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/mpris2/mpris2-provider.h b/src/plugins/mpris2/mpris2-provider.h index ae64a97..dc06c42 100644 --- a/src/plugins/mpris2/mpris2-provider.h +++ b/src/plugins/mpris2/mpris2-provider.h @@ -1,5 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org + * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/mpris2/mpris2.desktop.in b/src/plugins/mpris2/mpris2.desktop.in index 37cb641..6536ab3 100644 --- a/src/plugins/mpris2/mpris2.desktop.in +++ b/src/plugins/mpris2/mpris2.desktop.in @@ -2,5 +2,5 @@ Module=parole-mpris2 _Name=MPRIS2 _Description=MPRIS2 remote control -Authors=Matias De Lellis mati8...@gmail.com Hakan Erduman smultime...@gmail.com +Authors=Matias De Lellis mati8...@gmail.com, Hakan Erduman smultime...@gmail.com Website=http://goodies.xfce.org/projects/applications/parole diff --git a/src/plugins/notify/notify-plugin.c b/src/plugins/notify/notify-plugin.c index ebf7bb2..63c1126 100644 --- a/src/plugins/notify/notify-plugin.c +++ b/src/plugins/notify/notify-plugin.c @@ -1,5 +1,7 @@ /* + * * Copyright (C) 2009-2011 Ali al...@xfce.org * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/notify/notify-provider.c b/src/plugins/notify/notify-provider.c index 1b7cda1..5264912 100644 --- a/src/plugins/notify/notify-provider.c +++ b/src/plugins/notify/notify-provider.c @@ -1,5 +1,7 @@ /* + * * Copyright (C) 2009-2011 Ali al...@xfce.org * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/notify/notify-provider.h b/src/plugins/notify/notify-provider.h index 26234d0..4977a30 100644 --- a/src/plugins/notify/notify-provider.h +++ b/src/plugins/notify/notify-provider.h @@ -1,5 +1,7 @@ /* + * * Copyright (C) 2009-2011 Ali al...@xfce.org * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/sample/sample-plugin.c b/src/plugins/sample/sample-plugin.c index f842459..29a429d 100644 --- a/src/plugins/sample/sample-plugin.c +++ b/src/plugins/sample/sample-plugin.c @@ -1,5 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org + * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/plugins/sample/sample-provider.c b/src/plugins/sample/sample-provider.c index b786155..b18429d 100644 --- a/src/plugins/sample/sample-provider.c +++ b/src/plugins/sample/sample-provider.c @@ -1,5 +1,7
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Show/hide display popups with focus
Updating branch refs/heads/bluesabre/display-settings
to 7d407c2d7beccf88fa3f1fe713f921eece5c8d1d (commit)
from 576ceecb404297a2cc4bbc6a2134f06cab771856 (commit)
commit 7d407c2d7beccf88fa3f1fe713f921eece5c8d1d
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Dec 10 05:32:22 2013 -0500
Show/hide display popups with focus
dialogs/display-settings/main.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 6dcfc5b..8c706db 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1707,6 +1707,35 @@ screen_on_event (GdkXEvent *xevent,
}
static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE);
+return TRUE;
+}
+
+static void
display_settings_show_main_dialog (GdkDisplay *display)
{
GtkBuilder *builder;
@@ -1729,6 +1758,10 @@ display_settings_show_main_dialog (GdkDisplay *display)
randr_event_base,
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
+
+/* Show/Hide the helper popups when the dialog is shown/hidden */
+g_signal_connect(G_OBJECT(dialog), focus-out-event, G_CALLBACK
(focus_out_event), builder);
+g_signal_connect(G_OBJECT(dialog), focus-in-event, G_CALLBACK
(focus_in_event), builder);
if (G_UNLIKELY (opt_socket_id == 0))
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Identify Displays button
Updating branch refs/heads/bluesabre/display-settings
to 7b6795076e0befd9d4796a6643d8c623414fa1c9 (commit)
from acaa796d552fbcfacc7bbb999d09674b6da8dbd1 (commit)
commit 7b6795076e0befd9d4796a6643d8c623414fa1c9
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Dec 10 21:36:52 2013 -0500
Identify Displays button
dialogs/display-settings/display-dialog.glade | 40 +++---
dialogs/display-settings/main.c | 71 ++---
2 files changed, 74 insertions(+), 37 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index b4bbd80..db7fcef 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -273,14 +273,40 @@
property name=visibleTrue/property
property name=can_focusFalse/property
child
- object class=GtkCheckButton id=minimal-autoshow
-property name=label translatable=yesConfigure _new
displays when connected/property
+ object class=GtkHBox id=hbox2
property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultFalse/property
-property name=use_action_appearanceFalse/property
-property name=use_underlineTrue/property
-property name=draw_indicatorTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkCheckButton id=minimal-autoshow
+property name=label translatable=yesConfigure
_new displays when connected/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+ /packing
+/child
+child
+ object class=GtkToggleButton id=identify-displays
+property name=label translatable=yesIdentify
Displays/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultTrue/property
+property name=use_action_appearanceFalse/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=pack_typeend/property
+property name=position1/property
+ /packing
+/child
/object
/child
/object
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 8c706db..b48c9e9 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -154,6 +154,7 @@ static gint randr_event_base;
/* Used to identify the display */
static GHashTable *display_popups;
+gboolean show_popups = FALSE;
gboolean supports_alpha = FALSE;
@@ -1440,6 +1441,42 @@ display_settings_dialog_response (GtkDialog *dialog,
gtk_main_quit ();
}
+static void
+set_display_popups_visible(gboolean visible)
+{
+GHashTableIter iter;
+gpointer key, value;
+GtkWidget *popup;
+
+g_hash_table_iter_init (iter, display_popups);
+while (g_hash_table_iter_next (iter, key, value))
+{
+popup = (GtkWidget *) value;
+gtk_widget_set_visible(popup, visible);
+}
+}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(FALSE);
+return TRUE;
+}
+
+static gboolean
+focus_in_event (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+{
+set_display_popups_visible(TRUE show_popups);
+return TRUE;
+}
+
+static void
+on_identify_displays_toggled (GtkWidget *widget, GtkBuilder *builder)
+{
+show_popups = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
+set_display_popups_visible (show_popups);
+}
+
static GtkWidget *
@@ -1449,7 +1486,7 @@ display_settings_dialog_new (GtkBuilder *builder)
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
GObject *combobox;
-GObject *label, *check
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Added Escape key to minimal dialog to close the dialog.
Updating branch refs/heads/bluesabre/display-settings
to 0d78cf92c19943fdbcbab98457168cd1924432fa (commit)
from 9dd260d8c81e1efc90e1765607655bc64e3c14d9 (commit)
commit 0d78cf92c19943fdbcbab98457168cd1924432fa
Author: Sean Davis smd.seanda...@gmail.com
Date: Fri Nov 23 10:24:44 2012 -0500
Added Escape key to minimal dialog to close the dialog.
dialogs/display-settings/main.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index b120925..4a6be6c 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -31,6 +31,7 @@
#include glib.h
#include gtk/gtk.h
#include gdk/gdkx.h
+#include gdk/gdkkeysyms.h
#include xfconf/xfconf.h
#include exo/exo.h
@@ -1770,6 +1771,19 @@ display_settings_show_main_dialog (GdkDisplay *display)
g_object_unref (G_OBJECT (builder));
}
+static gboolean
+display_settings_minimal_dialog_key_press_event(GtkWidget *widget,
+GdkEventKey *event,
+gpointer user_data)
+{
+if (event-keyval == GDK_Escape)
+{
+gtk_main_quit();
+return TRUE;
+}
+return FALSE;
+}
+
static void
display_settings_minimal_advanced_clicked (GtkButton *button,
GtkBuilder *builder)
@@ -1821,6 +1835,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
dialog = GTK_WIDGET (gtk_builder_get_object (builder, dialog));
cancel = GTK_WIDGET (gtk_builder_get_object (builder,
cancel_button));
+g_signal_connect (dialog, key-press-event, G_CALLBACK
(display_settings_minimal_dialog_key_press_event), NULL);
g_signal_connect (dialog, delete-event, G_CALLBACK (gtk_main_quit),
NULL);
g_signal_connect (cancel, clicked, G_CALLBACK (gtk_main_quit), NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Ellipsize display names in the minimal dialog, and display tooltip.
Updating branch refs/heads/bluesabre/display-settings
to 908e44ea981b845092ef99630d4e4705a35e0f01 (commit)
from d24219ec41b66e51b453fdf7371dfa2dde38ee83 (commit)
commit 908e44ea981b845092ef99630d4e4705a35e0f01
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Dec 16 08:34:05 2012 -0500
Ellipsize display names in the minimal dialog, and display tooltip.
dialogs/display-settings/main.c |2 ++
dialogs/display-settings/minimal-display-dialog.glade | 10 ++
2 files changed, 12 insertions(+)
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 4a6be6c..4136542 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -1855,6 +1855,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
label = gtk_builder_get_object (builder, label1);
gtk_label_set_text (GTK_LABEL (label), xfce_randr-friendly_name[0]);
+gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr-friendly_name[0]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display1),
xfce_randr-mode[0] != None);
@@ -1863,6 +1864,7 @@ display_settings_show_minimal_dialog (GdkDisplay *display)
{
label = gtk_builder_get_object (builder, label4);
gtk_label_set_text (GTK_LABEL (label),
xfce_randr-friendly_name[1]);
+gtk_widget_set_tooltip_text(GTK_WIDGET(label),
xfce_randr-friendly_name[1]);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (only_display2),
xfce_randr-mode[1] != None);
diff --git a/dialogs/display-settings/minimal-display-dialog.glade
b/dialogs/display-settings/minimal-display-dialog.glade
index 3b04070..80c3e05 100644
--- a/dialogs/display-settings/minimal-display-dialog.glade
+++ b/dialogs/display-settings/minimal-display-dialog.glade
@@ -25,9 +25,11 @@
property name=row_spacing3/property
child
object class=GtkLabel id=label1
+property name=width_request128/property
property name=visibleTrue/property
property name=can_focusFalse/property
property name=label translatable=yesOnly Display
1/property
+property name=ellipsizemiddle/property
/object
packing
property name=top_attach1/property
@@ -38,9 +40,12 @@
/child
child
object class=GtkLabel id=label2
+property name=width_request128/property
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=tooltip_text translatable=yesMirror
Displays/property
property name=label translatable=yesMirror
Displays/property
+property name=ellipsizemiddle/property
/object
packing
property name=left_attach1/property
@@ -53,9 +58,12 @@
/child
child
object class=GtkLabel id=label3
+property name=width_request128/property
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=tooltip_text translatable=yesExtend to the
right/property
property name=label translatable=yesExtend to the
right/property
+property name=ellipsizemiddle/property
/object
packing
property name=left_attach2/property
@@ -68,9 +76,11 @@
/child
child
object class=GtkLabel id=label4
+property name=width_request128/property
property name=visibleTrue/property
property name=can_focusFalse/property
property name=label translatable=yesOnly Display
2/property
+property name=ellipsizemiddle/property
/object
packing
property name=left_attach3/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Updated changelog
Updating branch refs/heads/master to bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 (commit) from 75c1bea7977cc73335745ef9ff33fb869ba4f14f (commit) commit bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 4 06:39:21 2013 -0500 Updated changelog ChangeLog |1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 09df981..182954c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Fix loading of playlists with relative paths (bug #10436) * Add realmedia video to supported video mimetypes (bug #10434) * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix building with enable-debug=full on some platforms (bug #10525) * Fix Remove Duplicates functionality. 2013-10-19: bluesa...@xfce.org ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Update version numbers
Updating branch refs/heads/0.5 to 17378c79a32e888df05593051e5b13bbd592bf15 (commit) from f7d0d88ab266aa7cb09918b5296859f37e893f1f (commit) commit 17378c79a32e888df05593051e5b13bbd592bf15 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Dec 4 18:39:56 2013 -0500 Update version numbers ChangeLog |4 ++-- configure.ac.in |4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a2f6d8..1d1f4be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -2013-12-02: bluesa...@xfce.org -* Next: 0.5.4 +2013-12-04: bluesa...@xfce.org +* Bugfix release 0.5.4 * Fix loading of playlists with relative paths (bug #10436) * Fix file-filters for audio/video mimetypes (bug #10434) * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) diff --git a/configure.ac.in b/configure.ac.in index cf95cf5..1019e49 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:5:3]) +m4_define([parole_verinfo], [0:5:4]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) m4_define([parole_version_minor], [5]) -m4_define([parole_version_micro], [3]) +m4_define([parole_version_micro], [4]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole|0.5.4 Creating annotated tag 0.5.4
Updating annotated tag refs/tags/0.5.4 as new annotated tag to f3a8ef0ac9833eee7ffd5c3b7b53cc089a0704d7 (tag) succeeds 0.5.3-15-gf7d0d88 tagged by Sean Davis smd.seanda...@gmail.com on 2013-12-05 00:41 +0100 Sean Davis (1): Update version numbers ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add step-increment for display settings, fix display settings not hiding with --xv false
Updating branch refs/heads/master
to 9c3ea8916836a04869b979924e9680adbb6fc82e (commit)
from bb2de13d11ef96ffbd36e2503cedfa5638db5fc3 (commit)
commit 9c3ea8916836a04869b979924e9680adbb6fc82e
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Dec 4 21:17:38 2013 -0500
Add step-increment for display settings, fix display settings not hiding
with --xv false
data/interfaces/parole-settings.ui |2 +-
src/parole-conf-dialog.c | 14 ++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/data/interfaces/parole-settings.ui
b/data/interfaces/parole-settings.ui
index 0621bb2..0574f3c 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -319,7 +319,7 @@
/packing
/child
child
- object class=GtkFrame id=frame4
+ object class=GtkFrame id=frame-display
property name=visibleTrue/property
property name=can_focusFalse/property
property name=margin_left6/property
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index b9f6091..bdc1fa5 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -426,6 +426,8 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
gbooleanwith_display;
GtkWidget *switch_widget;
+GtkAdjustment *adjustment;
+GValue step_increment = {0};
builder = parole_builder_new_from_string (parole_settings_ui,
parole_settings_ui_length);
@@ -475,6 +477,18 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
gtk_scale_add_mark (GTK_SCALE (self-priv-contrast), 0,
GTK_POS_BOTTOM, NULL);
gtk_scale_add_mark (GTK_SCALE (self-priv-saturation), 0,
GTK_POS_BOTTOM, NULL);
gtk_scale_add_mark (GTK_SCALE (self-priv-hue), 0, GTK_POS_BOTTOM,
NULL);
+
+/* Set the step increment on the sliders to make them keyboard
friendly */
+g_value_init(step_increment, G_TYPE_DOUBLE);
+g_value_set_double(step_increment, 10.0);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self-priv-brightness));
+g_object_set_property(G_OBJECT(adjustment), step-increment,
step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self-priv-contrast));
+g_object_set_property(G_OBJECT(adjustment), step-increment,
step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE (self-priv-hue));
+g_object_set_property(G_OBJECT(adjustment), step-increment,
step_increment);
+adjustment = gtk_range_get_adjustment(GTK_RANGE
(self-priv-saturation));
+g_object_set_property(G_OBJECT(adjustment), step-increment,
step_increment);
g_object_get (G_OBJECT (self-priv-conf),
brightness, brightness_value,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix debug build on older platforms
Updating branch refs/heads/master
to 75c1bea7977cc73335745ef9ff33fb869ba4f14f (commit)
from 6c8f5999dedb380d28908545678b9d3e85108e01 (commit)
commit 75c1bea7977cc73335745ef9ff33fb869ba4f14f
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Dec 3 20:33:06 2013 -0500
Fix debug build on older platforms
src/misc/parole-pl-parser.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 456fec1..4054ff2 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -64,13 +64,13 @@ gchar *g_substr (const gchar* string, gint start, gint end);
static gchar*
parole_filename_to_utf8(const gchar* filename)
{
-gsize read, written;
+gsize read_size, written;
gchar *utf8;
gchar *tmp = g_strdup(filename);
tmp = g_strconcat(tmp, \0, NULL);
-utf8 = g_filename_to_utf8(tmp, -1, read, written, NULL);
+utf8 = g_filename_to_utf8(tmp, -1, read_size, written, NULL);
g_free(tmp);
return utf8;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix playlist handling of stream protocols (bug #10487)
Updating branch refs/heads/master
to a999388e235beadee923da4635560b7c9ad22369 (commit)
from 406dfc2263691b0ab90809d115542cac0c7248e2 (commit)
commit a999388e235beadee923da4635560b7c9ad22369
Author: Sean Davis smd.seanda...@gmail.com
Date: Fri Nov 15 06:57:18 2013 -0500
Fix playlist handling of stream protocols (bug #10487)
src/misc/parole-pl-parser.c | 23 +--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 57c495b..456fec1 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -40,6 +40,7 @@
#include string.h
#include gio/gio.h
+#include glib.h
#include libxfce4util/libxfce4util.h
#include parole-file.h
@@ -333,6 +334,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
const gchar *split_char;
guint i;
+GRegex *regex;
+GMatchInfo *match_info;
+
file = g_file_new_for_path (filename);
path = g_path_get_dirname(filename);
@@ -362,6 +366,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
lines = g_strsplit (contents, split_char, 0);
g_free (contents);
+/* Regular expression for stream protocols, such as http:// smb:// */
+regex = g_regex_new (^(?!/)[a-zA-Z_0-9]+://, 0, 0, NULL);
+
num_lines = g_strv_length (lines);
num_lines--; /* Drop the terminating NULL */
@@ -370,12 +377,21 @@ parole_pl_parser_parse_m3u (const gchar *filename)
if ( lines[i][0] == '\0' || lines[i][0] == '#')
continue;
+/* Absolute, local path */
if ( lines[i][0] == '/' ) {
pl_filename = g_strdup(lines[i]);
}
-
+
else {
-pl_filename = g_strjoin(/, path, lines[i], NULL);
+/* Stream protocol */
+if ( g_regex_match (regex, lines[i], 0, match_info) ) {
+pl_filename = g_strdup(lines[i]);
+}
+
+else {
+/* Relative path */
+pl_filename = g_strjoin(/, path, lines[i], NULL);
+}
}
list = g_slist_append (list, parole_file_new (pl_filename));
@@ -384,6 +400,9 @@ parole_pl_parser_parse_m3u (const gchar *filename)
if (pl_filename)
g_free(pl_filename);
g_strfreev (lines);
+
+g_match_info_free (match_info);
+g_regex_unref (regex);
out:
g_object_unref (file);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/apps/parole
Updating branch refs/heads/master to ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 (commit) from 389705e7bcc206124c5716ec960291f843507a95 (commit) commit ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 Merge: 389705e b1628f0 Author: Sean Davis smd.seanda...@gmail.com Date: Mon Nov 11 05:55:38 2013 -0500 Merge branch 'master' of ssh://git.xfce.org/apps/parole commit b1628f069d23ef1ebac3769e3f71d976e9b3b56e Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:36:43 2013 +0100 Fix one more build-error (missing declaration) commit 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:33:42 2013 +0100 Add missing declaration of parole_conf_dialog_enable_vis_changed_cb commit 1768158096763a6735c06da519a06784b4c2ee62 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:31:48 2013 +0100 Remove unused variable src/parole-conf-dialog.c |5 + src/parole-conf.c|2 ++ 2 files changed, 7 insertions(+) diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index b9f6091..cd34c56 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -60,6 +60,11 @@ void parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget, ParoleConfDialog *self); +void +parole_conf_dialog_enable_vis_changed_cb(GObject *object, + GParamSpec *pspec, + gpointer *data); + voidbrightness_value_changed_cb (GtkRange *range, ParoleConfDialog *self); diff --git a/src/parole-conf.c b/src/parole-conf.c index 7ac6fba..a5db768 100644 --- a/src/parole-conf.c +++ b/src/parole-conf.c @@ -91,6 +91,8 @@ static void parole_conf_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +gchar +*parole_conf_map_xfconf_property_name (const gchar *prop_name); static void parole_conf_set_property(GObject*object, guint prop_id, const GValue *value, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix build errors
Updating branch refs/heads/master
to 389705e7bcc206124c5716ec960291f843507a95 (commit)
from 7db869c5da74c8a8f6f63d4e380c348077ad39b9 (commit)
commit 389705e7bcc206124c5716ec960291f843507a95
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Nov 11 05:55:25 2013 -0500
Fix build errors
src/parole-conf-dialog.c |5 -
src/parole-conf.c|2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index bf410b7..b9f6091 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -51,6 +51,10 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
+
+void parole_conf_dialog_enable_vis_changed_cb (GObject *object,
+ GParamSpec *pspec,
+ gpointer *data);
void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
@@ -420,7 +424,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self,
GtkWidget *parent)
GtkWidget *dialog;
GtkWidget *combox;
gbooleanwith_display;
-gbooleanreset_saver;
GtkWidget *switch_widget;
diff --git a/src/parole-conf.c b/src/parole-conf.c
index fe2ee55..7ac6fba 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -242,7 +242,7 @@ static void parole_conf_get_property (GObject *object,
}
}
-gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+static gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
{
gchar *value = NULL;
if (g_strcmp0(prop_name, /audio/visualization-enabled) == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Revert my fixes that ochosi already fixed
Updating branch refs/heads/master
to 2ffcfb81207b68cc3dab146e953dbb5619f5ad2a (commit)
from ee16f0f2ca60d307f75a244e2d3f43d7044e3cf8 (commit)
commit 2ffcfb81207b68cc3dab146e953dbb5619f5ad2a
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Nov 11 05:58:35 2013 -0500
Revert my fixes that ochosi already fixed
src/parole-conf-dialog.c |5 -
src/parole-conf.c|2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index cd34c56..b9f6091 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -60,11 +60,6 @@ void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
ParoleConfDialog *self);
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
voidbrightness_value_changed_cb (GtkRange *range,
ParoleConfDialog *self);
diff --git a/src/parole-conf.c b/src/parole-conf.c
index a5db768..a18e001 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -244,7 +244,7 @@ static void parole_conf_get_property (GObject *object,
}
}
-static gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
{
gchar *value = NULL;
if (g_strcmp0(prop_name, /audio/visualization-enabled) == 0)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix 2-way syncing with parole-conf
Updating branch refs/heads/master
to bcf12e226f93dec8018c0ad6337e149850ee1133 (commit)
from 554ce74adbe4b4562ca0fc422175fac7f09b0d29 (commit)
commit bcf12e226f93dec8018c0ad6337e149850ee1133
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 10 15:55:12 2013 -0500
Fix 2-way syncing with parole-conf
src/parole-conf.c | 64 -
1 file changed, 63 insertions(+), 1 deletion(-)
diff --git a/src/parole-conf.c b/src/parole-conf.c
index f5e8683..fe2ee55 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -242,6 +242,68 @@ static void parole_conf_get_property (GObject *object,
}
}
+gchar *parole_conf_map_xfconf_property_name (const gchar *prop_name)
+{
+gchar *value = NULL;
+if (g_strcmp0(prop_name, /audio/visualization-enabled) == 0)
+value = g_strdup(vis-enabled);
+if (g_strcmp0(prop_name, /audio/visualization-name) == 0)
+value = g_strdup(vis-name);
+if (g_strcmp0(prop_name, /audio/volume) == 0)
+value = g_strdup(volume);
+if (g_strcmp0(prop_name, /folders/last-used-media) == 0)
+value = g_strdup(media-chooser-folder);
+if (g_strcmp0(prop_name, /parole/multimedia-keys) == 0)
+value = g_strdup(multimedia-keys);
+if (g_strcmp0(prop_name, /parole/plugins) == 0)
+value = g_strdup(plugins);
+if (g_strcmp0(prop_name, scan-recursive) == 0)
+value = g_strdup(/parole/scan-recursive);
+if (g_strcmp0(prop_name, /playlist/remember-playlist) == 0)
+value = g_strdup(remember-playlist);
+if (g_strcmp0(prop_name, /playlist/remove-duplicates) == 0)
+value = g_strdup(remove-duplicated);
+if (g_strcmp0(prop_name, /playlist/repeat) == 0)
+value = g_strdup(repeat);
+if (g_strcmp0(prop_name, /playlist/replace-playlist) == 0)
+value = g_strdup(replace-playlist);
+if (g_strcmp0(prop_name, /playlist/show-playlist) == 0)
+value = g_strdup(showhide-playlist);
+if (g_strcmp0(prop_name, /playlist/shuffle) == 0)
+value = g_strdup(shuffle);
+if (g_strcmp0(prop_name, /playlist/play-opened-files) == 0)
+value = g_strdup(play-opened-files);
+if (g_strcmp0(prop_name, /subtitles/enabled) == 0)
+value = g_strdup(enable-subtitle);
+if (g_strcmp0(prop_name, /subtitles/encoding) == 0)
+value = g_strdup(subtitle-encoding);
+if (g_strcmp0(prop_name, /subtitles/font) == 0)
+value = g_strdup(subtitle-font);
+if (g_strcmp0(prop_name, /video/aspect-ratio) == 0)
+value = g_strdup(aspect-ratio);
+if (g_strcmp0(prop_name, /video/brightness) == 0)
+value = g_strdup(brightness);
+if (g_strcmp0(prop_name, /video/contrast) == 0)
+value = g_strdup(contrast);
+if (g_strcmp0(prop_name, /video/disable-screensaver) == 0)
+value = g_strdup(reset-saver);
+if (g_strcmp0(prop_name, /video/enable-xv) == 0)
+value = g_strdup(enable-xv);
+if (g_strcmp0(prop_name, /video/hue) == 0)
+value = g_strdup(hue);
+if (g_strcmp0(prop_name, /video/saturation) == 0)
+value = g_strdup(saturation);
+if (g_strcmp0(prop_name, /window/height) == 0)
+value = g_strdup(window-height);
+if (g_strcmp0(prop_name, /window/minimized) == 0)
+value = g_strdup(minimized);
+if (g_strcmp0(prop_name, /window/maximized) == 0)
+value = g_strdup(window-maximized);
+if (g_strcmp0(prop_name, /window/width) == 0)
+value = g_strdup(window-width);
+return value;
+}
+
/**
* parole_conf_prop_changed:
* @channel : the #XfconfChannel where settings are stored.
@@ -259,7 +321,7 @@ static void parole_conf_prop_changed(XfconfChannel
*channel,
GParamSpec *pspec;
/* check if the property exists and emit change */
-pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf), prop_name
+ 1);
+pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (conf),
parole_conf_map_xfconf_property_name(prop_name));
if (G_LIKELY (pspec != NULL))
g_object_notify_by_pspec (G_OBJECT (conf), pspec);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Use g_object_bind_property for repeat and shuffle
Updating branch refs/heads/master
to 7db869c5da74c8a8f6f63d4e380c348077ad39b9 (commit)
from bcf12e226f93dec8018c0ad6337e149850ee1133 (commit)
commit 7db869c5da74c8a8f6f63d4e380c348077ad39b9
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 10 16:56:19 2013 -0500
Use g_object_bind_property for repeat and shuffle
src/parole-player.c | 30 +++---
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index a8daebd..9cb0f90 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -215,12 +215,6 @@ voidparole_player_volume_value_changed_cb
(GtkScaleButton *widget,
gbooleanparole_player_volume_scroll_event_cb(GtkWidget *widget,
GdkEventScroll *ev,
ParolePlayer *player);
-
-voidparole_player_toggle_shuffle_action_cb (GtkToggleAction *action,
- ParolePlayer *player);
-
-voidparole_player_toggle_repeat_action_cb (GtkToggleAction *action,
- ParolePlayer *player);
static void parole_player_clear_subtitles (ParolePlayer *player);
@@ -2187,21 +2181,6 @@ parole_player_menu_exit_cb (GtkWidget *widget,
ParolePlayer *player)
parole_player_delete_event_cb (NULL, NULL, player);
}
-
-void parole_player_toggle_shuffle_action_cb (GtkToggleAction *action,
ParolePlayer *player)
-{
-g_object_set (G_OBJECT (player-priv-conf),
- shuffle, gtk_toggle_action_get_active (action),
- NULL);
-}
-
-void parole_player_toggle_repeat_action_cb (GtkToggleAction *action,
ParolePlayer *player)
-{
-g_object_set (G_OBJECT (player-priv-conf),
- repeat, gtk_toggle_action_get_active (action),
- NULL);
-}
-
static void
parole_property_notify_cb_volume (ParoleGst *gst, GParamSpec *spec,
ParolePlayer *player)
{
@@ -3008,13 +2987,17 @@ parole_player_init (ParolePlayer *player)
/* Toggle Repeat */
player-priv-toggle_repeat_action =
gtk_toggle_action_new(toggle_repeat_action, _(_Repeat), _(Repeat), NULL);
gtk_action_set_icon_name(GTK_ACTION(player-priv-toggle_repeat_action),
media-playlist-repeat-symbolic);
-g_signal_connect(G_OBJECT(player-priv-toggle_repeat_action), activate,
G_CALLBACK(parole_player_toggle_repeat_action_cb), player);
+g_object_bind_property(G_OBJECT (player-priv-conf), repeat,
+ player-priv-toggle_repeat_action, active,
+ G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player-priv-toggle_repeat_action),
TRUE);
/* Toggle Shuffle */
player-priv-toggle_shuffle_action =
gtk_toggle_action_new(toggle_shuffle_action, _(_Shuffle), _(Shuffle),
NULL);
gtk_action_set_icon_name(GTK_ACTION(player-priv-toggle_shuffle_action),
media-playlist-shuffle-symbolic);
-g_signal_connect(G_OBJECT(player-priv-toggle_shuffle_action),
activate, G_CALLBACK(parole_player_toggle_shuffle_action_cb), player);
+g_object_bind_property(G_OBJECT (player-priv-conf), shuffle,
+ player-priv-toggle_shuffle_action, active,
+ G_BINDING_BIDIRECTIONAL);
gtk_action_set_sensitive(GTK_ACTION(player-priv-toggle_shuffle_action),
TRUE);
@@ -3312,6 +3295,7 @@ parole_player_init (ParolePlayer *player)
NULL);
gtk_scale_button_set_value (GTK_SCALE_BUTTON (player-priv-volume),
(gdouble) (volume/100.));
+
/*
* Pack the playlist.
*/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master use g_object_bind_property in parole-conf-dialog
Updating branch refs/heads/master
to 554ce74adbe4b4562ca0fc422175fac7f09b0d29 (commit)
from 1bfa7e83469d26a13ac30649de9bfe893763c930 (commit)
commit 554ce74adbe4b4562ca0fc422175fac7f09b0d29
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 10 14:55:35 2013 -0500
use g_object_bind_property in parole-conf-dialog
src/parole-conf-dialog.c | 165 +++---
1 file changed, 25 insertions(+), 140 deletions(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 9074e7e..bf410b7 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -44,16 +44,6 @@
voidparole_conf_dialog_response_cb (GtkDialog *dialog,
gint response_id,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_vis_changed_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-void
-parole_conf_dialog_reset_saver_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_vis_plugin_changed_cb(GtkComboBox *widget,
@@ -61,11 +51,6 @@ parole_conf_dialog_vis_plugin_changed_cb
(GtkComboBox *widget,
voidparole_conf_dialog_font_set_cb (GtkFontButton *button,
ParoleConfDialog *self);
-
-void
-parole_conf_dialog_enable_subtitle_changed_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
void
parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget,
@@ -85,26 +70,6 @@ voidsaturation_value_changed_cb
(GtkRange *range,
voidreset_color_clicked_cb (GtkButton *button,
ParoleConfDialog *self);
-
-voidreplace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremove_duplicated_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidstart_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidremember_playlist_toggled_cb(GObject *object,
- GParamSpec *pspec,
- gpointer *data);
-
-voidmultimedia_keys_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data);
/*
* End of GtkBuilder callbacks
@@ -139,65 +104,6 @@ parole_conf_dialog_destroy (GtkWidget *widget,
ParoleConfDialog *self)
gtk_widget_hide(widget);
}
-/* Replace the playlist with newly opened files */
-void replace_playlist_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self-priv-conf),
- replace-playlist, gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Remove duplicate entries from the playlist FIXME */
-void remove_duplicated_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self-priv-conf),
- remove-duplicated, gtk_switch_get_active
(GTK_SWITCH(GTK_WIDGET(object))),
- NULL);
-}
-
-/* Automatically start playing opened files (vs. just adding them to the
playlist) */
-void start_playing_opened_toggled_cb (GObject *object,
- GParamSpec *pspec,
- gpointer *data)
-{
-ParoleConfDialog *self;
-self = PAROLE_CONF_DIALOG(data);
-g_object_set (G_OBJECT (self-priv-conf
[Xfce4-commits] parole:master Remove rhythmbox comments
Updating branch refs/heads/master
to 1bfa7e83469d26a13ac30649de9bfe893763c930 (commit)
from 4812174d4b580f1fdb4101d9f5be405a7099deb5 (commit)
commit 1bfa7e83469d26a13ac30649de9bfe893763c930
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Nov 9 09:55:43 2013 -0500
Remove rhythmbox comments
src/parole-medialist.c | 36 +---
1 file changed, 13 insertions(+), 23 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index bd12a27..c07671b 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1491,37 +1491,27 @@ parole_media_list_playing_cell_data_func
(GtkTreeViewColumn *column,
GtkTreeIter *iter,
GtkWidget *view)
{
- //RhythmDBEntry *entry;
const char *name = NULL;
- //entry = rhythmdb_query_model_iter_to_entry (view-priv-model, iter);
-
- //if (entry == NULL) {
- // return;
- //}
gint state = 0;
gtk_tree_model_get (tree_model, iter, STATE_COL, state, -1);
- //if (entry == view-priv-playing_entry) {
- switch (state) {
- case PAROLE_MEDIA_STATE_NONE:
- name = NULL;
- break;
- case PAROLE_MEDIA_STATE_PAUSED:
- name = media-playback-pause-symbolic;
- break;
- case PAROLE_MEDIA_STATE_PLAYING:
- name = media-playback-start-symbolic;
- break;
- default:
- name = NULL;
- break;
- // }
+ switch (state) {
+ case PAROLE_MEDIA_STATE_NONE:
+ name = NULL;
+ break;
+ case PAROLE_MEDIA_STATE_PAUSED:
+ name = media-playback-pause-symbolic;
+ break;
+ case PAROLE_MEDIA_STATE_PLAYING:
+ name = media-playback-start-symbolic;
+ break;
+ default:
+ name = NULL;
+ break;
}
g_object_set (renderer, icon-name, name, NULL);
-
- //rhythmdb_entry_unref (entry);
}
static void
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Do not handle keypress with ALT modifier (fixes bug #10462)
Updating branch refs/heads/master
to 1fa000dde70e4a1250f9b54fd20f9b9d7bb74f70 (commit)
from decba160008b46eba4bc84e4fffec8300dbb02c9 (commit)
commit 1fa000dde70e4a1250f9b54fd20f9b9d7bb74f70
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Nov 3 21:50:33 2013 -0500
Do not handle keypress with ALT modifier (fixes bug #10462)
src/parole-player.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/src/parole-player.c b/src/parole-player.c
index 43785fc..0fabf32 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2474,6 +2474,9 @@ parole_player_handle_key_press (GdkEventKey *ev,
ParolePlayer *player)
return FALSE;
}
}
+
+if (ev-state GDK_MOD1_MASK)
+return FALSE;
switch (ev-keyval)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix order of right-click menu to be consistent with the rest of the application
Updating branch refs/heads/master to d69a4206a65feee38e67abd7cc56e9dbff8cd459 (commit) from f7b40ffc15a5b6bcc53cbee1affe276e4499401c (commit) commit d69a4206a65feee38e67abd7cc56e9dbff8cd459 Author: Sean Davis smd.seanda...@gmail.com Date: Sat Nov 2 08:12:24 2013 -0400 Fix order of right-click menu to be consistent with the rest of the application src/parole-player.c |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index 5bb2c8e..e3b1067 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2050,15 +2050,15 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* - * Next item in playlist. + * Previous item in playlist. */ -mi = gtk_action_create_menu_item(player-priv-media_next_action); +mi = gtk_action_create_menu_item(player-priv-media_previous_action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* - * Previous item in playlist. + * Next item in playlist. */ -mi = gtk_action_create_menu_item(player-priv-media_previous_action); +mi = gtk_action_create_menu_item(player-priv-media_next_action); gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi); /* ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix None string not translated after subtitle clear
Updating branch refs/heads/master
to 5d474929f70cb56da89b6d597f1c80ef8a87f460 (commit)
from d69a4206a65feee38e67abd7cc56e9dbff8cd459 (commit)
commit 5d474929f70cb56da89b6d597f1c80ef8a87f460
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Nov 2 08:27:46 2013 -0400
Fix None string not translated after subtitle clear
src/parole-player.c |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index e3b1067..43785fc 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -675,7 +675,6 @@ parole_player_clear_chapters (ParolePlayer *player)
/* Clear the chapter menu options */
menu_items = gtk_container_get_children( GTK_CONTAINER
(player-priv-chapters_menu) );
-
//gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(player-priv-subtitles_group),
TRUE);
for (menu_iter = menu_items; menu_iter != NULL; menu_iter =
g_list_next(menu_iter))
{
@@ -723,7 +722,7 @@ parole_player_clear_subtitles (ParolePlayer *player)
/* Clear the InfoBar Combobox */
gtk_list_store_clear(player-priv-liststore_subtitles);
gtk_list_store_append(GTK_LIST_STORE(player-priv-liststore_subtitles),
iter);
-gtk_list_store_set(GTK_LIST_STORE(player-priv-liststore_subtitles),
iter, 0, None, -1);
+gtk_list_store_set(GTK_LIST_STORE(player-priv-liststore_subtitles),
iter, 0, _(None), -1);
gtk_combo_box_set_active( GTK_COMBO_BOX(player-priv-combobox_subtitles),
0 );
/* Clear the subtitle menu options */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Update changelog
Updating branch refs/heads/master to ea18d8439479ffc991fe85c174cd7cb0eed6a5cb (commit) from 881b57d087518a8e35c47eef1c5bd128f52850a2 (commit) commit ea18d8439479ffc991fe85c174cd7cb0eed6a5cb Author: Sean Davis smd.seanda...@gmail.com Date: Wed Oct 30 00:05:52 2013 -0400 Update changelog ChangeLog |8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6f6bc4..09df981 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ -2013-10-20: bluesa...@xfce.org -* Fix untranslatable strings (bug #10418) +2013-10-30: bluesa...@xfce.org +* Fix untranslatable strings (bug #10418) +* Fix loading of playlists with relative paths (bug #10436) +* Add realmedia video to supported video mimetypes (bug #10434) +* Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix Remove Duplicates functionality. 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Fix if/else for plugin installer
Updating branch refs/heads/0.5 to 4f17bbef7315210f8022926427dd2935de1f5629 (commit) from 252a2c50057c20b6299a7c11e20a1a6514f1a48f (commit) commit 4f17bbef7315210f8022926427dd2935de1f5629 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Oct 29 23:51:16 2013 -0400 Fix if/else for plugin installer src/gst/parole-gst.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index f828448..336ee5b 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1582,7 +1582,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, #if defined(__linux__) GTK_MESSAGE_QUESTION, -#elif defined(__FreeBSD__) +#else GTK_MESSAGE_WARNING, #endif GTK_BUTTONS_NONE, @@ -1590,24 +1590,23 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) _(Additional software is required.) )); -#if defined(__linux__) gtk_dialog_add_buttons( GTK_DIALOG(dialog), +#if defined(__linux__) _(Don't Install), GTK_RESPONSE_REJECT, _(Install), GTK_RESPONSE_ACCEPT, -NULL ); -#elif defined(__FreeBSD__) -gtk_dialog_add_button( GTK_DIALOG(dialog), -GTK_STOCK_OK, -GTK_RESPONSE_ACCEPT); +#else +_(OK), +GTK_RESPONSE_ACCEPT, #endif +NULL ); gtk_message_dialog_format_secondary_markup(dialog, #if defined(__linux__) Parole needs b%s/b to play this file.\n It can be installed automatically., -#elif defined(__FreeBSD__) +#else Parole needs b%s/b to play this file., #endif desc); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Make remove-duplicates work again
Updating branch refs/heads/0.5
to 95f32035b80c1ba8d06a7006d922560ce83ae432 (commit)
from 4f17bbef7315210f8022926427dd2935de1f5629 (commit)
commit 95f32035b80c1ba8d06a7006d922560ce83ae432
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Oct 29 23:58:58 2013 -0400
Make remove-duplicates work again
src/parole-medialist.c | 67 +---
1 file changed, 52 insertions(+), 15 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 85aad22..f63eadd 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -260,31 +260,67 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
GtkTreeIter iter;
gint nch;
+/* Objects used for the remove-duplicates functionality. */
+gchar *filename;
+ParoleFile *row_file;
+gboolean remove_duplicates;
+g_object_get (G_OBJECT (list-priv-conf),
+ remove-duplicated, remove_duplicates,
+ NULL);
+
+/* Set the list_store variable based on with store we're viewing. */
if (disc)
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list-priv-disc_view)));
else
list_store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW
(list-priv-view)));
+
+/* Remove duplicates functionality. If the file being added is already in
the
+ * playlist, remove it from its current position in the playlist before
+ * adding it again. */
+if (!disc remove_duplicates gtk_tree_model_iter_n_children
(GTK_TREE_MODEL(list_store), NULL) != 0)
+{
+filename = g_strdup(parole_file_get_file_name(file));
+
+/* Check the first row */
+gtk_tree_model_get_iter_first(GTK_TREE_MODEL(list_store), iter);
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), iter, DATA_COL,
row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), iter);
+}
+
+/* Check subsequent rows */
+while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list_store), iter)) {
+gtk_tree_model_get(GTK_TREE_MODEL(list_store), iter, DATA_COL,
row_file, -1);
+if (g_strcmp0(filename, parole_file_get_file_name(row_file)) == 0)
+{
+gtk_list_store_remove (GTK_LIST_STORE(list_store), iter);
+}
+}
+
+g_object_unref(row_file);
+}
+/* Add the file to the playlist */
gtk_list_store_append (list_store, iter);
-
gtk_list_store_set (list_store,
- iter,
- NAME_COL, parole_file_get_display_name (file),
- DATA_COL, file,
- LENGTH_COL, parole_taglibc_get_media_length (file),
- PIXBUF_COL, NULL,
- -1);
+iter,
+NAME_COL, parole_file_get_display_name (file),
+DATA_COL, file,
+LENGTH_COL, parole_taglibc_get_media_length (file),
+PIXBUF_COL, NULL,
+-1);
if ( emit || select_row )
{
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
- row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
- if ( select_row )
- parole_media_list_select_path (list, disc, path);
- gtk_tree_path_free (path);
- if ( emit )
- g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
- gtk_tree_row_reference_free (row);
+path = gtk_tree_model_get_path (GTK_TREE_MODEL (list_store), iter);
+row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list_store), path);
+if ( select_row )
+parole_media_list_select_path (list, disc, path);
+gtk_tree_path_free (path);
+if ( emit )
+g_signal_emit (G_OBJECT (list), signals [MEDIA_ACTIVATED], 0, row);
+gtk_tree_row_reference_free (row);
}
/*
@@ -293,6 +329,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile
*file, gboolean disc, g
*/
g_object_unref (file);
+/* Update the playlist count. */
if (disc)
nch = gtk_tree_model_iter_n_children (GTK_TREE_MODEL
(list-priv-disc_store), NULL);
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Add realmedia video to supported video mimetypes (bug #10434)
Updating branch refs/heads/0.5
to 252a2c50057c20b6299a7c11e20a1a6514f1a48f (commit)
from 74815a4b1e1cce4a81b0d29ec9c7e8eac4682b6e (commit)
commit 252a2c50057c20b6299a7c11e20a1a6514f1a48f
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Oct 29 23:45:50 2013 -0400
Add realmedia video to supported video mimetypes (bug #10434)
data/mime/mime-functions.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 370f35b..118040b 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -9,6 +9,6 @@ get_audio_mimetypes ()
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v application/x-flac | grep -v text/google-video-pointer | grep -v
application/x-quicktime-media-link | grep -v application/smil | grep -v
application/smil+xml | grep -v application/x-smil | grep -v
application/xspf+xml | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES audio/x-pn-realaudio
+ MIMETYPES=$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Update changelog
Updating branch refs/heads/0.5 to 4a14bbf081d1ee7986e67b0cd9c6f34280df5cda (commit) from 95f32035b80c1ba8d06a7006d922560ce83ae432 (commit) commit 4a14bbf081d1ee7986e67b0cd9c6f34280df5cda Author: Sean Davis smd.seanda...@gmail.com Date: Wed Oct 30 00:04:07 2013 -0400 Update changelog ChangeLog |7 +++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7c2091c..b468449 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-10-30: bluesa...@xfce.org +* Next: 0.5.4 +* Fix loading of playlists with relative paths (bug #10436) +* Add realmedia video to supported video mimetypes (bug #10434) +* Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) +* Fix Remove Duplicates functionality. + 2013-08-03: bluesa...@xfce.org * Bugfix release 0.5.3 * Fix “Remember playlist” option in GUI not working (bug #10269) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix if/else for plugin installer
Updating branch refs/heads/master to 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 (commit) from 2983de5d5e8c527e3da9659046881c5e8b0c567e (commit) commit 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 Author: Sean Davis smd.seanda...@gmail.com Date: Mon Oct 28 21:28:42 2013 -0400 Fix if/else for plugin installer src/gst/parole-gst.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 8ca98c9..7fc18cd 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1484,7 +1484,7 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, #if defined(__linux__) GTK_MESSAGE_QUESTION, -#elif defined(__FreeBSD__) +#else GTK_MESSAGE_WARNING, #endif GTK_BUTTONS_NONE, @@ -1492,24 +1492,23 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) _(Additional software is required.) )); -#if defined(__linux__) gtk_dialog_add_buttons( GTK_DIALOG(dialog), +#if defined(__linux__) _(Don't Install), GTK_RESPONSE_REJECT, _(Install), GTK_RESPONSE_ACCEPT, -NULL ); -#elif defined(__FreeBSD__) -gtk_dialog_add_button( GTK_DIALOG(dialog), +#else _(OK), -GTK_RESPONSE_ACCEPT); +GTK_RESPONSE_ACCEPT, #endif +NULL ); gtk_message_dialog_format_secondary_markup(dialog, #if defined(__linux__) _(Parole needs b%s/b to play this file.\n It can be installed automatically.), -#elif defined(__FreeBSD__) +#else _(Parole needs b%s/b to play this file.), #endif desc); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add realmedia video to supported video mimetypes (bug #10434)
Updating branch refs/heads/master
to 881b57d087518a8e35c47eef1c5bd128f52850a2 (commit)
from 2d8ef63938e8a04f425ad20ef8d7176bac1b48c5 (commit)
commit 881b57d087518a8e35c47eef1c5bd128f52850a2
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Oct 28 21:42:08 2013 -0400
Add realmedia video to supported video mimetypes (bug #10434)
data/mime/mime-functions.sh |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 370f35b..118040b 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -9,6 +9,6 @@ get_audio_mimetypes ()
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v application/x-flac | grep -v text/google-video-pointer | grep -v
application/x-quicktime-media-link | grep -v application/smil | grep -v
application/smil+xml | grep -v application/x-smil | grep -v
application/xspf+xml | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES audio/x-pn-realaudio
+ MIMETYPES=$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix untranslatable strings (bug #10418)
Updating branch refs/heads/master to 042ad465534068605a8025e5d71e19342751a619 (commit) from 0d439ef5d9f572d7716c165f3409faf737a05ab1 (commit) commit 042ad465534068605a8025e5d71e19342751a619 Author: Sean Davis smd.seanda...@gmail.com Date: Sun Oct 20 10:31:18 2013 -0400 Fix untranslatable strings (bug #10418) ChangeLog |3 +++ data/interfaces/parole.ui | 12 ++-- src/gst/parole-gst.c |6 +++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index e44e761..e6f6bc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2013-10-20: bluesa...@xfce.org +* Fix untranslatable strings (bug #10418) + 2013-10-19: bluesa...@xfce.org * Development release 0.5.90 * Completed port to GTK+3 diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index c13c361..f3472d0 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -163,7 +163,7 @@ property name=can_focusFalse/property child object class=GtkImageMenuItem id=menu-add -property name=label_Open…/property +property name=label translatable=yes_Open…/property property name=visibleTrue/property property name=can_focusFalse/property property name=use_underlineTrue/property @@ -217,7 +217,7 @@ /child child object class=GtkImageMenuItem id=menu-open-disc -property name=labelInsert Disk/property +property name=label translatable=yesInsert Disk/property property name=visibleTrue/property property name=sensitiveFalse/property property name=can_focusFalse/property @@ -233,7 +233,7 @@ /child child object class=GtkImageMenuItem id=menu-exit -property name=label_Quit/property +property name=label translatable=yes_Quit/property property name=visibleTrue/property property name=can_focusFalse/property property name=use_underlineTrue/property @@ -422,8 +422,8 @@ property name=use_underlineTrue/property property name=imageimage_volume_up/property property name=use_stockFalse/property -accelerator key=equal signal=activate/ accelerator key=plus signal=activate/ +accelerator key=equal signal=activate/ signal name=activate handler=parole_player_volume_up swapped=no/ /object /child @@ -467,7 +467,7 @@ property name=can_focusFalse/property child object class=GtkImageMenuItem id=fullscreen-menu -property name=label_Fullscreen/property +property name=label translatable=yes_Fullscreen/property property name=visibleTrue/property property name=can_focusFalse/property property name=use_underlineTrue/property @@ -672,7 +672,7 @@ /child child object class=GtkImageMenuItem id=about -property name=label_About/property +property name=label translatable=yes_About/property property name=visibleTrue/property property name=can_focusFalse/property property name=use_underlineTrue/property diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 878deff..8ca98c9 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1507,10 +1507,10 @@ parole_gst_missing_codec_dialog(ParoleGst *gst, GstMessage *msg) gtk_message_dialog_format_secondary_markup(dialog, #if defined(__linux__) - Parole needs b%s/b to play this file.\n - It can be installed automatically., + _(Parole needs b%s/b to play this file.\n + It can be installed automatically.), #elif defined(__FreeBSD__) - Parole needs b%s/b to play this file., + _(Parole needs b%s/b to play this file.), #endif desc); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org
[Xfce4-commits] parole:master Update details for parole development release 0.5.90 on the way to 0.6.0 stable release
Updating branch refs/heads/master to 0d439ef5d9f572d7716c165f3409faf737a05ab1 (commit) from 4f0c64d1ea9349528d27d7993bc10098ffdc (commit) commit 0d439ef5d9f572d7716c165f3409faf737a05ab1 Author: Sean Davis smd.seanda...@gmail.com Date: Sat Oct 19 10:14:52 2013 -0400 Update details for parole development release 0.5.90 on the way to 0.6.0 stable release ChangeLog |4 ++-- README |2 +- configure.ac.in |8 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index d201681..e44e761 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -2013-10-11: bluesa...@xfce.org -* Road to 0.6.0... +2013-10-19: bluesa...@xfce.org +* Development release 0.5.90 * Completed port to GTK+3 - Remove deprecated GTK+2 items - Use GtkOverlay for player controls diff --git a/README b/README index 4f72d97..63e6790 100644 --- a/README +++ b/README @@ -10,7 +10,7 @@ Required packages = Parole depends on the following packages: - - Gtk 3.0 or above. + - Gtk 3.2 or above. - Glib 2.32 or above. - Gio 2.28 or above. - DBus 0.60 or above. diff --git a/configure.ac.in b/configure.ac.in index 0e8ef00..3386947 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,9 +1,9 @@ m4_define([intltool_minimum_version], [0.31]) -m4_define([parole_verinfo], [0:6:0]) +m4_define([parole_verinfo], [0:5:90]) m4_define([parole_version_api], [0]) m4_define([parole_version_major], [0]) -m4_define([parole_version_minor], [6]) -m4_define([parole_version_micro], [0]) +m4_define([parole_version_minor], [5]) +m4_define([parole_version_micro], [90]) m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) @@ -78,7 +78,7 @@ XDT_I18N([@LINGUAS@]) # = # # Check for required packages # # = # -m4_define([gtk_minimum_version], [3.0.0]) +m4_define([gtk_minimum_version], [3.2.0]) m4_define([glib_minimum_version], [2.32.0]) dnl gstreamer version ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole|0.5.90 Creating annotated tag 0.5.90
Updating annotated tag refs/tags/0.5.90 as new annotated tag to 337b108810c2240954abf9593247e4b8a7f1e52f (tag) succeeds 0.5.3-201-g4f0c64c tagged by Sean Davis smd.seanda...@gmail.com on 2013-10-19 16:16 +0200 Sean Davis (1): Update details for parole development release 0.5.90 on the way to 0.6.0 stable release ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix strings (bug #10405)
Updating branch refs/heads/master
to eb43c2e9db2bb62595e2f634c07a63ccb9c24a48 (commit)
from b5c77983078455667fe6d25037f629a4807deb82 (commit)
commit eb43c2e9db2bb62595e2f634c07a63ccb9c24a48
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Oct 13 07:03:20 2013 -0400
Fix strings (bug #10405)
data/interfaces/parole.ui |2 +-
src/parole-medialist.c|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 614299e..c13c361 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -637,7 +637,7 @@
/child
child
object class=GtkImageMenuItem id=preferences
-property name=label_Preferences/property
+property name=label
translatable=yes_Preferences/property
property name=visibleTrue/property
property name=can_focusFalse/property
property name=use_underlineTrue/property
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index c5a2a1a..ad87c34 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -679,7 +679,7 @@ parole_media_list_save_playlist_response_cb
(GtkDialog *dialog,
{
parole_dialog_info (GTK_WINDOW (gtk_widget_get_toplevel
(data-list-priv-view)),
_(Unknown playlist format),
-_(Please chooser a supported playlist
format));
+_(Please choose a supported playlist
format));
goto out;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Updated changelog
Updating branch refs/heads/master to ba494a17c6a227d1d02f1b1290eacb95fe4e8969 (commit) from b30fa93f0ec1d1338954314bd63fa9963dde0c4b (commit) commit ba494a17c6a227d1d02f1b1290eacb95fe4e8969 Author: Sean Davis smd.seanda...@gmail.com Date: Sat Oct 12 05:58:02 2013 -0400 Updated changelog ChangeLog |1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index b13f482..d201681 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,7 @@ - missing option to open DVD from iso (bug #10300) - Allow a playlist to be sorted and/or items to be moved (bug #10066) - Remember playlist option in GUI not working (bug #10269) + - Parole show irritating edge (bug #10081) 2013-08-03: bluesa...@xfce.org * Bugfix release 0.5.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master GTK+3 Playlist.
Updating branch refs/heads/master
to 5172df1b1d530b7ecccee022e397fa055ae3d207 (commit)
from 2114d25306708c290ecaae4abdb9329cd8871e67 (commit)
commit 5172df1b1d530b7ecccee022e397fa055ae3d207
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 11:25:30 2013 -0500
GTK+3 Playlist.
data/interfaces/Makefile.am|4 +-
data/interfaces/{playlist.ui = playlist-3.ui} | 72 +++-
2 files changed, 22 insertions(+), 54 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 640e327..14d7218 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -15,7 +15,7 @@ if ENABLE_GTK3
interfaces = \
parole.ui \
parole-settings-3.ui\
- playlist.ui \
+ playlist-3.ui \
mediachooser-3.ui \
save-playlist-3.ui \
plugins-3.ui\
@@ -30,7 +30,7 @@ parole_ui.h: parole.ui
parole-settings_ui.h: parole-settings-3.ui
xdt-csource --static --strip-comments --strip-content
--name=parole_settings_ui $ $@
-playlist_ui.h: playlist.ui
+playlist_ui.h: playlist-3.ui
xdt-csource --static --strip-comments --strip-content
--name=playlist_ui $ $@
mediachooser_ui.h: mediachooser-3.ui
diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist-3.ui
similarity index 83%
copy from data/interfaces/playlist.ui
copy to data/interfaces/playlist-3.ui
index 898fd26..30b5b09 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist-3.ui
@@ -1,16 +1,13 @@
?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=GtkMenu id=dvd-menu
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=ubuntu_localTrue/property
child
object class=GtkMenuItem id=dvd-menu-menu
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=use_action_appearanceFalse/property
property name=label translatable=yesDVD Menu/property
property name=use_underlineTrue/property
/object
@@ -19,7 +16,6 @@
object class=GtkMenuItem id=dvd-menu-title
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=use_action_appearanceFalse/property
property name=label translatable=yesTitle Menu/property
property name=use_underlineTrue/property
/object
@@ -28,7 +24,6 @@
object class=GtkMenuItem id=dvd-menu-audio
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=use_action_appearanceFalse/property
property name=label translatable=yesAudio Menu/property
property name=use_underlineTrue/property
/object
@@ -37,7 +32,6 @@
object class=GtkMenuItem id=dvd-menu-angle
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=use_action_appearanceFalse/property
property name=label translatable=yesAngle Menu/property
property name=use_underlineTrue/property
/object
@@ -46,7 +40,6 @@
object class=GtkMenuItem id=dvd-menu-chapter
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=use_action_appearanceFalse/property
property name=label translatable=yesChapter Menu/property
property name=use_underlineTrue/property
/object
@@ -88,23 +81,22 @@
property name=pixel_size24/property
property name=icon_namemedia-playlist-shuffle/property
/object
- object class=GtkVBox id=playlist-box
+ object class=GtkBox id=playlist-box
property name=width_request220/property
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=orientationvertical/property
child
- object class=GtkNotebook id=playlist_notebook
+ object class=GtkNotebook id=notebook1
property name=visibleTrue/property
property name=can_focusTrue/property
property name=tab_posbottom/property
property name=show_tabsFalse/property
-property name=show_borderFalse/property
child
object class=GtkScrolledWindow id=scrolledwindow1
property name=visibleTrue/property
property name=can_focusTrue/property
property name=hscrollbar_policynever/property
-property name=vscrollbar_policyautomatic/property
property name=window_placement_setTrue/property
property name=shadow_typein/property
child
@@ -114,10
[Xfce4-commits] parole:master More general fixes
Updating branch refs/heads/master
to b285c76bcac9b894c871716f8ee2b9144cd2b7b6 (commit)
from ed702ea8a2560b0af83bc5fbef240b23d20cca4c (commit)
commit b285c76bcac9b894c871716f8ee2b9144cd2b7b6
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Aug 11 20:16:34 2013 -0400
More general fixes
data/interfaces/parole-3.ui | 13 -
src/parole-player.c |3 +--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/data/interfaces/parole-3.ui b/data/interfaces/parole-3.ui
index 6cd66ea..f147a29 100644
--- a/data/interfaces/parole-3.ui
+++ b/data/interfaces/parole-3.ui
@@ -44,6 +44,12 @@
property name=pixel_size16/property
property name=icon_namedocument-open-symbolic/property
/object
+ object class=GtkImage id=image8
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_nameparole-extension/property
+ /object
object class=GtkImage id=image_media_fullscreen
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -76,6 +82,9 @@
/object
object class=GtkWindow id=main-window
property name=can_focusFalse/property
+property name=title translatable=yesParole Media Player/property
+property name=window_positioncenter/property
+property name=icon_nameparole/property
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/
@@ -206,6 +215,7 @@
property name=label
translatable=yesPlugins/property
property name=visibleTrue/property
property name=can_focusFalse/property
+property name=imageimage8/property
property name=use_stockFalse/property
/object
/child
@@ -821,6 +831,7 @@ audio-volume-medium-symbolic/property
property name=visibleTrue/property
property name=can_focusFalse/property
property name=receives_defaultTrue/property
+property name=no_show_allTrue/property
property
name=imageimage_media_toggleplaylist/property
property name=reliefnone/property
signal name=clicked
handler=parole_player_show_hide_playlist swapped=no/
@@ -854,8 +865,8 @@ audio-volume-medium-symbolic/property
/child
child
object class=GtkNotebook id=notebook-playlist
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
child
placeholder/
/child
diff --git a/src/parole-player.c b/src/parole-player.c
index 9995246..0a5a604 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -456,13 +456,13 @@ void parole_player_set_playlist_visible (ParolePlayer
*player, gboolean visibili
playlist_w = 220;
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(player-priv-show_hide_playlist), visibility );
+gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON(player-priv-show_hide_playlist_button), visibility );
if ( visibility )
{
if ( !player-priv-full_screen )
gtk_window_resize(GTK_WINDOW (player-priv-window),
window_w+playlist_w+player-priv-handle_width, window_h);
gtk_widget_show (player-priv-playlist_nt);
-gtk_image_set_from_stock( GTK_IMAGE(
player-priv-show_hide_playlist_image ), gtk-go-forward,
GTK_ICON_SIZE_LARGE_TOOLBAR );
gtk_widget_set_tooltip_text( GTK_WIDGET(
player-priv-show_hide_playlist_button ), _(Hide playlist) );
g_object_set (G_OBJECT (player-priv-conf),
showhide-playlist, TRUE,
@@ -471,7 +471,6 @@ void parole_player_set_playlist_visible (ParolePlayer
*player, gboolean visibili
else
{
gtk_widget_hide (player-priv-playlist_nt);
-gtk_image_set_from_stock( GTK_IMAGE(
player-priv-show_hide_playlist_image ), gtk-go-back,
GTK_ICON_SIZE_LARGE_TOOLBAR );
gtk_widget_set_tooltip_text( GTK_WIDGET(
player-priv-show_hide_playlist_button ), _(Show playlist) );
g_object_set (G_OBJECT (player-priv-conf),
showhide-playlist, FALSE,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master GTK+3 Media Chooser dialog.
Updating branch refs/heads/master to 74bb2f66a7ea49c9fabefc1cc61bdc03053be655 (commit) from 27d42a8846498524420ca7c1c021b1a4de90f9b7 (commit) commit 74bb2f66a7ea49c9fabefc1cc61bdc03053be655 Author: Sean Davis smd.seanda...@gmail.com Date: Sun Feb 17 08:28:21 2013 -0500 GTK+3 Media Chooser dialog. data/interfaces/Makefile.am |4 +- data/interfaces/mediachooser-3.ui | 96 + 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am index fb2f3bd..6a356fc 100644 --- a/data/interfaces/Makefile.am +++ b/data/interfaces/Makefile.am @@ -16,7 +16,7 @@ interfaces = \ parole.ui \ parole-settings-3.ui\ playlist.ui \ - mediachooser.ui \ + mediachooser-3.ui \ save-playlist.ui\ plugins.ui \ open-location.ui @@ -33,7 +33,7 @@ parole-settings_ui.h: parole-settings-3.ui playlist_ui.h: playlist.ui xdt-csource --static --strip-comments --strip-content --name=playlist_ui $ $@ -mediachooser_ui.h: mediachooser.ui +mediachooser_ui.h: mediachooser-3.ui xdt-csource --static --strip-comments --strip-content --name=mediachooser_ui $ $@ save-playlist_ui.h: save-playlist.ui diff --git a/data/interfaces/mediachooser-3.ui b/data/interfaces/mediachooser-3.ui new file mode 100644 index 000..9112a03 --- /dev/null +++ b/data/interfaces/mediachooser-3.ui @@ -0,0 +1,96 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + object class=GtkDialog id=chooser +property name=can_focusFalse/property +property name=border_width5/property +property name=title translatable=yesOpen Media Files/property +property name=modalTrue/property +property name=default_width640/property +property name=default_height480/property +property name=type_hintdialog/property +signal name=destroy handler=parole_media_chooser_destroy_cb swapped=no/ +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkSpinner id=spinner +property name=can_focusFalse/property +property name=no_show_allTrue/property +property name=activeTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property +property name=secondaryTrue/property +property name=non_homogeneousTrue/property + /packing +/child +child + object class=GtkButton id=close +property name=labelgtk-cancel/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +signal name=clicked handler=parole_media_chooser_close_clicked swapped=no/ + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=open +property name=labelgtk-open/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property +signal name=clicked handler=parole_media_chooser_add_clicked swapped=no/ + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position2/property + /packing +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=pack_typeend/property +property name=position0/property + /packing +/child +child + object class=GtkFileChooserWidget id=filechooserwidget +property name=visibleTrue/property +property name
[Xfce4-commits] parole:master Prepared for gtk3 with -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
Updating branch refs/heads/master
to c6429490cb5a519be718f7f78798b7fd7c428ff4 (commit)
from 121ae284eb55cc60b257efdc10423e09f94726eb (commit)
commit c6429490cb5a519be718f7f78798b7fd7c428ff4
Author: Sean Davis smd.seanda...@gmail.com
Date: Sat Feb 16 10:33:10 2013 -0500
Prepared for gtk3 with -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED
-DGSEAL_ENABLE
src/gst/parole-gst.c | 139 +++---
src/parole-button.c | 10 +--
src/parole-mediachooser.c|2 +-
src/parole-medialist.c |8 +--
src/parole-open-location.c |2 +-
src/parole-player.c | 51 +-
src/plugins/tray/tray-provider.c |4 +-
7 files changed, 130 insertions(+), 86 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 47f41a3..671e55f 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -215,17 +215,22 @@ parole_gst_configure_event_cb (GtkWidget *widget,
GdkEventConfigure *ev, ParoleG
static gboolean
parole_gst_parent_expose_event (GtkWidget *w, GdkEventExpose *ev, ParoleGst
*gst)
{
+GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
cairo_t *cr;
-cr = gdk_cairo_create (w-window);
+gtk_widget_get_allocation(w, allocation);
+
+cr = gdk_cairo_create ( gtk_widget_get_window(w) );
cairo_set_source_rgb (cr, 0.0f, 0.0f, 0.0f);
-cairo_rectangle (cr, w-allocation.x, w-allocation.y,
w-allocation.width, w-allocation.height);
+cairo_rectangle (cr, allocation-x, allocation-y, allocation-width,
allocation-height);
cairo_fill (cr);
cairo_destroy (cr);
+g_free(allocation);
+
return FALSE;
}
@@ -233,17 +238,20 @@ static void
parole_gst_realize (GtkWidget *widget)
{
ParoleGst *gst;
+GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
GdkWindowAttr attr;
GdkColor color;
gint mask;
-GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+gtk_widget_set_realized (widget, TRUE);
gst = PAROLE_GST (widget);
-attr.x = widget-allocation.x;
-attr.y = widget-allocation.y;
-attr.width = widget-allocation.width;
-attr.height = widget-allocation.height;
+gtk_widget_get_allocation(widget, allocation);
+
+attr.x = allocation-x;
+attr.y = allocation-y;
+attr.width = allocation-width;
+attr.height = allocation-height;
attr.visual = gtk_widget_get_visual (widget);
attr.colormap = gtk_widget_get_colormap (widget);
attr.wclass = GDK_INPUT_OUTPUT;
@@ -257,30 +265,31 @@ parole_gst_realize (GtkWidget *widget)
mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
-widget-window = gdk_window_new (gtk_widget_get_parent_window (widget),
-attr, mask);
+gtk_widget_set_window(widget, gdk_window_new (gtk_widget_get_parent_window
(widget),
+attr, mask) );
-gdk_window_set_user_data (widget-window, widget);
+gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
gdk_color_parse (black, color);
gdk_colormap_alloc_color (gtk_widget_get_colormap (widget), color,
TRUE, TRUE);
-gdk_window_set_background (widget-window, color);
-widget-style = gtk_style_attach (widget-style, widget-window);
+gdk_window_set_background (gtk_widget_get_window(widget), color);
+gtk_widget_set_style(widget, gtk_style_attach
(gtk_widget_get_style(widget), gtk_widget_get_window(widget)));
g_signal_connect (gtk_widget_get_toplevel (widget), configure_event,
G_CALLBACK (parole_gst_configure_event_cb), gst);
g_signal_connect (gtk_widget_get_parent (widget), expose_event,
G_CALLBACK (parole_gst_parent_expose_event), gst);
-
+
+g_free(allocation);
}
static void
parole_gst_show (GtkWidget *widget)
{
-if ( widget-window )
- gdk_window_show (widget-window);
+if ( gtk_widget_get_window(widget) )
+ gdk_window_show (gtk_widget_get_window(widget));
if ( GTK_WIDGET_CLASS (parole_gst_parent_class)-show )
GTK_WIDGET_CLASS (parole_gst_parent_class)-show (widget);
@@ -295,8 +304,11 @@ parole_gst_get_video_output_size (ParoleGst *gst, gint
*ret_w, gint *ret_h)
* 2) Playing audio.
* 3) Playing video but we don't have its correct size yet.
*/
-*ret_w = GTK_WIDGET (gst)-allocation.width;
-*ret_h = GTK_WIDGET (gst)-allocation.height;
+GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+gtk_widget_get_allocation(GTK_WIDGET(gst), allocation);
+*ret_w = allocation-width;
+*ret_h = allocation-height;
+g_free(allocation);
if ( gst-priv-state = GST_STATE_PAUSED )
{
@@ -373,9 +385,9
[Xfce4-commits] parole:master GTK+3 Parole interface.
Updating branch refs/heads/master
to 44bbee42bb9e5279181af96c4c98f398e3e25685 (commit)
from 5172df1b1d530b7ecccee022e397fa055ae3d207 (commit)
commit 44bbee42bb9e5279181af96c4c98f398e3e25685
Author: Sean Davis smd.seanda...@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=visibleTrue/property
property name=can_focusFalse/property
+property name=stockgtk-network/property
+property name=icon-size1/property
+ /object
+ object class=GtkImage id=image2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
property name=icon_nameparole-extension/property
/object
- object class=GtkImage id=image_cd_rom
+ object class=GtkImage id=image3
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=icon_namemedia-optical/property
+property name=pixel_size16/property
+property name=icon_nameaudio-volume-high/property
/object
- object class=GtkImage id=image_fullscreen
+ object class=GtkImage id=image4
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=stockgtk-fullscreen/property
-property name=icon-size3/property
+property name=pixel_size16/property
+property name=icon_nameaudio-volume-low/property
/object
- object class=GtkImage id=image_network
+ object class=GtkImage id=image5
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=stockgtk-network/property
+property name=pixel_size16/property
+property name=icon_nameaudio-volume-muted/property
+ /object
+ object class=GtkImage id=image_fullscreen
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=tooltip_text translatable=yesFullscreen/property
+property name=stockgtk-fullscreen/property
+property name=icon-size3/property
/object
object class=GtkImage id=image_play_next
property name=visibleTrue/property
@@ -41,35 +56,7 @@
property name=stockgtk-media-previous/property
property name=icon-size3/property
/object
- object class=GtkImage id=image_volume_down
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=icon_nameaudio-volume-low/property
- /object
- object class=GtkImage id=image_volume_mute
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=icon_nameaudio-volume-muted/property
- /object
- object class=GtkImage id=image_volume_up
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=icon_nameaudio-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=visibleTrue/property
property name=can_focusFalse/property
property name=title translatable=yesParole Media Player/property
property name=window_positioncenter/property
[Xfce4-commits] parole:master Start reimplementing gst-logo
Updating branch refs/heads/master
to 5698714a4e4235fa457dcc349487945b8bf93773 (commit)
from b285c76bcac9b894c871716f8ee2b9144cd2b7b6 (commit)
commit 5698714a4e4235fa457dcc349487945b8bf93773
Author: Sean Davis smd.seanda...@gmail.com
Date: Mon Aug 19 22:50:52 2013 -0400
Start reimplementing gst-logo
src/parole-player.c | 127 +++
1 file changed, 127 insertions(+)
diff --git a/src/parole-player.c b/src/parole-player.c
index 0a5a604..ab6f403 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -121,6 +121,9 @@ static gbooleanparole_audiobox_expose_event
(GtkWidget *w, GdkEventE
/*
* GtkBuilder Callbacks
*/
+void on_content_area_size_allocate (GtkWidget *widget, GtkAllocation
*allocation, ParolePlayer *player);
+
+
gbooleanparole_player_configure_event_cb(GtkWidget *widget,
GdkEventConfigure *ev,
ParolePlayer *player);
@@ -335,6 +338,8 @@ struct ParolePlayerPrivate
GtkWidget *control; /* contains all play button*/
GtkWidget *fullscreen_button;
GtkWidget *fullscreen_image;
+GdkPixbuf *logo;
+gbooleanscale_logo;
GtkWidget *hbox_infobar;
GtkWidget *infobar;
@@ -2756,6 +2761,122 @@ parole_audiobox_expose_event (GtkWidget *w,
GdkEventExpose *ev, ParolePlayer *pl
return FALSE;
}
+void
+on_content_area_size_allocate (GtkWidget *widget, GtkAllocation *allocation,
ParolePlayer *player)
+{
+g_print(size allocate\n);
+g_return_if_fail (allocation != NULL);
+
+gtk_widget_set_allocation(widget, allocation);
+
+if ( gtk_widget_get_realized (widget) )
+{
+ player-priv-scale_logo = TRUE;
+
+ gtk_widget_queue_draw (widget);
+ }
+}
+
+static void
+parole_draw_logo (ParolePlayer *player)
+{
+static GdkPixbuf *pix = NULL;
+#if GTK_CHECK_VERSION(3, 0, 0)
+cairo_region_t *region;
+GdkRGBA *color;
+cairo_t *cr;
+#else
+GdkRegion *region;
+#endif
+GdkRectangle rect;
+GtkWidget *widget;
+GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+
+widget = GTK_WIDGET (player-priv-eventbox_output);
+
+if ( !gtk_widget_get_window(widget) )
+ return;
+
+rect.x = 0;
+rect.y = 0;
+
+gtk_widget_get_allocation(widget, allocation);
+rect.width = allocation-width;
+rect.height = allocation-height;
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+region = cairo_region_create_rectangle(rect);
+#else
+region = gdk_region_rectangle (rect);
+#endif
+
+gdk_window_begin_paint_region (gtk_widget_get_window(widget),
+ region);
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+cairo_region_destroy (region);
+
+GdkWindow *window;
+cairo_surface_t *target;
+
+window = gtk_widget_get_window (widget);
+
+//target = cairo_get_group_target (cr);
+
+/* Clear to parent-relative pixmap
+* We need to use direct X access here because GDK doesn't know about
+* the parent relative pixmap. */
+//cairo_surface_flush (target);
+
+XClearArea (GDK_WINDOW_XDISPLAY (window),
+GDK_WINDOW_XID (window),
+0, 0,
+allocation-width, allocation-height,
+False);/*
+cairo_surface_mark_dirty_rectangle (target,
+0, 0,
+allocation-width,
allocation-height);*/
+#else
+gdk_region_destroy (region);
+
+gdk_window_clear_area (gtk_widget_get_window(widget),
+ 0, 0,
+ allocation-width,
+ allocation-height);
+#endif
+
+if (player-priv-scale_logo)
+{
+ if (pix)
+ g_object_unref (pix);
+ pix = gdk_pixbuf_scale_simple (player-priv-logo,
+ allocation-width,
+ allocation-height,
+ GDK_INTERP_BILINEAR);
+ player-priv-scale_logo = FALSE;
+}
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+cr = gdk_cairo_create (gtk_widget_get_window(widget));
+gdk_cairo_set_source_pixbuf (cr, pix, 0, 0);
+cairo_paint (cr);
+cairo_destroy (cr);
+#else
+gdk_draw_pixbuf (GDK_DRAWABLE (gtk_widget_get_window(widget)),
+gtk_widget_get_style(widget)-fg_gc[0],
+pix,
+0, 0, 0, 0,
+allocation-width,
+allocation-height,
+GDK_RGB_DITHER_NONE,
+0, 0);
+#endif
+
+gdk_window_end_paint (gtk_widget_get_window(GTK_WIDGET
(player-priv-eventbox_output)));
+
+g_free(allocation);
+}
+
gboolean
parole_player_configure_event_cb (GtkWidget *widget, GdkEventConfigure *ev,
ParolePlayer
[Xfce4-commits] parole:master Initial GTK+3 port. Configure with --enable-gtk3=yes
Updating branch refs/heads/master
to 8060b259e08aea7a45653f39332719c78b5ee904 (commit)
from c6429490cb5a519be718f7f78798b7fd7c428ff4 (commit)
commit 8060b259e08aea7a45653f39332719c78b5ee904
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 01:42:10 2013 -0500
Initial GTK+3 port. Configure with --enable-gtk3=yes
configure.ac.in | 40 ++
src/common/parole-common.c | 31 +++---
src/common/parole-screensaver.c | 14 +-
src/gst/parole-gst.c| 81 ---
src/parole-button.c | 18 +++-
src/parole-conf-dialog.c| 14 ++
src/parole-disc.c |2 +-
src/parole-medialist.c |4 ++
src/parole-player.c | 89 +--
9 files changed, 257 insertions(+), 36 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index ae8daf4..f00dadb 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -110,18 +110,39 @@ AC_DEFINE_UNQUOTED(GSTREAMER_API_VERSION,
$gstreamer_api_version, [Define the GS
m4_define([dbus_minimum_version], [0.60])
m4_define([dbus_glib_minimum_version], [0.70])
-m4_define([libxfce4ui_minimum_version],[4.8.0])
-m4_define([libxfce4util_minimum_version],[4.8.0])
+m4_define([libxfce4ui_minimum_version],[4.10.0])
+m4_define([libxfce4util_minimum_version],[4.10.0])
m4_define([libnotify_minimum_version], [0.4.1])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version])
+XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
+XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
+
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_version])
+XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
+
+dnl
+dnl *** Compile against GTK3 or GTK2 ***
+dnl
+AC_ARG_ENABLE([gtk3],
+ [AC_HELP_STRING([--enable-gtk3],
+ [Compile against GTK+-3.0 (default=disabled)])],
+ [enable_gtk3=$enableval], [enable_gtk3=no])
+if test x$enable_gtk3 = xyes; then
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
+else
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+fi
+AM_CONDITIONAL([ENABLE_GTK3], [test x$enable_gtk3 = xyes])
+
XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}],
[gstreamer_minimum_version])
XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}],
[gstreamer_minimum_version])
XDT_CHECK_PACKAGE([GST_VIDEO], [gstreamer-video-${gstreamer_api_version}],
[gstreamer_minimum_version])
@@ -134,13 +155,7 @@ else
GST_LIBS=$GST_LIBS -lgstbase-$GST_API_VERSION -lgstvideo-$GST_API_VERSION
-lgstaudio-$GST_API_VERSION -lgstpbutils-$GST_API_VERSION
-lgsttag-$GST_API_VERSION
fi
-XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
-XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
-
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version])
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_version])
-XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
XDT_CHECK_LIBX11()
@@ -268,6 +283,12 @@ docs/plugin-api/Makefile
po/Makefile.in
])
+if test x$enable_gtk3 = xyes; then
+gtk_toolkit_version=GTK+-3
+else
+gtk_toolkit_version=GTK+-2
+fi
+
echo
--
Parole Media Player $VERSION
@@ -280,6 +301,7 @@ echo
Debug: $enable_debug
Building plugin api docs: ${enable_gtk_doc}
GStreamer API version: ${gstreamer_api_version}
+GTK+ version: $gtk_toolkit_version
Optional dependencies:
==
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index 59c3317..404bda5 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -82,22 +82,38 @@ void parole_window_busy_cursor (GdkWindow
*window)
cursor = gdk_cursor_new (GDK_WATCH);
gdk_window_set_cursor (window, cursor);
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+g_object_unref (cursor);
+#else
gdk_cursor_unref (cursor);
+#endif
gdk_flush ();
}
void parole_window_invisible_cursor(GdkWindow *window)
{
-GdkBitmap *empty_bitmap;
GdkCursor *cursor;
+#if GTK_CHECK_VERSION(3, 0, 0)
+cairo_surface_t *s;
+GdkPixbuf
[Xfce4-commits] parole:master Fix visualization loading.
Updating branch refs/heads/master
to b383387fb57927437be8792d3a6eddaca9d9e5a6 (commit)
from 8060b259e08aea7a45653f39332719c78b5ee904 (commit)
commit b383387fb57927437be8792d3a6eddaca9d9e5a6
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 03:28:38 2013 -0500
Fix visualization loading.
src/parole-conf-dialog.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 6ac2ab1..cf36a00 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -340,7 +340,11 @@ static void
parole_conf_dialog_add_vis_plugins (gpointer key, gpointer value, GtkWidget
*combox)
{
#if GTK_CHECK_VERSION(3, 0, 0)
-gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combox), (const gchar
*) key);
+GtkListStore *store =
GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combox)));
+GtkTreeIter iter;
+
+gtk_list_store_append( store, iter );
+gtk_list_store_set( store, iter, 0, (const gchar *) key, -1 );
#else
gtk_combo_box_append_text (GTK_COMBO_BOX (combox), (const gchar *) key);
#endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master GTK+3 Open Location dialog.
Updating branch refs/heads/master
to e50b87ae5721c8110ba86cc77d0acda18c7d88d6 (commit)
from 74bb2f66a7ea49c9fabefc1cc61bdc03053be655 (commit)
commit e50b87ae5721c8110ba86cc77d0acda18c7d88d6
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 08:53:37 2013 -0500
GTK+3 Open Location dialog.
.../{open-location.ui = open-location-3.ui} | 68 ++--
1 file changed, 35 insertions(+), 33 deletions(-)
diff --git a/data/interfaces/open-location.ui
b/data/interfaces/open-location-3.ui
similarity index 83%
copy from data/interfaces/open-location.ui
copy to data/interfaces/open-location-3.ui
index 98eb497..69725ad 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location-3.ui
@@ -1,7 +1,6 @@
?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=visibleTrue/property
property name=can_focusFalse/property
@@ -9,67 +8,64 @@
/object
object class=GtkDialog id=open-location
property name=can_focusFalse/property
+property name=border_width5/property
property name=title translatable=yesOpen Network Location/property
-property name=modalTrue/property
property name=default_width450/property
property name=icon_nameparole/property
property name=type_hintdialog/property
child internal-child=vbox
- object class=GtkVBox id=dialog-vbox1
-property name=visibleTrue/property
+ object class=GtkBox id=dialog-vbox1
property name=can_focusFalse/property
+property name=orientationvertical/property
property name=spacing12/property
child internal-child=action_area
- object class=GtkHButtonBox id=dialog-action_area1
-property name=visibleTrue/property
+ object class=GtkButtonBox id=dialog-action_area1
property name=can_focusFalse/property
property name=layout_styleend/property
child
- object class=GtkButton id=cancel
-property name=labelgtk-cancel/property
+ object class=GtkButton id=clear-history
+property name=label translatable=yesClear
History/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
-property name=use_stockTrue/property
+property name=imageimage1/property
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position0/property
+property name=secondaryTrue/property
+property name=non_homogeneousTrue/property
/packing
/child
child
- object class=GtkButton id=open
-property name=labelgtk-open/property
+ object class=GtkButton id=cancel
+property name=labelgtk-cancel/property
property name=visibleTrue/property
property name=can_focusTrue/property
-property name=can_defaultTrue/property
-property name=has_defaultTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position1/property
/packing
/child
child
- object class=GtkButton id=clear-history
-property name=label translatable=yesClear
History/property
+ object class=GtkButton id=open
+property name=labelgtk-open/property
property name=visibleTrue/property
property name=can_focusTrue/property
+property name=can_defaultTrue/property
+property name=has_defaultTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
-property name=imageimage1/property
+property name=use_stockTrue/property
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position2/property
-property name=secondaryTrue/property
[Xfce4-commits] parole:master Rename GTK3 ui files to remove -3.ui
Updating branch refs/heads/master
to 4a220b26cbf35604c5b64f2820d457b76e45edf2 (commit)
from 3424775cac176caed5a1eee7caa64f50915abdd6 (commit)
commit 4a220b26cbf35604c5b64f2820d457b76e45edf2
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Aug 20 07:11:42 2013 -0400
Rename GTK3 ui files to remove -3.ui
data/interfaces/Makefile.am| 23 ++--
.../{mediachooser-3.ui = mediachooser.ui} |0
.../{open-location-3.ui = open-location.ui} |0
.../{parole-settings-3.ui = parole-settings.ui} |0
data/interfaces/{parole-3.ui = parole.ui} |0
data/interfaces/{playlist-3.ui = playlist.ui} |0
data/interfaces/{plugins-3.ui = plugins.ui} |0
.../{save-playlist-3.ui = save-playlist.ui} |0
8 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 55badea..6292efc 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,37 +10,28 @@ interfaces =\
interfaces_h = \
$(interfaces:.ui=_ui.h)
-interfaces = \
- parole-3.ui \
- parole-settings-3.ui\
- playlist-3.ui \
- mediachooser-3.ui \
- save-playlist-3.ui \
- plugins-3.ui\
- open-location-3.ui
-
if MAINTAINER_MODE
BUILT_SOURCES = $(interfaces_h)
-parole_ui.h: parole-3.ui
+parole_ui.h: parole.ui
xdt-csource --static --strip-comments --strip-content --name=parole_ui
$ $@
-parole-settings_ui.h: parole-settings-3.ui
+parole-settings_ui.h: parole-settings.ui
xdt-csource --static --strip-comments --strip-content
--name=parole_settings_ui $ $@
-playlist_ui.h: playlist-3.ui
+playlist_ui.h: playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=playlist_ui $ $@
-mediachooser_ui.h: mediachooser-3.ui
+mediachooser_ui.h: mediachooser.ui
xdt-csource --static --strip-comments --strip-content
--name=mediachooser_ui $ $@
-save-playlist_ui.h: save-playlist-3.ui
+save-playlist_ui.h: save-playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $ $@
-open-location_ui.h: open-location-3.ui
+open-location_ui.h: open-location.ui
xdt-csource --static --strip-comments --strip-content
--name=open_location_ui $ $@
-plugins_ui.h: plugins-3.ui
+plugins_ui.h: plugins.ui
xdt-csource --static --strip-comments --strip-content --name=plugins_ui
$ $@
endif
diff --git a/data/interfaces/mediachooser-3.ui b/data/interfaces/mediachooser.ui
similarity index 100%
rename from data/interfaces/mediachooser-3.ui
rename to data/interfaces/mediachooser.ui
diff --git a/data/interfaces/open-location-3.ui
b/data/interfaces/open-location.ui
similarity index 100%
rename from data/interfaces/open-location-3.ui
rename to data/interfaces/open-location.ui
diff --git a/data/interfaces/parole-settings-3.ui
b/data/interfaces/parole-settings.ui
similarity index 100%
rename from data/interfaces/parole-settings-3.ui
rename to data/interfaces/parole-settings.ui
diff --git a/data/interfaces/parole-3.ui b/data/interfaces/parole.ui
similarity index 100%
rename from data/interfaces/parole-3.ui
rename to data/interfaces/parole.ui
diff --git a/data/interfaces/playlist-3.ui b/data/interfaces/playlist.ui
similarity index 100%
rename from data/interfaces/playlist-3.ui
rename to data/interfaces/playlist.ui
diff --git a/data/interfaces/plugins-3.ui b/data/interfaces/plugins.ui
similarity index 100%
rename from data/interfaces/plugins-3.ui
rename to data/interfaces/plugins.ui
diff --git a/data/interfaces/save-playlist-3.ui
b/data/interfaces/save-playlist.ui
similarity index 100%
rename from data/interfaces/save-playlist-3.ui
rename to data/interfaces/save-playlist.ui
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master GTK+3 Settings dialog.
Updating branch refs/heads/master to 27d42a8846498524420ca7c1c021b1a4de90f9b7 (commit) from b383387fb57927437be8792d3a6eddaca9d9e5a6 (commit) commit 27d42a8846498524420ca7c1c021b1a4de90f9b7 Author: Sean Davis smd.seanda...@gmail.com Date: Sun Feb 17 08:12:48 2013 -0500 GTK+3 Settings dialog. data/interfaces/Makefile.am | 49 ++- data/interfaces/parole-settings-3.ui | 648 ++ src/parole-conf-dialog.c |2 + 3 files changed, 695 insertions(+), 4 deletions(-) diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am index f17d0ed..fb2f3bd 100644 --- a/data/interfaces/Makefile.am +++ b/data/interfaces/Makefile.am @@ -6,10 +6,49 @@ interfaces = \ save-playlist.ui\ plugins.ui \ open-location.ui - + interfaces_h = \ $(interfaces:.ui=_ui.h) + +if ENABLE_GTK3 +interfaces = \ + parole.ui \ + parole-settings-3.ui\ + playlist.ui \ + mediachooser.ui \ + save-playlist.ui\ + plugins.ui \ + open-location.ui + +if MAINTAINER_MODE +BUILT_SOURCES = $(interfaces_h) + +parole_ui.h: parole.ui + xdt-csource --static --strip-comments --strip-content --name=parole_ui $ $@ + +parole-settings_ui.h: parole-settings-3.ui + xdt-csource --static --strip-comments --strip-content --name=parole_settings_ui $ $@ + +playlist_ui.h: playlist.ui + xdt-csource --static --strip-comments --strip-content --name=playlist_ui $ $@ + +mediachooser_ui.h: mediachooser.ui + xdt-csource --static --strip-comments --strip-content --name=mediachooser_ui $ $@ + +save-playlist_ui.h: save-playlist.ui + xdt-csource --static --strip-comments --strip-content --name=save_playlist_ui $ $@ + +open-location_ui.h: open-location.ui + xdt-csource --static --strip-comments --strip-content --name=open_location_ui $ $@ + +plugins_ui.h: plugins.ui + xdt-csource --static --strip-comments --strip-content --name=plugins_ui $ $@ + +endif + +else + if MAINTAINER_MODE BUILT_SOURCES = $(interfaces_h) @@ -34,11 +73,13 @@ open-location_ui.h: open-location.ui plugins_ui.h: plugins.ui xdt-csource --static --strip-comments --strip-content --name=plugins_ui $ $@ +endif + +endif + DISTCLEANFILES = \ $(interfaces_h) -endif - EXTRA_DIST = \ $(interfaces) \ - $(interfaces_h) + $(interfaces_h) \ No newline at end of file diff --git a/data/interfaces/parole-settings-3.ui b/data/interfaces/parole-settings-3.ui new file mode 100644 index 000..dfcf9d6 --- /dev/null +++ b/data/interfaces/parole-settings-3.ui @@ -0,0 +1,648 @@ +?xml version=1.0 encoding=UTF-8? +interface + !-- interface-requires gtk+ 3.0 -- + !-- interface-requires libxfce4ui 4.5 -- + object class=GtkImage id=image2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=stockgtk-revert-to-saved/property + /object + object class=GtkListStore id=liststore1 +columns + !-- column-name gchararray1 -- + column type=gchararray/ +/columns + /object + object class=XfceTitledDialog id=settings-dialog +property name=can_focusFalse/property +property name=title translatable=yesParole Settings/property +property name=modalTrue/property +property name=icon_nameparole/property +property name=border_width5/property +property name=type_hintdialog/property +property name=subtitle translatable=yesConfigure your media player/property +signal name=response handler=parole_conf_dialog_response_cb swapped=no/ +child internal-child=vbox + object class=GtkBox id=dialog-vbox1 +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing2/property +child internal-child=action_area + object class=GtkButtonBox id=dialog-action_area1 +property name=can_focusFalse/property +property name=layout_styleend/property +child + object class=GtkButton id=close +property name=labelgtk-close/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0
[Xfce4-commits] parole:master GTK+3 Plugins dialog.
Updating branch refs/heads/master
to 9a37941ca3c6cd55c31fd5171f6324891187c5c1 (commit)
from e50b87ae5721c8110ba86cc77d0acda18c7d88d6 (commit)
commit 9a37941ca3c6cd55c31fd5171f6324891187c5c1
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 09:24:08 2013 -0500
GTK+3 Plugins dialog.
data/interfaces/Makefile.am |8 +-
data/interfaces/{plugins.ui = plugins-3.ui} | 222 --
data/interfaces/plugins.ui |2 -
3 files changed, 105 insertions(+), 127 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 6a356fc..cad214a 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -18,8 +18,8 @@ interfaces = \
playlist.ui \
mediachooser-3.ui \
save-playlist.ui\
- plugins.ui \
- open-location.ui
+ plugins-3.ui\
+ open-location-3.ui
if MAINTAINER_MODE
BUILT_SOURCES = $(interfaces_h)
@@ -39,10 +39,10 @@ mediachooser_ui.h: mediachooser-3.ui
save-playlist_ui.h: save-playlist.ui
xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $ $@
-open-location_ui.h: open-location.ui
+open-location_ui.h: open-location-3.ui
xdt-csource --static --strip-comments --strip-content
--name=open_location_ui $ $@
-plugins_ui.h: plugins.ui
+plugins_ui.h: plugins-3.ui
xdt-csource --static --strip-comments --strip-content --name=plugins_ui
$ $@
endif
diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins-3.ui
similarity index 50%
copy from data/interfaces/plugins.ui
copy to data/interfaces/plugins-3.ui
index e900d09..efb68f7 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins-3.ui
@@ -1,10 +1,10 @@
?xml version=1.0 encoding=UTF-8?
interface
- requires lib=gtk+ version=2.24/
+ !-- interface-requires gtk+ 3.0 --
!-- interface-requires libxfce4ui 4.5 --
- !-- interface-naming-policy project-wide --
object class=XfceTitledDialog id=dialog
property name=can_focusFalse/property
+property name=border_width5/property
property name=title translatable=yesParole Plugins/property
property name=default_width600/property
property name=default_height300/property
@@ -16,12 +16,12 @@
property name=subtitle translatable=yesExtend your media
player/property
signal name=response handler=parole_plugins_manager_pref_response_cb
swapped=no/
child internal-child=vbox
- object class=GtkVBox id=dialog-vbox2
-property name=visibleTrue/property
+ object class=GtkBox id=dialog-vbox1
property name=can_focusFalse/property
+property name=orientationvertical/property
+property name=spacing2/property
child internal-child=action_area
- object class=GtkHButtonBox id=dialog-action_area2
-property name=visibleTrue/property
+ object class=GtkButtonBox id=dialog-action_area1
property name=can_focusFalse/property
property name=layout_styleend/property
child
@@ -33,12 +33,11 @@
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position1/property
/packing
/child
@@ -51,55 +50,48 @@
/packing
/child
child
- object class=GtkHBox id=hbox1
+ object class=GtkBox id=box1
property name=visibleTrue/property
property name=can_focusFalse/property
property name=spacing10/property
child
- object class=GtkViewport id=viewport1
+ object class=GtkScrolledWindow id=scrolledwindow1
property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=resize_modequeue/property
-property name=shadow_typenone/property
+property name=can_focusTrue/property
+property name=hscrollbar_policynever/property
+property name=shadow_typein/property
child
- object class=GtkScrolledWindow id=scrolledwindow1
+ object class=GtkTreeView id=treeview
property name=visibleTrue/property
property name=can_focusTrue/property
-property name
[Xfce4-commits] parole:master Fix parole background image
Updating branch refs/heads/master
to 6728aaa9202732026dfd5ccf586fa354619a2476 (commit)
from e00256f810a195e6ce79dcce4e7a4c26d2083fa9 (commit)
commit 6728aaa9202732026dfd5ccf586fa354619a2476
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Aug 20 20:29:16 2013 -0400
Fix parole background image
data/interfaces/parole.ui | 29 +-
src/gst/parole-gst.c | 132 +++--
src/parole-player.c | 113 ++
3 files changed, 62 insertions(+), 212 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 9b3c389..c9c97ef 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -456,8 +456,8 @@
property name=use_underlineTrue/property
property name=imageimage3/property
property name=use_stockFalse/property
-accelerator key=plus signal=activate/
accelerator key=equal signal=activate/
+accelerator key=plus signal=activate/
signal name=activate
handler=parole_player_volume_up swapped=no/
/object
/child
@@ -555,8 +555,8 @@
property name=can_focusFalse/property
child
object class=GtkBox id=video_output
-property name=visibleTrue/property
property name=can_focusFalse/property
+property name=no_show_allTrue/property
property name=orientationvertical/property
child
placeholder/
@@ -655,6 +655,31 @@
property name=position1/property
/packing
/child
+child
+ object class=GtkScrolledWindow id=logo_window
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+ object class=GtkViewport id=viewport1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=shadow_typenone/property
+child
+ object class=GtkImage id=logo
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property
name=stockgtk-missing-image/property
+ /object
+/child
+ /object
+/child
+ /object
+ packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position2/property
+ /packing
+/child
/object
/child
/object
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ad63ac3..5b1baa6 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -450,105 +450,6 @@ parole_gst_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
}
static void
-parole_gst_draw_logo (ParoleGst *gst)
-{
-static GdkPixbuf *pix = NULL;
-#if GTK_CHECK_VERSION(3, 0, 0)
-cairo_region_t *region;
-GdkRGBA *color;
-cairo_t *cr;
-#else
-GdkRegion *region;
-#endif
-GdkRectangle rect;
-GtkWidget *widget;
-GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
-
-widget = GTK_WIDGET (gst);
-
-if ( !gtk_widget_get_window(widget) )
- return;
-
-rect.x = 0;
-rect.y = 0;
-
-gtk_widget_get_allocation(widget, allocation);
-rect.width = allocation-width;
-rect.height = allocation-height;
-
-#if GTK_CHECK_VERSION(3, 0, 0)
-region = cairo_region_create_rectangle(rect);
-#else
-region = gdk_region_rectangle (rect);
-#endif
-
-gdk_window_begin_paint_region (gtk_widget_get_window(widget),
- region);
-
-#if GTK_CHECK_VERSION(3, 0, 0)
-cairo_region_destroy (region);
-
-GdkWindow *window;
-cairo_surface_t *target;
-
-window = gtk_widget_get_window (widget);
-target = cairo_get_group_target (cr);
-
-/* Clear to parent-relative pixmap
-* We need to use direct X access here because GDK doesn't know about
-* the parent relative pixmap. */
-cairo_surface_flush (target);
-
-XClearArea (GDK_WINDOW_XDISPLAY (window
[Xfce4-commits] parole:master Use new logo, no resize events
Updating branch refs/heads/master
to 757525ea245d009e685218c2f80535f486fb942d (commit)
from 080c45bce1b733f721c86934f3a28d01554c (commit)
commit 757525ea245d009e685218c2f80535f486fb942d
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Aug 21 07:44:51 2013 -0400
Use new logo, no resize events
data/interfaces/parole.ui | 19 ---
src/parole-player.c | 45 +++--
2 files changed, 7 insertions(+), 57 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index d938c4d..b897553 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -546,6 +546,8 @@
/child
child
object class=GtkEventBox id=content_area
+property name=width_request128/property
+property name=height_request128/property
property name=visibleTrue/property
property name=can_focusFalse/property
signal name=button-press-event
handler=parole_player_gst_widget_button_press swapped=no/
@@ -656,23 +658,10 @@
/packing
/child
child
- object class=GtkScrolledWindow id=logo_window
+ object class=GtkImage id=logo
property name=visibleTrue/property
property name=can_focusFalse/property
-child
- object class=GtkViewport id=viewport1
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=shadow_typenone/property
-child
- object class=GtkImage id=logo
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property
name=stockgtk-missing-image/property
- /object
-/child
- /object
-/child
+property name=stockgtk-missing-image/property
/object
packing
property name=expandTrue/property
diff --git a/src/parole-player.c b/src/parole-player.c
index d16997b..4853390 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -333,8 +333,6 @@ struct ParolePlayerPrivate
GtkWidget *fullscreen_image;
GdkPixbuf *logo;
GtkWidget *logo_image;
-GtkWidget *logo_window;
-gbooleanscale_logo;
GtkWidget *hbox_infobar;
GtkWidget *infobar;
@@ -896,7 +894,7 @@ parole_player_show_audiobox (ParolePlayer *player)
{
/* Only show the audiobox if we're sure there's no video playing and
visualizations are disabled. */
-gtk_widget_hide(player-priv-logo_window);
+gtk_widget_hide(player-priv-logo_image);
if (!gst_get_has_video ( PAROLE_GST(player-priv-gst) )
!gst_get_has_vis ( PAROLE_GST(player-priv-gst) ) )
{
@@ -1453,7 +1451,7 @@ parole_player_stopped (ParolePlayer *player)
gtk_widget_hide(player-priv-videobox);
gtk_widget_hide(player-priv-audiobox);
- gtk_widget_show_all(player-priv-logo_window);
+ gtk_widget_show(player-priv-logo_image);
gchar dur_text[128];
get_time_string (dur_text, 0);
@@ -2776,43 +2774,11 @@ on_content_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation, Par
if ( gtk_widget_get_realized (widget) )
{
- player-priv-scale_logo = TRUE;
gtk_widget_queue_draw (widget);
}
}
-static gboolean
-on_scrollbar_resize (GtkWidget *widget, GdkEventExpose *ev, ParolePlayer
*player) {
-player-priv-scale_logo = TRUE;
-
-gtk_widget_queue_draw (player-priv-logo_image);
-}
-
-static gboolean
-on_logo_draw (GtkWidget *widget, GdkEventExpose *ev, ParolePlayer *player) {
-GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
-static GdkPixbuf *pix = NULL;
-
-gtk_widget_get_allocation(player-priv-logo_window, allocation);
-
-if (player-priv-scale_logo)
-{
- if (pix)
- g_object_unref (pix);
- pix = gdk_pixbuf_scale_simple (player-priv-logo,
- allocation-width,
- allocation-height,
- GDK_INTERP_BILINEAR);
-gtk_image_set_from_pixbuf(GTK_IMAGE(player-priv-logo_image), pix);
- player-priv-scale_logo = FALSE;
-}
-
-g_free(allocation);
-
-return FALSE;
-}
-
gboolean
[Xfce4-commits] parole:master Scrollbars fix
Updating branch refs/heads/master
to 7478b8ba62276915e07d49859369faf760f8d9b0 (commit)
from e7e93e678b6d07b99fb0dbb1004f0641889879fe (commit)
commit 7478b8ba62276915e07d49859369faf760f8d9b0
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Aug 21 06:19:15 2013 -0400
Scrollbars fix
data/interfaces/parole.ui |4 +---
src/parole-player.c | 12 +---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 8658cde..ed87acf 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -456,8 +456,8 @@
property name=use_underlineTrue/property
property name=imageimage3/property
property name=use_stockFalse/property
-accelerator key=equal signal=activate/
accelerator key=plus signal=activate/
+accelerator key=equal signal=activate/
signal name=activate
handler=parole_player_volume_up swapped=no/
/object
/child
@@ -659,8 +659,6 @@
object class=GtkScrolledWindow id=logo_window
property name=visibleTrue/property
property name=can_focusFalse/property
-property name=hscrollbar_policynever/property
-property name=vscrollbar_policynever/property
child
object class=GtkViewport id=viewport1
property name=visibleTrue/property
diff --git a/src/parole-player.c b/src/parole-player.c
index 8b3f75e..d16997b 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2783,13 +2783,18 @@ on_content_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation, Par
}
static gboolean
+on_scrollbar_resize (GtkWidget *widget, GdkEventExpose *ev, ParolePlayer
*player) {
+player-priv-scale_logo = TRUE;
+
+gtk_widget_queue_draw (player-priv-logo_image);
+}
+
+static gboolean
on_logo_draw (GtkWidget *widget, GdkEventExpose *ev, ParolePlayer *player) {
-GtkWidget *parent;
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
static GdkPixbuf *pix = NULL;
-parent = gtk_widget_get_parent(widget);
-gtk_widget_get_allocation(parent, allocation);
+gtk_widget_get_allocation(player-priv-logo_window, allocation);
if (player-priv-scale_logo)
{
@@ -3138,6 +3143,7 @@ parole_player_init (ParolePlayer *player)
/* Background Image */
player-priv-logo_window = GTK_WIDGET (gtk_builder_get_object (builder,
logo_window));
+g_signal_connect(player-priv-logo_window, size-allocate,
G_CALLBACK(on_scrollbar_resize), player);
player-priv-logo = gdk_pixbuf_new_from_file (g_strdup_printf
(%s/parole.png, PIXMAPS_DIR), NULL);
player-priv-logo_image = GTK_WIDGET (gtk_builder_get_object (builder,
logo));
g_signal_connect(player-priv-logo_image, draw,
G_CALLBACK(on_logo_draw), player);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Remove useless child placeholders
Updating branch refs/heads/master to 107c5ac67a3fbf933a4735282f464a1054c1ac24 (commit) from 4a220b26cbf35604c5b64f2820d457b76e45edf2 (commit) commit 107c5ac67a3fbf933a4735282f464a1054c1ac24 Author: Sean Davis smd.seanda...@gmail.com Date: Tue Aug 20 07:21:33 2013 -0400 Remove useless child placeholders data/interfaces/parole.ui | 18 -- 1 file changed, 18 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 4ec2bcc..9b3c389 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -868,24 +868,6 @@ audio-volume-medium-symbolic/property object class=GtkNotebook id=notebook-playlist property name=can_focusFalse/property property name=no_show_allTrue/property -child - placeholder/ -/child -child type=tab - placeholder/ -/child -child - placeholder/ -/child -child type=tab - placeholder/ -/child -child - placeholder/ -/child -child type=tab - placeholder/ -/child /object packing property name=resizeTrue/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Remove building in gtk2
Updating branch refs/heads/master
to d0f9677e793eea4bdb8ba2289f16b74275ceff60 (commit)
from 35ea6ecf2c09ceb59a73604ce0627ebf4900d12c (commit)
commit d0f9677e793eea4bdb8ba2289f16b74275ceff60
Author: Sean Davis smd.seanda...@gmail.com
Date: Tue Aug 20 07:07:00 2013 -0400
Remove building in gtk2
configure.ac.in | 26 +-
data/interfaces/Makefile.am | 32
2 files changed, 5 insertions(+), 53 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index d621f66..6c640a8 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -78,7 +78,7 @@ XDT_I18N([@LINGUAS@])
# #
# Check for required packages #
#=#
-m4_define([gtk_minimum_version], [2.24.0])
+m4_define([gtk_minimum_version], [3.0.0])
m4_define([glib_minimum_version], [2.32.0])
dnl gstreamer version
@@ -128,20 +128,10 @@ XDT_CHECK_PACKAGE([LIBXFCE4UTIL],
[libxfce4util-1.0],[libxfce4util_minimum_versi
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
dnl
-dnl *** Compile against GTK3 or GTK2 ***
+dnl *** Compile against GTK3 ***
dnl
-AC_ARG_ENABLE([gtk3],
- [AC_HELP_STRING([--enable-gtk3],
- [Compile against GTK+-3.0 (default=disabled)])],
- [enable_gtk3=$enableval], [enable_gtk3=no])
-if test x$enable_gtk3 = xyes; then
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
-else
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
-fi
-AM_CONDITIONAL([ENABLE_GTK3], [test x$enable_gtk3 = xyes])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.10.0])
+XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.2.0])
XDT_CHECK_PACKAGE([GST], [gstreamer-${gstreamer_api_version}],
[${gstreamer_minimum_version}])
XDT_CHECK_PACKAGE([GST_BASE], [gstreamer-base-${gstreamer_api_version}],
[${gstreamer_minimum_version}])
@@ -286,12 +276,6 @@ docs/plugin-api/Makefile
po/Makefile.in
])
-if test x$enable_gtk3 = xyes; then
-gtk_toolkit_version=GTK+-3
-else
-gtk_toolkit_version=GTK+-2
-fi
-
echo
--
Parole Media Player $VERSION
@@ -304,7 +288,7 @@ echo
Debug: $enable_debug
Building plugin api docs: ${enable_gtk_doc}
GStreamer API version: ${gstreamer_api_version}
-GTK+ version: $gtk_toolkit_version
+GTK+ version: GTK+-3
Optional dependencies:
==
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 5a2c446..55badea 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -10,8 +10,6 @@ interfaces = \
interfaces_h = \
$(interfaces:.ui=_ui.h)
-
-if ENABLE_GTK3
interfaces = \
parole-3.ui \
parole-settings-3.ui\
@@ -47,36 +45,6 @@ plugins_ui.h: plugins-3.ui
endif
-else
-
-if MAINTAINER_MODE
-BUILT_SOURCES = $(interfaces_h)
-
-parole_ui.h: parole.ui
- xdt-csource --static --strip-comments --strip-content --name=parole_ui
$ $@
-
-parole-settings_ui.h: parole-settings.ui
- xdt-csource --static --strip-comments --strip-content
--name=parole_settings_ui $ $@
-
-playlist_ui.h: playlist.ui
- xdt-csource --static --strip-comments --strip-content
--name=playlist_ui $ $@
-
-mediachooser_ui.h: mediachooser.ui
- xdt-csource --static --strip-comments --strip-content
--name=mediachooser_ui $ $@
-
-save-playlist_ui.h: save-playlist.ui
- xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $ $@
-
-open-location_ui.h: open-location.ui
- xdt-csource --static --strip-comments --strip-content
--name=open_location_ui $ $@
-
-plugins_ui.h: plugins.ui
- xdt-csource --static --strip-comments --strip-content --name=plugins_ui
$ $@
-
-endif
-
-endif
-
DISTCLEANFILES = \
$(interfaces_h)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master GTK+3 Save Playlist dialog.
Updating branch refs/heads/master
to 2114d25306708c290ecaae4abdb9329cd8871e67 (commit)
from 9a37941ca3c6cd55c31fd5171f6324891187c5c1 (commit)
commit 2114d25306708c290ecaae4abdb9329cd8871e67
Author: Sean Davis smd.seanda...@gmail.com
Date: Sun Feb 17 09:44:01 2013 -0500
GTK+3 Save Playlist dialog.
data/interfaces/Makefile.am|4 +--
.../{save-playlist.ui = save-playlist-3.ui} | 36 ++--
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index cad214a..640e327 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -17,7 +17,7 @@ interfaces = \
parole-settings-3.ui\
playlist.ui \
mediachooser-3.ui \
- save-playlist.ui\
+ save-playlist-3.ui \
plugins-3.ui\
open-location-3.ui
@@ -36,7 +36,7 @@ playlist_ui.h: playlist.ui
mediachooser_ui.h: mediachooser-3.ui
xdt-csource --static --strip-comments --strip-content
--name=mediachooser_ui $ $@
-save-playlist_ui.h: save-playlist.ui
+save-playlist_ui.h: save-playlist-3.ui
xdt-csource --static --strip-comments --strip-content
--name=save_playlist_ui $ $@
open-location_ui.h: open-location-3.ui
diff --git a/data/interfaces/save-playlist.ui
b/data/interfaces/save-playlist-3.ui
similarity index 85%
copy from data/interfaces/save-playlist.ui
copy to data/interfaces/save-playlist-3.ui
index 68bb6b8..5a2d511 100644
--- a/data/interfaces/save-playlist.ui
+++ b/data/interfaces/save-playlist-3.ui
@@ -1,53 +1,50 @@
?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=GtkFileChooserDialog id=filechooserdialog
property name=can_focusFalse/property
property name=border_width5/property
+property name=roleGtkFileChooserDialog/property
property name=window_positioncenter-on-parent/property
-property name=type_hintnormal/property
+property name=type_hintdialog/property
property name=actionsave/property
property name=do_overwrite_confirmationTrue/property
child internal-child=vbox
- object class=GtkVBox id=dialog-vbox1
-property name=visibleTrue/property
+ object class=GtkBox id=filechooserdialog-vbox1
property name=can_focusFalse/property
+property name=orientationvertical/property
property name=spacing2/property
child internal-child=action_area
- object class=GtkHButtonBox id=dialog-action_area1
-property name=visibleTrue/property
+ object class=GtkButtonBox id=filechooserdialog-action_area1
property name=can_focusFalse/property
property name=layout_styleend/property
child
- object class=GtkButton id=button2
+ object class=GtkButton id=button1
property name=labelgtk-close/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
signal name=clicked
handler=parole_media_list_close_save_dialog_cb swapped=no/
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position0/property
/packing
/child
child
- object class=GtkButton id=button1
+ object class=GtkButton id=button2
property name=labelgtk-save/property
property name=visibleTrue/property
property name=can_focusTrue/property
property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
property name=use_stockTrue/property
signal name=clicked
handler=parole_media_list_save_playlist_cb swapped=no/
/object
packing
property name=expandFalse/property
-property name=fillFalse/property
+property name=fillTrue/property
property name=position1/property
/packing
/child
@@ -69,9 +66,12 @@
property name=can_focusTrue/property
property name=modelliststore/property
signal name=cursor-changed
handler=parole_media_list_format_cursor_changed_cb swapped=no/
+child
[Xfce4-commits] parole:master Make Leave Fullscreen a tooltip instead of label
Updating branch refs/heads/master to 35ea6ecf2c09ceb59a73604ce0627ebf4900d12c (commit) from cd5ff993de30e9245ae85450ca8e8a451ba35f82 (commit) commit 35ea6ecf2c09ceb59a73604ce0627ebf4900d12c Author: Sean Davis smd.seanda...@gmail.com Date: Tue Aug 20 06:41:42 2013 -0400 Make Leave Fullscreen a tooltip instead of label src/parole-player.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index e3f7ba5..0df3291 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -1953,8 +1953,8 @@ parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen) gtk_widget_hide (player-priv-menu_bar); gtk_widget_hide (player-priv-playlist_nt); parole_player_set_playlist_visible(player, FALSE); -gtk_button_set_label (GTK_BUTTON(player-priv-fullscreen_button), _(Leave Fullscreen)); -gtk_widget_set_tooltip_text (player-priv-fullscreen_button, ); +gtk_button_set_label (GTK_BUTTON(player-priv-fullscreen_button), ); +gtk_widget_set_tooltip_text (player-priv-fullscreen_button, _(Leave Fullscreen)); gtk_image_set_from_icon_name (GTK_IMAGE(player-priv-fullscreen_image), view-restore-symbolic, 24); gtk_widget_hide (player-priv-show_hide_playlist_button); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'bluesabre/gtk2' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3
Updating branch refs/heads/master
to d0d209f31fc81971bc2c49368ad96619b06f9165 (commit)
from 39cb913bc4085e54160bfe3aaf6ee3e8449ffbec (commit)
commit d0d209f31fc81971bc2c49368ad96619b06f9165
Merge: 39cb913 99321f3
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Aug 21 20:15:41 2013 -0400
Merge branch 'bluesabre/gtk2' of ssh://git.xfce.org/apps/parole into
bluesabre/gtk3
commit 99321f39ffe24c137e22d9457665456d76a25402
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Aug 22 01:31:00 2013 +0200
Improve 32px app-icon
commit 9e9ae122090074909f06920cef016b68ada90b20
Merge: 8e4fb48 520cd96
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Aug 22 01:30:26 2013 +0200
Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into
bluesabre/gtk3
commit 8e4fb48b1bdce6f920d7db093163a402fa92fb81
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Aug 22 01:28:05 2013 +0200
Make a few more menuitems use symbolic icons
data/icons/32x32/parole.png | Bin 1257 - 1171 bytes
src/parole-player.c | 35 ---
2 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/data/icons/32x32/parole.png b/data/icons/32x32/parole.png
index bcbb91b..f60a5db 100644
Binary files a/data/icons/32x32/parole.png and b/data/icons/32x32/parole.png
differ
diff --git a/src/parole-player.c b/src/parole-player.c
index e0faa0f..e0a759a 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2021,7 +2021,7 @@ void parole_player_leave_fs_cb (GtkButton *button,
ParolePlayer *player)
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
-GtkWidget *menu, *mi;
+GtkWidget *menu, *mi, *icon;
gboolean sensitive;
player-priv-current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player-priv-gst));
@@ -2030,9 +2030,10 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*Play menu item
*/
-mi = gtk_image_menu_item_new_from_stock (player-priv-state ==
PAROLE_STATE_PLAYING
-? GTK_STOCK_MEDIA_PAUSE :
GTK_STOCK_MEDIA_PLAY,
-NULL);
+mi = gtk_image_menu_item_new_with_mnemonic (player-priv-state ==
PAROLE_STATE_PLAYING ? _(_Pause):_(_Play));
+icon = gtk_image_new_from_icon_name (player-priv-state ==
PAROLE_STATE_PLAYING ?
media-playback-pause-symbolic:media-playback-start-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
+
g_object_get (G_OBJECT (player-priv-play_pause),
sensitive, sensitive,
@@ -2045,10 +2046,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Previous item in playlist.
+ * Next item in playlist.
*/
-mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_NEXT, NULL);
-
+mi = gtk_image_menu_item_new_with_mnemonic (_(_Next));
+icon = gtk_image_new_from_icon_name (media-skip-forward-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player-priv-state =
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, activate,
@@ -2056,10 +2058,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Next item in playlist.
+ * Previous item in playlist.
*/
-mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, NULL);
-
+mi = gtk_image_menu_item_new_with_mnemonic (_(_Previous));
+icon = gtk_image_new_from_icon_name (media-skip-backward-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player-priv-state =
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, activate,
@@ -2069,8 +2072,9 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*
* Un/Full screen
*/
-mi = gtk_image_menu_item_new_from_stock (player-priv-full_screen ?
GTK_STOCK_LEAVE_FULLSCREEN:
-GTK_STOCK_FULLSCREEN, NULL);
+mi = gtk_image_menu_item_new_with_mnemonic (player-priv-full_screen ?
_(_Leave Fullscreen):_(_Fullscreen));
+icon = gtk_image_new_from_icon_name (player-priv-full_screen ?
view-restore-symbolic:view-fullscreen-symbolic, GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_show
[Xfce4-commits] parole:master Fix invalid cast warning
Updating branch refs/heads/master
to 32597d83a30d0c8dc57944b20c1c2ff7a33a4908 (commit)
from 8ab5d96b3a6b1449f1611003044e1cc1827fc410 (commit)
commit 32597d83a30d0c8dc57944b20c1c2ff7a33a4908
Author: Sean Davis smd.seanda...@gmail.com
Date: Wed Aug 21 18:32:33 2013 -0400
Fix invalid cast warning
src/parole-medialist.c |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 716a3c1..b5aa6d9 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1314,9 +1314,9 @@ parole_media_list_dvd_chapter_activated (GtkMenuItem
*widget, ParoleMediaList *l
static void
-parole_media_list_show_dvd_menu (GtkToggleToolButton *button, ParoleMediaList
*list)
+parole_media_list_show_dvd_menu (GtkToggleButton *button, ParoleMediaList
*list)
{
-gboolean toggled = gtk_toggle_tool_button_get_active( button );
+gboolean toggled = gtk_toggle_button_get_active( button );
GtkBuilder *builder;
GtkMenu *menu;
GtkMenuItem *dvd_menu, *title_menu, *audio_menu, *angle_menu,
*chapter_menu;
@@ -1745,7 +1745,7 @@ parole_media_list_init (ParoleMediaList *list)
list-priv-playlist_controls = GTK_WIDGET
(gtk_builder_get_object(builder, playlist_controls));
list-priv-playlist_notebook = GTK_WIDGET
(gtk_builder_get_object(builder, playlist_notebook));
-g_signal_connect (GTK_TOGGLE_TOOL_BUTTON(list-priv-dvd_menu_button),
toggled,
+g_signal_connect (GTK_TOGGLE_BUTTON(list-priv-dvd_menu_button),
toggled,
G_CALLBACK (parole_media_list_show_dvd_menu), list);
list-priv-view = GTK_WIDGET (gtk_builder_get_object (builder,
media-list));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master More symbolics
Updating branch refs/heads/master to 520cd967196f6291bd5415830d49683bc64a1752 (commit) from 6717712c86eacb83296c8b979b7115b2a1f61882 (commit) commit 520cd967196f6291bd5415830d49683bc64a1752 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Aug 21 19:22:24 2013 -0400 More symbolics data/interfaces/parole.ui | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index b897553..567729b 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -35,7 +35,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_namemedia-cdrom/property +property name=icon_namemedia-optical-symbolic/property /object object class=GtkImage id=image2 property name=visibleTrue/property @@ -80,6 +80,12 @@ property name=pixel_size16/property property name=icon_nameparole-extension/property /object + object class=GtkImage id=image9 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixel_size16/property +property name=icon_namedocument-properties-symbolic/property + /object object class=GtkWindow id=main-window property name=can_focusFalse/property property name=title translatable=yesParole Media Player/property @@ -166,7 +172,6 @@ property name=labelgtk-quit/property property name=visibleTrue/property property name=can_focusFalse/property -property name=use_underlineTrue/property property name=use_stockTrue/property accelerator key=q signal=activate modifiers=GDK_CONTROL_MASK/ signal name=activate handler=parole_player_menu_exit_cb swapped=no/ @@ -221,11 +226,11 @@ /child child object class=GtkImageMenuItem id=preferences -property name=labelgtk-preferences/property +property name=labelPreferences/property property name=visibleTrue/property property name=can_focusFalse/property -property name=use_underlineTrue/property -property name=use_stockTrue/property +property name=imageimage9/property +property name=use_stockFalse/property signal name=activate handler=parole_player_open_preferences_cb swapped=no/ /object /child @@ -456,8 +461,8 @@ property name=use_underlineTrue/property property name=imageimage3/property property name=use_stockFalse/property -accelerator key=equal signal=activate/ accelerator key=plus signal=activate/ +accelerator key=equal signal=activate/ signal name=activate handler=parole_player_volume_up swapped=no/ /object /child ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
