[Xfce4-commits] parole:master Merge the playback gtk-scale and the control hbox

[Christoph Mende]

Updating branch refs/heads/master
 to ee2de664c08b182973521464429f405674591d2f (commit)
   from 0dee480cbdb21566c3a14054157a889ebcdf77a3 (commit)

commit ee2de664c08b182973521464429f405674591d2f
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 03:28:27 2012 +0200

Merge the playback gtk-scale and the control hbox

 data/interfaces/parole.ui |   35 ++-
 1 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 4ffad80..2350121 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -494,22 +494,6 @@
   /packing
 /child
 child
-  object class=GtkHScale 
id=scale
-property 
name=visibleTrue/property
-property 
name=sensitiveFalse/property
-property 
name=can_focusTrue/property
-property 
name=draw_valueFalse/property
-signal 
name=button_press_event handler=parole_player_range_button_press/
-signal name=value_changed 
handler=parole_player_range_value_changed/
-signal 
name=button_release_event handler=parole_player_range_button_release/
-signal name=scroll_event 
handler=parole_player_scroll_event_cb/
-  /object
-  packing
-property 
name=expandFalse/property
-property 
name=position1/property
-  /packing
-/child
-child
   object class=GtkHBox 
id=hbox7
 property 
name=visibleTrue/property
 child
@@ -585,6 +569,22 @@
 property 
name=position3/property
   /packing
 /child
+   child
+ object 
class=GtkHScale id=scale
+   property 
name=visibleTrue/property
+   property 
name=sensitiveFalse/property
+   property 
name=can_focusTrue/property
+   property 
name=draw_valueFalse/property
+   signal 
name=button_press_event handler=parole_player_range_button_press/
+   signal 
name=value_changed handler=parole_player_range_value_changed/
+   signal 
name=button_release_event handler=parole_player_range_button_release/
+   signal 
name=scroll_event handler=parole_player_scroll_event_cb/
+ /object
+ packing
+   property 
name=expandTrue/property
+   property 
name=position4/property
+ /packing
+   /child
 child
   object 
class=GtkHBox id=hbox8
 property 
name=visibleTrue/property
@@ -617,9 +617,10 @@
 /child
   /object
   packing
+   property 
name=expandFalse/property
 property 
name=padding30/property
 property 
name=pack_typeend/property
-property 

[Xfce4-commits] parole:master Remove stop-button from main interface

[Christoph Mende]

Updating branch refs/heads/master
 to 6279390bac13d35dcdd15c3197e4c461813251cd (commit)
   from ee2de664c08b182973521464429f405674591d2f (commit)

commit 6279390bac13d35dcdd15c3197e4c461813251cd
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 03:29:08 2012 +0200

Remove stop-button from main interface

 data/interfaces/parole.ui |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 2350121..8f4711d 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -521,7 +521,7 @@
 property 
name=position0/property
   /packing
 /child
-child
+!--child
   object 
class=GtkButton id=stop
 property 
name=visibleTrue/property
 property 
name=sensitiveFalse/property
@@ -536,7 +536,7 @@
 property 
name=expandFalse/property
 property 
name=position1/property
   /packing
-/child
+/child--
 child
   object 
class=GtkButton id=play-pause
 property 
name=visibleTrue/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fix position numbers

[Christoph Mende]

Updating branch refs/heads/master
 to 82683fd7bab0ba224b2c908e76b9c1e4e54cbb52 (commit)
   from 6279390bac13d35dcdd15c3197e4c461813251cd (commit)

commit 82683fd7bab0ba224b2c908e76b9c1e4e54cbb52
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 03:29:57 2012 +0200

Fix position numbers

 data/interfaces/parole.ui |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 8f4711d..8b5b8e3 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -550,7 +550,7 @@
   /object
   packing
 property 
name=expandFalse/property
-property 
name=position2/property
+property 
name=position1/property
   /packing
 /child
 child
@@ -566,7 +566,7 @@
   /object
   packing
 property 
name=expandFalse/property
-property 
name=position3/property
+property 
name=position2/property
   /packing
 /child
child
@@ -582,7 +582,7 @@
  /object
  packing
property 
name=expandTrue/property
-   property 
name=position4/property
+   property 
name=position3/property
  /packing
/child
 child
@@ -620,7 +620,7 @@
property 
name=expandFalse/property
 property 
name=padding30/property
 property 
name=pack_typeend/property
-property 
name=position5/property
+property 
name=position4/property
   /packing
 /child
   /object
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Move the sidebar-toggle to the View-menu

[Christoph Mende]

Updating branch refs/heads/master
 to 4a2aff94b658b2b611d6228b937a553dad98ca7a (commit)
   from 82683fd7bab0ba224b2c908e76b9c1e4e54cbb52 (commit)

commit 4a2aff94b658b2b611d6228b937a553dad98ca7a
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 03:54:36 2012 +0200

Move the sidebar-toggle to the View-menu

 data/interfaces/parole.ui |   12 ++--
 src/parole-player.c   |   24 +---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 8b5b8e3..9393765 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -180,6 +180,14 @@
 child type=submenu
   object class=GtkMenu id=menu2
 property name=visibleTrue/property
+   child
+  object class=GtkMenuItem id=show-hide-list
+property name=label translatable=yesHide 
playlist/property
+property name=visibleTrue/property
+property name=use_underlineTrue/property
+signal name=activate 
handler=parole_player_show_hide_playlist/
+  /object
+/child
 child
   object class=GtkMenuItem id=menuitem1
 property name=visibleTrue/property
@@ -648,7 +656,7 @@
 property 
name=position2/property
   /packing
 /child
-child
+!--child
   object class=GtkButton 
id=show-hide-list
 property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
@@ -664,7 +672,7 @@
 property 
name=pack_typeend/property
 property 
name=position1/property
   /packing
-/child
+/child--
   /object
   packing
 property 
name=expandFalse/property
diff --git a/src/parole-player.c b/src/parole-player.c
index 819e67d..d5c5a24 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -125,7 +125,7 @@ gbooleanparole_player_delete_event_cb   
(GtkWidget *widget,
 GdkEvent *ev,
 ParolePlayer *player);
 
-void   parole_player_show_hide_playlist(GtkButton *button,
+void   parole_player_show_hide_playlist(GtkMenuItem *widget,
 ParolePlayer *player);
 
 /*Menu items callbacks*/
@@ -315,36 +315,22 @@ void ratio_20_9_toggled_cb (GtkWidget *widget, 
ParolePlayer *player)
  NULL);
 }
 
-void parole_player_show_hide_playlist (GtkButton *button, ParolePlayer *player)
+void parole_player_show_hide_playlist (GtkMenuItem *widget, ParolePlayer 
*player)
 {
-GtkWidget *img;
 gboolean   visible;
 
-g_object_get (G_OBJECT (player-priv-show_hide_playlist),
- image, img,
- NULL);
-
 visible = GTK_WIDGET_VISIBLE (player-priv-playlist_nt);
 
 if ( !visible )
 {
-   g_object_set (G_OBJECT (img),
- stock, GTK_STOCK_GO_FORWARD,
- NULL);
- 
gtk_widget_show_all (player-priv-playlist_nt);
-   gtk_widget_set_tooltip_text (GTK_WIDGET 
(player-priv-show_hide_playlist), _(Hide playlist));
+   gtk_menu_item_set_label (GTK_MENU_ITEM 
(player-priv-show_hide_playlist), _(Hide playlist));
 }
 else
-{
-   g_object_set (G_OBJECT (img),
- stock, GTK_STOCK_GO_BACK,
- NULL);
- 
+{
gtk_widget_hide_all (player-priv-playlist_nt);
-   gtk_widget_set_tooltip_text (GTK_WIDGET 
(player-priv-show_hide_playlist), _(Show playlist));
+   gtk_menu_item_set_label (GTK_MENU_ITEM 
(player-priv-show_hide_playlist), _(Show playlist));
 }
-g_object_unref (img);
 }
 
 typedef enum
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Add fullscreen-button

[Christoph Mende]

Updating branch refs/heads/master
 to dc717ecc6b35f900e0eadc1a73257f6d44491e62 (commit)
   from 4a2aff94b658b2b611d6228b937a553dad98ca7a (commit)

commit dc717ecc6b35f900e0eadc1a73257f6d44491e62
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 04:21:23 2012 +0200

Add fullscreen-button

 data/interfaces/parole.ui |   45 ++---
 src/parole-player.c   |4 
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 9393765..774730f 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -529,22 +529,6 @@
 property 
name=position0/property
   /packing
 /child
-!--child
-  object 
class=GtkButton id=stop
-property 
name=visibleTrue/property
-property 
name=sensitiveFalse/property
-property 
name=can_focusTrue/property
-property 
name=receives_defaultTrue/property
-property 
name=imageimage7/property
-property 
name=reliefnone/property
-property 
name=focus_on_clickFalse/property
-signal 
name=clicked handler=parole_player_stop_clicked/
-  /object
-  packing
-property 
name=expandFalse/property
-property 
name=position1/property
-  /packing
-/child--
 child
   object 
class=GtkButton id=play-pause
 property 
name=visibleTrue/property
@@ -641,38 +625,37 @@
 property 
name=position0/property
   /packing
 /child
-child
-  object class=GtkButton 
id=leave_fs
-property 
name=labelgtk-leave-fullscreen/property
+   child
+  object class=GtkButton 
id=go_fs
+   property 
name=imageimage18/property
+   property 
name=visibleTrue/property
 property 
name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
 property 
name=no_show_allTrue/property
 property 
name=reliefnone/property
 property 
name=use_stockTrue/property
-signal name=clicked 
handler=parole_player_leave_fs_cb/
+signal name=clicked 
handler=parole_player_full_screen_activated_cb/
   /object
   packing
 property 
name=expandFalse/property
-property 
name=position2/property
+property 
name=position1/property
   /packing
 /child
-!--child
-  object class=GtkButton 
id=show-hide-list
-property 
name=visibleTrue/property
+child
+  object class=GtkButton 
id=leave_fs
+

[Xfce4-commits] parole:master Use g_object_unref (gdk_pixbuf_unref is deprecated)

[Christoph Mende]

Updating branch refs/heads/master
 to 7cdaccca5adae3389848523270e6c73f0878e92e (commit)
   from dc717ecc6b35f900e0eadc1a73257f6d44491e62 (commit)

commit 7cdaccca5adae3389848523270e6c73f0878e92e
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 04:26:55 2012 +0200

Use g_object_unref (gdk_pixbuf_unref is deprecated)

 src/parole-player.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 8d4e5f2..37126c7 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1405,7 +1405,7 @@ parole_player_set_volume_image (ParolePlayer *player, 
gdouble value)
g_object_set (G_OBJECT (player-priv-volume_image),
  pixbuf, icon,
  NULL);
-   gdk_pixbuf_unref (icon);
+   g_object_unref (icon);
 }
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Replace the buggy volume-range with a GtkVolumeButton

[Christoph Mende]

Updating branch refs/heads/master
 to 3a90e5a06c5748419bdeaa55c291fbcda13cbfbc (commit)
   from 7cdaccca5adae3389848523270e6c73f0878e92e (commit)

commit 3a90e5a06c5748419bdeaa55c291fbcda13cbfbc
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 05:10:53 2012 +0200

Replace the buggy volume-range with a GtkVolumeButton

 data/interfaces/parole.ui |   33 +++---
 src/parole-player.c   |   56 +
 2 files changed, 15 insertions(+), 74 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 774730f..a91ad8a 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -577,41 +577,16 @@
property 
name=position3/property
  /packing
/child
-child
-  object 
class=GtkHBox id=hbox8
-property 
name=visibleTrue/property
-property 
name=spacing5/property
-child
-object 
class=GtkImage id=volume-image
-property 
name=visibleTrue/property
-property 
name=stockgtk-missing-image/property
-/object
-packing
-property 
name=expandFalse/property
-property 
name=position0/property
-/packing
-/child
-child
-object 
class=GtkHScale id=volume
-property 
name=width_request100/property
-property 
name=height_request10/property
+   child
+  object 
class=GtkVolumeButton id=volume
 property 
name=visibleTrue/property
+   property 
name=sizeGTK_ICON_SIZE_LARGE_TOOLBAR/property
 property 
name=can_focusTrue/property
-property 
name=show_fill_levelTrue/property
-property 
name=draw_valueFalse/property
 signal 
name=value_changed handler=parole_player_volume_value_changed_cb/
 signal 
name=scroll_event handler=parole_player_volume_scroll_event_cb/
-/object
-packing
-property 
name=expandFalse/property
-property 
name=position1/property
-/packing
-/child
   /object
   packing
-   property 
name=expandFalse/property
-property 
name=padding30/property
-property 
name=pack_typeend/property
+property 
name=expandFalse/property
 property 
name=position4/property
   /packing
 /child
