[Xfce4-commits] xfce4-wavelan-plugin:master l10n: Updated Belarusian (be) translation to 91%

[Transifex]

Updating branch refs/heads/master
 to 2c6e570abf66462fa72d392f6d70eced7edde277 (commit)
   from 6268225caae57b0a081ba57b34f62a48bcd16f17 (commit)

commit 2c6e570abf66462fa72d392f6d70eced7edde277
Author: Andrej Zakharevich and...@zahar.ws
Date:   Sun Jul 22 10:32:31 2012 +0200

l10n: Updated Belarusian (be) translation to 91%

New status: 11 messages complete with 0 fuzzies and 1 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/be.po |   30 +++---
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/po/be.po b/po/be.po
index b761519..e0bc239 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,44 +6,44 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-wavelan-plugin trunk\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-09 23:00+0200\n
+POT-Creation-Date: 2012-07-22 08:30+\n
 PO-Revision-Date: 2008-11-09 13:41+0200\n
 Last-Translator: Alexander Nyakhaychyk nyakhayc...@gmail.com\n
 Language-Team: Belarusian xfce-i...@xfce.org\n
-Language: be\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=utf-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: be\n
 
-#: ../panel-plugin/wavelan.c:153
+#: ../panel-plugin/wavelan.c:156
 msgid No carrier signal
-msgstr Адсутнічае сыгнал
+msgstr Адсутнічае сігнал
 
-#: ../panel-plugin/wavelan.c:172
+#: ../panel-plugin/wavelan.c:175
 msgid No device configured
 msgstr Прылада не наладжана
 
-#: ../panel-plugin/wavelan.c:521
+#: ../panel-plugin/wavelan.c:508
 msgid Wavelan Plugin Options
 msgstr Опцыі модуля Wi-Fi
 
-#: ../panel-plugin/wavelan.c:536
+#: ../panel-plugin/wavelan.c:523
 msgid Properties
 msgstr Уласьцівасьці
 
-#: ../panel-plugin/wavelan.c:547
+#: ../panel-plugin/wavelan.c:534
 msgid Interface
 msgstr Картка
 
-#: ../panel-plugin/wavelan.c:568
+#: ../panel-plugin/wavelan.c:555
 msgid _Autohide when offline
 msgstr _Хаваць, калі не далучаны
 
-#: ../panel-plugin/wavelan.c:578
+#: ../panel-plugin/wavelan.c:565
 msgid Autohide when no hardware present
 msgstr Хаваць, калі адсутнічае прылада
 
-#: ../panel-plugin/wavelan.c:589
+#: ../panel-plugin/wavelan.c:576
 msgid 
 Note: This will make it difficult to remove or configure the plugin if there 
 is no device detected.
@@ -51,18 +51,18 @@ msgstr 
 Заўвага: гэтая опцыя зробіць вельмі складаным наладку альбо выдаленьне 
 модулю, калі будзе адсутнічаць прылада.
 
-#: ../panel-plugin/wavelan.c:597
+#: ../panel-plugin/wavelan.c:584
 msgid Enable signal quality colors
 msgstr Уключыць колеры якасьці сыгналу
 
-#: ../panel-plugin/wavelan.c:608
+#: ../panel-plugin/wavelan.c:595
 msgid Show icon
 msgstr 
 
-#: ../panel-plugin/wavelan.c:671 ../panel-plugin/wavelan.desktop.in.h:2
+#: ../panel-plugin/wavelan.c:623 ../panel-plugin/wavelan.desktop.in.h:1
 msgid View the status of a wireless network
 msgstr Прагляд стану бесправоднай сеткі
 