diff --git a/src/parole-player.c b/src/parole-player.c
index 37126c7..3e3f008 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -156,7 +156,7 @@ voidparole_player_volume_mute   
(GtkWidget *widget,
 void   parole_player_open_preferences_cb   (GtkWidget *widget,
 

[Xfce4-commits] parole:master Improve Open Location-dialog

[Christoph Mende]

Updating branch refs/heads/master
 to 0a5c4ad7451893cabbebbab312415b0ccf247df6 (commit)
   from 3a90e5a06c5748419bdeaa55c291fbcda13cbfbc (commit)

commit 0a5c4ad7451893cabbebbab312415b0ccf247df6
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 05:48:26 2012 +0200

Improve Open Location-dialog

 data/interfaces/open-location.ui |   36 +---
 src/parole-open-location.c   |3 ++-
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index ca7ced4..7c41108 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -4,6 +4,7 @@
   !-- interface-requires libxfce4ui 4.5 --
   !-- interface-naming-policy project-wide --
   object class=XfceTitledDialog id=open-location
+property name=title translatable=yesOpen Location/property
 property name=default_width400/property
 property name=icon_namegtk-network/property
 property name=type_hintnormal/property
@@ -20,40 +21,6 @@
 property name=orientationvertical/property
 property name=spacing5/property
 child
-  object class=GtkHBox id=hbox1
-property name=visibleTrue/property
-property name=spacing5/property
-child
-  object class=GtkLabel id=label1
-property name=visibleTrue/property
-property name=label translatable=yesEnter the 
address of a location to open/property
-  /object
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-property name=position0/property
-  /packing
-/child
-child
-  object class=GtkImage id=image1
-property name=visibleTrue/property
-property name=has_tooltipTrue/property
-property name=stockgtk-info/property
-property name=icon-size1/property
-  /object
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-property name=position1/property
-  /packing
-/child
-  /object
-  packing
-property name=fillFalse/property
-property name=position0/property
-  /packing
-/child
-child
   object class=GtkHBox id=hbox2
 property name=visibleTrue/property
 property name=spacing5/property
@@ -69,7 +36,6 @@
 /child
 child
   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
diff --git a/src/parole-open-location.c b/src/parole-open-location.c
index bddf303..8fdcab4 100644
--- a/src/parole-open-location.c
+++ b/src/parole-open-location.c
@@ -204,9 +204,10 @@ ParoleOpenLocation *parole_open_location (GtkWidget 
*parent)
 NULL);
 
 gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
-
+
 g_signal_connect_swapped (gtk_builder_get_object (builder, 
clear-history), clicked,
  G_CALLBACK (parole_open_location_clear_history), 
model);
+gtk_widget_set_tooltip_text (GTK_WIDGET (gtk_builder_get_object (builder, 
clear-history)), _(Clear History));
 
 g_signal_connect (dialog, delete-event,
  G_CALLBACK (gtk_widget_destroy), NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Window title is now set to displayed media name.

[Christoph Mende]

Updating branch refs/heads/master
 to 508d60420395261563183f8a43fee0f03935c64f (commit)
   from 0a5c4ad7451893cabbebbab312415b0ccf247df6 (commit)

commit 508d60420395261563183f8a43fee0f03935c64f
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 06:59:56 2012 -0400

Window title is now set to displayed media name.

 src/parole-player.c |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 3e3f008..a6ccde8 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -481,6 +481,9 @@ parole_player_media_activated_cb (ParoleMediaList *list, 
GtkTreeRowReference *ro
 parole_file_get_uri (file),
 sub);
g_free (sub);
+   
+   gtk_window_set_title (GTK_WINDOW (player-priv-window), 
parole_file_get_display_name(file));
+   
g_object_unref (file);
}
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Revert volume-button to button-size (otherwise all other buttons in that toolbar won't look square anymore)

[Christoph Mende]

Updating branch refs/heads/master
 to 49ed1c12a1cbe666cb477e17af643ce6de9ed795 (commit)
   from f707aabeaf717a6003e2695a425fbd886c341e1f (commit)

commit 49ed1c12a1cbe666cb477e17af643ce6de9ed795
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 13:52:08 2012 +0200

Revert volume-button to button-size (otherwise all other buttons in that 
toolbar won't look square anymore)

 data/interfaces/parole.ui |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 1774ff5..85c5253 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -808,7 +808,7 @@
 property 
name=reliefnone/property
 property 
name=focus_on_clickFalse/property
 property 
name=orientationvertical/property
-property 
name=sizelarge-toolbar/property
+property 
name=sizebutton/property
 property 
name=iconsaudio-volume-muted
 audio-volume-high
 audio-volume-low
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Progress is now displayed along with slider and duration.

[Christoph Mende]

Updating branch refs/heads/master
 to c9564ad89ee02764053a636106260af69b4725b5 (commit)
   from 49ed1c12a1cbe666cb477e17af643ce6de9ed795 (commit)

commit c9564ad89ee02764053a636106260af69b4725b5
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 09:17:44 2012 -0400

Progress is now displayed along with slider and duration.

 src/parole-player.c |8 
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 1fca219..6d9d918 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -551,6 +551,13 @@ parole_player_media_progressed_cb (ParoleGst *gst, const 
ParoleStream *stream, g
 if ( !player-priv-user_seeking  player-priv-state == 
PAROLE_MEDIA_STATE_PLAYING )
 {
parole_player_change_range_value (player, value);
+gchar pos_text[128];
+get_time_string (pos_text, value);
+/*text = g_strdup_printf (%s %s/%s, 
+   state == PAROLE_MEDIA_STATE_PAUSED ? _(Paused) : 
_(Playing), 
+   pos_text, 
+   dur_text);*/
+gtk_label_set_text (GTK_LABEL (player-priv-label_elapsed), pos_text);
 }
 }
 
@@ -1965,6 +1972,7 @@ parole_player_init (ParolePlayer *player)
 player-priv-main_nt = GTK_WIDGET (gtk_builder_get_object (builder, 
main-notebook));
 
 player-priv-label_duration = GTK_WIDGET(gtk_builder_get_object(builder, 
label_duration));
+player-priv-label_elapsed = GTK_WIDGET(gtk_builder_get_object(builder, 
label_elapsed));
 player-priv-play_pause = GTK_WIDGET (gtk_builder_get_object (builder, 
play-pause));
 player-priv-stop = GTK_WIDGET (gtk_builder_get_object (builder, stop));
 player-priv-seekf = GTK_WIDGET (gtk_builder_get_object (builder, 
forward));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Removed statusbar and moved buffering to a progressbar that shows when buffering.

[Christoph Mende]

Updating branch refs/heads/master
 to 66986d8f74bf3876971e33e45d0b278359649e02 (commit)
   from c9564ad89ee02764053a636106260af69b4725b5 (commit)

commit 66986d8f74bf3876971e33e45d0b278359649e02
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 09:58:03 2012 -0400

Removed statusbar and moved buffering to a progressbar that shows when 
buffering.

 data/interfaces/parole.ui |  108 +++--
 src/parole-player.c   |   27 ---
 2 files changed, 74 insertions(+), 61 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 85c5253..06621e4 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -757,20 +757,28 @@
   /packing
 /child
 child
-  object 
class=GtkLabel id=label_elapsed
+  object 
class=GtkVBox id=vbox2
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+child
+object 
class=GtkHBox id=play_box
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+child
+object 
class=GtkLabel id=label_elapsed
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 property 
name=label translatable=yes0:00/property
-  /object
-  packing
+/object
+packing
 property 
name=expandFalse/property
 property 
name=fillTrue/property
 property 
name=padding6/property
-property 
name=position3/property
-  /packing
-/child
-child
-  object 
class=GtkHScale id=scale
+property 
name=position0/property
+/packing
+/child
+child
+object 
class=GtkHScale id=scale
 property 
name=visibleTrue/property
 property 
name=sensitiveFalse/property
 property 
name=can_focusTrue/property
@@ -779,24 +787,53 @@
 signal 
name=button-release-event handler=parole_player_range_button_release 
swapped=no/
 signal 
name=value-changed handler=parole_player_range_value_changed swapped=no/
 signal 
name=scroll-event handler=parole_player_scroll_event_cb swapped=no/
-  /object
-  packing
+/object
+packing
 property 
name=expandTrue/property
 property 
name=fillTrue/property
-property 
name=position4/property
-  /packing
-/child
-child
-

[Xfce4-commits] parole:master Removed all references to parole-statusbar.

[Christoph Mende]

Updating branch refs/heads/master
 to de732d1e3c750ae241ac49c9b69b5f01da7a58ca (commit)
   from 66986d8f74bf3876971e33e45d0b278359649e02 (commit)

commit de732d1e3c750ae241ac49c9b69b5f01da7a58ca
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 10:08:20 2012 -0400

Removed all references to parole-statusbar.

 src/Makefile.am|2 -
 src/parole-disc-menu.c |1 -
 src/parole-statusbar.c |  346 
 src/parole-statusbar.h |   56 
 4 files changed, 0 insertions(+), 405 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index b2928a8..82f0eb5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,8 +37,6 @@ parole_SOURCES =  \
parole-player.h \
parole-vis.c\
parole-vis.h\
-   parole-statusbar.c  \
-   parole-statusbar.h  \
parole-medialist.c  \
parole-medialist.h  \
parole-mediachooser.c   \
diff --git a/src/parole-disc-menu.c b/src/parole-disc-menu.c
index fcb0833..5d33cbe 100644
--- a/src/parole-disc-menu.c
+++ b/src/parole-disc-menu.c
@@ -30,7 +30,6 @@
 
 #include parole-disc-menu.h
 #include parole-builder.h
-#include parole-statusbar.h
 #include parole-gst.h
 
 static void parole_disc_menu_finalize   (GObject *object);
diff --git a/src/parole-statusbar.c b/src/parole-statusbar.c
deleted file mode 100644
index 528f27b..000
--- a/src/parole-statusbar.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-#include stdio.h
-#include stdlib.h
-#include string.h
-
-#include gtk/gtk.h
-
-#include libxfcegui4/libxfcegui4.h
-
-#include parole-builder.h
-#include parole-statusbar.h
-
-#include parole-gst.h
-
-#define PAROLE_STATUSBAR_GET_PRIVATE(o) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_STATUSBAR, 
ParoleStatusbarPrivate))
-
-struct ParoleStatusbarPrivate
-{
-ParoleGst*gst;
-GtkWidget*box;
-GtkWidget*progress;
-GtkWidget*label_text;
-GtkWidget*label_duration;
-GtkWidget*sep;
-
-gint64   duration;
-gint64   pos;
-};
-
-G_DEFINE_TYPE (ParoleStatusbar, parole_statusbar, G_TYPE_OBJECT)
-
-static void 
-parole_statusbar_set_buffering (ParoleStatusbar *bar, gint percentage)
-{
-gchar *buff;
-
-buff = g_strdup_printf (%s %d%%, _(Buffering), percentage);
-
-gtk_progress_bar_set_text (GTK_PROGRESS_BAR (bar-priv-progress), buff);
-gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar-priv-progress), 
(gdouble) percentage/100);
-gtk_widget_hide (bar-priv-label_text);
-gtk_widget_hide (bar-priv-label_duration);
-gtk_widget_show (bar-priv-progress);
-g_free (buff);
-}
-
-static void
-get_time_string (gchar *timestring, gint total_seconds)
-{
-gint  hours;
-gint  minutes;
-gint  seconds;
-
-minutes =  total_seconds / 60;
-seconds = total_seconds % 60;
-hours = minutes / 60;
-minutes = minutes % 60;
-
-if ( hours == 0 )
-{
-   g_snprintf (timestring, 128, %02i:%02i, minutes, seconds);
-}
-else
-{
-   g_snprintf (timestring, 128, %i:%02i:%02i, hours, minutes, seconds);
-}
-}
-
-static void 
-parole_statusbar_set_duration (ParoleStatusbar *bar, ParoleMediaState state, 
gint64 position)
-{
-gchar *text = NULL;
-
-if ( state == PAROLE_MEDIA_STATE_STOPPED )
-{
-   gtk_label_set_text (GTK_LABEL (bar-priv-label_duration), 
_(Stopped));
-}
-else if ( state == PAROLE_MEDIA_STATE_FINISHED )
-{
-   gtk_label_set_text (GTK_LABEL (bar-priv-label_duration), 
_(Finished));
-}
-else
-{
-   if ( bar-priv-duration != 0)
-   {
-   gchar pos_text[128], dur_text[128];
-   get_time_string (pos_text, position);
-   get_time_string (dur_text, bar-priv-duration);
-   text = g_strdup_printf (%s %s/%s, 
-   state == 

[Xfce4-commits] parole:master Fixed show/hide order for buffer and scale.

[Christoph Mende]

Updating branch refs/heads/master
 to 8ef01741ee76ee9f5d2117c6a76baff082fb79c2 (commit)
   from de732d1e3c750ae241ac49c9b69b5f01da7a58ca (commit)

commit 8ef01741ee76ee9f5d2117c6a76baff082fb79c2
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 11:08:30 2012 -0400

Fixed show/hide order for buffer and scale.

 src/parole-player.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 62d6529..1a419e5 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1050,8 +1050,8 @@ parole_player_buffering_cb (ParoleGst *gst, const 
ParoleStream *stream, gint per
 {
player-priv-buffering = FALSE;
parole_gst_resume (PAROLE_GST (player-priv-gst));
-   gtk_widget_show (player-priv-playcontrol_box);
gtk_widget_hide (player-priv-progressbar_buffering);
+   gtk_widget_show (player-priv-playcontrol_box);
 }
 else
 {
@@ -1067,8 +1067,8 @@ parole_player_buffering_cb (ParoleGst *gst, const 
ParoleStream *stream, gint per
 
 gtk_progress_bar_set_text (GTK_PROGRESS_BAR 
(player-priv-progressbar_buffering), buff);
 gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR 
(player-priv-progressbar_buffering), (gdouble) percentage/100);
-gtk_widget_show (player-priv-progressbar_buffering);
gtk_widget_hide (player-priv-playcontrol_box);
+gtk_widget_show (player-priv-progressbar_buffering);
 g_free (buff);
 }
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fill property breaks scale-theming, so remove it

[Christoph Mende]

Updating branch refs/heads/master
 to d7a383b767d9c78de00258b3cb260fa845abb891 (commit)
   from 8ef01741ee76ee9f5d2117c6a76baff082fb79c2 (commit)

commit d7a383b767d9c78de00258b3cb260fa845abb891
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 17:14:33 2012 +0200

Fill property breaks scale-theming, so remove it

 data/interfaces/parole.ui |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 06621e4..bf3c92f 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -790,7 +790,6 @@
 /object
 packing
 property 
name=expandTrue/property
-property 
name=fillTrue/property
 property 
name=position1/property
 /packing
 /child
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Possible fix for hbox adjustments on buffer.

[Christoph Mende]

Updating branch refs/heads/master
 to 7a1e153e5bd3789e92786b2007c48ba8c013d000 (commit)
   from d7a383b767d9c78de00258b3cb260fa845abb891 (commit)

commit 7a1e153e5bd3789e92786b2007c48ba8c013d000
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 11:38:08 2012 -0400

Possible fix for hbox adjustments on buffer.

 data/interfaces/parole.ui |   37 +
 1 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index bf3c92f..5eb7fc1 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -757,11 +757,7 @@
   /packing
 /child
 child
-  object 
class=GtkVBox id=vbox2
-property 
name=visibleTrue/property
-property 
name=can_focusFalse/property
-child
-object 
class=GtkHBox id=play_box
+  object 
class=GtkHBox id=play_box
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 child
@@ -790,6 +786,7 @@
 /object
 packing
 property 
name=expandTrue/property
+property 
name=fillTrue/property
 property 
name=position1/property
 /packing
 /child
@@ -806,33 +803,25 @@
 property 
name=position2/property
 /packing
 /child
-/object
-packing
-property 
name=expandFalse/property
+  /object
+  packing
+property 
name=expandTrue/property
 property 
name=fillTrue/property
 property 
name=padding6/property
-property 
name=position0/property
-/packing
-/child
-child
-object 
class=GtkProgressBar id=progressbar_buffering
+property 
name=position3/property
+  /packing
+/child
+child
+  object 
class=GtkProgressBar id=progressbar_buffering
 property 
name=can_focusFalse/property
 property 
name=no_show_allTrue/property
 property 
name=show_textTrue/property
 property 
name=text translatable=yesBuffering (0%)/property
-/object
-packing
-property 
name=expandTrue/property
-property 
name=fillFalse/property
-property 
name=position1/property
-/packing
-/child
   

[Xfce4-commits] parole:master Hide time labels if live streaming.

[Christoph Mende]

Updating branch refs/heads/master
 to 58ef72695403b9453793aa3ad0171eb0aeab36d6 (commit)
   from 7a1e153e5bd3789e92786b2007c48ba8c013d000 (commit)

commit 58ef72695403b9453793aa3ad0171eb0aeab36d6
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 11 13:34:20 2012 -0400

Hide time labels if live streaming.

 src/parole-player.c |   25 -
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 1a419e5..1db5296 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -671,26 +671,25 @@ parole_player_playing (ParolePlayer *player, const 
ParoleStream *stream)
 
 player-priv-internal_range_change = TRUE;
 if ( live || duration == 0)
-   parole_player_change_range_value (player, 0);
+{
+   parole_player_change_range_value (player, 0);
+   gtk_widget_set_visible( player-priv-label_duration, FALSE );
+   gtk_widget_set_visible( player-priv-label_elapsed, FALSE );
+   }
 else 
-   gtk_range_set_range (GTK_RANGE (player-priv-range), 0, duration);
-   
-   /* Added duration here.*/
+{
+   gtk_range_set_range (GTK_RANGE (player-priv-range), 0, 
duration);
+   gtk_widget_set_visible( player-priv-label_duration, TRUE );
+   gtk_widget_set_visible( player-priv-label_elapsed, TRUE );
+   }
+
if ( duration != 0)
{
gchar dur_text[128];
get_time_string (dur_text, duration);
-   /*text = g_strdup_printf (%s %s/%s, 
-   state == PAROLE_MEDIA_STATE_PAUSED ? 
_(Paused) : _(Playing), 
-   pos_text, 
-   dur_text);*/
+
gtk_label_set_text (GTK_LABEL (player-priv-label_duration), 
dur_text);
}
-   /*if ( text )
-   {
-   
-   g_free (text);
-   }*/

 player-priv-internal_range_change = FALSE;
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master New idle-pixmap

[Christoph Mende]

Updating branch refs/heads/master
 to 745cf4e54620db333f8f6d0b7be7f7fe11cb13ed (commit)
   from 58ef72695403b9453793aa3ad0171eb0aeab36d6 (commit)

commit 745cf4e54620db333f8f6d0b7be7f7fe11cb13ed
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 23:05:53 2012 +0200

New idle-pixmap

 data/pixmaps/parole.png |  Bin 91063 - 102577 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/pixmaps/parole.png b/data/pixmaps/parole.png
index 1edd548..d086cd5 100644
Binary files a/data/pixmaps/parole.png and b/data/pixmaps/parole.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Reduce idle-logo size

[Christoph Mende]

Updating branch refs/heads/master
 to 91699fc9d4bf9d29fa6713a3fe473d6453bc0dbd (commit)
   from 745cf4e54620db333f8f6d0b7be7f7fe11cb13ed (commit)

commit 91699fc9d4bf9d29fa6713a3fe473d6453bc0dbd
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 12 00:59:28 2012 +0200

Reduce idle-logo size

 data/pixmaps/parole.png |  Bin 102577 - 40546 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/data/pixmaps/parole.png b/data/pixmaps/parole.png
index d086cd5..bc7c2d4 100644
Binary files a/data/pixmaps/parole.png and b/data/pixmaps/parole.png differ
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fix deprecated unref and add FIXMEs

[Christoph Mende]

Updating branch refs/heads/master
 to b61cca662b464dd2b7397a16a06bf4b4f6e10f14 (commit)
   from c263a406ba42a0277b7c721c078fd8d8ac1544d6 (commit)

commit b61cca662b464dd2b7397a16a06bf4b4f6e10f14
Author: Simon Steinbeiss och...@xfce.org
Date:   Fri Jul 13 02:34:42 2012 +0200

Fix deprecated unref and add FIXMEs

 gst/parole-gst.c |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index e61b3e0..db1d683 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -416,7 +416,7 @@ parole_gst_draw_logo (ParoleGst *gst)
 if (gst-priv-scale_logo)
 {
if (pix)
-   gdk_pixbuf_unref (pix);
+   g_object_unref (pix);
pix = gdk_pixbuf_scale_simple (gst-priv-logo,
   widget-allocation.width,
   widget-allocation.height,
@@ -1490,7 +1490,7 @@ parole_gst_check_state_change_timeout (gpointer data)
 if ( gst-priv-state != gst-priv-target )
 {
gboolean ret_val = 1;
-   /*gboolean ret_val = xfce_dialog_confirm (GTK_WINDOW 
(gtk_widget_get_toplevel (GTK_WIDGET (gst))),
+   /*FIXME gboolean ret_val = xfce_dialog_confirm (GTK_WINDOW 
(gtk_widget_get_toplevel (GTK_WIDGET (gst))),
GTK_STOCK_YES,
_(Stop),
_(The stream is taking too 
much time to load), 
@@ -1537,7 +1537,7 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean 
fade_sound)
step = volume - volume / 10;
parole_gst_set_volume (gst, step  0.01 ? 0 : step);
volume = parole_gst_get_volume (gst);
-   g_usleep (4);
+   g_usleep (4); // FIXME: isn't 4sec a bit long?
}
}
 }
@@ -1665,7 +1665,7 @@ parole_gst_constructed (GObject *object)
error = g_error_new (0, 0, %s, _(Unable to load playbin GStreamer 
plugin
, check your GStreamer 
installation));

-   /*xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel 
(GTK_WIDGET (gst))),
+   /*FIXME xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel 
(GTK_WIDGET (gst))),
error, NULL);*/
g_error_free (error);
g_error (playbin load failed);
@@ -1688,7 +1688,7 @@ parole_gst_constructed (GObject *object)
GError *error;
error = g_error_new (0, 0, %s, _(Unable to load video GStreamer 
plugin
  , check your GStreamer 
installation));
-   /*xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel 
(GTK_WIDGET (gst))),
+   /*FIXME xfce_dialog_show_error (GTK_WINDOW (gtk_widget_get_toplevel 
(GTK_WIDGET (gst))),
error, NULL);*/
g_error_free (error);
g_error (ximagesink load failed);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Gstreamer update from the 0.2.2 branch (should fix LP: #1023583)

[Christoph Mende]

Updating branch refs/heads/master
 to c263a406ba42a0277b7c721c078fd8d8ac1544d6 (commit)
   from 91699fc9d4bf9d29fa6713a3fe473d6453bc0dbd (commit)

commit c263a406ba42a0277b7c721c078fd8d8ac1544d6
Author: Simon Steinbeiss och...@xfce.org
Date:   Fri Jul 13 02:14:57 2012 +0200

Gstreamer update from the 0.2.2 branch (should fix LP: #1023583)

 gst/parole-gst.c|  457 ++-
 gst/parole-gst.h|   23 +--
 parole/parole-provider-player.c |2 +-
 parole/parole-provider-player.h |   11 +-
 parole/parole-stream.c  |2 +-
 parole/parole-stream.h  |   14 ++-
 src/parole-disc-menu.c  |6 +-
 src/parole-player.c |   52 +++--
 src/parole-plugin-player.c  |2 +-
 9 files changed, 262 insertions(+), 307 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index fd0d5ba..e61b3e0 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -1,5 +1,5 @@
 /*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
+ * * Copyright (C) 2009 Ali al...@xfce.org
  *
  * Licensed under the GNU General Public License Version 2
  *
@@ -33,16 +33,12 @@
 
 #include gst/video/video.h
 
-#ifdef XFCE_DISABLE_DEPRECATED
-#undef XFCE_DISABLE_DEPRECATED
-#endif
 #include libxfce4util/libxfce4util.h
 #include libxfcegui4/libxfcegui4.h
 
 #include gdk/gdkx.h
 
 #include parole-gst.h
-#include parole-gst-iface.h
 
 #include common/parole-common.h
 #include common/parole-rc-utils.h
@@ -50,15 +46,11 @@
 #include gst-enum-types.h
 #include gstmarshal.h
 
-
-
 #define HIDE_WINDOW_CURSOR_TIMEOUT 3.0f
 
 #define PAROLE_GST_GET_PRIVATE(o) \
 (G_TYPE_INSTANCE_GET_PRIVATE ((o), PAROLE_TYPE_GST, ParoleGstPrivate))
 
-static void parole_gst_helper_iface_init(ParoleGstHelperIface *iface);
-
 static voidparole_gst_play_file_internal   (ParoleGst *gst);
 
 static void parole_gst_change_state(ParoleGst *gst, 
@@ -70,17 +62,32 @@ static void parole_gst_terminate_internal   (ParoleGst *gst,
 static void parole_gst_seek_cdda_track (ParoleGst *gst,
 gint track);
 
+typedef enum 
+{
+GST_PLAY_FLAG_VIDEO = (1  0),
+GST_PLAY_FLAG_AUDIO = (1  1),
+GST_PLAY_FLAG_TEXT  = (1  2),
+GST_PLAY_FLAG_VIS   = (1  3),
+GST_PLAY_FLAG_SOFT_VOLUME   = (1  4),
+GST_PLAY_FLAG_NATIVE_AUDIO  = (1  5),
+GST_PLAY_FLAG_NATIVE_VIDEO  = (1  6),
+GST_PLAY_FLAG_DOWNLOAD  = (1  7),
+GST_PLAY_FLAG_BUFFERING = (1  8),
+GST_PLAY_FLAG_DEINTERLACE   = (1  9)
+
+} GstPlayFlags;
+
 struct ParoleGstPrivate
 {
 GstElement  *playbin;
 GstElement   *video_sink;
-GstElement   *vis_sink;
+
 GstBus   *bus;
 
 GMutex   *lock;
 GstState  state;
 GstState  target;
-ParoleMediaState media_state;
+ParoleState media_state;
 
 ParoleStream *stream;
 gulong   tick_id;
@@ -91,17 +98,19 @@ struct ParoleGstPrivate
 gpointer  conf; /* Specific for ParoleMediaPlayer*/
 
 gboolean terminating;
-gboolean embedded;
 gboolean  enable_tags;
 
 gboolean update_vis;
 gboolean  with_vis;
+gboolean  vis_loaded;
 gboolean  buffering;
 gboolean  update_color_balance;
 
 ParoleAspectRatio aspect_ratio;
 gulong   state_change_id;
 
+gboolean scale_logo;
+
 /*
  * xvimage sink has brightness+hue+aturation+contrast.
  */
@@ -124,7 +133,6 @@ enum
 enum
 {
 PROP_0,
-PROP_EMBEDDED,
 PROP_CONF_OBJ,
 PROP_ENABLE_TAGS
 };
@@ -133,8 +141,7 @@ static gpointer parole_gst_object = NULL;
 
 static guint signals [LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE_WITH_CODE (ParoleGst, parole_gst, GTK_TYPE_WIDGET,
-G_IMPLEMENT_INTERFACE (PAROLE_TYPE_GST_HELPER, 
parole_gst_helper_iface_init));
+G_DEFINE_TYPE (ParoleGst, parole_gst, GTK_TYPE_WIDGET)
 
 static void
 parole_gst_finalize (GObject *object)
@@ -347,11 +354,12 @@ parole_gst_size_allocate (GtkWidget *widget, 
GtkAllocation *allocation)
gint w, h;
gdouble ratio, width, height;

+   PAROLE_GST (widget)-priv-scale_logo = TRUE;
+   
w = allocation-width;
h = allocation-height;

-   if ( PAROLE_GST (widget)-priv-embedded == FALSE )
-   parole_gst_get_video_output_size (PAROLE_GST (widget), w, h);
+   parole_gst_get_video_output_size (PAROLE_GST (widget), w, h);
 
width = w;
height = h;
@@ -375,9 +383,9 @@ parole_gst_size_allocate (GtkWidget *widget, GtkAllocation 
*allocation)
 }
 
 static void
-parole_gst_draw_logo_common (ParoleGst *gst)
+parole_gst_draw_logo (ParoleGst *gst)
 {
-GdkPixbuf *pix;
+static GdkPixbuf *pix = NULL;
 GdkRegion *region;
 GdkRectangle rect;
 GtkWidget *widget;
@@ -404,11 +412,17 @@ parole_gst_draw_logo_common (ParoleGst *gst)
   0, 0,
   

[Xfce4-commits] parole:master Drop deprecated gst-iface files

[Christoph Mende]

Updating branch refs/heads/master
 to 8b97d255332df3eba9a270d2d2630fc2d6e1106b (commit)
   from 52fea68f3851b53e7226d8c7755794b771ccd25f (commit)

commit 8b97d255332df3eba9a270d2d2630fc2d6e1106b
Author: Simon Steinbeiss och...@xfce.org
Date:   Fri Jul 13 14:01:29 2012 +0200

Drop deprecated gst-iface files

 gst/Makefile.am|4 +-
 gst/parole-gst-iface.c |  108 
 gst/parole-gst-iface.h |   70 ---
 3 files changed, 1 insertions(+), 181 deletions(-)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 891ec29..393edc3 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -18,9 +18,7 @@ GENERATED_FILES = \
 libparolegst_la_SOURCES =  \
$(GENERATED_FILES)  \
parole-gst.c\
-   parole-gst.h\
-   parole-gst-iface.c  \
-   parole-gst-iface.h
+   parole-gst.h

 libparolegst_la_CFLAGS =   \
$(GST_VIDEO_CFLAGS) \
diff --git a/gst/parole-gst-iface.c b/gst/parole-gst-iface.c
deleted file mode 100644
index cdc8e67..000
--- a/gst/parole-gst-iface.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-#include stdio.h
-#include stdlib.h
-#include string.h
-
-#include glib.h
-
-#include parole-gst-iface.h
-
-GType
-parole_gst_helper_get_type (void)
-{
-static GType type = G_TYPE_INVALID;
-
-if (G_UNLIKELY (type == G_TYPE_INVALID))
-{
-   static const GTypeInfo info =
-   {
-   sizeof (ParoleGstHelperIface),
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   0,
-   0,
-   NULL,
-   NULL,
-   };
-
-   type = g_type_register_static (G_TYPE_INTERFACE, 
ParoleGstHelperIface, info, 0);
-
-   g_type_interface_add_prerequisite (type, G_TYPE_OBJECT);
-}
-
-return type;
-}
-
-void parole_gst_helper_draw_logo (ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-draw_logo )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-draw_logo) (gst);
-}
-}
-
-void parole_gst_helper_load_subtitle (ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-load_subtitle )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-load_subtitle) (gst);
-}
-}
-
-void parole_gst_helper_set_video_colors(ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-set_video_color_balance )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-set_video_color_balance) (gst);
-}
-}
-
-void parole_gst_helper_set_subtitle_font (ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-set_subtitle_font )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-set_subtitle_font) (gst);
-}
-}
-
-void parole_gst_helper_set_subtitle_encoding (ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-set_subtitle_encoding )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-set_subtitle_encoding) (gst);
-}
-}
-
-void parole_gst_helper_update_vis (ParoleGstHelper *gst)
-{
-if ( PAROLE_GST_HELPER_GET_IFACE (gst)-update_vis )
-{
-   (*PAROLE_GST_HELPER_GET_IFACE (gst)-update_vis) (gst);
-}
-}
diff --git a/gst/parole-gst-iface.h b/gst/parole-gst-iface.h
deleted file mode 100644
index c236458..000
--- a/gst/parole-gst-iface.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You 

[Xfce4-commits] parole:master Reduce fade-out-on-exit from 4sec to 1.5sec

[Christoph Mende]

Updating branch refs/heads/master
 to 300db3a1dbac06b0bc9d29de01e3b78fa15c1877 (commit)
   from 8b97d255332df3eba9a270d2d2630fc2d6e1106b (commit)

commit 300db3a1dbac06b0bc9d29de01e3b78fa15c1877
Author: Simon Steinbeiss och...@xfce.org
Date:   Fri Jul 13 14:39:23 2012 +0200

Reduce fade-out-on-exit from 4sec to 1.5sec

 gst/parole-gst.c |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index 4b519c3..f8a7e56 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -1531,7 +1531,7 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean 
fade_sound)
gdouble step;
volume = parole_gst_get_volume (gst);
/*
-* Like amarok, reduce the sound slowley then exit.
+* Fade-out on exit.
 */
if ( volume != 0 )
{
@@ -1540,7 +1540,7 @@ parole_gst_terminate_internal (ParoleGst *gst, gboolean 
fade_sound)
step = volume - volume / 10;
parole_gst_set_volume (gst, step  0.01 ? 0 : step);
volume = parole_gst_get_volume (gst);
-   g_usleep (4); // FIXME: isn't 4sec a bit long?
+   g_usleep (15000);
}
}
 }
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fix for widget_hide error. Addressed some messages displayed when running autogen.sh

[Christoph Mende]

Updating branch refs/heads/master
 to 4a100aa3601ae43b508fa94a9965c5994b5f9b4e (commit)
   from 300db3a1dbac06b0bc9d29de01e3b78fa15c1877 (commit)

commit 4a100aa3601ae43b508fa94a9965c5994b5f9b4e
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 13:49:26 2012 -0400

Fix for widget_hide error. Addressed some messages displayed when running 
autogen.sh

 configure.ac.in   |4 ++--
 data/interfaces/parole.ui |3 +--
 src/parole-player.c   |2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 43bcf52..8099c39 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -31,8 +31,8 @@ AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
 # = #
 #   Initialize libtool  #
 # = #
-AC_DISABLE_STATIC()
-AC_PROG_LIBTOOL()
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
 m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
 
 # = #
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ba51c4e..1921679 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -757,7 +757,7 @@
   /packing
 /child
 child
-  object 
class=GtkHBox id=play_box
+  object 
class=GtkHBox id=playing_box
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 child
@@ -786,7 +786,6 @@
 /object
 packing
 property 
name=expandTrue/property
-property 
name=fillTrue/property
 property 
name=position1/property
 /packing
 /child
diff --git a/src/parole-player.c b/src/parole-player.c
index 6d00dc6..9b80fee 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1967,7 +1967,7 @@ parole_player_init (ParolePlayer *player)

 player-priv-main_nt = GTK_WIDGET (gtk_builder_get_object (builder, 
main-notebook));
 
-player-priv-play_box = GTK_WIDGET (gtk_builder_get_object (builder, 
play_box));
+player-priv-playcontrol_box = GTK_WIDGET (gtk_builder_get_object 
(builder, playing_box));
 player-priv-progressbar_buffering = GTK_WIDGET (gtk_builder_get_object 
(builder, progressbar_buffering));
 
 player-priv-label_duration = GTK_WIDGET(gtk_builder_get_object(builder, 
label_duration));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Removed window title plugin from build since its functionality is now baked-in.

[Christoph Mende]

Updating branch refs/heads/master
 to 1dff422e325ad26d68b70366f153cbe283c8190e (commit)
   from 4a100aa3601ae43b508fa94a9965c5994b5f9b4e (commit)

commit 1dff422e325ad26d68b70366f153cbe283c8190e
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 13:59:06 2012 -0400

Removed window title plugin from build since its functionality is now 
baked-in.

 configure.ac.in |   10 --
 plugins/Makefile.am |6 +-
 2 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 8099c39..c22eb6f 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -181,14 +181,6 @@ if test x$ac_tray_plugin = xyes; then
[libnotify library], [yes]) 
 fi
 