-#: ../panel-plugin/wavelan.desktop.in.h:1
+#: ../panel-plugin/wavelan.desktop.in.h:2
 msgid Wavelan
 msgstr Бесправодная сетка
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-panel:master Actions: Fix logic of session saving (bug #8857).

[Nick Schermer]

Updating branch refs/heads/master
 to 17643fd28f499691ae97503eb58755b4b9fabb53 (commit)
   from eae14b0fc9587bb2064efd59170a602844f1cd15 (commit)

commit 17643fd28f499691ae97503eb58755b4b9fabb53
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 22 11:43:51 2012 +0200

Actions: Fix logic of session saving (bug #8857).

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

diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c
index ebc7b5b..53ff8d0 100644
--- a/plugins/actions/actions.c
+++ b/plugins/actions/actions.c
@@ -705,7 +705,7 @@ actions_plugin_action_confirmation_time (gpointer data)
 
   if (timeout-time_left == 0)
 {
-  /* unattended shutdown, so don't allow apps to cancel shutdown */
+  /* unattended shutdown, don't save the session to avoid blocking the 
logout */
   timeout-unattended = TRUE;
 
   gtk_dialog_response (GTK_DIALOG (timeout-dialog),
@@ -928,22 +928,22 @@ actions_plugin_action_activate (GtkWidget  *widget,
 {
 case ACTION_TYPE_LOGOUT:
   succeed = actions_plugin_action_dbus_xfsm (Logout, FALSE,
- unattended, error);
+ !unattended, error);
   break;
 
 case ACTION_TYPE_LOGOUT_DIALOG:
   succeed = actions_plugin_action_dbus_xfsm (Logout, TRUE,
- unattended, error);
+ !unattended, error);
   break;
 
 case ACTION_TYPE_RESTART:
   succeed = actions_plugin_action_dbus_xfsm (Restart, FALSE,
- unattended, error);
+ !unattended, error);
   break;
 
 case ACTION_TYPE_SHUTDOWN:
   succeed = actions_plugin_action_dbus_xfsm (Shutdown, FALSE,
- unattended, error);
+ !unattended, error);
   break;
 
 case ACTION_TYPE_HIBERNATE:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-session:master Fix logic of the --fast action (bug #8857).

[Nick Schermer]

Updating branch refs/heads/master
 to 499a719019e03da90b6901bb0f8a89d06ae167ee (commit)
   from 6924c3a28cb600706ec8ee781ee1b2d4f0525249 (commit)

commit 499a719019e03da90b6901bb0f8a89d06ae167ee
Author: Nick Schermer n...@xfce.org
Date:   Sun Jul 22 11:44:49 2012 +0200

Fix logic of the --fast action (bug #8857).

 xfce4-session-logout/main.c |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/xfce4-session-logout/main.c b/xfce4-session-logout/main.c
index 5af54c6..19a5c9a 100644
--- a/xfce4-session-logout/main.c
+++ b/xfce4-session-logout/main.c
@@ -48,7 +48,7 @@ gboolean opt_halt = FALSE;
 gboolean opt_reboot = FALSE;
 gboolean opt_suspend = FALSE;
 gboolean opt_hibernate = FALSE;
-gboolean allow_save = FALSE;
+gboolean opt_fast = FALSE;
 gboolean opt_version = FALSE;
 
 enum
@@ -83,7 +83,7 @@ static GOptionEntry option_entries[] =
 N_(Hibernate without displaying the logout dialog),
 NULL
   },
-  { fast, 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, allow_save,
+  { fast, 'f', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, opt_fast,
 N_(Log out quickly; don't save the session),
 NULL
   },
@@ -123,6 +123,7 @@ main (int argc, char **argv)
   gboolean show_dialog;
   gboolean result = FALSE;
   guintshutdown_type;
+  gboolean allow_save;
 
   xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, UTF-8);
 
@@ -149,6 +150,9 @@ main (int argc, char **argv)
   return EXIT_FAILURE;
 }
 
+  /* save the session, unless fast is provided */
+  allow_save = !opt_fast;
+
   /* create messsage */
   proxy = dbus_g_proxy_new_for_name_owner (conn,
org.xfce.SessionManager,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-places-plugin:master l10n: Updated Belarusian (be) translation to 18%

[Transifex]

Updating branch refs/heads/master
 to fc84910c54d09332371a672cb5fd3dd408a9acae (commit)
   from 7430366e98e65dd6407fb6f6893408dac11f916b (commit)

commit fc84910c54d09332371a672cb5fd3dd408a9acae
Author: Andrej Zakharevich and...@zahar.ws
Date:   Sun Jul 22 11:49:39 2012 +0200

l10n: Updated Belarusian (be) translation to 18%

New status: 7 messages complete with 0 fuzzies and 31 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/be.po |   17 -
 1 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/po/be.po b/po/be.po
index 8981da0..3e098d4 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@
 # Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
 # This file is distributed under the same license as the thunar package.
 # Alexander Nyakhaychyk nyakhayc...@gmail.com, 2007.
-#
+# 
 # ###
 # Беларускі пераклад gnome-panel.HEAD.
 # SOME DESCRIPTIVE TITLE
@@ -14,7 +14,7 @@
 # Vital Khilko doj...@mova.org, 2003.
 # Ales Nyakhaychyk n...@mail.by, 2004, 2005.
 # Ihar Hrachyshka ihar.hrachys...@gmail.com, 2006.
-#
+# 
 # ###
 msgid 
 msgstr 
@@ -37,16 +37,16 @@ msgstr Месцы
 #. Trash
 #: ../panel-plugin/model_system.c:154
 msgid Trash
-msgstr Сьметніца
+msgstr Сметніца
 
 #: ../panel-plugin/model_system.c:188
 msgid Desktop
-msgstr Тэчка стальца
+msgstr Стол
 
 #. File System (/)
 #: ../panel-plugin/model_system.c:204
 msgid File System
-msgstr Файлавая сыстэма
+msgstr Файлавая сістэма
 
 #: ../panel-plugin/model_volumes.c:71
 #, c-format
@@ -124,11 +124,11 @@ msgstr 
 
 #: ../panel-plugin/view.c:707 ../panel-plugin/cfg.c:486
 msgid Recent Documents
-msgstr Ранейшыя дакумэнты
+msgstr Нядаўнія дакумэнты
 
 #: ../panel-plugin/cfg.c:347
 msgid Button
-msgstr 
+msgstr Кнопка
 
 #: ../panel-plugin/cfg.c:356
 msgid _Show
@@ -175,9 +175,8 @@ msgstr 
 
 #. MENU: Show Recent Documents
 #: ../panel-plugin/cfg.c:468
-#, fuzzy
 msgid Show recent _documents
-msgstr Ранейшыя дакумэнты
+msgstr Паказаць нядаўнія дакумэнты
 
 #. RECENT DOCUMENTS: Show clear option
 #: ../panel-plugin/cfg.c:490
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Add met.no logo to summary window details tab.

[Harald Judt]

Updating branch refs/heads/master
 to ccf4789ea28ebdbfa416710320df7f553f7176be (commit)
   from 173505ce874db84c5e66027a71766a9a511b00ba (commit)

commit ccf4789ea28ebdbfa416710320df7f553f7176be
Author: Harald Judt h.j...@gmx.at
Date:   Sun Jul 22 14:30:32 2012 +0200

Add met.no logo to summary window details tab.

http://api.yr.no/license_data.html states:

Credit should be given to The Norwegian Meteorological institute,
shortened met.no as the source of data with use of our logo.
The logo should be followed by a text. Some suggestions:
Data from The Norwegian Meteorological Institute,
Based on data from Norwegian Meteorological Institute.
You can find our logo here: http://met.no/Om_oss/Logo_til_metno/.

Unfortunately, the link to the logo is dead, so let's fetch it
from the met.no website (http://met.no/filestore/met.no-logo.gif).

 panel-plugin/weather-summary.c |   39 ++-
 1 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 573fad5..93a3391 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -153,8 +153,8 @@ static void view_scrolled_cb (GtkAdjustment *adj, GtkWidget 
*view)
 {
   if (weather_channel_evt) {
 gint x, y, x1, y1;
-x1 = view-allocation.width - 73 - 5;
-y1 = view-requisition.height - 55 - 5;
+x1 = view-allocation.width - 191 - 15;
+y1 = view-requisition.height - 60 - 15;
 gtk_text_view_buffer_to_window_coords(
GTK_TEXT_VIEW(view),
GTK_TEXT_WINDOW_TEXT, x1, y1, x, y);
@@ -180,7 +180,7 @@ static gchar *get_logo_path (void)
 
return g_strconcat(g_get_user_cache_dir(), G_DIR_SEPARATOR_S,
xfce4, G_DIR_SEPARATOR_S, weather-plugin,
-   G_DIR_SEPARATOR_S, weather_logo.jpg, NULL);
+   G_DIR_SEPARATOR_S, weather_logo.gif, NULL);
 }
 
 static void
@@ -219,7 +219,7 @@ static GtkWidget *weather_summary_get_logo(xfceweather_data 
*data)
pixbuf = gdk_pixbuf_new_from_file(path, NULL);
g_free(path);
if (pixbuf == NULL) {
-   weather_http_receive_data (xoap.weather.com, 
/web/common/twc/logos/web_73x55.jpg,
+   weather_http_receive_data (met.no, 
/filestore/met.no-logo.gif,
data-proxy_host, data-proxy_port, logo_fetched, 
image);
} else {
gtk_image_set_from_pixbuf(GTK_IMAGE(image), pixbuf);
@@ -234,7 +234,7 @@ create_summary_tab (xfceweather_data *data)
 {
   GtkTextBuffer *buffer;
   GtkTextIteriter;
-  GtkTextTag*btag, *ltag1;
+  GtkTextTag*btag, *ltag0, *ltag1;
   gchar *value, *wind, *sun_val, *vis, *rawvalue;
   const gchar   *unit;
   GtkWidget *view, *frame, *scrolled;
@@ -267,6 +267,7 @@ create_summary_tab (xfceweather_data *data)
 NULL);
 
   gdk_color_parse(#ff, lnk_color);
+  ltag0 = gtk_text_buffer_create_tag(buffer, lnk0, foreground-gdk, 
lnk_color, NULL);
   ltag1 = gtk_text_buffer_create_tag(buffer, lnk1, foreground-gdk, 
lnk_color, NULL);
 
   /* head */
@@ -344,6 +345,8 @@ create_summary_tab (xfceweather_data *data)
   APPEND_TEXT_ITEM (_(Cloudiness), CLOUDINESS);
 
   APPEND_BTEXT (_(\nData from The Norwegian Meteorological Institute\n));
+  value = g_strdup (http://met.no;);
+  g_object_set_data_full(G_OBJECT(ltag0), url, value, g_free);
   APPEND_LINK_ITEM (\t, _(Thanks to met.no), http://met.no/;, ltag1);
 
   g_signal_connect(G_OBJECT(view), motion-notify-event,
@@ -351,6 +354,32 @@ create_summary_tab (xfceweather_data *data)
   g_signal_connect(G_OBJECT(view), leave-notify-event,
G_CALLBACK(view_leave_notify), view);
 
+  weather_channel_icon = weather_summary_get_logo(data);
+
+  if (weather_channel_icon) {
+weather_channel_evt = gtk_event_box_new();
+gtk_container_add(GTK_CONTAINER(weather_channel_evt), 
weather_channel_icon);
+gtk_text_view_add_child_in_window(GTK_TEXT_VIEW(view), weather_channel_evt,
+  GTK_TEXT_WINDOW_TEXT, 0, 0);
+gtk_widget_show_all(weather_channel_evt);
+adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolled));
+g_signal_connect(G_OBJECT(adj), value-changed,
+G_CALLBACK(view_scrolled_cb), view);
+g_signal_connect(G_OBJECT(view), size_allocate,
+G_CALLBACK(view_size_allocate_cb),
+view);
+g_signal_connect(G_OBJECT(weather_channel_evt), button-release-event,
+G_CALLBACK(icon_clicked),
+ltag0);
+g_signal_connect(G_OBJECT(weather_channel_evt), enter-notify-event,
+G_CALLBACK(icon_motion_notify), view);
+g_signal_connect(G_OBJECT(weather_channel_evt), visibility-notify-event,
+

[Xfce4-commits] xfce4-weather-plugin:master Update README and TODO.

[Harald Judt]

Updating branch refs/heads/master
 to 3808a617e815ce6af6b19125adbd71c7425e19f8 (commit)
   from ccf4789ea28ebdbfa416710320df7f553f7176be (commit)

commit 3808a617e815ce6af6b19125adbd71c7425e19f8
Author: Harald Judt h.j...@gmx.at
Date:   Sun Jul 22 14:37:48 2012 +0200

Update README and TODO.

 README |1 +
 TODO   |7 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 6f72e65..17bba2f 100644
--- a/README
+++ b/README
@@ -2,6 +2,7 @@ DOCUMENTATION
 ==
 http://api.yr.no/weatherapi/documentation
 http://api.met.no/weatherapi/locationforecastlts/1.1/documentation
+http://api.met.no/license_data.html
 
 Especially for information about the different types of data, please
 read the FAQ:
diff --git a/TODO b/TODO
index 4cb954e..30f1337 100644
--- a/TODO
+++ b/TODO
@@ -11,9 +11,8 @@ Panel widget
 
 Data
 ==
-* Get sunrise/sunset times via webservice
-  - get rid of the hardcoded values
-  - maybe met.no provides an API for it too
+* Get sunrise/sunset times via met.no webservice
+  - see http://api.yr.no/weatherapi/sunrise/1.0/documentation
 * Use met.no RSS feed to warn in time about API changes
 * Further reduce HTTP requests fetching data
   - maybe use data in XML to schedule downloads?
@@ -28,7 +27,7 @@ Forecast tab
 
 Details tab
 ==
-* Fetch logo from website (code is still there)
+* Show sunrise and sunset times
 
 Configuration dialog
 ==
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-netload-plugin:master l10n: Updated Ukrainian (uk) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 6c77cf982fb408019c349eefcd03b34f6e2de9df (commit)
   from 22cca0eb95d365d59634a27baa6f2420263a4ac1 (commit)

commit 6c77cf982fb408019c349eefcd03b34f6e2de9df
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Sun Jul 22 14:42:39 2012 +0200

l10n: Updated Ukrainian (uk) translation to 100%

New status: 30 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |   61 +++--
 1 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 9fb4bf9..65dbbfb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: xfce4-netload-plugin\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-01-10 22:00+\n
+POT-Creation-Date: 2012-07-22 12:24+\n
 PO-Revision-Date: 2007-03-14 16:59+0200\n
 Last-Translator: Dmitry Nikitin luckas...@mail.ru\n
 Language-Team: Ukrainian xfce-i...@xfce.org\n
@@ -19,35 +19,36 @@ msgstr 
 Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  
n%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
 X-Generator: KBabel 1.11.4\n
 
-#: ../panel-plugin/netload.c:59
+#: ../panel-plugin/netload.c:61
 msgid Xfce4-Netload-Plugin
 msgstr Модуль контролю з'єднаннями мережі для Xfce4
 
-#: ../panel-plugin/netload.c:62
+#: ../panel-plugin/netload.c:64
 msgid Unknown error.
 msgstr Невідома помилка.
 
-#: ../panel-plugin/netload.c:63
+#: ../panel-plugin/netload.c:65
 msgid Linux proc device '/proc/net/dev' not found.
 msgstr Не знайдено Linux пристрій '/proc/net/dev'.
 
-#: ../panel-plugin/netload.c:64
+#: ../panel-plugin/netload.c:66
 msgid Interface was not found.
 msgstr Інтерфейс не існує.
 
-#: ../panel-plugin/netload.c:162
+#: ../panel-plugin/netload.c:163
 #, c-format
 msgid  %s  (Interface down)
 msgstr  %s  (Інтерфейс відключено)
 
-#: ../panel-plugin/netload.c:249
+#: ../panel-plugin/netload.c:250
 #, c-format
 msgid 
  %s  (%s)\n
-Average of last %d measures:\n
-Incoming: %s/s\n
-Outgoing: %s/s\n
-Total: %s/s
+Average of last %d measures\n
+with an interval of %.2fs:\n
+Incoming: %s\n
+Outgoing: %s\n
+Total: %s
 msgstr 
  %s  (%s)\n
 Середнє значення за останні %d періоди:\n
@@ -55,11 +56,11 @@ msgstr 
 Вихідний: %s кБайт/с\n
 Загалом: %s кБайт/с 
 
-#: ../panel-plugin/netload.c:251
+#: ../panel-plugin/netload.c:253
 msgid no IP address
 msgstr немає IP адреси
 
-#: ../panel-plugin/netload.c:533
+#: ../panel-plugin/netload.c:567
 #, c-format
 msgid 
 %s: Error in initializing:\n
@@ -68,71 +69,71 @@ msgstr 
 %s: Помилка ініціалізації:\n
 %s
 
-#: ../panel-plugin/netload.c:872
+#: ../panel-plugin/netload.c:882
 msgid Select color
 msgstr Колір індикатора
 
-#: ../panel-plugin/netload.c:938
+#: ../panel-plugin/netload.c:948
 msgid Bar color (i_ncoming):
 msgstr Колір (вхід_ний):
 
-#: ../panel-plugin/netload.c:939
+#: ../panel-plugin/netload.c:949
 msgid Bar color (_outgoing):
 msgstr Колір (вихі_дний):
 
-#: ../panel-plugin/netload.c:942
+#: ../panel-plugin/netload.c:952
 msgid Maximum (inco_ming):
 msgstr Максимум (в_хідний):
 
-#: ../panel-plugin/netload.c:943
+#: ../panel-plugin/netload.c:953
 msgid Maximum (o_utgoing):
 msgstr Максимум (в_ихідний):
 
-#: ../panel-plugin/netload.c:948 ../panel-plugin/netload.desktop.in.in.h:1
+#: ../panel-plugin/netload.c:958 ../panel-plugin/netload.desktop.in.in.h:1
 msgid Network Monitor
 msgstr Спостереження за мережею
 
-#: ../panel-plugin/netload.c:977
+#: ../panel-plugin/netload.c:987
 msgid _Text to display:
 msgstr _Відображуваний текст:
 
-#: ../panel-plugin/netload.c:1008
+#: ../panel-plugin/netload.c:1018
 msgid Network _device:
 msgstr Мережевий _пристрій:
 
-#: ../panel-plugin/netload.c:1036
+#: ../panel-plugin/netload.c:1046
 msgid Update _interval:
 msgstr Інтервал _оновлення:
 
-#: ../panel-plugin/netload.c:1049
+#: ../panel-plugin/netload.c:1059
 msgid s
 msgstr с
 
-#: ../panel-plugin/netload.c:1062
+#: ../panel-plugin/netload.c:1072
 msgid _Automatic maximum
 msgstr А_втоматичний максимум
 
-#: ../panel-plugin/netload.c:1096
+#: ../panel-plugin/netload.c:1106
 msgid KiB/s
 msgstr КіБ/с
 
-#: ../panel-plugin/netload.c:1121
+#: ../panel-plugin/netload.c:1131
 msgid _Present data as:
 msgstr Показати дані як:
 
-#: ../panel-plugin/netload.c:1130
+#: ../panel-plugin/netload.c:1140
 msgid Bars
 msgstr Шкала
 
-#: ../panel-plugin/netload.c:1131
+#: ../panel-plugin/netload.c:1141
 msgid Values
 msgstr Значення
 
-#: ../panel-plugin/netload.c:1132
+#: ../panel-plugin/netload.c:1142
 msgid Bars and values
 msgstr Шкала і значення
 
-#: ../panel-plugin/netload.c:1182
+#: ../panel-plugin/netload.c:1192
 msgid _Colorize values
 msgstr _Значення в кольорі
 
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Ukrainian (uk) translation to 90%

[Transifex]

Updating branch refs/heads/master
 to 6728f7e4fb8eb7ab37961910f4b60ed00b39b888 (commit)
   from 3808a617e815ce6af6b19125adbd71c7425e19f8 (commit)

commit 6728f7e4fb8eb7ab37961910f4b60ed00b39b888
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Sun Jul 22 14:48:02 2012 +0200

l10n: Updated Ukrainian (uk) translation to 90%

New status: 141 messages complete with 10 fuzzies and 5 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |   18 ++
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index 4a38a10..dab6531 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,7 +1,7 @@
 # Ukrainian translation of xfce4-weather-plugin.
 # Copyright (C) 2006-2007 The Xfce development team.
 # This file is distributed under the same license as the xfce4-weather-plugin 
package.
-#
+# 
 # Dmitry Nikitin luckas...@mail.ru, 2008.
 msgid 
 msgstr 
@@ -11,10 +11,10 @@ msgstr 
 PO-Revision-Date: 2012-07-15 11:21+0200\n
 Last-Translator: Oleksandr Natalenko pfac...@gmail.com\n
 Language-Team: Ukrainian xfce4-...@xfce.org\n
-Language: uk\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: uk\n
 X-Generator: KBabel 1.11.4\n
 
 #: ../panel-plugin/weather.c:127
@@ -84,7 +84,8 @@ msgstr Не вдалося відкрити таке посилання: %s
 msgid Weather Update
 msgstr Оновлення погоди
 
-#. add refresh button to right click menu, for people who missed the middle 
mouse click feature
+#. add refresh button to right click menu, for people who missed the middle
+#. mouse click feature
 #: ../panel-plugin/weather.c:970 ../panel-plugin/weather-summary.c:646
 msgid _Forecast
 msgstr _Прогноз
@@ -368,6 +369,8 @@ msgid 
 \tPoint data applies to:\n
 \t%s\n
 msgstr 
+\tТочкові дані застосувати до:\n
+\t%s\n
 
 #: ../panel-plugin/weather-summary.c:293
 #, c-format
@@ -377,6 +380,10 @@ msgid 
 \tStart:\t%s\n
 \tEnd:\t%s\n
 msgstr 
+\n
+\tІнтервальні дані застосувати до:\n
+\tStart:\t%s\n
+\tEnd:\t%s\n
 
 #: ../panel-plugin/weather-summary.c:298
 #, c-format
@@ -385,6 +392,9 @@ msgid 
 \tInterval data provides icon, description and precipitation,\n
 \twhile the remaining information originates from point data.\n
 msgstr 
+\n
+\tІнтервальні дані містять іконку, опис і опади,\n
+\tтоді як решта інформації походить з точкових даних.\n
 
 #. Temperature
 #: ../panel-plugin/weather-summary.c:304
@@ -411,7 +421,7 @@ msgstr 
 #: ../panel-plugin/weather-summary.c:313
 #, c-format
 msgid \t%s: %s (%s on the Beaufort scale)\n
-msgstr 
+msgstr \t%s: %s (%s на шкалі Бофорта)\n
 
 #: ../panel-plugin/weather-summary.c:313
 msgid Speed
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master l10n: Updated Ukrainian (uk) translation to None%

[Transifex]

Updating branch refs/heads/master
 to b198b2456f875c349f90b3995f0ad78c8fa3dd06 (commit)
   from 6728f7e4fb8eb7ab37961910f4b60ed00b39b888 (commit)

commit b198b2456f875c349f90b3995f0ad78c8fa3dd06
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Sun Jul 22 14:51:08 2012 +0200

l10n: Updated Ukrainian (uk) translation to None%

New status: 0 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |   28 +---
 1 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index dab6531..a4982bb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -30,9 +30,8 @@ msgid WS
 msgstr WS
 
 #: ../panel-plugin/weather.c:136
-#, fuzzy
 msgid WB
-msgstr Зх
+msgstr WB
 
 #: ../panel-plugin/weather.c:139 ../panel-plugin/weather.c:142
 msgid WD
@@ -119,24 +118,20 @@ msgid Humidity (H)
 msgstr Вологість (H)
 
 #: ../panel-plugin/weather-config.c:45
-#, fuzzy
 msgid Low clouds (CL)
 msgstr Низька хмарність (CL)
 
 #: ../panel-plugin/weather-config.c:46
-#, fuzzy
 msgid Medium clouds (CM)
 msgstr Середня хмарність (CM)
 
 #: ../panel-plugin/weather-config.c:47
-#, fuzzy
 msgid High clouds (CH)
 msgstr Висока хмарність (CH)
 
 #: ../panel-plugin/weather-config.c:48
-#, fuzzy
 msgid Cloudiness (C)
-msgstr Хмари
+msgstr _Хмарність (C)
 
 #: ../panel-plugin/weather-config.c:49
 msgid Fog (F)
@@ -172,9 +167,8 @@ msgid Metric
 msgstr Метричні
 
 #: ../panel-plugin/weather-config.c:470
-#, fuzzy
 msgid L_ocation:
-msgstr Розташування:
+msgstr _Розташування:
 
 #: ../panel-plugin/weather-config.c:508
 msgid Chan_ge...
@@ -182,12 +176,10 @@ msgstr Змі_нити…
 
 #. proxy
 #: ../panel-plugin/weather-config.c:521
-#, fuzzy
 msgid _Proxy server:
-msgstr Проксі-сервер:
+msgstr _Проксі-сервер:
 
 #: ../panel-plugin/weather-config.c:526
-#, fuzzy
 msgid Use proxy _server
 msgstr _Використовувати проксі-сервер
 
@@ -206,22 +198,21 @@ msgstr _Мітки для показу
 
 #: ../panel-plugin/weather-config.c:619
 msgid _Add
-msgstr 
+msgstr _Додати
 
 #: ../panel-plugin/weather-config.c:635
 msgid _Remove
-msgstr 
+msgstr _Вилучити
 
 #: ../panel-plugin/weather-config.c:640
 msgid Move _Up
-msgstr 
+msgstr Посунути в_гору
 
 #: ../panel-plugin/weather-config.c:645
 msgid Move _Down
-msgstr 
+msgstr Посунути в_низ
 
 #: ../panel-plugin/weather-config.c:683
-#, fuzzy
 msgid Animate _transitions between labels
 msgstr _Анімація переходів між мітками
 
@@ -327,7 +318,7 @@ msgstr Введіть назву міста або поштовий індек
 
 #: ../panel-plugin/weather-search.c:468
 msgid Untitled
-msgstr 
+msgstr Без назви
 
 #. head
 #: ../panel-plugin/weather-summary.c:273
@@ -433,7 +424,6 @@ msgstr Напрямок
 
 #. Precipitation
 #: ../panel-plugin/weather-summary.c:330
-#, fuzzy
 msgid 
 \n
 Precipitations\n
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-power-manager:master l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to 9439fbc7c65a9b8770f97252081897593715f0cc (commit)
   from 778278154e5c5acabe0c81ceb866986b5b994ed8 (commit)

commit 9439fbc7c65a9b8770f97252081897593715f0cc
Author: Cheng-Chia Tseng pswo10...@gmail.com
Date:   Sun Jul 22 14:52:48 2012 +0200

l10n: Updated Chinese (Taiwan) (zh_TW) translation to 100%

New status: 213 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/zh_TW.po |  212 ++-
 1 files changed, 78 insertions(+), 134 deletions(-)

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b889170..9a1a859 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,19 +2,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR EMAIL@ADDRESS, YEAR.
-#
+# 
 msgid 
 msgstr 
 Project-Id-Version: xfce4-power-manager master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-04-26 14:30+\n
+POT-Creation-Date: 2012-07-22 12:42+\n
 PO-Revision-Date: 2012-04-26 23:54+0800\n
 Last-Translator: Cheng-Chia Tseng pswo10...@gmail.com\n
 Language-Team: chinese-l10n chinese-l...@googlegroups.com\n
-Language: \n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
+Language: \n
 Plural-Forms: nplurals=2; plural=n1;\n
 
 #: ../data/interfaces/xfpm-settings.ui.h:1
@@ -46,14 +46,10 @@ msgid Consider the computer on low power at:
 msgstr 將電腦視為低電量於：
 
 #. Hibernate menu option
-#: ../data/interfaces/xfpm-settings.ui.h:8
-#: ../settings/xfpm-settings.c:820
-#: ../settings/xfpm-settings.c:888
-#: ../settings/xfpm-settings.c:1037
-#: ../settings/xfpm-settings.c:1214
-#: ../settings/xfpm-settings.c:1271
-#: ../settings/xfpm-settings.c:1323
-#: ../src/xfpm-power.c:484
+#: ../data/interfaces/xfpm-settings.ui.h:8 ../settings/xfpm-settings.c:820
+#: ../settings/xfpm-settings.c:888 ../settings/xfpm-settings.c:1037
+#: ../settings/xfpm-settings.c:1214 ../settings/xfpm-settings.c:1271
+#: ../settings/xfpm-settings.c:1323 ../src/xfpm-power.c:484
 #: ../src/xfpm-power.c:779
 msgid Hibernate
 msgstr 休眠
@@ -66,8 +62,7 @@ msgstr 等級：
 msgid Lock screen when going for suspend/hibernate
 msgstr 當暫停或休眠時鎖上螢幕
 
-#: ../data/interfaces/xfpm-settings.ui.h:11
-#: ../src/xfpm-power-common.c:132
+#: ../data/interfaces/xfpm-settings.ui.h:11 ../src/xfpm-power-common.c:132
 msgid Monitor
 msgstr 螢幕
 
@@ -75,12 +70,9 @@ msgstr 螢幕
 msgid Monitor power management control
 msgstr 螢幕電源管理控制
 
-#: ../data/interfaces/xfpm-settings.ui.h:13
-#: ../settings/xfpm-settings.c:809
-#: ../settings/xfpm-settings.c:877
-#: ../settings/xfpm-settings.c:1026
-#: ../settings/xfpm-settings.c:1203
-#: ../settings/xfpm-settings.c:1260
+#: ../data/interfaces/xfpm-settings.ui.h:13 ../settings/xfpm-settings.c:809
+#: ../settings/xfpm-settings.c:877 ../settings/xfpm-settings.c:1026
+#: ../settings/xfpm-settings.c:1203 ../settings/xfpm-settings.c:1260
 #: ../settings/xfpm-settings.c:1312
 msgid Nothing
 msgstr 無
@@ -126,14 +118,10 @@ msgid Standby
 msgstr 待機
 
 #. Suspend menu option
-#: ../data/interfaces/xfpm-settings.ui.h:24
-#: ../settings/xfpm-settings.c:814
-#: ../settings/xfpm-settings.c:882
-#: ../settings/xfpm-settings.c:1031
-#: ../settings/xfpm-settings.c:1208
-#: ../settings/xfpm-settings.c:1265
-#: ../settings/xfpm-settings.c:1317
-#: ../src/xfpm-power.c:499
+#: ../data/interfaces/xfpm-settings.ui.h:24 ../settings/xfpm-settings.c:814
+#: ../settings/xfpm-settings.c:882 ../settings/xfpm-settings.c:1031
+#: ../settings/xfpm-settings.c:1208 ../settings/xfpm-settings.c:1265
+#: ../settings/xfpm-settings.c:1317 ../src/xfpm-power.c:499
 #: ../src/xfpm-power.c:792
 msgid Suspend
 msgstr 暫停
@@ -167,45 +155,37 @@ msgid When sleep button is pressed:
 msgstr 當按壓睡眠按鈕時：
 
 #: ../data/interfaces/xfpm-settings.ui.h:32
-#: ../settings/xfpm-settings-main.c:121
-#: ../src/xfpm-main.c:413
+#: ../settings/xfpm-settings-main.c:121 ../src/xfpm-main.c:413
 msgid Xfce Power Manager
 msgstr Xfce 電池管理員
 
-#: ../settings/xfpm-settings.c:567
-#: ../settings/xfpm-settings.c:582
+#: ../settings/xfpm-settings.c:567 ../settings/xfpm-settings.c:582
 #: ../settings/xfpm-settings.c:609
 msgid Never
-msgstr 用不
+msgstr 永不
 
 #: ../settings/xfpm-settings.c:570
 msgid One minute
 msgstr 1 分鐘
 
-#: ../settings/xfpm-settings.c:572
-#: ../settings/xfpm-settings.c:584
+#: ../settings/xfpm-settings.c:572 ../settings/xfpm-settings.c:584
 msgid Minutes
 msgstr 分鐘
 
-#: ../settings/xfpm-settings.c:586
-#: ../settings/xfpm-settings.c:593
-#: ../settings/xfpm-settings.c:594
-#: ../settings/xfpm-settings.c:595
+#: ../settings/xfpm-settings.c:586 ../settings/xfpm-settings.c:593
+#: ../settings/xfpm-settings.c:594 ../settings/xfpm-settings.c:595
 msgid One hour
 msgstr 1 小時
 
-#: ../settings/xfpm-settings.c:594
-#: ../settings/xfpm-settings.c:598
+#: ../settings/xfpm-settings.c:594 ../settings/xfpm-settings.c:598
 

[Xfce4-commits] midori:master l10n: Updated Ukrainian (uk) translation to 100%

[Transifex]

Updating branch refs/heads/master
 to f67822736f7b21aa70b48f407774e409e1af8e4e (commit)
   from 100f45a9db1e628940570c802afba6fdc43d6172 (commit)

commit f67822736f7b21aa70b48f407774e409e1af8e4e
Author: Yarema aka Knedlyk yupad...@gmail.com
Date:   Sun Jul 22 15:03:48 2012 +0200

l10n: Updated Ukrainian (uk) translation to 100%

New status: 674 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/uk.po |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index c65916f..1444165 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1095,7 +1095,7 @@ msgstr Підпис сертифікату невідомий.
 msgid 
 The certificate does not match the expected identity of the site that it was 
 retrieved from.
-msgstr 
+msgstr Сертифікат не відповідає очікуваному сертифікату, який отриманий з 
сторінки.
 
 #: ../midori/midori-locationaction.c:1231
 msgid The certificate's activation time is still in the future.
@@ -1109,7 +1109,7 @@ msgstr Термін дії сертифіката закінчився
 msgid 
 The certificate has been revoked according to the GTlsConnection's 
 certificate revocation list.
-msgstr 
+msgstr Сертифікат був анульований згідно зі списком відкликаних сертифікатів 
GTlsConnection
 
 #: ../midori/midori-locationaction.c:1237
 msgid The certificate's algorithm is considered insecure.
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Fix Ukrainian translation.

[Harald Judt]

Updating branch refs/heads/master
 to 19f20fab99912cc59ec8fddc41cfa157018062d1 (commit)
   from b198b2456f875c349f90b3995f0ad78c8fa3dd06 (commit)

commit 19f20fab99912cc59ec8fddc41cfa157018062d1
Author: Harald Judt h.j...@gmx.at
Date:   Sun Jul 22 19:57:56 2012 +0200

Fix Ukrainian translation.

 po/uk.po |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/po/uk.po b/po/uk.po
index a4982bb..b1e0f16 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -427,7 +427,9 @@ msgstr Напрямок
 msgid 
 \n
 Precipitations\n
-msgstr bОпади/b
+msgstr 
+\n
+Опади\n
 
 #: ../panel-plugin/weather-summary.c:331
 msgid Precipitations amount
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Fix another forgotten struct tm/time_t occurrence.

[Harald Judt]

Updating branch refs/heads/master
 to 5abdd3916520fc08ec560c62e3f3902ab0c81291 (commit)
   from 19f20fab99912cc59ec8fddc41cfa157018062d1 (commit)

commit 5abdd3916520fc08ec560c62e3f3902ab0c81291
Author: Harald Judt h.j...@gmx.at
Date:   Sun Jul 22 20:05:08 2012 +0200

Fix another forgotten struct tm/time_t occurrence.

 panel-plugin/weather-summary.c |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 93a3391..95c6b55 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -242,7 +242,7 @@ create_summary_tab (xfceweather_data *data)
   GtkAdjustment *adj;
   GtkWidget *weather_channel_icon;
   xml_time  *conditions;
-  struct tm *start, *end, *point_tm;
+  struct tm *start_tm, *end_tm, *point_tm;
   char   interval_start[80], interval_end[80], point[80];
 
   view = gtk_text_view_new ();
@@ -287,10 +287,10 @@ create_summary_tab (xfceweather_data *data)
   value = g_strdup_printf (_(\tPoint data applies to:\n\t%s\n), point);
   APPEND_TEXT_ITEM_REAL (value);
 
-  start = localtime(conditions-start);
-  strftime (interval_start, 80, %c, start);
-  end = localtime(conditions-end);
-  strftime (interval_end, 80, %c, end);
+  start_tm = localtime(conditions-start);
+  strftime (interval_start, 80, %c, start_tm);
+  end_tm = localtime(conditions-end);
+  strftime (interval_end, 80, %c, end_tm);
   value = g_strdup_printf (_(\n\tInterval data applies 
to:\n\tStart:\t%s\n\tEnd:\t%s\n),
interval_start,
interval_end);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] xfce4-weather-plugin:master Summary details: Better explanation for the two different types of data.

[Harald Judt]

Updating branch refs/heads/master
 to 4c1f9f55e8696fc7142d5230e348c83e584a4f54 (commit)
   from 5abdd3916520fc08ec560c62e3f3902ab0c81291 (commit)

commit 4c1f9f55e8696fc7142d5230e348c83e584a4f54
Author: Harald Judt h.j...@gmx.at
Date:   Sun Jul 22 20:26:34 2012 +0200

Summary details: Better explanation for the two different types of data.

Make clear to the user that there are two different types of data,
as stated on http://api.yr.no/faq.html#times, and get rid of the
confusing terms point data and interval data.

 panel-plugin/weather-summary.c |9 ++---
 1 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/panel-plugin/weather-summary.c b/panel-plugin/weather-summary.c
index 95c6b55..cc8eb39 100644
--- a/panel-plugin/weather-summary.c
+++ b/panel-plugin/weather-summary.c
@@ -284,23 +284,18 @@ create_summary_tab (xfceweather_data *data)
   APPEND_BTEXT(_(\nTime\n));
   point_tm = localtime(conditions-point);
   strftime (point, 80, %c, point_tm);
-  value = g_strdup_printf (_(\tPoint data applies to:\n\t%s\n), point);
+  value = g_strdup_printf (_(\tTemperature, wind, atmosphere and cloud data 
apply to:\n\t%s\n), point);
   APPEND_TEXT_ITEM_REAL (value);
 
   start_tm = localtime(conditions-start);
   strftime (interval_start, 80, %c, start_tm);
   end_tm = localtime(conditions-end);
   strftime (interval_end, 80, %c, end_tm);
-  value = g_strdup_printf (_(\n\tInterval data applies 
to:\n\tStart:\t%s\n\tEnd:\t%s\n),
+  value = g_strdup_printf (_(\n\tPrecipitation and the weather symbol have 
been calculated\n\tfor the following time 
interval:\n\tStart:\t%s\n\tEnd:\t%s\n),
interval_start,
interval_end);
   APPEND_TEXT_ITEM_REAL (value);
 
-  value = g_strdup_printf (_(\n\tInterval data provides icon, description and 
precipitation,
- \n\twhile the remaining information originates 
from point data.\n));
-  APPEND_TEXT_ITEM_REAL (value);
-
-
   /* Temperature */
   APPEND_BTEXT (_(\nTemperature\n));
   APPEND_TEXT_ITEM (_(Temperature), TEMPERATURE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

[Xfce4-commits] parole:master l10n: New Serbian translation, author salepetronije

[Transifex]

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

commit dcbcb8f23951fc5bd7975d05a82940ac446fe843
Author: Мирослав Николић miroslavniko...@rocketmail.com
Date:   Sun Jul 22 22:47:11 2012 +0200

l10n: New Serbian translation, author salepetronije

New status: 184 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/{nl.po = sr.po} |  434 +++---
 1 files changed, 200 insertions(+), 234 deletions(-)

diff --git a/po/nl.po b/po/sr.po
similarity index 62%
copy from po/nl.po
copy to po/sr.po
index 769d6af..03f838d 100644
--- a/po/nl.po
+++ b/po/sr.po
@@ -1,309 +1,301 @@
-# Dutch translation of the parole package.
-# Copyright (C) The Xfce development team.
+# Serbian translation of parole.
+# Copyright (C) 2012
 # This file is distributed under the same license as the parole package.
-# Huib Kleinhout h...@stack.nl, 2002–2004.
-# Tino Meinen a.t.mei...@chello.nl, 2004–2009.
-# Wouter Bolsterlee wbols...@gnome.org, 2006–2009.
-# Mario Blättermann mari...@gnome.org.
-# Pjotr, 2011.
-#
+# salepetronije salepetron...@gmail.com, 2012.
 msgid 
 msgstr 
-Project-Id-Version: parole\n
+Project-Id-Version: parole.master\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2011-09-08 10:10+\n
-PO-Revision-Date: 2011-09-08 11:55+0200\n
-Last-Translator: Pjotr\n
-Language-Team: Dutch (Flemish)\n
+POT-Creation-Date: 2012-07-22 15:33+\n
+PO-Revision-Date: 2012-07-22 22:36+0200\n
+Last-Translator: salepetronije salepetron...@gmail.com\n
+Language-Team: српски xfce-i...@xfce.org\n
+Language: sr\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: nl (Dutch)\n
-Plural-Forms: nplurals=2; plural=(n != 1);\n
+Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  n
+%10=4  (n%10010 || n%100=20) ? 1 : 2);\n
 
 #: ../data/interfaces/parole.ui.h:1
 msgid 16:9 (Widescreen)
-msgstr 16:9 (breedbeeld)
+msgstr 16:9 (широки екран)
 
 #: ../data/interfaces/parole.ui.h:2
 msgid 20:9 (DVB)
-msgstr 20:9 (DVB)
+msgstr 20:9 (ДВБ)
 
 #: ../data/interfaces/parole.ui.h:3
 msgid 4:3 (TV)
-msgstr 4:3 (TV)
+msgstr 4:3 (ТВ)
 
 #: ../data/interfaces/parole.ui.h:4
 msgid Aspect Ratio
-msgstr Beeldverhouding
+msgstr Размера
 
 #: ../data/interfaces/parole.ui.h:5
 msgid Auto
-msgstr Automatisch
+msgstr Самостално
 
 #: ../data/interfaces/parole.ui.h:6
 msgid Chapter Menu
-msgstr Hoofdstukmenu
+msgstr Изборник поглавља
 
 #: ../data/interfaces/parole.ui.h:7
 msgid DVD
-msgstr DVD
+msgstr ДВД
 
 #: ../data/interfaces/parole.ui.h:8
 msgid DVD Menu
-msgstr DVD-menu
+msgstr ДВД изборник
 
 #: ../data/interfaces/parole.ui.h:9
 msgid From ISO image
-msgstr Van ISO-beeldbestand
+msgstr Из ИСО одраза
 
-# Totem erbij want ik heb meerdere mediaspelers.
-# media omdat totem meer dan alleen films kan afspelen
 #: ../data/interfaces/parole.ui.h:10
 msgid Media player
-msgstr Mediaspeler
+msgstr Програм за пуштање звука и видеа
 
 #: ../data/interfaces/parole.ui.h:11
 msgid Mute
-msgstr Dempen
+msgstr Утишај
 
 #: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:1215
 #: ../src/parole-disc-menu.c:113
 msgid Next Chapter
-msgstr Volgende hoofdstuk
+msgstr Следећe поглавље
 
 #: ../data/interfaces/parole.ui.h:13
 msgid None
-msgstr Geen
+msgstr Ништа
 
 #: ../data/interfaces/parole.ui.h:14 ../src/parole-about.c:74
 #: ../plugins/window-title/window-title-provider.c:58
 msgid Parole Media Player
-msgstr Parole mediaspeler
+msgstr Програм за пуштање звука и видеа Часноречац
 
 #: ../data/interfaces/parole.ui.h:15
 msgid Plugins
-msgstr Plugins
+msgstr Прикључци
 
 #: ../data/interfaces/parole.ui.h:16 ../src/parole-player.c:1227
 #: ../src/parole-disc-menu.c:114
 msgid Previous Chapter
-msgstr Vorige hoofdstuk
+msgstr Претходно поглавље
 
 #: ../data/interfaces/parole.ui.h:17 ../src/parole-medialist.c:1264
 msgid Repeat
-msgstr Herhaal
+msgstr Понови
 
 #: ../data/interfaces/parole.ui.h:18
 msgid Select Track
-msgstr Spoor selecteren
+msgstr Изабери нумеру
 
 #: ../data/interfaces/parole.ui.h:19 ../src/parole-medialist.c:1280
 msgid Shuffle
-msgstr Schuffelen
+msgstr Насумично
 
 #: ../data/interfaces/parole.ui.h:20
 msgid Sound
-msgstr Geluid
+msgstr Звук
 
 #: ../data/interfaces/parole.ui.h:21
 msgid Square
-msgstr Vierkant
+msgstr Квадратни
 
-# zachter/Minder volume
 #: ../data/interfaces/parole.ui.h:22
 msgid Volume Down
-msgstr Zachter
+msgstr Утишај
 
-# harder/Meer volume
 #: ../data/interfaces/parole.ui.h:23
 msgid Volume Up
-msgstr Harder
+msgstr Појачај
 
 #: ../data/interfaces/parole.ui.h:24
 msgid _Edit
-msgstr Be_werken
+msgstr _Уреди
 
 #: ../data/interfaces/parole.ui.h:25
 msgid _Help
-msgstr _Hulp
+msgstr По_моћ
 
 #: ../data/interfaces/parole.ui.h:26
 msgid _Media
-msgstr _Media
+msgstr _Датотека
 
 #: ../data/interfaces/parole.ui.h:27
 msgid _Open 

[Xfce4-commits] squeeze:master l10n: New Serbian translation, author salepetronije

[Transifex]

Updating branch refs/heads/master
 to 449611227ba68af09a486cd23e96a8ec1f01ee7d (commit)
   from c7a4e5b24411eb5a8c29b8417b8d75a08d603e73 (commit)

commit 449611227ba68af09a486cd23e96a8ec1f01ee7d
Author: Мирослав Николић miroslavniko...@rocketmail.com
Date:   Sun Jul 22 23:08:10 2012 +0200

l10n: New Serbian translation, author salepetronije

New status: 90 messages complete with 0 fuzzies and 0 untranslated.

Transmitted-via: Transifex (translations.xfce.org).

 po/{hr.po = sr.po} |  232 ++-
 1 files changed, 117 insertions(+), 115 deletions(-)

diff --git a/po/hr.po b/po/sr.po
similarity index 53%
copy from po/hr.po
copy to po/sr.po
index 52fdbcf..9207c03 100644
--- a/po/hr.po
+++ b/po/sr.po
@@ -1,162 +1,164 @@
-# Croatian translation of the squeeze package
-# Copyright (C) 2006-2007 Stephan Arts.
+# Serbian translation of squeeze.
+# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the squeeze package.
-# Ivica Kolić ik...@yahoo.com, 2011.
-# 
+# Саша Петровић salepetron...@gmail.com, 2012.
 msgid 
 msgstr 
-Project-Id-Version: hr.po\n
+Project-Id-Version: squeeze\n
 Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2012-05-19 21:42+\n
-PO-Revision-Date: 2011-01-04 02:50+0100\n
-Last-Translator: Ivica Kolić ik...@yahoo.com\n
-Language-Team: Croatian\n
+POT-Creation-Date: 2012-07-22 15:48+\n
+PO-Revision-Date: 2012-07-22 23:05+0200\n
+Last-Translator: Саша Петровић salepetron...@gmail.com\n
+Language-Team: српски xfce-i...@xfce.org\n
+Language: sr\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
-Language: Croatian\n
-X-Poedit-Language: Croatian\n
-X-Poedit-SourceCharset: utf-8\n
-X-Poedit-Country: CROATIA\n
+Plural-Forms: nplurals=3; plural=(n%10==1  n%100!=11 ? 0 : n%10=2  n%
+10=4  (n%10010 || n%100=20) ? 1 : 2);\n
 
 #: ../libsqueeze/archive.c:266
 msgid Name
-msgstr Ime
+msgstr Назив
 
 #: ../libsqueeze/archive.c:269
 msgid Mime type
-msgstr Mime tip
+msgstr Врста датотеке
 
 #: ../squeeze.desktop.in.h:1
 msgid Archive Manager
-msgstr Upravitelj arhivama
+msgstr Управљач архивом
 
 #: ../squeeze.desktop.in.h:2
 msgid Create and manage archives with the archive manager
-msgstr Napravite i upravljajte arhivama pomoću upravitelja arhivama
+msgstr Направите и управљајте архивама уз помоћ управника архива
 
 #: ../squeeze.desktop.in.h:3
 msgid Squeeze Archive Manager
-msgstr Squeeze upravitelj arhivama
+msgstr Управљач архивом Цедиљка
 
+#.
 #. * Could not open archive (mime type not supported or file did not exist)
 #. * Should be a more specific error message.
-#. 
+#.
 #: ../src/application.c:160 ../src/application.c:251
 msgid Could not open archive, MIME-type unsupported or file did not exist
-msgstr Ne mogu otvoriti arhivu,nepodržan MIME-tip ili datoteka ne postoji
+msgstr 
+Нисам могао отворити архиву, врста датотеке није подржана или датотека не 
+постоји
 
 #: ../src/application.c:190 ../src/main_window.c:834 ../src/main_window.c:1297
 msgid 
 Squeeze cannot extract this archive type,\n
 the application to support this is missing.
 msgstr 
-Squeeze ne može raspakirati ovaj tip arhive\n
-nedostaje program koji to podržava.
+Цедиљка не може издвојити ову врсту архиве,\n
+програм подршке за ту радњу недостаје.
 
+#.
 #. * Could not create archive (mime type unsupported)
-#. 
+#.
 #: ../src/application.c:234
 msgid Could not create archive, MIME-type unsupported
-msgstr Ne mogu napraviti arhivu,MIME-tip nepodržan
+msgstr Не могу да направим архиву, врста датотеке није подржана
 
 #: ../src/application.c:269 ../src/main_window.c:887
 msgid 
 Squeeze cannot add files to this archive type,\n
 the application to support this is missing.
 msgstr 
-Squeeze ne može dodati datoteke u ovaj tip arhive\n
-nedostaje program koji to podržava.
+Цедиљка не може додати датотеке у ову врсту архиве,\n
+програм подршке за ту радњу недостаје.
 
 #: ../src/archive_store.c:250 ../src/notebook.c:181
 msgid Show full path
-msgstr Pokaži punu stazu
+msgstr Прикажи пуну путању
 
 #: ../src/archive_store.c:251 ../src/notebook.c:182
 msgid Show the full path strings for each entry
-msgstr 
+msgstr Прикажи ниске потпуне путање за сваки извор
 
 #: ../src/archive_store.c:257 ../src/notebook.c:188
 msgid Show mime icons
-msgstr Pokaži mime ikone
+msgstr Прикажи иконице врсти датотека
 
 #: ../src/archive_store.c:258 ../src/notebook.c:189
 msgid Show the mime type icons for each entry
-msgstr Pokaži ikone mime.tipa za svaki unos
+msgstr Прикажи иконице врста датотека за сваки извор
 
 #: ../src/archive_store.c:264
 msgid Show up dir entry
-msgstr 
+msgstr Прикажи унос горње фасцикли
 
 #: ../src/archive_store.c:265
 msgid Show '..' to go to the parent directory
-msgstr 
+msgstr Прикажи „..“ за прелазак на родитељску фасциклу
 
 #: ../src/archive_store.c:271 ../src/notebook.c:195
 msgid Sort folders before files
-msgstr Sortiraj mape prije 

[Xfce4-commits] parole:master Initial commit

[Simon Steinbeiß]

Updating branch refs/heads/master
 to 383b6dd8e1c58d2337e07130278062fb21763aab (commit)
   from 383b6dd8e1c58d2337e07130278062fb21763aab^1 ()


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

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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 373448167a928babb7763cd1c60642d1f8e0a51b (commit)
   from b1308b2be1dba297d00b5a68081be70a837a744e (commit)

commit 373448167a928babb7763cd1c60642d1f8e0a51b
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 Merge the playback gtk-scale and the control hbox

[Simon Steinbeiss]

Updating branch refs/heads/master
 to b1308b2be1dba297d00b5a68081be70a837a744e (commit)
   from 48c3e6c6214338fce645930dffccd26235189d45 (commit)

commit b1308b2be1dba297d00b5a68081be70a837a744e
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 Fix position numbers

[Simon Steinbeiss]

Updating branch refs/heads/master
 to c0e67e5d2d0cff5a4eed0b719336b3a513219aa9 (commit)
   from 373448167a928babb7763cd1c60642d1f8e0a51b (commit)

commit c0e67e5d2d0cff5a4eed0b719336b3a513219aa9
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to ce55c1808052e61ff69f44efd218f7a4ec9db61b (commit)
   from c0e67e5d2d0cff5a4eed0b719336b3a513219aa9 (commit)

commit ce55c1808052e61ff69f44efd218f7a4ec9db61b
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to b7d5382b3642ebfb7a61e95069bae3474a745fb3 (commit)
   from ce55c1808052e61ff69f44efd218f7a4ec9db61b (commit)

commit b7d5382b3642ebfb7a61e95069bae3474a745fb3
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)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 4186d8effeda714d5a6557a8362a464b222901c4 (commit)
   from b7d5382b3642ebfb7a61e95069bae3474a745fb3 (commit)

commit 4186d8effeda714d5a6557a8362a464b222901c4
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to dfa0bc2acb4f22aa964fe421dd1d4f4544d19be8 (commit)
   from 4186d8effeda714d5a6557a8362a464b222901c4 (commit)

commit dfa0bc2acb4f22aa964fe421dd1d4f4544d19be8
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 478bf554829acf087d3d2f4ea6292a9fc21d0d2a (commit)
   from dfa0bc2acb4f22aa964fe421dd1d4f4544d19be8 (commit)

commit 478bf554829acf087d3d2f4ea6292a9fc21d0d2a
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.

[Sean Davis]

Updating branch refs/heads/master
 to fc5a15bed5c9822c234cc8230f8d80f204a1c623 (commit)
   from 478bf554829acf087d3d2f4ea6292a9fc21d0d2a (commit)

commit fc5a15bed5c9822c234cc8230f8d80f204a1c623
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)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 3bd50585089a6a55891e0352a23667e63b1e2b63 (commit)
   from 87414f6a91114159c5365646b1f942b604d1fa18 (commit)

commit 3bd50585089a6a55891e0352a23667e63b1e2b63
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.

[Sean Davis]

Updating branch refs/heads/master
 to b8c070db52a80c3833c6f4d0efaca726aa21f0b2 (commit)
   from 3bd50585089a6a55891e0352a23667e63b1e2b63 (commit)

commit b8c070db52a80c3833c6f4d0efaca726aa21f0b2
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.

[Sean Davis]

Updating branch refs/heads/master
 to 85cdca6c7132c058bd6a0d3ada908235bf575da9 (commit)
   from b8c070db52a80c3833c6f4d0efaca726aa21f0b2 (commit)

commit 85cdca6c7132c058bd6a0d3ada908235bf575da9
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.

[Sean Davis]

Updating branch refs/heads/master
 to 73bd88a67081e12a6baadd2e3b362cc505428b44 (commit)
   from 85cdca6c7132c058bd6a0d3ada908235bf575da9 (commit)

commit 73bd88a67081e12a6baadd2e3b362cc505428b44
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.

[Sean Davis]

Updating branch refs/heads/master
 to 146b2c937b9f75d24cb7fe870ceb0d0e7fd6497e (commit)
   from 73bd88a67081e12a6baadd2e3b362cc505428b44 (commit)

commit 146b2c937b9f75d24cb7fe870ceb0d0e7fd6497e
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to c2abe62f033fa097c7fc897381682e55f1ea5ab3 (commit)
   from 73bd88a67081e12a6baadd2e3b362cc505428b44 (commit)

commit c2abe62f033fa097c7fc897381682e55f1ea5ab3
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 Merge branch 'master' of github.com:ochosi/Parole

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 3e5ed8c60f08430e61946ce6e3303437e5fb2398 (commit)
   from c2abe62f033fa097c7fc897381682e55f1ea5ab3 (commit)

commit 3e5ed8c60f08430e61946ce6e3303437e5fb2398
Merge: c2abe62 146b2c9
Author: Simon Steinbeiss och...@xfce.org
Date:   Wed Jul 11 17:15:02 2012 +0200

Merge branch 'master' of github.com:ochosi/Parole

commit 146b2c937b9f75d24cb7fe870ceb0d0e7fd6497e
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 Possible fix for hbox adjustments on buffer.

[Sean Davis]

Updating branch refs/heads/master
 to 217867585255fd8030da4bae0fc8c21b979463d8 (commit)
   from 3e5ed8c60f08430e61946ce6e3303437e5fb2398 (commit)

commit 217867585255fd8030da4bae0fc8c21b979463d8
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.

[Sean Davis]

Updating branch refs/heads/master
 to a1e47f494b35ec886c18c7c6d59a212931d44338 (commit)
   from 217867585255fd8030da4bae0fc8c21b979463d8 (commit)

commit a1e47f494b35ec886c18c7c6d59a212931d44338
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 6ba2f8c36d04c717e5e8d1fbd24c7e69eab5c99d (commit)
   from a1e47f494b35ec886c18c7c6d59a212931d44338 (commit)

commit 6ba2f8c36d04c717e5e8d1fbd24c7e69eab5c99d
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 8aedf5a1ce74dc0a00089f3675e62f2bb44b57a1 (commit)
   from 6ba2f8c36d04c717e5e8d1fbd24c7e69eab5c99d (commit)

commit 8aedf5a1ce74dc0a00089f3675e62f2bb44b57a1
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 Gstreamer update from the 0.2.2 branch (should fix LP: #1023583)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to fe21e9e96219e880996cb6e8ae663fe8eb60f880 (commit)
   from 8aedf5a1ce74dc0a00089f3675e62f2bb44b57a1 (commit)

commit fe21e9e96219e880996cb6e8ae663fe8eb60f880
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 6dd5ebc25a6e7bb05c08929243b08d94c5951526 (commit)
   from 61f634d4e6338eed469c9782cd06066ed1a7603f (commit)

commit 6dd5ebc25a6e7bb05c08929243b08d94c5951526
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 Fix for widget_hide error. Addressed some messages displayed when running autogen.sh

[Sean Davis]

Updating branch refs/heads/master
 to dbecec4db56fc15bf05c0ecdc4043ed39a015c90 (commit)
   from d1c58c9e88ff81dba4ca0acd2e4f121f31a6df52 (commit)

commit dbecec4db56fc15bf05c0ecdc4043ed39a015c90
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.

[Sean Davis]

Updating branch refs/heads/master
 to 0dd9f5bdd24068954643866ac0518a4b003df8d6 (commit)
   from dbecec4db56fc15bf05c0ecdc4043ed39a015c90 (commit)

commit 0dd9f5bdd24068954643866ac0518a4b003df8d6
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 suggestions provided by libtool. All existing errors in configure are from XDT_FEATURE_DEBUG.

[Sean Davis]

Updating branch refs/heads/master
 to e88e0ad9a87d3ef3d2a3380f7c2fe05db6fc56d3 (commit)
   from 8dea778bb431edf73af2c871cf8f73e0d2ae (commit)

commit e88e0ad9a87d3ef3d2a3380f7c2fe05db6fc56d3
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 Small fix for autogen.sh

[Sean Davis]

Updating branch refs/heads/master
 to 09ac4a8f1e77b852bf50a3f917a27dd333080e83 (commit)
   from e88e0ad9a87d3ef3d2a3380f7c2fe05db6fc56d3 (commit)

commit 09ac4a8f1e77b852bf50a3f917a27dd333080e83
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.

[Sean Davis]

Updating branch refs/heads/master
 to c1e8e2234d9b58d1308364de5d7f89fa1ef9145c (commit)
   from 4b2fb26cc04bc9c454563b5f68d6c0647c363336 (commit)

commit c1e8e2234d9b58d1308364de5d7f89fa1ef9145c
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

[Sean Davis]

Updating branch refs/heads/master
 to 4b2fb26cc04bc9c454563b5f68d6c0647c363336 (commit)
   from 09ac4a8f1e77b852bf50a3f917a27dd333080e83 (commit)

commit 4b2fb26cc04bc9c454563b5f68d6c0647c363336
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to cdd5b9e9206c97a5324f9dc6518efa33ac14ae58 (commit)
   from c1e8e2234d9b58d1308364de5d7f89fa1ef9145c (commit)

commit cdd5b9e9206c97a5324f9dc6518efa33ac14ae58
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 6e2c241aae2fc7c5903738afd0db4fa961ee8060 (commit)
   from 8aedf5a1ce74dc0a00089f3675e62f2bb44b57a1 (commit)

commit 6e2c241aae2fc7c5903738afd0db4fa961ee8060
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 1db5296..c79d24f 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);
 }
 }
 
@@ -1894,6 +1900,7 @@ parole_player_init (ParolePlayer *player)
 GtkBuilder *builder;
 GdkScreen *screen;
 gint w, h;
+gboolean showhide;
 
 gboolean repeat, shuffle;
 
@@ -2009,7 +2016,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,
@@ -2018,6 +2025,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 Drop references to the stop-button

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 99ab22458c8c70a086e8e310239acd98bc15d7e4 (commit)
   from 6e2c241aae2fc7c5903738afd0db4fa961ee8060 (commit)

commit 99ab22458c8c70a086e8e310239acd98bc15d7e4
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 |   17 -
 1 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/src/parole-player.c b/src/parole-player.c
index c79d24f..5cdc65b 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -507,8 +507,6 @@ parole_player_media_activated_cb (ParoleMediaList *list, 
GtkTreeRowReference *ro
TRACE (Trying to play media file %s, uri);
TRACE (File content type %s, parole_file_get_content_type (file));

-   gtk_widget_set_sensitive (player-priv-stop, TRUE);
-   
parole_gst_play_uri (PAROLE_GST (player-priv-gst), 
 parole_file_get_uri (file),
 sub);
@@ -525,8 +523,6 @@ static void
 parole_player_disc_selected_cb (ParoleDisc *disc, const gchar *uri, const 
gchar *device, ParolePlayer *player)
 {
 parole_player_reset (player);
-gtk_widget_set_sensitive (player-priv-stop, TRUE);
-
 parole_gst_play_device_uri (PAROLE_GST (player-priv-gst), uri, device);
 }
 
@@ -534,7 +530,6 @@ static void
 parole_player_uri_opened_cb (ParoleMediaList *list, const gchar *uri, 
ParolePlayer *player)
 {
 parole_player_reset (player);
-gtk_widget_set_sensitive (player-priv-stop, TRUE);
 parole_gst_play_uri (PAROLE_GST (player-priv-gst), uri, NULL);
 }
 
@@ -669,7 +664,6 @@ parole_player_playing (ParolePlayer *player, const 
ParoleStream *stream)
  NULL);
  
 gtk_widget_set_sensitive (player-priv-play_pause, TRUE);
-gtk_widget_set_sensitive (player-priv-stop, TRUE);
 
 parole_player_set_playpause_button_image (player-priv-play_pause, 
GTK_STOCK_MEDIA_PAUSE);
 
@@ -722,7 +716,6 @@ parole_player_paused (ParolePlayer *player)
 parole_media_list_set_row_pixbuf (player-priv-list, player-priv-row, 
pix);
 
 gtk_widget_set_sensitive (player-priv-play_pause, TRUE);
-gtk_widget_set_sensitive (player-priv-stop, TRUE);
 
 if ( player-priv-user_seeking == FALSE)
parole_player_set_playpause_button_image (player-priv-play_pause, 
GTK_STOCK_MEDIA_PLAY);
@@ -750,16 +743,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.
- */
-if ( parole_gst_get_gst_target_state (PAROLE_GST (player-priv-gst)) != 
GST_STATE_PLAYING)
-{
-   gtk_widget_set_sensitive (player-priv-stop, FALSE);
-}
 
 parole_player_change_range_value (player, 0);
 gtk_widget_set_sensitive (player-priv-range, FALSE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits

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

[danny]

Updating branch refs/heads/master
 to 20c5ee8ebe67cff644a3fb117abffdd298337185 (commit)
   from 99ab22458c8c70a086e8e310239acd98bc15d7e4 (commit)

commit 20c5ee8ebe67cff644a3fb117abffdd298337185
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 |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index fd0d5ba..c20f952 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -910,7 +910,6 @@ parole_gst_update_vis (ParoleGstHelper *helper)
g_object_set (G_OBJECT (gst-priv-playbin),
  vis-plugin, NULL,
  NULL);
-   gtk_widget_queue_draw (GTK_WIDGET (gst));
 }
 
 gst-priv-update_vis = FALSE;
@@ -1357,7 +1356,6 @@ parole_gst_play_file_internal (ParoleGst *gst)
 if ( gst-priv-update_vis)
parole_gst_helper_update_vis (PAROLE_GST_HELPER (gst));
 
-gtk_widget_queue_draw (GTK_WIDGET (gst));
 
 g_object_get (G_OBJECT (gst-priv-stream),
  uri, uri,
___
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.

[Sean Davis]

Updating branch refs/heads/master
 to 02fab972c3397e51fd9289313eec0d9d2d605809 (commit)
   from cdd5b9e9206c97a5324f9dc6518efa33ac14ae58 (commit)

commit 02fab972c3397e51fd9289313eec0d9d2d605809
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 Merge pull request #1 from tekkenfreak3/master

[Simon Steinbeiß]

Updating branch refs/heads/master
 to a9f8b19db9b79ce24cc00d5b1a379ec7058a26fc (commit)
   from 99ab22458c8c70a086e8e310239acd98bc15d7e4 (commit)

commit a9f8b19db9b79ce24cc00d5b1a379ec7058a26fc
Merge: 99ab224 20c5ee8
Author: Simon Steinbeiß och...@xfce.org
Date:   Sat Jul 14 15:23:07 2012 -0700

Merge pull request #1 from tekkenfreak3/master

Quick initial fix

commit 20c5ee8ebe67cff644a3fb117abffdd298337185
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 |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/gst/parole-gst.c b/gst/parole-gst.c
index fd0d5ba..c20f952 100644
--- a/gst/parole-gst.c
+++ b/gst/parole-gst.c
@@ -910,7 +910,6 @@ parole_gst_update_vis (ParoleGstHelper *helper)
g_object_set (G_OBJECT (gst-priv-playbin),
  vis-plugin, NULL,
  NULL);
-   gtk_widget_queue_draw (GTK_WIDGET (gst));
 }
 
 gst-priv-update_vis = FALSE;
@@ -1357,7 +1356,6 @@ parole_gst_play_file_internal (ParoleGst *gst)
 if ( gst-priv-update_vis)
parole_gst_helper_update_vis (PAROLE_GST_HELPER (gst));
 
-gtk_widget_queue_draw (GTK_WIDGET (gst));
 
 g_object_get (G_OBJECT (gst-priv-stream),
  uri, uri,
___
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.

[Sean Davis]

Updating branch refs/heads/master
 to c1d80be637ebdaeed5aa4e893dc1afb6459b2a70 (commit)
   from c4c147a4844c406d820bea16b26d2003d7d437cb (commit)

commit c1d80be637ebdaeed5aa4e893dc1afb6459b2a70
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.

[Sean Davis]

Updating branch refs/heads/master
 to 499c3f71b49e34646d43c937c57b4abb881849e1 (commit)
   from c1d80be637ebdaeed5aa4e893dc1afb6459b2a70 (commit)

commit 499c3f71b49e34646d43c937c57b4abb881849e1
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 ee4caf3..2f7e14b 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2086,9 +2086,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.

[Sean Davis]

Updating branch refs/heads/master
 to 94b5bd7c98ea42c0749d8c428ff054fca7e41c66 (commit)
   from 499c3f71b49e34646d43c937c57b4abb881849e1 (commit)

commit 94b5bd7c98ea42c0749d8c428ff054fca7e41c66
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)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 1706d0132316820bd322191c6fdecbeeaaebe4e8 (commit)
   from 2b0367c13ab9f96f5ce9e221f4c08e8cdbae7fa5 (commit)

commit 1706d0132316820bd322191c6fdecbeeaaebe4e8
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 4fe44e23f2fd706649690586ae103406ab4272a1 (commit)
   from 1706d0132316820bd322191c6fdecbeeaaebe4e8 (commit)

commit 4fe44e23f2fd706649690586ae103406ab4272a1
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 2e38a9893ebe34018db22458d7e4562f74c586d1 (commit)
   from 4fe44e23f2fd706649690586ae103406ab4272a1 (commit)

commit 2e38a9893ebe34018db22458d7e4562f74c586d1
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)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 45e8e7c22a54c298c8b0c98b5b71264d069bd200 (commit)
   from 2e38a9893ebe34018db22458d7e4562f74c586d1 (commit)

commit 45e8e7c22a54c298c8b0c98b5b71264d069bd200
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)

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 5be31e323b3b7393c72490f8fadb984688e664a7 (commit)
   from 45e8e7c22a54c298c8b0c98b5b71264d069bd200 (commit)

commit 5be31e323b3b7393c72490f8fadb984688e664a7
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 10df69bd6f4effb015b8db379e9873407efebf2b (commit)
   from 5be31e323b3b7393c72490f8fadb984688e664a7 (commit)

commit 10df69bd6f4effb015b8db379e9873407efebf2b
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 6092d3948b20170f06abd1e7c02a243dde57d49b (commit)
   from 10df69bd6f4effb015b8db379e9873407efebf2b (commit)

commit 6092d3948b20170f06abd1e7c02a243dde57d49b
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to b42a06656922e452bd510fef13332df4e1843d90 (commit)
   from 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d (commit)

commit b42a06656922e452bd510fef13332df4e1843d90
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d (commit)
   from 6092d3948b20170f06abd1e7c02a243dde57d49b (commit)

commit 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to ad261e851dd08aca0adc7bd3ebba238f14b2b3a3 (commit)
   from b42a06656922e452bd510fef13332df4e1843d90 (commit)

commit ad261e851dd08aca0adc7bd3ebba238f14b2b3a3
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

[Simon Steinbeiss]

Updating branch refs/heads/master
 to a9c40d08949ab4ccfaa82ab1c82d3db33941e657 (commit)
   from ad261e851dd08aca0adc7bd3ebba238f14b2b3a3 (commit)

commit a9c40d08949ab4ccfaa82ab1c82d3db33941e657
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 Merge branch 'master' of https://github.com/ochosi/Parole

[Sean Davis]

Updating branch refs/heads/master
 to eaf2ba9b53031fd16101581e1fa2705c5afe48d6 (commit)
   from 311a4068c42abf355293900c330420f7c1386c85 (commit)

commit eaf2ba9b53031fd16101581e1fa2705c5afe48d6
Merge: 311a406 a9c40d0
Author: Sean Davis smd.seanda...@gmail.com
Date:   Wed Jul 18 15:40:12 2012 -0400

Merge branch 'master' of https://github.com/ochosi/Parole

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

Make open location dialog modal

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

Fix accelerators of open-location and dvd-submenu

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

Drop commented lines

 data/interfaces/open-location.ui |   43 ++---
 data/interfaces/parole.ui|4 +-
 src/main.c   |2 -
 3 files changed, 5 insertions(+), 44 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
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index af96b01..6f5940a 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
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 

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

[Sean Davis]

Updating branch refs/heads/master
 to 311a4068c42abf355293900c330420f7c1386c85 (commit)
   from 124892a90fa2e5d09ced6a1d6ac5e249eb14b22d (commit)

commit 311a4068c42abf355293900c330420f7c1386c85
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 3ad31aa..af96b01 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.

[Sean Davis]

Updating branch refs/heads/master
 to 7bc533582532cd3b4b3a0afc202eea748c1ca855 (commit)
   from eaf2ba9b53031fd16101581e1fa2705c5afe48d6 (commit)

commit 7bc533582532cd3b4b3a0afc202eea748c1ca855
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 Added infobar for selecting audio tracks and subtitles.

[Sean Davis]

Updating branch refs/heads/master
 to 5179af3df5d83b5717517de35cb8e1db21b6aeae (commit)
   from 7bc533582532cd3b4b3a0afc202eea748c1ca855 (commit)

commit 5179af3df5d83b5717517de35cb8e1db21b6aeae
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 Add more mnemonic shortcuts to the menus

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 4d6708163de0565c959f13ae9cd32b8f7b6e05d6 (commit)
   from 5179af3df5d83b5717517de35cb8e1db21b6aeae (commit)

commit 4d6708163de0565c959f13ae9cd32b8f7b6e05d6
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 audio stream switching.

[Sean Davis]

Updating branch refs/heads/master
 to 56f9f0acd5f18566e911e4484f148843135aebb9 (commit)
   from 5179af3df5d83b5717517de35cb8e1db21b6aeae (commit)

commit 56f9f0acd5f18566e911e4484f148843135aebb9
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 bf8e023..f1f88a5 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -603,6 +603,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 9b8d10c..3102e09 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2394,6 +2394,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 Merge branch 'master' of https://github.com/ochosi/Parole

[Sean Davis]

Updating branch refs/heads/master
 to 4565225c5bab4abe7652f34d092f70b55a669def (commit)
   from 56f9f0acd5f18566e911e4484f148843135aebb9 (commit)

commit 4565225c5bab4abe7652f34d092f70b55a669def
Merge: 56f9f0a 4d67081
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Jul 19 05:05:17 2012 -0400

Merge branch 'master' of https://github.com/ochosi/Parole

commit 4d6708163de0565c959f13ae9cd32b8f7b6e05d6
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 f1f88a5..a350883 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 Add mnemonic keys for sound-menuitems

[Simon Steinbeiss]

Updating branch refs/heads/master
 to d60186cc80cbe6a2ade432beec6c9cc2ac18b621 (commit)
   from 4d6708163de0565c959f13ae9cd32b8f7b6e05d6 (commit)

commit d60186cc80cbe6a2ade432beec6c9cc2ac18b621
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 7e0181d..8e10c15 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 Merge branch 'master' of github.com:ochosi/Parole

[Simon Steinbeiss]

Updating branch refs/heads/master
 to 3d8217787b750620a5a9838cf42173000cce4dec (commit)
   from d60186cc80cbe6a2ade432beec6c9cc2ac18b621 (commit)

commit 3d8217787b750620a5a9838cf42173000cce4dec
Merge: d60186c 4565225
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 19 18:09:48 2012 +0200

Merge branch 'master' of github.com:ochosi/Parole

commit 4565225c5bab4abe7652f34d092f70b55a669def
Merge: 56f9f0a 4d67081
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Jul 19 05:05:17 2012 -0400

Merge branch 'master' of https://github.com/ochosi/Parole

commit 56f9f0acd5f18566e911e4484f148843135aebb9
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 8e10c15..60f2728 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -607,6 +607,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 9b8d10c..3102e09 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2394,6 +2394,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 Fixed segmentation fault with play/pause.

[Sean Davis]

Updating branch refs/heads/master
 to 37cd2802a72d61b614f00951237a9ad823c47809 (commit)
   from 4565225c5bab4abe7652f34d092f70b55a669def (commit)

commit 37cd2802a72d61b614f00951237a9ad823c47809
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 a350883..3f3b4e1 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -642,6 +642,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 3102e09..a4b7cfb 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 Merge branch 'master' of https://github.com/ochosi/Parole

[Sean Davis]

Updating branch refs/heads/master
 to 4b15078fb16a33faafe819f351eba7e402323b0e (commit)
   from 37cd2802a72d61b614f00951237a9ad823c47809 (commit)

commit 4b15078fb16a33faafe819f351eba7e402323b0e
Merge: 37cd280 3d82177
Author: Sean Davis smd.seanda...@gmail.com
Date:   Thu Jul 19 12:54:10 2012 -0400

Merge branch 'master' of https://github.com/ochosi/Parole

commit 3d8217787b750620a5a9838cf42173000cce4dec
Merge: d60186c 4565225
Author: Simon Steinbeiss och...@xfce.org
Date:   Thu Jul 19 18:09:48 2012 +0200

Merge branch 'master' of github.com:ochosi/Parole

commit d60186cc80cbe6a2ade432beec6c9cc2ac18b621
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 3f3b4e1..b4ca5d2 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 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