-# Window title plugin.
-#--
-AC_ARG_ENABLE([window-title-plugin], 
AC_HELP_STRING([--disable-window-title-plugin], [Don't build the window title 
plugin]),
-  [ac_window_title_plugin=$enableval], [ac_window_title_plugin=yes])
-AC_MSG_CHECKING([whether to build the window title plugin])
-AM_CONDITIONAL([WINDOW_TITLE_PLUGIN], [test x$ac_window_title_plugin = 
xyes])
-AC_MSG_RESULT([$ac_window_title_plugin])
-
 # Power Manager
 #--
 AC_ARG_ENABLE([power-manager-plugin], 
AC_HELP_STRING([--disable-power-manager-plugin], [Don't build the power manager 
plugin]),
@@ -230,7 +222,6 @@ plugins/Makefile
 plugins/sample/Makefile
 plugins/properties/Makefile
 plugins/tray/Makefile
-plugins/window-title/Makefile
 plugins/power-manager/Makefile
 docs/Makefile
 docs/plugin-api/version.xml
@@ -268,7 +259,6 @@ echo 
fi 

echo 
-   Window title:   ${ac_window_title_plugin}
Power Manager:  ${ac_power_manager_plugin}
 
 --
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index a122328..e5de6c1 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -8,10 +8,6 @@ if PAROLE_TRAY_PLUGIN
 SUBDIRS+=tray
 endif
 
-if WINDOW_TITLE_PLUGIN
-SUBDIRS+=window-title
-endif
-
 if POWER_MANAGER_PLUGIN
 SUBDIRS+=power-manager
-endif
\ No newline at end of file
+endif
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Added deletions to commit.

[Christoph Mende]

Updating branch refs/heads/master
 to b1a552953c2bbeea6416c22a5a6fd66837874734 (commit)
   from 1dff422e325ad26d68b70366f153cbe283c8190e (commit)

commit b1a552953c2bbeea6416c22a5a6fd66837874734
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 14:00:28 2012 -0400

Added deletions to commit.

 plugins/window-title/Makefile.am |   42 
 plugins/window-title/window-title-plugin.c   |   47 
 plugins/window-title/window-title-provider.c |  147 --
 plugins/window-title/window-title-provider.h |   44 
 plugins/window-title/window-title.desktop.in |6 -
 5 files changed, 0 insertions(+), 286 deletions(-)

diff --git a/plugins/window-title/Makefile.am b/plugins/window-title/Makefile.am
deleted file mode 100644
index 888a2db..000
--- a/plugins/window-title/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-INCLUDES = \
-   -I$(top_builddir)   \
-   -I$(top_srcdir) \
-   -DG_LOG_DOMAIN=\window_title\ \
-   -DLIBEXECDIR=\$(libexecdir)\  \
-   -DPACKAGE_LOCALE_DIR=\$(localedir)\
-
-pluginsdir =   \
-   $(libdir)/parole-$(PAROLE_VERSION_API)
-
-plugins_LTLIBRARIES =  \
-   window-title.la
-
-window_title_la_SOURCES =  \
-   window-title-plugin.c   \
-   window-title-provider.c \
-   window-title-provider.h
-
-window_title_la_CFLAGS =   \
-   $(PLATFORM_CFLAGS)  \
-   $(GTK_CFLAGS)   \
-   $(LIBXFCE4UTIL_CFLAGS)
-
-window_title_la_LDFLAGS =  \
-   -avoid-version  \
-   -export-dynamic \
-   -module \
-   $(PLATFORM_LDFLAGS)
-
-#
-# .desktop file
-#
-desktop_in_files = window-title.desktop.in
-desktopdir = $(datadir)/parole/parole-plugins-$(PAROLE_VERSION_API)
-desktop_DATA =  $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
-
-EXTRA_DIST =   \
-   $(desktop_in_files)
-
-DISTCLEANFILES =   \
-   $(desktop_DATA)
\ No newline at end of file
diff --git a/plugins/window-title/window-title-plugin.c 
b/plugins/window-title/window-title-plugin.c
deleted file mode 100644
index 465e605..000
--- a/plugins/window-title/window-title-plugin.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include config.h
-#endif
-
-#include libxfce4util/libxfce4util.h
-
-#include window-title-provider.h
-
-G_MODULE_EXPORT GType  parole_plugin_initialize (ParoleProviderPlugin *plugin);
- 
-G_MODULE_EXPORT void   parole_plugin_shutdown   (void);
-
-G_MODULE_EXPORT GType
-parole_plugin_initialize (ParoleProviderPlugin *plugin)
-{
-xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
-
-window_title_provider_register_type (plugin);
-
-return WINDOW_TYPE_TITLE_PROVIDER;
-}
-
-G_MODULE_EXPORT void
-parole_plugin_shutdown (void)
-{
-
-}
diff --git a/plugins/window-title/window-title-provider.c 
b/plugins/window-title/window-title-provider.c
deleted file mode 100644
index 85e2364..000
--- a/plugins/window-title/window-title-provider.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * * Copyright (C) 2009-2011 Ali al...@xfce.org
- *
- * Licensed under the GNU General Public License Version 2
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public 

[Xfce4-commits] parole:master Added suggestions provided by libtool. All existing errors in configure are from XDT_FEATURE_DEBUG.

[Christoph Mende]

Updating branch refs/heads/master
 to b305f7d10832090e90d872ecec08ad5b249f7fcd (commit)
   from b1a552953c2bbeea6416c22a5a6fd66837874734 (commit)

commit b305f7d10832090e90d872ecec08ad5b249f7fcd
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 14:25:10 2012 -0400

Added suggestions provided by libtool. All existing errors in configure are 
from XDT_FEATURE_DEBUG.

 Makefile.am |2 ++
 configure.ac.in |2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7ec106d..8993042 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS =  \
data\
parole  \
diff --git a/configure.ac.in b/configure.ac.in
index c22eb6f..67568da 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -11,6 +11,8 @@ m4_define([parole_version], 
[parole_version_major().parole_version_minor().parol
 AC_INIT([parole], [parole_version], [al...@xfce.org])
 AC_PREREQ(2.59c)
 
+AC_CONFIG_MACRO_DIR([m4])
+
 AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
 AM_CONFIG_HEADER([config.h])
 AM_MAINTAINER_MODE()
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Drop references to the stop-button

[Christoph Mende]

Updating branch refs/heads/master
 to aef73c682154ee088c5345ec89d3ea36bb73e717 (commit)
   from 41f406204af55f56538420bde9159acdf754ba17 (commit)

commit aef73c682154ee088c5345ec89d3ea36bb73e717
Author: Simon Steinbeiss och...@xfce.org
Date:   Sat Jul 14 16:49:51 2012 +0200

Drop references to the stop-button

 src/parole-player.c |6 --
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 4cc9254..6daf8e0 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -744,12 +744,6 @@ parole_player_stopped (ParolePlayer *player)
 gtk_widget_set_sensitive (player-priv-play_pause, 
  parole_media_list_is_selected_row 
(player-priv-list) || 
  !parole_media_list_is_empty (player-priv-list));
-
-/* 
- * Set the stop widget insensitive only if we are not going to got to 
playing
- * state, this give the possibility to press on it if the media get stuck
- * for some reason.
- */
 
 parole_player_change_range_value (player, 0);
 gtk_widget_set_sensitive (player-priv-range, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Rearranged playlist buttons, added shuffle and repeat. Shuffle and Repeat playlist buttons now toggle menu items as well... but not the other way around yet.

[Christoph Mende]

Updating branch refs/heads/master
 to e5438a783449a94c580e571b3cea262ecad41a39 (commit)
   from aef73c682154ee088c5345ec89d3ea36bb73e717 (commit)

commit e5438a783449a94c580e571b3cea262ecad41a39
Author: Sean Davis smd.seanda...@gmail.com
Date:   Sat Jul 14 11:43:41 2012 -0400

Rearranged playlist buttons, added shuffle and repeat. Shuffle and Repeat 
playlist buttons now toggle menu items as well... but not the other way around 
yet.

 data/interfaces/playlist.ui |   55 +-
 src/parole-medialist.c  |  129 ++-
 src/parole-medialist.h  |6 ++
 src/parole-player.c |   65 ++
 src/parole-player.h |7 ++
 5 files changed, 159 insertions(+), 103 deletions(-)

diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index 8b09d5f..d9bb444 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -2,30 +2,32 @@
 interface
   requires lib=gtk+ version=2.24/
   !-- interface-naming-policy project-wide --
-  object class=GtkImage id=image1
+  object class=GtkImage id=image_add
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=stockgtk-add/property
   /object
-  object class=GtkImage id=image2
+  object class=GtkImage id=image_clear
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-remove/property
+property name=stockgtk-clear/property
   /object
-  object class=GtkImage id=image3
+  object class=GtkImage id=image_remove
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-go-up/property
+property name=stockgtk-remove/property
   /object
-  object class=GtkImage id=image4
+  object class=GtkImage id=image_repeat
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-go-down/property
+property name=pixel_size20/property
+property name=icon_namemedia-playlist-repeat/property
   /object
-  object class=GtkImage id=image5
+  object class=GtkImage id=image_shuffle
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-save-as/property
+property name=pixel_size20/property
+property name=icon_namemedia-playlist-shuffle/property
   /object
   object class=GtkVBox id=playlist-box
 property name=visibleTrue/property
@@ -80,7 +82,7 @@
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
-property name=imageimage1/property
+property name=imageimage_add/property
 signal name=clicked 
handler=parole_media_list_add_clicked_cb swapped=no/
   /object
   packing
@@ -90,14 +92,14 @@
   /packing
 /child
 child
-  object class=GtkButton id=save-playlist
+  object class=GtkButton id=remove-media
 property name=visibleTrue/property
 property name=sensitiveFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
-property name=imageimage5/property
-signal name=clicked handler=parole_media_list_save_cb 
swapped=no/
+property name=imageimage_remove/property
+signal name=clicked 
handler=parole_media_list_remove_clicked_cb swapped=no/
   /object
   packing
 property name=expandFalse/property
@@ -106,49 +108,46 @@
   /packing
 /child
 child
-  object class=GtkButton id=remove-media
+  object class=GtkButton id=clear-media
 property name=visibleTrue/property
-property name=sensitiveFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
-property name=imageimage2/property
-signal name=clicked 
handler=parole_media_list_remove_clicked_cb swapped=no/
+property name=imageimage_clear/property
+signal name=clicked 
handler=parole_media_list_clear_clicked_cb swapped=no/
   /object
   packing
-property name=expandFalse/property
+property name=expandTrue/property
 property name=fillTrue/property
 property 

[Xfce4-commits] parole:master Removed redundant draws in parole-gst.c

[Christoph Mende]

Updating branch refs/heads/master
 to 2a4d1de2dc070b1baf5c0c5d67e310f0662d0ad1 (commit)
   from e5438a783449a94c580e571b3cea262ecad41a39 (commit)

commit 2a4d1de2dc070b1baf5c0c5d67e310f0662d0ad1
Author: danny da...@wes.ec.rr.com
Date:   Sat Jul 14 18:13:17 2012 -0400

Removed redundant draws in parole-gst.c

 gst/parole-gst.c |3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index f8a7e56..bde1cb2 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -903,7 +903,6 @@ parole_gst_update_vis (ParoleGst *gst)
 
 gst-priv-update_vis = FALSE;
 g_free (vis_name);
-gtk_widget_queue_draw (GTK_WIDGET (gst));
 TRACE (end);
 }
 
@@ -1327,8 +1326,6 @@ parole_gst_play_file_internal (ParoleGst *gst)
 if ( gst-priv-update_vis)
parole_gst_update_vis (gst);
 
-gtk_widget_queue_draw (GTK_WIDGET (gst));
-
 g_object_get (G_OBJECT (gst-priv-stream),
  uri, uri,
  NULL);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Finished connecting Shuffle/Repeat buttons and menu items.

[Christoph Mende]

Updating branch refs/heads/master
 to 0821e49e48be8f623668ed95f4a5cfe90816ada8 (commit)
   from 2a4d1de2dc070b1baf5c0c5d67e310f0662d0ad1 (commit)

commit 0821e49e48be8f623668ed95f4a5cfe90816ada8
Author: Sean Davis smd.seanda...@gmail.com
Date:   Sat Jul 14 19:34:34 2012 -0400

Finished connecting Shuffle/Repeat buttons and menu items.

 src/parole-medialist.c |   46 +-
 src/parole-medialist.h |6 ++
 src/parole-player.c|   31 ---
 3 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 41ace6b..9ada493 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -42,6 +42,7 @@
 #include interfaces/save-playlist_ui.h
 
 #include parole-builder.h
+#include parole-player.h
 #include parole-medialist.h
 #include parole-mediachooser.h
 #include parole-open-location.h
@@ -169,9 +170,8 @@ struct ParoleMediaListPrivate
 GtkTreeSelection*sel;
 
 GtkWidget  *remove;
-GtkWidget  *up;
-GtkWidget  *down;
-GtkWidget  *save;
+GtkWidget  *shuffle;
+GtkWidget  *repeat;
 };
 
 enum
@@ -191,10 +191,7 @@ G_DEFINE_TYPE (ParoleMediaList, parole_media_list, 
GTK_TYPE_VBOX)
 static void
 parole_media_list_set_widget_sensitive (ParoleMediaList *list, gboolean 
sensitive)
 {
-gtk_widget_set_sensitive (GTK_WIDGET (list-priv-up), sensitive);
 gtk_widget_set_sensitive (GTK_WIDGET (list-priv-remove), sensitive);
-gtk_widget_set_sensitive (GTK_WIDGET (list-priv-down), sensitive);
-gtk_widget_set_sensitive (GTK_WIDGET (list-priv-save), sensitive);
 }
 
 /**
@@ -251,9 +248,6 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile 
*file, gboolean emit, g
 
 if ( nch == 1 )
 {
-   gtk_widget_set_sensitive (list-priv-up, FALSE);
-   gtk_widget_set_sensitive (list-priv-down, FALSE);
-   gtk_widget_set_sensitive (list-priv-save, TRUE);
gtk_widget_set_sensitive (list-priv-remove, TRUE);
 }
 else
@@ -865,11 +859,6 @@ parole_media_list_remove_clicked_cb (GtkButton *button, 
ParoleMediaList *list)
 */
g_signal_emit (G_OBJECT (list), signals [MEDIA_CURSOR_CHANGED], 0, 
FALSE);
 }
-else if ( nch == 1 )
-{
-   gtk_widget_set_sensitive (list-priv-up, FALSE);
-   gtk_widget_set_sensitive (list-priv-down, FALSE);
-}
 }
 
 /**
@@ -1516,10 +1505,9 @@ parole_media_list_init (ParoleMediaList *list)
 
 gtk_box_pack_start (GTK_BOX (list), box, TRUE, TRUE, 0);
 
-list-priv-up = GTK_WIDGET (gtk_builder_get_object (builder, media-up));
-list-priv-down = GTK_WIDGET (gtk_builder_get_object (builder, 
media-down));
 list-priv-remove = GTK_WIDGET (gtk_builder_get_object (builder, 
remove-media));
-list-priv-save = GTK_WIDGET (gtk_builder_get_object (builder, 
save-playlist));
+list-priv-repeat = GTK_WIDGET (gtk_builder_get_object (builder, 
repeat-media));
+list-priv-shuffle = GTK_WIDGET (gtk_builder_get_object (builder, 
shuffle-media));
 
 g_object_unref (builder);
 
@@ -1910,3 +1898,27 @@ void parole_media_list_grab_focus (ParoleMediaList *list)
 if (GTK_WIDGET_VISIBLE (list-priv-view) )
gtk_widget_grab_focus (list-priv-view);
 }
+
+void 
+parole_media_list_set_repeat_toggled (ParoleMediaList *list,
+ 
gboolean repeat_toggled)
+{
+   gboolean toggled;
+
+toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(list-priv-repeat));
+
+if (toggled != repeat_toggled)
+   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (list-priv-repeat), 
repeat_toggled );
+}
+   

+void 
+parole_media_list_set_shuffle_toggled (ParoleMediaList *list,
+ 
gboolean shuffle_toggled)
+{
+   gboolean toggled;
+
+toggled = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON 
(list-priv-shuffle));
+
+if (toggled != shuffle_toggled)
+   gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON (list-priv-shuffle), 
shuffle_toggled );
+}
diff --git a/src/parole-medialist.h b/src/parole-medialist.h
index 321a23e..73ac6e6 100644
--- a/src/parole-medialist.h
+++ b/src/parole-medialist.h
@@ -124,6 +124,12 @@ void
parole_media_list_save_list(ParoleMediaList *list);
 
 voidparole_media_list_grab_focus   
(ParoleMediaList *list);
 
+voidparole_media_list_set_repeat_toggled   
(ParoleMediaList *list,
+   
gboolean repeat_toggled);
+ 

[Xfce4-commits] parole:master Added initial values for repeat and shuffle togglebuttons.

[Christoph Mende]

Updating branch refs/heads/master
 to dfdab952c656e61d0bd27d0acaf1c5feea996723 (commit)
   from 0821e49e48be8f623668ed95f4a5cfe90816ada8 (commit)

commit dfdab952c656e61d0bd27d0acaf1c5feea996723
Author: Sean Davis smd.seanda...@gmail.com
Date:   Sat Jul 14 19:48:38 2012 -0400

Added initial values for repeat and shuffle togglebuttons.

 src/parole-player.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index 5ce246f..4bceaff 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2087,9 +2087,13 @@ parole_player_init (ParolePlayer *player)
 
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM 
(gtk_builder_get_object (builder, repeat)),
repeat);
+   
+parole_media_list_set_repeat_toggled(player-priv-list, repeat);
 
 gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM 
(gtk_builder_get_object (builder, shuffle)),
shuffle);
+   
+parole_media_list_set_shuffle_toggled(player-priv-list, shuffle);

 player-priv-fs_window = gtk_window_new (GTK_WINDOW_POPUP);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fixes for sensitivity of playlist clear item.

[Christoph Mende]

Updating branch refs/heads/master
 to 7a91c308610039b9cfe300595a6ad934f552ddba (commit)
   from dfdab952c656e61d0bd27d0acaf1c5feea996723 (commit)

commit 7a91c308610039b9cfe300595a6ad934f552ddba
Author: Sean Davis smd.seanda...@gmail.com
Date:   Sat Jul 14 20:03:42 2012 -0400

Fixes for sensitivity of playlist clear item.

 data/interfaces/playlist.ui |1 -
 src/parole-medialist.c  |4 
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui
index d9bb444..dbd09ab 100644
--- a/data/interfaces/playlist.ui
+++ b/data/interfaces/playlist.ui
@@ -94,7 +94,6 @@
 child
   object class=GtkButton id=remove-media
 property name=visibleTrue/property
-property name=sensitiveFalse/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
 property name=use_action_appearanceFalse/property
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 9ada493..a641860 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -170,6 +170,7 @@ struct ParoleMediaListPrivate
 GtkTreeSelection*sel;
 
 GtkWidget  *remove;
+GtkWidget  *clear;
 GtkWidget  *shuffle;
 GtkWidget  *repeat;
 };
@@ -192,6 +193,7 @@ static void
 parole_media_list_set_widget_sensitive (ParoleMediaList *list, gboolean 
sensitive)
 {
 gtk_widget_set_sensitive (GTK_WIDGET (list-priv-remove), sensitive);
+gtk_widget_set_sensitive (GTK_WIDGET (list-priv-clear), sensitive);
 }
 
 /**
@@ -249,6 +251,7 @@ parole_media_list_add (ParoleMediaList *list, ParoleFile 
*file, gboolean emit, g
 if ( nch == 1 )
 {
gtk_widget_set_sensitive (list-priv-remove, TRUE);
+   gtk_widget_set_sensitive (list-priv-clear, TRUE);
 }
 else
parole_media_list_set_widget_sensitive (list, TRUE);
@@ -1506,6 +1509,7 @@ parole_media_list_init (ParoleMediaList *list)
 gtk_box_pack_start (GTK_BOX (list), box, TRUE, TRUE, 0);
 
 list-priv-remove = GTK_WIDGET (gtk_builder_get_object (builder, 
remove-media));
+list-priv-clear = GTK_WIDGET (gtk_builder_get_object (builder, 
clear-media));
 list-priv-repeat = GTK_WIDGET (gtk_builder_get_object (builder, 
repeat-media));
 list-priv-shuffle = GTK_WIDGET (gtk_builder_get_object (builder, 
shuffle-media));
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Change warning into debug message (not relevant for normal users)

[Christoph Mende]

Updating branch refs/heads/master
 to c11572bb2f1f4253c7c2394eba7f653e904c9240 (commit)
   from c222a82f19fbcdcc9cd332f1bdeb448a2017978b (commit)

commit c11572bb2f1f4253c7c2394eba7f653e904c9240
Author: Simon Steinbeiss och...@xfce.org
Date:   Mon Jul 16 14:42:06 2012 +0200

Change warning into debug message (not relevant for normal users)

 src/parole-conf.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/parole-conf.c b/src/parole-conf.c
index 498423f..90523e7 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -404,7 +404,7 @@ parole_conf_load (ParoleConf *conf)
 
 if ( G_UNLIKELY (rc == NULL ) )
 {
-   g_warning (Unable to lookup rc file in : %s\n, PAROLE_RESOURCE_FILE);
+   g_debug (Unable to lookup rc file in : %s\n, PAROLE_RESOURCE_FILE);
return;
 }
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Make auto the default aspect ratio

[Christoph Mende]

Updating branch refs/heads/master
 to 2fd2d4a955b8418ff223fb428e1319947a7a34dc (commit)
   from c11572bb2f1f4253c7c2394eba7f653e904c9240 (commit)

commit 2fd2d4a955b8418ff223fb428e1319947a7a34dc
Author: Simon Steinbeiss och...@xfce.org
Date:   Mon Jul 16 14:44:44 2012 +0200

Make auto the default aspect ratio

 src/parole-conf.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/parole-conf.c b/src/parole-conf.c
index 90523e7..b583a48 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -317,7 +317,7 @@ parole_conf_class_init (ParoleConfClass *klass)
  g_param_spec_enum (aspect-ratio,
 NULL, NULL,

GST_ENUM_TYPE_ASPECT_RATIO,
-   
PAROLE_ASPECT_RATIO_NONE,
+   
PAROLE_ASPECT_RATIO_AUTO,
 G_PARAM_READWRITE));
   
 g_object_class_install_property (object_class,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Don't show simple text-files in all supported filetypes-filter in open-file dialog

[Christoph Mende]

Updating branch refs/heads/master
 to 28fd33d7f9ce22a14b40055ff21e9b73f200b6e0 (commit)
   from 2fd2d4a955b8418ff223fb428e1319947a7a34dc (commit)

commit 28fd33d7f9ce22a14b40055ff21e9b73f200b6e0
Author: Simon Steinbeiss och...@xfce.org
Date:   Tue Jul 17 01:35:42 2012 +0200

Don't show simple text-files in all supported filetypes-filter in 
open-file dialog

 src/misc/parole-filters.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/misc/parole-filters.c b/src/misc/parole-filters.c
index cdd99de..7c33346 100644
--- a/src/misc/parole-filters.c
+++ b/src/misc/parole-filters.c
@@ -34,7 +34,7 @@
 #include data/mime/parole-mime-types.h
 
 static char *playlist_mime_types[] = {
-text/plain,
+//text/plain,
 audio/x-mpegurl,
 audio/playlist,
 audio/x-scpls,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Enable multimedia-button support and fix most of the preferences dialog (visualisation combo is still broken)

[Christoph Mende]

Updating branch refs/heads/master
 to 1954726617ae7bbeb48739fc5dd85e7a65bfb7e3 (commit)
   from 28fd33d7f9ce22a14b40055ff21e9b73f200b6e0 (commit)

commit 1954726617ae7bbeb48739fc5dd85e7a65bfb7e3
Author: Simon Steinbeiss och...@xfce.org
Date:   Tue Jul 17 02:06:20 2012 +0200

Enable multimedia-button support and fix most of the preferences dialog 
(visualisation combo is still broken)

 data/interfaces/parole-settings.ui |2 +-
 src/parole-conf-dialog.c   |  104 +++-
 src/parole-player.c|   23 ++--
 3 files changed, 122 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/parole-settings.ui 
b/data/interfaces/parole-settings.ui
index 5914788..19b6d83 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -382,7 +382,7 @@
 property 
name=receives_defaultTrue/property
 property 
name=use_action_appearanceFalse/property
 property name=imageimage1/property
-signal name=clicked 
handler=reset-color_clicked_cb swapped=no/
+signal name=clicked 
handler=reset_color_clicked_cb swapped=no/
   /object
   packing
 property name=expandTrue/property
diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c
index 40784da..7f3dc1c 100644
--- a/src/parole-conf-dialog.c
+++ b/src/parole-conf-dialog.c
@@ -75,6 +75,19 @@ void saturation_value_changed_cb 
(GtkRange *range,
 
 void   reset_color_clicked_cb  (GtkButton 
*button, 
 
ParoleConfDialog *self);
+
+void   replace_playlist_toggled_cb 
(GtkToggleButton *widget,
+
ParoleConfDialog *self);
+
+void   remove_duplicated_toggled_cb
(GtkToggleButton *widget,
+
ParoleConfDialog *self);
+
+void   start_playing_opened_toggled_cb 
(GtkToggleButton *widget,
+
ParoleConfDialog *self);
+
+void   multimedia_keys_toggled_cb  
(GtkToggleButton *widget,
+
ParoleConfDialog *self);
+   
 /*
  * End of GtkBuilder callbacks
  */
@@ -108,13 +121,40 @@ parole_conf_dialog_destroy (GtkWidget *widget, 
ParoleConfDialog *self)
 g_object_unref (self);
 }
 
+void replace_playlist_toggled_cb (GtkToggleButton *widget, ParoleConfDialog 
*self)
+{
+g_object_set (G_OBJECT (self-priv-conf),
+ replace-playlist, gtk_toggle_button_get_active (widget),
+ NULL);
+}
+
+void remove_duplicated_toggled_cb (GtkToggleButton *widget, ParoleConfDialog 
*self)
+{
+g_object_set (G_OBJECT (self-priv-conf),
+ remove-duplicated, gtk_toggle_button_get_active (widget),
+ NULL);
+}
+
+void start_playing_opened_toggled_cb (GtkToggleButton *widget, 
ParoleConfDialog *self)
+{
+g_object_set (G_OBJECT (self-priv-conf),
+ play-opened-files, gtk_toggle_button_get_active (widget),
+ NULL);
+}
+
+void multimedia_keys_toggled_cb (GtkToggleButton *widget, ParoleConfDialog 
*self)
+{
+g_object_set (G_OBJECT (self-priv-conf),
+ multimedia-keys, gtk_toggle_button_get_active (widget),
+ NULL);
+}
+
 void reset_color_clicked_cb (GtkButton *button, ParoleConfDialog *self)
 {
 gtk_range_set_value (GTK_RANGE (self-priv-brightness), 0);
 gtk_range_set_value (GTK_RANGE (self-priv-contrast), 0);
 gtk_range_set_value (GTK_RANGE (self-priv-hue), 0);
 gtk_range_set_value (GTK_RANGE (self-priv-saturation), 0);
-
 }
 
 void parole_conf_dialog_response_cb (GtkDialog *dialog, gint response_id, 
ParoleConfDialog *self)
@@ -302,6 +342,65 @@ parole_conf_dialog_set_default_vis_plugin (GtkTreeModel 
*model, GtkTreePath *pat
 }
 
 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,
+ 

[Xfce4-commits] parole:master Fix visualisations combobox (add liststore and cellrenderer)

[Christoph Mende]

Updating branch refs/heads/master
 to 732a96d7aec1190ba268cb475fc9ea121373120c (commit)
   from 1954726617ae7bbeb48739fc5dd85e7a65bfb7e3 (commit)

commit 732a96d7aec1190ba268cb475fc9ea121373120c
Author: Simon Steinbeiss och...@xfce.org
Date:   Tue Jul 17 18:54:48 2012 +0200

Fix visualisations combobox (add liststore and cellrenderer)

 data/interfaces/parole-settings.ui |   15 ++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/data/interfaces/parole-settings.ui 
b/data/interfaces/parole-settings.ui
index 19b6d83..10ebbb7 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -151,7 +151,14 @@
   object class=GtkComboBox 
id=vis-combobox
 property name=visibleTrue/property
 property name=can_focusFalse/property
-signal name=changed 
handler=parole_conf_dialog_vis_plugin_changed_cb swapped=no/
+property 
name=modelliststore1/property
+signal name=changed 
handler=parole_conf_dialog_vis_plugin_changed_cb/
+child
+  object class=GtkCellRendererText 
id=cellrenderertext1/
+  attributes
+attribute 
name=text0/attribute
+  /attributes
+/child
   /object
   packing
 property name=expandTrue/property
@@ -654,4 +661,10 @@
   action-widget response=-7close/action-widget
 /action-widgets
   /object
+object class=GtkListStore id=liststore1
+columns
+  !-- column-name gchararray1 --
+  column type=gchararray/
+/columns
+  /object
 /interface
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Drop XfceTitledHeader (libxfce4util dependency) on Open-File dialog

[Christoph Mende]

Updating branch refs/heads/master
 to 682dc61c906520cc4739f9da9265de1625df4e81 (commit)
   from 732a96d7aec1190ba268cb475fc9ea121373120c (commit)

commit 682dc61c906520cc4739f9da9265de1625df4e81
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 09:42:10 2012 +0200

Drop XfceTitledHeader (libxfce4util dependency) on Open-File dialog

 data/interfaces/mediachooser.ui |   12 ++--
 src/parole-mediachooser.c   |2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/mediachooser.ui b/data/interfaces/mediachooser.ui
index d77d01b..2def10d 100644
--- a/data/interfaces/mediachooser.ui
+++ b/data/interfaces/mediachooser.ui
@@ -3,14 +3,14 @@
   requires lib=gtk+ version=2.24/
   !-- interface-requires libxfce4ui 4.5 --
   !-- interface-naming-policy project-wide --
-  object class=XfceTitledDialog id=chooser
+  object class=GtkDialog id=chooser
 property name=can_focusFalse/property
-property name=title translatable=yesParole Media Chooser/property
 property name=default_width680/property
 property name=default_height480/property
+!--property name=title translatable=yesParole Media 
Chooser/property
 property name=icon_nameaudio-x-generic/property
 property name=type_hintnormal/property
-property name=subtitle translatable=yesOpen media files/property
+property name=subtitle translatable=yesOpen media files/property--
 signal name=destroy handler=parole_media_chooser_destroy_cb 
swapped=no/
 child internal-child=vbox
   object class=GtkVBox id=dialog-vbox
@@ -44,7 +44,7 @@
 property name=homogeneousTrue/property
 child
   object class=GtkButton id=close
-property name=labelgtk-close/property
+property name=labelgtk-cancel/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -60,7 +60,7 @@
 /child
 child
   object class=GtkButton id=open
-property name=label translatable=yesAdd/property
+property name=label translatable=yesOpen/property
 property name=visibleTrue/property
 property name=can_focusTrue/property
 property name=receives_defaultTrue/property
@@ -171,6 +171,6 @@
   object class=GtkImage id=image1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-add/property
+property name=stockgtk-open/property
   /object
 /interface
diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c
index 3028af0..148000a 100644
--- a/src/parole-mediachooser.c
+++ b/src/parole-mediachooser.c
@@ -29,7 +29,7 @@
 #include gtk/gtk.h
 #include glib.h
 
-#include libxfce4util/libxfce4util.h
+//#include libxfce4util/libxfce4util.h
 
 #include src/misc/parole-file.h
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Simpler Open Location dialog, no more XfceTitleHeader

[Christoph Mende]

Updating branch refs/heads/master
 to ccf872eadb7ea5ff8227b3a761ae8a43101e5ae9 (commit)
   from 682dc61c906520cc4739f9da9265de1625df4e81 (commit)

commit ccf872eadb7ea5ff8227b3a761ae8a43101e5ae9
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 09:42:36 2012 +0200

Simpler Open Location dialog, no more XfceTitleHeader

 data/interfaces/open-location.ui |   89 +-
 1 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index 36893d1..db2db36 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -1,11 +1,13 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   requires lib=gtk+ version=2.24/
-  !-- interface-requires libxfce4ui 4.5 --
   !-- interface-naming-policy project-wide --
   object class=GtkDialog id=dialog1
 property name=can_focusFalse/property
 property name=border_width5/property
+property name=titleOpen Location/property
+property name=default_width400/property
+property name=default_height300/property
 property name=type_hintnormal/property
 child internal-child=vbox
   object class=GtkVBox id=dialog-vbox2
@@ -42,13 +44,18 @@
 property name=can_focusFalse/property
 property name=stockgtk-clear/property
   /object
-  object class=XfceTitledDialog id=open-location
+  object class=GtkImage id=image3
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-clear/property
+  /object
+  object class=GtkDialog id=open-location
 property name=can_focusFalse/property
 property name=title translatable=yesOpen Location/property
 property name=default_width400/property
-property name=icon_namegtk-network/property
+property name=default_height300/property
+property name=icon_nameparole/property
 property name=type_hintnormal/property
-property name=subtitle translatable=yesOpen location of media file 
or live stream/property
 child internal-child=vbox
   object class=GtkVBox id=dialog-vbox1
 property name=visibleTrue/property
@@ -99,48 +106,50 @@
   /packing
 /child
 child
-  object class=GtkVBox id=vbox1
+  object class=GtkLabel id=label1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yesPlease enter a network 
URL:/property
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+child
+  object class=GtkHBox id=hbox2
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=spacing5/property
 child
-  object class=GtkHBox id=hbox2
+  object class=GtkEntry id=entry
 property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=spacing5/property
-child
-  object class=GtkEntry id=entry
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=invisible_char●/property
-property name=primary_icon_activatableFalse/property
-property 
name=secondary_icon_activatableFalse/property
-property name=primary_icon_sensitiveTrue/property
-property name=secondary_icon_sensitiveTrue/property
-  /object
-  packing
-property name=expandTrue/property
-property name=fillTrue/property
-property name=position0/property
-  /packing
-/child
-child
-  object class=GtkButton id=clear-history
-property name=visibleTrue/property
-property name=can_focusTrue/property
-property name=receives_defaultTrue/property
-property name=use_action_appearanceFalse/property
-property name=imageimage2/property
-  /object
-  packing
-property name=expandFalse/property
-property name=fillFalse/property
-property name=position1/property
-  /packing
-/child
+property name=can_focusTrue/property
+property name=invisible_char●/property
+property name=invisible_char_setTrue/property
+property name=primary_icon_activatableFalse/property
+property name=secondary_icon_activatableFalse/property
+property 

[Xfce4-commits] parole:master Drop commented lines

[Christoph Mende]

Updating branch refs/heads/master
 to 1d1fccea4829ec2f2a08727078383dbab82b89a1 (commit)
   from b8864ba67406985513533b3e14d26ab6983240d7 (commit)

commit 1d1fccea4829ec2f2a08727078383dbab82b89a1
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 20:30:26 2012 +0200

Drop commented lines

 src/main.c |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index dffdde8..7ef0af8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,7 +46,6 @@
 #include parole-dbus.h
 #include parole-builder.h
 #include parole-rc-utils.h
-//#include parole-setup.h
 
 static void G_GNUC_NORETURN
 show_version (void)
@@ -313,7 +312,6 @@ int main (int argc, char **argv)
builder = parole_builder_get_main_interface ();
parole_dbus_register_name (PAROLE_DBUS_NAME);
 
-   //parole_setup ();
player = parole_player_new (client_id);
g_free (client_id);

___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Port from libxfcegui4 to libxfce4ui

[Christoph Mende]

Updating branch refs/heads/master
 to b8864ba67406985513533b3e14d26ab6983240d7 (commit)
   from ccf872eadb7ea5ff8227b3a761ae8a43101e5ae9 (commit)

commit b8864ba67406985513533b3e14d26ab6983240d7
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 20:22:08 2012 +0200

Port from libxfcegui4 to libxfce4ui

 configure.ac.in  |4 +-
 src/Makefile.am  |7 +-
 src/gst/Makefile.am  |2 +-
 src/gst/parole-gst.c |   15 ++--
 src/main.c   |   15 +---
 src/parole-about.c   |  110 +-
 src/parole-about.h   |2 +-
 src/parole-player.c  |  153 ++--
 src/parole-player.h  |2 +-
 src/parole-plugins-manager.c |7 +-
 src/parole-session.c |  178 --
 src/parole-session.h |   61 --
 12 files changed, 209 insertions(+), 347 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 93cbd7d..029db4b 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -75,7 +75,7 @@ m4_define([gstreamer_minimum_version], [0.10.11])
 m4_define([dbus_minimum_version], [0.60])
 m4_define([dbus_glib_minimum_version], [0.70])
 
-m4_define([libxfcegui4_minimum_version],[4.6.0])
+m4_define([libxfce4ui_minimum_version],[4.7.0])
 m4_define([libxfce4util_minimum_version],[4.6.0])
 
 m4_define([libnotify_minimum_version], [0.4.1])
@@ -95,7 +95,7 @@ XDT_CHECK_PACKAGE([GST_INTERFACES], 
[gstreamer-interfaces-0.10], [gstreamer_mini
 XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
 XDT_CHECK_PACKAGE([DBUS_GLIB], [dbus-glib-1], [dbus_glib_minimum_version])
 
-XDT_CHECK_PACKAGE([LIBXFCE4GUI], 
[libxfcegui4-1.0],[libxfcegui4_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1],[libxfce4ui_minimum_version])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], 
[libxfce4util-1.0],[libxfce4util_minimum_version])
 
 #===#
diff --git a/src/Makefile.am b/src/Makefile.am
index 4c480e3..8469028 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ INCLUDES =\
-I$(top_srcdir)/src/dbus\
-I$(top_srcdir)/src/common  \
-DLOCALEDIR=\$(localedir)\\
+   -DDESKTOPDIR=\$(datadir)/applications\\
-DG_LOG_DOMAIN=\parole\   \
-DPAROLE_PLUGINS_DIR=\$(libdir)/parole-$(PAROLE_VERSION_API)\\

-DPAROLE_PLUGINS_DATA_DIR=\$(datadir)/src/misc/parole-plugins-$(PAROLE_VERSION_API)\\
@@ -23,7 +24,7 @@ INCLUDES =\
$(GIO_CFLAGS)   \
$(GMODULE_CFLAGS)   \
 $(DBUS_GLIB_CFLAGS) \
-$(LIBXFCE4GUI_CFLAGS)   \
+$(LIBXFCE4UI_CFLAGS)   \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS)\
$(TAGLIBC_CFLAGS)
@@ -69,8 +70,6 @@ parole_SOURCES =  \
parole-open-location.h  \
parole-disc-menu.c  \
parole-disc-menu.h  \
-   parole-session.c\
-   parole-session.h\
parole-button.c \
parole-button.h \
parole-plugin-player.c  \
@@ -86,7 +85,7 @@ parole_LDADD =
\
$(GIO_LIBS) \
$(GMODULE_LIBS) \
 $(DBUS_GLIB_LIBS)   \
-$(LIBXFCE4GUI_LIBS) \
+$(LIBXFCE4UI_LIBS) \
$(GST_VIDEO_LIBS)   \
$(GST_INTERFACES_LIBS)  \
$(TAGLIBC_LIBS)
diff --git a/src/gst/Makefile.am b/src/gst/Makefile.am
index 299b7d5..30e7c08 100644
--- a/src/gst/Makefile.am
+++ b/src/gst/Makefile.am
@@ -25,7 +25,7 @@ libparolegst_la_CFLAGS =  \
$(GST_VIDEO_CFLAGS) \
 $(GST_INTERFACES_CFLAGS)   \
$(GTHREAD_CFLAGS)   \
-   $(LIBXFCE4GUI_CFLAGS)
+   $(LIBXFCE4UI_CFLAGS)
 
 libparolegst_la_LIBADD =   \
$(top_builddir)/src/misc/libparole.la\
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ad9f6d9..344869e 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -34,7 +34,7 @@
 #include gst/video/video.h
 
 #include libxfce4util/libxfce4util.h
-#include libxfcegui4/libxfcegui4.h
+#include libxfce4ui/libxfce4ui.h
 
 #include gdk/gdkx.h
 
@@ -1491,12 +1491,11 @@ parole_gst_check_state_change_timeout (gpointer data)
 
 if ( gst-priv-state != gst-priv-target )
 {
-   gboolean ret_val = 1;
-   /*FIXME gboolean ret_val = 

[Xfce4-commits] parole:master Fix accelerators of open-location and dvd-submenu

[Christoph Mende]

Updating branch refs/heads/master
 to af21b9011e4b75b6ee1fef15504704381d564ab2 (commit)
   from 1d1fccea4829ec2f2a08727078383dbab82b89a1 (commit)

commit af21b9011e4b75b6ee1fef15504704381d564ab2
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 20:48:11 2012 +0200

Fix accelerators of open-location and dvd-submenu

 data/interfaces/parole.ui |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 3ad31aa..ccb94e5 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -134,7 +134,7 @@
 /child
 child
   object class=GtkImageMenuItem id=menu-open-location
-property name=label translatable=yes_Open 
location/property
+property name=label translatable=yesOpen 
_location/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
@@ -152,7 +152,7 @@
 /child
 child
   object class=GtkImageMenuItem id=dvd-menu
-property name=label 
translatable=yesDVD/property
+property name=label 
translatable=yes_DVD/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Make open location dialog modal

[Christoph Mende]

Updating branch refs/heads/master
 to 5a286beea4069bf44b3a8642dbe6489f1af3878c (commit)
   from af21b9011e4b75b6ee1fef15504704381d564ab2 (commit)

commit 5a286beea4069bf44b3a8642dbe6489f1af3878c
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 18 20:48:20 2012 +0200

Make open location dialog modal

 data/interfaces/open-location.ui |   43 ++---
 1 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/data/interfaces/open-location.ui b/data/interfaces/open-location.ui
index db2db36..31acb0e 100644
--- a/data/interfaces/open-location.ui
+++ b/data/interfaces/open-location.ui
@@ -2,43 +2,6 @@
 interface
   requires lib=gtk+ version=2.24/
   !-- interface-naming-policy project-wide --
-  object class=GtkDialog id=dialog1
-property name=can_focusFalse/property
-property name=border_width5/property
-property name=titleOpen Location/property
-property name=default_width400/property
-property name=default_height300/property
-property name=type_hintnormal/property
-child internal-child=vbox
-  object class=GtkVBox id=dialog-vbox2
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=spacing2/property
-child internal-child=action_area
-  object class=GtkHButtonBox id=dialog-action_area2
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=layout_styleend/property
-child
-  placeholder/
-/child
-child
-  placeholder/
-/child
-  /object
-  packing
-property name=expandFalse/property
-property name=fillTrue/property
-property name=pack_typeend/property
-property name=position0/property
-  /packing
-/child
-child
-  placeholder/
-/child
-  /object
-/child
-  /object
   object class=GtkImage id=image2
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -52,8 +15,8 @@
   object class=GtkDialog id=open-location
 property name=can_focusFalse/property
 property name=title translatable=yesOpen Location/property
-property name=default_width400/property
-property name=default_height300/property
+property name=modalTrue/property
+property name=default_width300/property
 property name=icon_nameparole/property
 property name=type_hintnormal/property
 child internal-child=vbox
@@ -112,7 +75,7 @@
 property name=label translatable=yesPlease enter a network 
URL:/property
   /object
   packing
-property name=expandTrue/property
+property name=expandFalse/property
 property name=fillTrue/property
 property name=position1/property
   /packing
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Removed DVD Menu, since the functionality that was implemented was just Previous and Next.

[Christoph Mende]

Updating branch refs/heads/master
 to 356d0e0b49710a1fd8af3e948e1411775aeace1b (commit)
   from 5a286beea4069bf44b3a8642dbe6489f1af3878c (commit)

commit 356d0e0b49710a1fd8af3e948e1411775aeace1b
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 18 15:39:26 2012 -0400

Removed DVD Menu, since the functionality that was implemented was just 
Previous and Next.

 data/interfaces/parole.ui |  125 +-
 src/Makefile.am   |2 -
 src/parole-disc-menu.c|  333 -
 src/parole-disc-menu.h|   60 
 src/parole-player.c   |  102 ---
 5 files changed, 28 insertions(+), 594 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index ccb94e5..6f5940a 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -562,133 +562,14 @@
   object class=GtkAlignment 
id=alignment3
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
-property 
name=top_padding3/property
-property 
name=bottom_padding3/property
+property 
name=top_padding5/property
+property 
name=bottom_padding4/property
 child
   object class=GtkVBox 
id=play-box
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 property 
name=spacing5/property
 child
-  object class=GtkEventBox 
id=disc-box
-property 
name=can_focusFalse/property
-property 
name=no_show_allTrue/property
-child
-  object class=GtkHBox 
id=disc-menu-box
-property 
name=visibleTrue/property
-property 
name=can_focusFalse/property
-property 
name=spacing5/property
-child
-  object 
class=GtkButton id=prev-chapter
-property name=label 
translatable=yesPrevious Chapter/property
-property 
name=can_focusTrue/property
-property 
name=receives_defaultTrue/property
-property 
name=no_show_allTrue/property
-property 
name=use_action_appearanceFalse/property
-property 
name=imageimage1/property
-property 
name=reliefnone/property
-  /object
-  packing
-property 
name=expandFalse/property
-property 
name=fillTrue/property
-property 
name=position0/property
-  /packing
-/child
-child
-  object 
class=GtkButton id=dvd-chapters-menu
-property name=label 
translatable=yesDVD Menu/property
-property 
name=can_focusTrue/property
-property 
name=receives_defaultTrue/property
-property 
name=no_show_allTrue/property
-property 
name=use_action_appearanceFalse/property
-property 
name=imageimage2/property
-property 
name=reliefnone/property
-  /object
-  packing
-property 
name=expandFalse/property
-  

[Xfce4-commits] parole:master Removed unused alignment, sized controls to same size as sidebar panel.

[Christoph Mende]

Updating branch refs/heads/master
 to 31225dc1bd7bd4b0c80a5334f9f6e0dedd144ee1 (commit)
   from 356d0e0b49710a1fd8af3e948e1411775aeace1b (commit)

commit 31225dc1bd7bd4b0c80a5334f9f6e0dedd144ee1
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 18 16:26:31 2012 -0400

Removed unused alignment, sized controls to same size as sidebar panel.

 data/interfaces/parole.ui |  330 +++--
 src/parole-player.c   |3 +
 2 files changed, 174 insertions(+), 159 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 6f5940a..fdbfa79 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -45,16 +45,36 @@
 property name=stockgtk-file/property
 property name=icon-size1/property
   /object
+  object class=GtkImage id=image17
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-media-previous/property
+  /object
   object class=GtkImage id=image18
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=stockgtk-fullscreen/property
   /object
+  object class=GtkImage id=image19
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-media-play/property
+  /object
   object class=GtkImage id=image2
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=stockgtk-index/property
   /object
+  object class=GtkImage id=image20
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-media-next/property
+  /object
+  object class=GtkImage id=image21
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=stockgtk-fullscreen/property
+  /object
   object class=GtkImage id=image3
 property name=visibleTrue/property
 property name=can_focusFalse/property
@@ -559,103 +579,97 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 child
-  object class=GtkAlignment 
id=alignment3
+  object class=GtkVBox id=play-box
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
-property 
name=top_padding5/property
-property 
name=bottom_padding4/property
+property name=spacing5/property
 child
-  object class=GtkVBox 
id=play-box
+  object class=GtkHBox id=hbox7
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
-property 
name=spacing5/property
 child
-  object class=GtkHBox 
id=hbox7
+  object class=GtkVBox 
id=vbox6
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
+property 
name=spacing5/property
 child
-  object class=GtkVBox 
id=vbox6
+  object class=GtkHBox 
id=hbox6
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 property 
name=spacing5/property
 child
-  object class=GtkHBox 
id=hbox6
+  object 
class=GtkButton id=back
+property 
name=visibleTrue/property
+property 
name=sensitiveFalse/property
+property 
name=can_focusTrue/property
+property 
name=receives_defaultTrue/property
+property 
name=use_action_appearanceFalse/property
+property 
name=imageimage17/property
+ 

[Xfce4-commits] parole:master Add more mnemonic shortcuts to the menus

[Christoph Mende]

Updating branch refs/heads/master
 to c4aeddcff63f99be08ee298c8280b6d19dc9f9a9 (commit)
   from 2b49152b54a5a09d2abfa494b8f7d6986fdcc6c9 (commit)

commit c4aeddcff63f99be08ee298c8280b6d19dc9f9a9
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 19 09:09:50 2012 +0200

Add more mnemonic shortcuts to the menus

 data/interfaces/parole.ui |9 +
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index bf8e023..7e0181d 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -188,6 +188,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
 property name=imageimage14/property
 property name=use_stockFalse/property
 child type=submenu
@@ -285,7 +286,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
-property name=label 
translatable=yesRepeat/property
+property name=label 
translatable=yes_Repeat/property
 property name=use_underlineTrue/property
 signal name=toggled 
handler=parole_player_repeat_toggled_cb swapped=no/
   /object
@@ -295,7 +296,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
-property name=label 
translatable=yesShuffle/property
+property name=label 
translatable=yes_Shuffle/property
 property name=use_underlineTrue/property
 signal name=toggled 
handler=parole_player_shuffle_toggled_cb swapped=no/
   /object
@@ -311,7 +312,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
-property name=label 
translatable=yesPlugins/property
+property name=label 
translatable=yesPl_ugins/property
 property name=use_underlineTrue/property
   /object
 /child
@@ -356,7 +357,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
-property name=label translatable=yesAspect 
Ratio/property
+property name=label translatable=yes_Aspect 
Ratio/property
 property name=use_underlineTrue/property
 child type=submenu
   object class=GtkMenu id=menu5
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Added infobar for selecting audio tracks and subtitles.

[Christoph Mende]

Updating branch refs/heads/master
 to 2b49152b54a5a09d2abfa494b8f7d6986fdcc6c9 (commit)
   from 31225dc1bd7bd4b0c80a5334f9f6e0dedd144ee1 (commit)

commit 2b49152b54a5a09d2abfa494b8f7d6986fdcc6c9
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 18 23:18:02 2012 -0400

Added infobar for selecting audio tracks and subtitles.

 data/interfaces/parole.ui |  113 -
 src/gst/parole-gst.c  |   78 
 src/gst/parole-gst.h  |2 +
 src/parole-player.c   |  174 -
 4 files changed, 363 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index fdbfa79..bf8e023 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -111,6 +111,18 @@
 property name=can_focusFalse/property
 property name=stockgtk-media-forward/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=can_focusFalse/property
 property name=title translatable=yesParole Media Player/property
@@ -560,6 +572,103 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 child
+  object class=GtkHBox id=hbox_infobar
+property name=visibleTrue/property
+property name=can_focusFalse/property
+child
+  object class=GtkHBox 
id=infobar_contents
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+property name=spacing12/property
+child
+  object class=GtkHBox id=hbox3
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+property 
name=spacing6/property
+child
+  object class=GtkLabel 
id=label1
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+property 
name=xalign1/property
+property name=label 
translatable=yesAudio Track:/property
+  /object
+  packing
+property 
name=expandFalse/property
+property 
name=fillTrue/property
+property 
name=position0/property
+  /packing
+/child
+child
+  object class=GtkComboBox 
id=combobox_audiotrack
+property 
name=visibleTrue/property
+property 
name=can_focusFalse/property
+property 
name=modelliststore_audiotrack/property
+  /object
+  packing
+property 
name=expandFalse/property
+property 
name=fillTrue/property
+property 
name=position1/property
+  /packing
+/child
+  /object
+  packing
+property 
name=expandTrue/property
+property 
name=fillTrue/property
+property 
name=position0/property
+  /packing
+/child
+child
+  object class=GtkHBox id=hbox4
+property 

[Xfce4-commits] parole:master Added audio stream switching.

[Christoph Mende]

Updating branch refs/heads/master
 to 60dfdc1c32aebace5e42a6c1545b61a26e02ab4a (commit)
   from c4aeddcff63f99be08ee298c8280b6d19dc9f9a9 (commit)

commit 60dfdc1c32aebace5e42a6c1545b61a26e02ab4a
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Jul 19 05:04:48 2012 -0400

Added audio stream switching.

 data/interfaces/parole.ui |1 +
 src/gst/parole-gst.c  |6 ++
 src/gst/parole-gst.h  |2 ++
 src/parole-player.c   |6 ++
 4 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 7e0181d..a350883 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -604,6 +604,7 @@
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 property 
name=modelliststore_audiotrack/property
+signal name=changed 
handler=parole_player_combo_box_audiotrack_changed_cb swapped=no/
   /object
   packing
 property 
name=expandFalse/property
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index b3948dd..a4d0959 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2266,6 +2266,12 @@ gst_get_lang_list_for_type (ParoleGst * gst, const gchar 
* type_name)
   return g_list_reverse (ret);
 }
 
+void
+gst_set_current_audio_track( ParoleGst *gst, gint track_no )
+{
+   g_object_set (G_OBJECT (gst-priv-playbin), current-audio, 
(track_no), NULL);
+}
+
 const ParoleStream *parole_gst_get_stream  (ParoleGst *gst)
 {
 g_return_val_if_fail (PAROLE_IS_GST (gst), NULL);
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 0f3e9f1..55f718c 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -142,6 +142,8 @@ voidparole_gst_set_cursor_visible   
(ParoleGst *gst,
 
 GList *gst_get_lang_list_for_type (ParoleGst * gst, 
const gchar * type_name);
 
+void   gst_set_current_audio_track( ParoleGst *gst, gint 
track_no );
+
 const ParoleStream *parole_gst_get_stream  (ParoleGst *gst);
 
 G_END_DECLS
diff --git a/src/parole-player.c b/src/parole-player.c
index 3922593..1202fd7 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2395,6 +2395,12 @@ void parole_player_play_uri_disc (ParolePlayer *player, 
const gchar *uri, const
 }
 }
 
+void parole_player_combo_box_audiotrack_changed_cb(GtkWidget *widget, 
ParolePlayer *player)
+{
+   gint index = 
gtk_combo_box_get_active(GTK_COMBO_BOX(player-priv-combobox_audiotrack));
+   gst_set_current_audio_track(PAROLE_GST(player-priv-gst), index);
+}
+
 void parole_player_terminate (ParolePlayer *player)
 {
 parole_player_delete_event_cb (NULL, NULL, player);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Add mnemonic keys for sound-menuitems

[Christoph Mende]

Updating branch refs/heads/master
 to d11b7bbc4b1521a961b2eb5a4224e862465f9ae1 (commit)
   from 60dfdc1c32aebace5e42a6c1545b61a26e02ab4a (commit)

commit d11b7bbc4b1521a961b2eb5a4224e862465f9ae1
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 19 17:51:40 2012 +0200

Add mnemonic keys for sound-menuitems

 data/interfaces/parole.ui |9 ++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index a350883..60f2728 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -473,10 +473,11 @@
 property name=can_focusFalse/property
 child
   object class=GtkImageMenuItem id=volume-mute-menu
-property name=label 
translatable=yesMute/property
+property name=label 
translatable=yes_Mute/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
 property name=imageimage12/property
 property name=use_stockFalse/property
 signal name=activate 
handler=parole_player_volume_mute swapped=no/
@@ -484,10 +485,11 @@
 /child
 child
   object class=GtkImageMenuItem id=volume-up-menu
-property name=label translatable=yesVolume 
Up/property
+property name=label translatable=yesVolume 
_Up/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
 property name=imageimage11/property
 property name=use_stockFalse/property
 accelerator key=plus signal=activate/
@@ -496,10 +498,11 @@
 /child
 child
   object class=GtkImageMenuItem id=volume-down-menu
-property name=label translatable=yesVolume 
Down/property
+property name=label translatable=yesVolume 
_Down/property
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=use_action_appearanceFalse/property
+property name=use_underlineTrue/property
 property name=imageimage10/property
 property name=use_stockFalse/property
 accelerator key=minus signal=activate/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fixed segmentation fault with play/pause.

[Christoph Mende]

Updating branch refs/heads/master
 to d2fb7d1426a17ae9689540c227bdc7569b4798d0 (commit)
   from d11b7bbc4b1521a961b2eb5a4224e862465f9ae1 (commit)

commit d2fb7d1426a17ae9689540c227bdc7569b4798d0
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Jul 19 12:53:54 2012 -0400

Fixed segmentation fault with play/pause.

 data/interfaces/parole.ui |1 +
 src/gst/parole-gst.c  |6 ++
 src/gst/parole-gst.h  |1 +
 src/parole-player.c   |   43 ++-
 4 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 60f2728..b4ca5d2 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -645,6 +645,7 @@
 property 
name=visibleTrue/property
 property 
name=can_focusFalse/property
 property 
name=modelliststore_subtitles/property
+signal name=changed 
handler=parole_player_combo_box_subtitles_changed_cb swapped=no/
   /object
   packing
 property 
name=expandFalse/property
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index a4d0959..b8614d3 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -2272,6 +2272,12 @@ gst_set_current_audio_track( ParoleGst *gst, gint 
track_no )
g_object_set (G_OBJECT (gst-priv-playbin), current-audio, 
(track_no), NULL);
 }
 
+void
+gst_set_current_subtitle_track( ParoleGst *gst, gint track_no )
+{
+   g_object_set (G_OBJECT (gst-priv-playbin), current-text, 
(track_no-1), NULL);
+}
+
 const ParoleStream *parole_gst_get_stream  (ParoleGst *gst)
 {
 g_return_val_if_fail (PAROLE_IS_GST (gst), NULL);
diff --git a/src/gst/parole-gst.h b/src/gst/parole-gst.h
index 55f718c..648dc0a 100644
--- a/src/gst/parole-gst.h
+++ b/src/gst/parole-gst.h
@@ -143,6 +143,7 @@ voidparole_gst_set_cursor_visible   
(ParoleGst *gst,
 GList *gst_get_lang_list_for_type (ParoleGst * gst, 
const gchar * type_name);
 
 void   gst_set_current_audio_track( ParoleGst *gst, gint 
track_no );
+void   gst_set_current_subtitle_track( ParoleGst *gst, gint 
track_no );
 
 const ParoleStream *parole_gst_get_stream  (ParoleGst *gst);
 
diff --git a/src/parole-player.c b/src/parole-player.c
index 1202fd7..35b6474 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -287,6 +287,7 @@ struct ParolePlayerPrivate
 GtkListStore   *liststore_subtitles;
 GList  *audio_list;
 GList  *subtitle_list;
+gboolean   update_languages;
 
 GtkWidget  *main_box;
 
@@ -483,6 +484,7 @@ parole_player_change_range_value (ParolePlayer *player, 
gdouble value)
 static void
 parole_player_reset (ParolePlayer *player)
 {
+   player-priv-update_languages = TRUE;
 parole_player_change_range_value (player, 0);
 
 if ( player-priv-row )
@@ -548,17 +550,16 @@ parole_player_update_audio_tracks (ParolePlayer *player, 
ParoleGst *gst)

gtk_combo_box_set_active( 
GTK_COMBO_BOX(player-priv-combobox_audiotrack), 0 );

-   if (g_list_length (list) = 1) {
-   gtk_widget_set_sensitive( GTK_WIDGET( player-priv-combobox_audiotrack 
), FALSE );
+   if (g_list_length (list) = 2) {
+   gtk_widget_set_sensitive( GTK_WIDGET( 
player-priv-combobox_audiotrack ), TRUE );
+   gtk_widget_show(player-priv-infobar);
+   }
+   else {
+   gtk_widget_set_sensitive( GTK_WIDGET( player-priv-combobox_audiotrack 
), FALSE );
+   }
 g_free (list-data);
 g_list_free (list);
 list = NULL;
-   }
-   else
-   {
-   gtk_widget_set_sensitive( GTK_WIDGET( 
player-priv-combobox_audiotrack ), TRUE );
-   gtk_widget_show(player-priv-infobar);
-   }
 }
 
 static void
@@ -601,22 +602,23 @@ parole_player_update_subtitles (ParolePlayer *player, 
ParoleGst *gst)

gtk_combo_box_set_active( 
GTK_COMBO_BOX(player-priv-combobox_subtitles), 0 );

-   if (g_list_length (list) == 1) {
-g_free (list-data);
+   if (g_list_length (list) != 1) {
+   gtk_widget_show(player-priv-infobar);
+   }
+   g_free (list-data);
 g_list_free (list);
 list = NULL;
-   }
-   else
-   {
-   gtk_widget_show(player-priv-infobar);
-   }
 }
 
 static void
 parole_player_update_languages (ParolePlayer *player, ParoleGst *gst)
 {
-   parole_player_update_audio_tracks(player, gst);
-   parole_player_update_subtitles(player, gst);
+   if 

[Xfce4-commits] parole:master Fix X11 linking (Bug #6244)

[Christoph Mende]

Updating branch refs/heads/master
 to c7f57add6f9c31e8f59888514d107fcb520830f5 (commit)
   from d2fb7d1426a17ae9689540c227bdc7569b4798d0 (commit)

commit c7f57add6f9c31e8f59888514d107fcb520830f5
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 19 20:23:55 2012 +0200

Fix X11 linking (Bug #6244)

 configure.ac.in |2 ++
 src/Makefile.am |6 --
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 029db4b..26f46ce 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -98,6 +98,8 @@ 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_LIBX11()
+
 #===#
 #   Check for availability of libnotify #
 #===#
diff --git a/src/Makefile.am b/src/Makefile.am
index 901b7b9..35421bc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,8 @@ INCLUDES =\
 $(LIBXFCE4UI_CFLAGS)   \
$(GST_VIDEO_CFLAGS) \
$(GST_INTERFACES_CFLAGS)\
-   $(TAGLIBC_CFLAGS)
+   $(TAGLIBC_CFLAGS)   \
+   $(LIBX11_CFLAGS)
 
 GENERATED_FILES =  \
gmarshal.c  \
@@ -86,7 +87,8 @@ parole_LDADD =
\
 $(LIBXFCE4UI_LIBS) \
$(GST_VIDEO_LIBS)   \
$(GST_INTERFACES_LIBS)  \
-   $(TAGLIBC_LIBS)
+   $(TAGLIBC_LIBS) \
+   $(LIBX11_LIBS)
 
 parole_glib_enum_headers = \
parole-conf.h   \
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Update POTFILES.in with new paths

[Christoph Mende]

Updating branch refs/heads/master
 to 48ac33159ed7cd4f80433ed47818aae12b894713 (commit)
   from ea3027f845b3212a45f3d36d2967a2bd3950a8ba (commit)

commit 48ac33159ed7cd4f80433ed47818aae12b894713
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 10:03:38 2012 +0200

Update POTFILES.in with new paths

 po/POTFILES.in |   28 +++-
 1 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38d1b41..25d68ae 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -7,31 +7,25 @@
 [type: gettext/glade]data/interfaces/save-playlist.ui
 [type: gettext/glade]data/interfaces/open-location.ui
 data/desktop/parole.desktop.in.in
-common/parole-common.c
-gst/parole-gst.c
+src/common/parole-common.c
+src/gst/parole-gst.c
 src/main.c
 src/parole-mediachooser.c
 src/parole-medialist.c
 src/parole-player.c
-src/parole-statusbar.c
 src/parole-about.c
 src/parole-disc.c
 src/parole-subtitle-encoding.c
 src/parole-open-location.c
-src/parole-disc-menu.c
 src/parole-plugins-manager.c
 src/misc/parole-filters.c
 src/misc/parole-pl-parser.c
-plugins/properties/stream-properties-plugin.c
-plugins/properties/stream-properties-provider.c
-plugins/properties/stream-properties-provider.h
-plugins/properties/stream-properties.desktop.in
-plugins/tray/tray-plugin.c
-plugins/tray/tray-provider.c
-plugins/tray/tray-provider.h
-plugins/tray/system-tray.desktop.in
-plugins/window-title/window-title-plugin.c
-plugins/window-title/window-title-provider.c
-plugins/window-title/window-title-provider.h
-plugins/window-title/window-title.desktop.in
-plugins/power-manager/power-manager.desktop.in
+src/plugins/properties/stream-properties-plugin.c
+src/plugins/properties/stream-properties-provider.c
+src/plugins/properties/stream-properties-provider.h
+src/plugins/properties/stream-properties.desktop.in
+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/power-manager/power-manager.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Fix make distcheck

[Christoph Mende]

Updating branch refs/heads/master
 to c2211a28c2be2af5faa41e7878787b57148feb71 (commit)
   from 48ac33159ed7cd4f80433ed47818aae12b894713 (commit)

commit c2211a28c2be2af5faa41e7878787b57148feb71
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 10:03:54 2012 +0200

Fix make distcheck

 Makefile.am |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1029dad..c16eaa7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,6 +17,9 @@ DISTCLEANFILES = \
intltool-merge \
intltool-update
 
+distuninstallcheck_listfiles = \
+   find -type f \! -name icon-theme.cache
+
 distclean-local:
rm -rf *.cache
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Use xdt-csource instead of exo-csource

[Christoph Mende]

Updating branch refs/heads/master
 to eb5df914c640ada97f8f5dca0b2b350a45246bce (commit)
   from 16bc1e8b3869d946235dd358abd2b72c6ccf8904 (commit)

commit eb5df914c640ada97f8f5dca0b2b350a45246bce
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 11:25:54 2012 +0200

Use xdt-csource instead of exo-csource

 autogen.sh  |2 +-
 data/interfaces/Makefile.am |   16 
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index aa17066..0c41ab6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@
 #
 # Written for Xfce by Benedikt Meurer be...@xfce.org.
 
-export XDT_AUTOGEN_REQUIRED_VERSION=4.7.0
+export XDT_AUTOGEN_REQUIRED_VERSION=4.9.0
 
 (type xdt-autogen) /dev/null 21 || {
   cat 2 EOF
diff --git a/data/interfaces/Makefile.am b/data/interfaces/Makefile.am
index 58a9c85..db6b338 100644
--- a/data/interfaces/Makefile.am
+++ b/data/interfaces/Makefile.am
@@ -14,25 +14,25 @@ if MAINTAINER_MODE
 BUILT_SOURCES = $(interfaces_h)
 
 parole_ui.h: parole.ui
-   exo-csource --static --strip-comments --strip-content --name=parole_ui 
$  $@
+   xdt-csource --static --strip-comments --strip-content --name=parole_ui 
$  $@
 
 parole-settings_ui.h: parole-settings.ui
-   exo-csource --static --strip-comments --strip-content 
--name=parole_settings_ui $  $@
+   xdt-csource --static --strip-comments --strip-content 
--name=parole_settings_ui $  $@
 
 playlist_ui.h: playlist.ui
-   exo-csource --static --strip-comments --strip-content 
--name=playlist_ui $  $@
+   xdt-csource --static --strip-comments --strip-content 
--name=playlist_ui $  $@
 
 mediachooser_ui.h: mediachooser.ui
-   exo-csource --static --strip-comments --strip-content 
--name=mediachooser_ui $  $@
+   xdt-csource --static --strip-comments --strip-content 
--name=mediachooser_ui $  $@
 
 save-playlist_ui.h: save-playlist.ui
-   exo-csource --static --strip-comments --strip-content 
--name=save_playlist_ui $  $@
+   xdt-csource --static --strip-comments --strip-content 
--name=save_playlist_ui $  $@
 
 open-location_ui.h: open-location.ui
-   exo-csource --static --strip-comments --strip-content 
--name=open_location_ui $  $@
+   xdt-csource --static --strip-comments --strip-content 
--name=open_location_ui $  $@
 
 plugins_ui.h: plugins.ui
-   exo-csource --static --strip-comments --strip-content --name=plugins_ui 
$  $@
+   xdt-csource --static --strip-comments --strip-content --name=plugins_ui 
$  $@
 
 endif
 
@@ -41,4 +41,4 @@ CLEANFILES =  \
 
 EXTRA_DIST =   \
$(interfaces)   \
-   $(interfaces_h)
\ No newline at end of file
+   $(interfaces_h)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Small fix for autogen.sh

[Christoph Mende]

Updating branch refs/heads/master
 to d0aeb87938c55cae0edd336f09a96f43f1e8bd8d (commit)
   from b305f7d10832090e90d872ecec08ad5b249f7fcd (commit)

commit d0aeb87938c55cae0edd336f09a96f43f1e8bd8d
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 15:00:55 2012 -0400

Small fix for autogen.sh

 autogen.sh |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index 6bc0c8a..aa17066 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,5 @@ EOF
   exit 1
 }
 
+mkdir m4
 xdt-autogen $@
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Corrected functionality of previous and next buttons.

[Christoph Mende]

Updating branch refs/heads/master
 to d429ee808ed9f1630fdea5294af8ccb847e17af2 (commit)
   from 492f4d4669cff4fb4658fd06c4350ca45410b1c3 (commit)

commit d429ee808ed9f1630fdea5294af8ccb847e17af2
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 16:00:14 2012 -0400

Corrected functionality of previous and next buttons.

 data/interfaces/parole.ui |5 +++--
 src/parole-player.c   |   43 +--
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 1921679..5297019 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -712,7 +712,7 @@
 property 
name=imageimage6/property
 property 
name=reliefnone/property
 property 
name=focus_on_clickFalse/property
-signal 
name=clicked handler=parole_player_seekb_cb swapped=no/
+signal 
name=clicked handler=parole_player_back_cb swapped=no/
   /object
   packing
 property 
name=expandFalse/property
@@ -748,7 +748,7 @@
 property 
name=imageimage9/property
 property 
name=reliefnone/property
 property 
name=focus_on_clickFalse/property
-signal 
name=clicked handler=parole_player_seekf_cb swapped=no/
+signal 
name=clicked handler=parole_player_forward_cb swapped=no/
   /object
   packing
 property 
name=expandFalse/property
@@ -786,6 +786,7 @@
 /object
 packing
 property 
name=expandTrue/property
+property 
name=fillTrue/property
 property 
name=position1/property
 /packing
 /child
diff --git a/src/parole-player.c b/src/parole-player.c
index 9b80fee..7644055 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -51,6 +51,7 @@
 #include parole-gst.h
 #include parole-dbus.h
 #include parole-mediachooser.h
+#include parole-medialist.h
 #include parole-filters.h
 #include parole-disc.h
 #include parole-disc-menu.h
@@ -128,10 +129,10 @@ voidparole_player_play_pause_clicked
(GtkButton *button,
 voidparole_player_stop_clicked  (GtkButton *button, 
 ParolePlayer *player);
 
-voidparole_player_seekf_cb  (GtkButton *button, 
+voidparole_player_forward_cb  (GtkButton *button, 
 ParolePlayer *player);
 
-voidparole_player_seekb_cb  (GtkButton *button, 
+voidparole_player_back_cb  (GtkButton *button, 
 ParolePlayer *player);
 
 gbooleanparole_player_scroll_event_cb  (GtkWidget *widget,
@@ -936,26 +937,16 @@ parole_player_get_seek_value (ParolePlayer *player)
 return val;
 }
 
-void parole_player_seekf_cb (GtkButton *button, ParolePlayer *player)
+void parole_player_forward_cb (GtkButton *button, ParolePlayer *player)
 {
-gdouble seek;
-
-seek =  parole_gst_get_stream_position (PAROLE_GST (player-priv-gst) )
-   +
-   parole_player_get_seek_value (player);
-   
-parole_gst_seek (PAROLE_GST (player-priv-gst), seek);
+   if ( !parole_disc_menu_seek_next (player-priv-disc_menu))
+   parole_player_play_next (player, FALSE);
 }
 
-void parole_player_seekb_cb (GtkButton *button, ParolePlayer *player)
+void parole_player_back_cb (GtkButton *button, ParolePlayer *player)
 {
-gdouble seek;
-
-seek =  parole_gst_get_stream_position (PAROLE_GST (player-priv-gst) )
-   -
-  

[Xfce4-commits] parole:master Added new Settings dialog from 0.2.2

[Christoph Mende]

Updating branch refs/heads/master
 to 492f4d4669cff4fb4658fd06c4350ca45410b1c3 (commit)
   from d0aeb87938c55cae0edd336f09a96f43f1e8bd8d (commit)

commit 492f4d4669cff4fb4658fd06c4350ca45410b1c3
Author: Sean Davis smd.seanda...@gmail.com
Date:   Fri Jul 13 15:23:45 2012 -0400

Added new Settings dialog from 0.2.2

 data/interfaces/parole-settings.ui |  478 +++-
 1 files changed, 313 insertions(+), 165 deletions(-)

diff --git a/data/interfaces/parole-settings.ui 
b/data/interfaces/parole-settings.ui
index b0fe623..5914788 100644
--- a/data/interfaces/parole-settings.ui
+++ b/data/interfaces/parole-settings.ui
@@ -6,19 +6,13 @@
   object class=GtkImage id=image1
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=stockgtk-undo/property
-  /object
-  object class=GtkListStore id=liststore1
-columns
-  !-- column-name gchararray1 --
-  column type=gchararray/
-/columns
+property name=stockgtk-revert-to-saved/property
   /object
   object class=XfceTitledDialog id=settings-dialog
 property name=can_focusFalse/property
 property name=title translatable=yesParole Settings/property
 property name=icon_nameparole/property
-property name=type_hintnormal/property
+property name=type_hintdialog/property
 property name=subtitle translatable=yesMedia Player 
Settings/property
 signal name=response handler=parole_conf_dialog_response_cb 
swapped=no/
 child internal-child=vbox
@@ -30,6 +24,7 @@
   object class=GtkHButtonBox id=dialog-action_area1
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=layout_styleend/property
 child
   placeholder/
 /child
@@ -57,46 +52,224 @@
   /packing
 /child
 child
-  object class=GtkVBox id=vbox1
+  object class=GtkNotebook id=notebook1
 property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=spacing10/property
+property name=can_focusTrue/property
 child
-  object class=GtkFrame id=frame-display
+  object class=GtkVBox id=vbox1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=spacing12/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=left_padding12/property
+child
+  object class=GtkCheckButton id=reset-saver
+property name=label translatable=yesDisable 
screensaver while playing movies/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property 
name=use_action_appearanceFalse/property
+property name=draw_indicatorTrue/property
+signal name=toggled 
handler=parole_conf_dialog_reset_saver_changed_cb swapped=no/
+  /object
+/child
+  /object
+/child
+child type=label
+  object class=GtkLabel id=label5
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label 
translatable=yeslt;bgt;Videolt;/bgt;/property
+property name=use_markupTrue/property
+  /object
+/child
+  /object
+  packing
+property name=expandTrue/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=GtkFrame id=frame2
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment2
+property 

[Xfce4-commits] parole:master Use correct icons for next/previous buttons

[Christoph Mende]

Updating branch refs/heads/master
 to c34e234c13e03101bf2f93dc7367e3d5d8ae609c (commit)
   from d429ee808ed9f1630fdea5294af8ccb847e17af2 (commit)

commit c34e234c13e03101bf2f93dc7367e3d5d8ae609c
Author: Simon Steinbeiss och...@xfce.org
Date:   Sat Jul 14 01:42:48 2012 +0200

Use correct icons for next/previous buttons

 data/interfaces/parole.ui |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index 5297019..3ad31aa 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -709,7 +709,7 @@
 property 
name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
 property 
name=use_action_appearanceFalse/property
-property 
name=imageimage6/property
+property 
name=imageimage1/property
 property 
name=reliefnone/property
 property 
name=focus_on_clickFalse/property
 signal 
name=clicked handler=parole_player_back_cb swapped=no/
@@ -745,7 +745,7 @@
 property 
name=can_focusTrue/property
 property 
name=receives_defaultTrue/property
 property 
name=use_action_appearanceFalse/property
-property 
name=imageimage9/property
+property 
name=imageimage4/property
 property 
name=reliefnone/property
 property 
name=focus_on_clickFalse/property
 signal 
name=clicked handler=parole_player_forward_cb swapped=no/
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Make Parole remember whether the playlist was shown/hidden

[Christoph Mende]

Updating branch refs/heads/master
 to 41f406204af55f56538420bde9159acdf754ba17 (commit)
   from c34e234c13e03101bf2f93dc7367e3d5d8ae609c (commit)

commit 41f406204af55f56538420bde9159acdf754ba17
Author: Simon Steinbeiss och...@xfce.org
Date:   Sat Jul 14 16:29:38 2012 +0200

Make Parole remember whether the playlist was shown/hidden

 src/parole-conf.c   |8 
 src/parole-player.c |   19 ++-
 2 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/src/parole-conf.c b/src/parole-conf.c
index c75d387..498423f 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -68,6 +68,7 @@ enum
 PROP_MINIMIZED,
 PROP_MULTIMEDIA_KEYS,
 /*Playlist*/
+PROP_SHOWHIDE_PLAYLIST,
 PROP_REPLACE_PLAYLIST,
 PROP_SCAN_FOLDER_RECURSIVELY,
 PROP_START_PLAYING_OPENED_FILES,
@@ -348,6 +349,13 @@ parole_conf_class_init (ParoleConfClass *klass)
  *Playlist options
  **/
 g_object_class_install_property (object_class,
+ PROP_SHOWHIDE_PLAYLIST,
+ g_param_spec_boolean (showhide-playlist,
+   NULL, NULL,
+   FALSE,
+   G_PARAM_READWRITE));
+
+g_object_class_install_property (object_class,
  PROP_REPLACE_PLAYLIST,
  g_param_spec_boolean (replace-playlist,
NULL, NULL,
diff --git a/src/parole-player.c b/src/parole-player.c
index 7644055..4cc9254 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -352,11 +352,17 @@ void parole_player_show_hide_playlist (GtkMenuItem 
*widget, ParolePlayer *player
 {
gtk_widget_show_all (player-priv-playlist_nt);
gtk_menu_item_set_label (GTK_MENU_ITEM 
(player-priv-show_hide_playlist), _(Hide playlist));
+   g_object_set (G_OBJECT (player-priv-conf),
+ showhide-playlist, FALSE,
+ NULL);
 }
 else
 {
gtk_widget_hide_all (player-priv-playlist_nt);
gtk_menu_item_set_label (GTK_MENU_ITEM 
(player-priv-show_hide_playlist), _(Show playlist));
+   g_object_set (G_OBJECT (player-priv-conf),
+ showhide-playlist, TRUE,
+ NULL);
 }
 }
 
@@ -1874,6 +1880,7 @@ parole_player_init (ParolePlayer *player)
 GtkBuilder *builder;
 GdkScreen *screen;
 gint w, h;
+gboolean showhide;
 
 gboolean repeat, shuffle;
 
@@ -1988,7 +1995,7 @@ parole_player_init (ParolePlayer *player)
 gtk_notebook_append_page (GTK_NOTEBOOK (player-priv-playlist_nt), 
  GTK_WIDGET (player-priv-list),
  gtk_label_new (_(Playlist)));
- 
+
 g_object_get (G_OBJECT (player-priv-conf),
  window-width, w,
  window-height, h,
@@ -1997,6 +2004,16 @@ parole_player_init (ParolePlayer *player)
 gtk_window_set_default_size (GTK_WINDOW (player-priv-window), w, h);
 
 gtk_widget_show_all (player-priv-window);
+
+g_object_get (G_OBJECT (player-priv-conf),
+ showhide-playlist, showhide,
+ NULL);
+if ( showhide ) {
+   gtk_widget_hide_all (player-priv-playlist_nt);
+}
+else {
+   gtk_widget_show_all (player-priv-playlist_nt);
+}
 
 parole_player_set_wm_opacity_hint (player-priv-window);
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Remove and ignore generated files

[Christoph Mende]

Updating branch refs/heads/master
 to 16bc1e8b3869d946235dd358abd2b72c6ccf8904 (commit)
   from c2211a28c2be2af5faa41e7878787b57148feb71 (commit)

commit 16bc1e8b3869d946235dd358abd2b72c6ccf8904
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 10:10:28 2012 +0200

Remove and ignore generated files

 .gitignore |   60 ++
 INSTALL|  370 
 2 files changed, 60 insertions(+), 370 deletions(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..9ea05ff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,60 @@
+*.desktop
+*.gmo
+*.la
+*.libs
+*.lo
+*.o
+.deps
+INSTALL
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.lt
+config.status
+config.sub
+configure
+configure.ac
+data/desktop/parole.desktop.in
+data/interfaces/*.h
+data/mime/parole-mime-types.h
+depcomp
+docs/plugin-api/version.xml
+gtk-doc.make
+install-sh
+intltool-extract.in
+intltool-merge.in
+intltool-update.in
+libtool
+ltmain.sh
+m4
+missing
+mkinstalldirs
+po/.intltool-merge-cache
+po/Makefile.in.in
+po/POTFILES
+po/stamp-it
+src/enum-gtypes.c
+src/enum-gtypes.h
+src/gmarshal.c
+src/gmarshal.h
+src/gst/gst-enum-types.c
+src/gst/gst-enum-types.h
+src/gst/gstmarshal.c
+src/gst/gstmarshal.h
+src/misc/parole-enum-types.c
+src/misc/parole-enum-types.h
+src/misc/parole-marshal.c
+src/misc/parole-marshal.h
+src/misc/parole.h
+src/org.parole.media.list.h
+src/org.parole.media.player.h
+src/parole
+src/stamp-enum-gtypes.h
+stamp-enum-types.h
+stamp-h1
diff --git a/INSTALL b/INSTALL
deleted file mode 100644
index a1e89e1..000
--- a/INSTALL
+++ /dev/null
@@ -1,370 +0,0 @@
-Installation Instructions
-*
-
-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
-Inc.
-
-   Copying and distribution of this file, with or without modification,
-are permitted in any medium without royalty provided the copyright
-notice and this notice are preserved.  This file is offered as-is,
-without warranty of any kind.
-
-Basic Installation
-==
-
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.  Some packages provide this
-`INSTALL' file but do not implement all of the features documented
-below.  The lack of an optional feature in a given package is not
-necessarily a bug.  More recommendations for GNU packages can be found
-in *note Makefile Conventions: (standards)Makefile Conventions.
-
-   The `configure' shell script attempts to guess correct values for
-various system-dependent variables used during compilation.  It uses
-those values to create a `Makefile' in each directory of the package.
-It may also create one or more `.h' files containing system-dependent
-definitions.  Finally, it creates a shell script `config.status' that
-you can run in the future to recreate the current configuration, and a
-file `config.log' containing compiler output (useful mainly for
-debugging `configure').
-
-   It can also use an optional file (typically called `config.cache'
-and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring.  Caching is
-disabled by default to prevent problems with accidental use of stale
-cache files.
-
-   If you need to do unusual things to compile the package, please try
-to figure out how `configure' could check whether to do them, and mail
-diffs or instructions to the address given in the `README' so they can
-be considered for the next release.  If you are using the cache, and at
-some point `config.cache' contains results you don't want to keep, you
-may remove or edit it.
-
-   The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'.  You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
-
-   The simplest way to compile this package is:
-
-  1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-
- Running `configure' might take a while.  While running, it prints
- some messages telling which features it is checking for.
-
-  2. Type `make' to compile the package.
-
-  3. Optionally, type `make check' to run any self-tests that come with
- the package, generally using the just-built uninstalled binaries.
-
-  4. Type `make install' to install the programs and any data files and
- documentation.  When installing into a prefix owned by root, it is
- recommended that the package be configured and built as a regular
- user, and only the `make install' phase executed with root
- privileges.
-
-  5. Optionally, type `make installcheck

[Xfce4-commits] parole:master Ignore parole.pot

[Christoph Mende]

Updating branch refs/heads/master
 to ab1aa12b2734d46c55face0861343b1244c00cdc (commit)
   from c82e82192f25b3f508b0d050160b80306e2aaee8 (commit)

commit ab1aa12b2734d46c55face0861343b1244c00cdc
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 11:47:55 2012 +0200

Ignore parole.pot

 .gitignore |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ea05ff..5501b76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ mkinstalldirs
 po/.intltool-merge-cache
 po/Makefile.in.in
 po/POTFILES
+po/parole.pot
 po/stamp-it
 src/enum-gtypes.c
 src/enum-gtypes.h
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Mark table headers as translatable (bug #8422)

[Christoph Mende]

Updating branch refs/heads/master
 to c82e82192f25b3f508b0d050160b80306e2aaee8 (commit)
   from eb5df914c640ada97f8f5dca0b2b350a45246bce (commit)

commit c82e82192f25b3f508b0d050160b80306e2aaee8
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 11:46:50 2012 +0200

Mark table headers as translatable (bug #8422)

 data/interfaces/plugins.ui |   20 ++--
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui
index bfdcfa3..c55b7ec 100644
--- a/data/interfaces/plugins.ui
+++ b/data/interfaces/plugins.ui
@@ -32,10 +32,10 @@
 child
   object class=GtkButton id=close
 property name=labelgtk-close/property
+property name=use_action_appearanceFalse/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
   /object
   packing
@@ -79,7 +79,7 @@
 child
   object class=GtkTreeViewColumn 
id=treeviewcolumn1
 property name=resizableTrue/property
-property name=titleEnabled/property
+property name=title 
translatable=yesEnabled/property
 property name=clickableTrue/property
 child
   object class=GtkCellRendererToggle 
id=cellrenderertoggle
@@ -93,7 +93,7 @@
 /child
 child
   object class=GtkTreeViewColumn 
id=treeviewcolumn2
-property name=titlePlugin/property
+property name=title 
translatable=yesPlugin/property
 child
   object class=GtkCellRendererText 
id=cellrenderertext1/
   attributes
@@ -134,8 +134,8 @@
 property name=use_markupTrue/property
   /object
   packing
-property name=x_options/property
-property name=y_options/property
+property name=x_options/
+property name=y_options/
   /packing
 /child
 child
@@ -148,8 +148,8 @@
   packing
 property name=top_attach1/property
 property name=bottom_attach2/property
-property name=x_options/property
-property name=y_options/property
+property name=x_options/
+property name=y_options/
   /packing
 /child
 child
@@ -187,8 +187,8 @@
   packing
 property name=top_attach2/property
 property name=bottom_attach3/property
-property name=x_options/property
-property name=y_options/property
+property name=x_options/
+property name=y_options/
   /packing
 /child
 child
@@ -221,10 +221,10 @@
 child
   object class=GtkButton id=configure
 property name=labelgtk-properties/property
+property name=use_action_appearanceFalse/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_plugins_manager_show_configure swapped=no/
   /object
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master Bump version to 0.2.90

[Christoph Mende]

Updating branch refs/heads/master
 to f506b2ddc58bea65974795ced55cc1dfd950a9a5 (commit)
   from c77d3953b7cad839396156d80c631b94bf7a1aec (commit)

commit f506b2ddc58bea65974795ced55cc1dfd950a9a5
Author: Christoph Mende mende.christ...@gmail.com
Date:   Fri Jul 20 17:14:18 2012 +0200

Bump version to 0.2.90

 configure.ac.in |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 26f46ce..33a0a38 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -3,7 +3,7 @@ m4_define([parole_verinfo],  [0:2:0])
 m4_define([parole_version_api],  [0])
 m4_define([parole_version_major],  [0])
 m4_define([parole_version_minor],  [2])
-m4_define([parole_version_micro],  [0.6])
+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()])])
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits