[Xfce4-commits] parole:master Bump year in copyright to 2014 and fix email-address typo
Updating branch refs/heads/master to 91405b60ae6eecfbcf755b684e7078b20519dda8 (commit) from bd69280ace188f1a8ef506b15fd6d9e78c412eeb (commit) commit 91405b60ae6eecfbcf755b684e7078b20519dda8 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Jan 27 00:37:57 2014 +0100 Bump year in copyright to 2014 and fix email-address typo AUTHORS |4 ++-- src/common/parole-common.c |4 ++-- src/common/parole-rc-utils.c |4 ++-- src/common/parole-screensaver.c |4 ++-- src/dbus/parole-dbus.c |4 ++-- src/gst/parole-gst.c |4 ++-- src/main.c |4 ++-- src/misc/parole-debug.c |4 ++-- src/misc/parole-file.c |4 ++-- src/misc/parole-filters.c|4 ++-- src/misc/parole-pl-parser.c |4 ++-- src/misc/parole-provider-player.c|4 ++-- src/misc/parole-provider-plugin.c|4 ++-- src/misc/parole-stream.c |4 ++-- src/parole-about.c |6 +++--- src/parole-builder.c |4 ++-- src/parole-button.c |4 ++-- src/parole-conf-dialog.c |4 ++-- src/parole-conf.c|4 ++-- src/parole-disc.c|4 ++-- src/parole-mediachooser.c|4 ++-- src/parole-medialist.c |4 ++-- src/parole-module.c |4 ++-- src/parole-open-location.c |4 ++-- src/parole-player.c |4 ++-- src/parole-plugin-player.c |4 ++-- src/parole-plugins-manager.c |4 ++-- src/parole-utils.c |4 ++-- src/parole-vis.c |4 ++-- src/plugins/mpris2/mpris2-plugin.c |4 ++-- src/plugins/mpris2/mpris2-provider.c |4 ++-- src/plugins/notify/notify-plugin.c |4 ++-- src/plugins/notify/notify-provider.c |4 ++-- src/plugins/sample/sample-plugin.c |4 ++-- src/plugins/sample/sample-provider.c |4 ++-- src/plugins/tray/tray-plugin.c |4 ++-- src/plugins/tray/tray-provider.c |4 ++-- 37 files changed, 75 insertions(+), 75 deletions(-) diff --git a/AUTHORS b/AUTHORS index 226d843..e4f4d08 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,3 @@ Copyright (C) 2009-2011 Ali Abdallah al...@xfce.org -Copyright (C) 2012-2013 Sean Davis bluesa...@xfce.org -Copyright (C) 2012-2013 Simon Steinbeiss och...@xfce.org +Copyright (C) 2012-2014 Sean Davis bluesa...@xfce.org +Copyright (C) 2012-2014 Simon Steinbeiss och...@xfce.org diff --git a/src/common/parole-common.c b/src/common/parole-common.c index 927aa90..857d1b3 100644 --- a/src/common/parole-common.c +++ b/src/common/parole-common.c @@ -1,7 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org - * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com - * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org + * * Copyright (C) 2012-2014 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2014 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/common/parole-rc-utils.c b/src/common/parole-rc-utils.c index df4e99f..05e9db1 100644 --- a/src/common/parole-rc-utils.c +++ b/src/common/parole-rc-utils.c @@ -1,7 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org - * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com - * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org + * * Copyright (C) 2012-2014 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2014 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/common/parole-screensaver.c b/src/common/parole-screensaver.c index 9cc58f6..0c34d61 100644 --- a/src/common/parole-screensaver.c +++ b/src/common/parole-screensaver.c @@ -1,7 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org - * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com - * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org + * * Copyright (C) 2012-2014 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2014 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/dbus/parole-dbus.c b/src/dbus/parole-dbus.c index 124d897..a9f8e3f 100644 --- a/src/dbus/parole-dbus.c +++ b/src/dbus/parole-dbus.c @@ -1,7 +1,7 @@ /* * * Copyright (C) 2009-2011 Ali al...@xfce.org - * * Copyright (C) 2012-2013 Sean Davis smd.seanda...@gmail.com - * * Copyright (C) 2012-2013 Simon Steinbeiß och...@xfce.org + * * Copyright (C) 2012-2014 Sean Davis smd.seanda...@gmail.com + * * Copyright (C) 2012-2014 Simon Steinbeiß och...@xfce.org * * Licensed under the GNU General Public License Version 2 * diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index e06ccc2..8cd8b73 100644 --- a/src/gst
[Xfce4-commits] parole:master Merge branch 'master' of ssh://git.xfce.org/apps/parole
Updating branch refs/heads/master to 9ebd2b10a26d81ceca2e13f5ff0f2c7fffdbe1a7 (commit) from 91405b60ae6eecfbcf755b684e7078b20519dda8 (commit) commit 9ebd2b10a26d81ceca2e13f5ff0f2c7fffdbe1a7 Merge: 91405b6 f9e95a2 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Jan 27 00:38:06 2014 +0100 Merge branch 'master' of ssh://git.xfce.org/apps/parole commit f9e95a2f2119c46bd940ab7c1ac0f111a98af92c Author: cri cri.pe...@gmail.com Date: Mon Jan 27 00:30:55 2014 +0100 I18n: Update translation it (100%). 261 translated messages. Transifex (https://www.transifex.com/projects/p/xfce/). po/it.po | 248 +- 1 file changed, 132 insertions(+), 116 deletions(-) diff --git a/po/it.po b/po/it.po index 9eb029c..38b8c0a 100644 --- a/po/it.po +++ b/po/it.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# cri cri.pe...@gmail.com, 2010,2013 +# cri cri.pe...@gmail.com, 2010,2013-2014 msgid msgstr Project-Id-Version: Xfce Apps\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2013-11-13 06:30+0100\n -PO-Revision-Date: 2013-11-19 16:28+\n -Last-Translator: Xfce transi...@xfce.org\n +POT-Creation-Date: 2014-01-26 00:31+0100\n +PO-Revision-Date: 2014-01-26 20:17+\n +Last-Translator: cri cri.pe...@gmail.com\n Language-Team: Italian (http://www.transifex.com/projects/p/xfce/language/it/)\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -19,8 +19,8 @@ msgstr Plural-Forms: nplurals=2; plural=(n != 1);\n #: ../data/interfaces/parole.ui.h:1 ../data/desktop/parole.desktop.in.in.h:1 -#: ../src/parole-player.c:565 ../src/parole-player.c:1453 -#: ../src/parole-about.c:70 +#: ../src/parole-player.c:567 ../src/parole-player.c:1455 +#: ../src/parole-about.c:70 ../src/plugins/mpris2/mpris2-provider.c:199 msgid Parole Media Player msgstr Media player Parole @@ -49,7 +49,7 @@ msgstr Salva sca_letta msgid Insert Disc msgstr Inserire disco -#: ../data/interfaces/parole.ui.h:8 ../src/plugins/tray/tray-provider.c:150 +#: ../data/interfaces/parole.ui.h:8 ../src/plugins/tray/tray-provider.c:152 msgid _Quit msgstr _Esci @@ -58,12 +58,12 @@ msgid _Playback msgstr _Riproduzione #. Toggle Repeat -#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:2988 +#: ../data/interfaces/parole.ui.h:10 ../src/parole-player.c:3012 msgid _Repeat msgstr Ri_peti #. Toggle Shuffle -#: ../data/interfaces/parole.ui.h:11 ../src/parole-player.c:2996 +#: ../data/interfaces/parole.ui.h:11 ../src/parole-player.c:3020 msgid _Shuffle msgstr Cas_uale @@ -103,7 +103,7 @@ msgstr _Audio msgid _Audio Track msgstr Traccia _audio -#: ../data/interfaces/parole.ui.h:21 ../src/parole-player.c:791 +#: ../data/interfaces/parole.ui.h:21 ../src/parole-player.c:793 msgid Empty msgstr Vuota @@ -124,8 +124,8 @@ msgid _Video msgstr _Video #. Fullscreen -#: ../data/interfaces/parole.ui.h:26 ../src/parole-player.c:1938 -#: ../src/parole-player.c:2976 +#: ../data/interfaces/parole.ui.h:26 ../src/parole-player.c:1940 +#: ../src/parole-player.c:3000 msgid _Fullscreen msgstr A schermo inter_o @@ -133,7 +133,7 @@ msgstr A schermo inter_o msgid _Aspect Ratio msgstr _Rapporto d'aspetto -#: ../data/interfaces/parole.ui.h:28 ../src/parole-player.c:719 +#: ../data/interfaces/parole.ui.h:28 ../src/parole-player.c:721 msgid None msgstr Nessuno @@ -186,30 +186,38 @@ msgid _Report a Bug… msgstr _Segnala bug... #: ../data/interfaces/parole.ui.h:41 +msgid _Contents +msgstr _Contenuti + +#: ../data/interfaces/parole.ui.h:42 +msgid Display Parole user manual +msgstr Visualizza il manuale dell'utente di Parole + +#: ../data/interfaces/parole.ui.h:43 msgid _About msgstr _Informazioni -#: ../data/interfaces/parole.ui.h:42 +#: ../data/interfaces/parole.ui.h:44 msgid span color='#F4F4F4'bbigUnknown Song/big/b/span msgstr span color='#F4F4F4'bbigBrano sconosciuto/big/b/span -#: ../data/interfaces/parole.ui.h:43 +#: ../data/interfaces/parole.ui.h:45 msgid bigspan color='#BB'ion/i/span span color='#F4F4F4'Unknown Album/span/big msgstr bigspan color='#BB'ion/i/span span color='#F4F4F4'Album sconosciuto/span/big -#: ../data/interfaces/parole.ui.h:44 +#: ../data/interfaces/parole.ui.h:46 msgid bigspan color='#BB'iby/i/span span color='#F4F4F4'Unknown Artist/span/big msgstr bigspan color='#BB'iby/i/span span color='#F4F4F4'Artista sconosciuto/span/big -#: ../data/interfaces/parole.ui.h:45 +#: ../data/interfaces/parole.ui.h:47 msgid 0:00 msgstr 0:00 -#: ../data/interfaces/parole.ui.h:47 +#: ../data/interfaces/parole.ui.h:49 #, no-c-format msgid Buffering (0%) msgstr Buffering (0%) @@ -219,8 +227,8 @@ msgid Open Media Files msgstr Apertura file multimediali #: ../data/interfaces/playlist.ui.h:1 -#: ../data/interfaces/parole-settings.ui.h:23 ../src/parole-medialist.c:808 -#: ../src/parole
[Xfce4-commits] parole:master Add Contents-item to the Help-menu, linking to the online docs
Updating branch refs/heads/master
to 1d321b222ed3f13a6fff00d679c5967f124bdb7d (commit)
from 848b523ec2566e626853dfd3c52a5fe30b0a5999 (commit)
commit 1d321b222ed3f13a6fff00d679c5967f124bdb7d
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Jan 25 18:39:00 2014 +0100
Add Contents-item to the Help-menu, linking to the online docs
data/interfaces/parole.ui | 42 +++---
src/parole-player.c | 22 +-
2 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui
index a9c0856..782a376 100644
--- a/data/interfaces/parole.ui
+++ b/data/interfaces/parole.ui
@@ -6,25 +6,18 @@
property name=step_increment1/property
property name=page_increment10/property
/object
- object class=GtkImage id=image_about
-property name=visibleTrue/property
-property name=can_focusFalse/property
-property name=pixel_size16/property
-property name=icon_namegtk-about-symbolic/property
-property name=use_fallbackTrue/property
- /object
- object class=GtkImage id=image_disc
+ object class=GtkImage id=image_help_reportbug
property name=visibleTrue/property
property name=can_focusFalse/property
property name=pixel_size16/property
-property name=icon_namemedia-optical-symbolic/property
+property name=icon_nameface-sad-symbolic/property
property name=use_fallbackTrue/property
/object
- object class=GtkImage id=image_help_reportbug
+ object class=GtkImage id=image_help_reportbug1
property name=visibleTrue/property
property name=can_focusFalse/property
property name=pixel_size16/property
-property name=icon_nameface-sad-symbolic/property
+property name=icon_namehelp-info-symbolic/property
property name=use_fallbackTrue/property
/object
object class=GtkImage id=image_media_fullscreen
@@ -55,6 +48,20 @@
property name=icon_namemedia-skip-backward-symbolic/property
property name=use_fallbackTrue/property
/object
+ object class=GtkImage id=image_about
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_namegtk-about-symbolic/property
+property name=use_fallbackTrue/property
+ /object
+ object class=GtkImage id=image_disc
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=pixel_size16/property
+property name=icon_namemedia-optical-symbolic/property
+property name=use_fallbackTrue/property
+ /object
object class=GtkImage id=image_menu_fullscreen
property name=visibleTrue/property
property name=can_focusFalse/property
@@ -671,6 +678,19 @@
/object
/child
child
+ object class=GtkImageMenuItem id=contents
+property name=label
translatable=yes_Contents/property
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=has_tooltipTrue/property
+property name=tooltip_text
translatable=yesDisplay Parole user manual/property
+property name=use_underlineTrue/property
+property name=imageimage_help_reportbug1/property
+property name=use_stockFalse/property
+accelerator key=F1 signal=activate/
+ /object
+/child
+child
object class=GtkImageMenuItem id=about
property name=label
translatable=yes_About/property
property name=visibleTrue/property
diff --git a/src/parole-player.c b/src/parole-player.c
index 4a3954d..91a6aa0 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2635,6 +2635,24 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer
*player)
}
}
+static void
+on_contents_clicked (GtkWidget *w, ParolePlayer *player)
+{
+GtkWidget *dialog;
+if (!gtk_show_uri(NULL, http://docs.xfce.org/apps/parole/start;,
GDK_CURRENT_TIME, NULL))
+{
+dialog = gtk_message_dialog_new(GTK_WINDOW(player-priv-window),
+GTK_DIALOG_DESTROY_WITH_PARENT,
+GTK_MESSAGE_ERROR,
+GTK_BUTTONS_CLOSE,
+_(Unable to open default web
browser));
+gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
+_(Please go to http://docs.xfce.org/apps/parole/start to read
Parole's online documentation.));
+gtk_dialog_run(GTK_DIALOG(dialog));
+gtk_widget_destroy(dialog);
+}
+}
+
/**
*
* Draw a simple rectangular GtkOverlay
@@ -2866,7
[Xfce4-commits] parole:master Fix build error introduced by commit 1585aecab8b5a89902d7bb13e8600f75935e559e
Updating branch refs/heads/master to 9ae811828af98bcd4e6c1fd46dfc3e1fa7a1eb8e (commit) from da3858b3d513e7fac1298f55f963352c9061ff11 (commit) commit 9ae811828af98bcd4e6c1fd46dfc3e1fa7a1eb8e Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Jan 21 10:36:52 2014 +0100 Fix build error introduced by commit 1585aecab8b5a89902d7bb13e8600f75935e559e configure.ac.in |2 ++ 1 file changed, 2 insertions(+) diff --git a/configure.ac.in b/configure.ac.in index 22b7c9d..8990738 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -251,6 +251,8 @@ data/icons/16x16/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile +data/icons/64x64/Makefile +data/icons/128x128/Makefile data/icons/scalable/Makefile data/mime/Makefile data/desktop/Makefile ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix m3u with with all absolute paths
Updating branch refs/heads/master to 59de668852c91279b21dde51449eb7f698825f22 (commit) from e6a744188febdd31a9d760ff1e6d180460961943 (commit) commit 59de668852c91279b21dde51449eb7f698825f22 Author: Matias De lellis mati8...@gmail.com Date: Thu Jan 16 20:56:47 2014 -0300 Fix m3u with with all absolute paths Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at src/misc/parole-pl-parser.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c index 6a26735..567ef90 100644 --- a/src/misc/parole-pl-parser.c +++ b/src/misc/parole-pl-parser.c @@ -335,7 +335,7 @@ parole_pl_parser_parse_m3u (const gchar *filename) guint i; GRegex *regex; -GMatchInfo *match_info; +GMatchInfo *match_info = NULL; file = g_file_new_for_path (filename); path = g_path_get_dirname(filename); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add 128px appicon and add separate dirs for 64px and 128px
Updating branch refs/heads/master
to 1585aecab8b5a89902d7bb13e8600f75935e559e (commit)
from 59de668852c91279b21dde51449eb7f698825f22 (commit)
commit 1585aecab8b5a89902d7bb13e8600f75935e559e
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Jan 20 23:49:18 2014 +0100
Add 128px appicon and add separate dirs for 64px and 128px
data/icons/{24x24 = 128x128}/Makefile.am |2 +-
data/icons/128x128/parole.png | Bin 0 - 6522 bytes
data/icons/{24x24 = 64x64}/Makefile.am |2 +-
data/icons/64x64/parole.png | Bin 0 - 2634 bytes
data/icons/Makefile.am|4 +-
data/icons/scalable/parole.svg| 180 +++--
6 files changed, 123 insertions(+), 65 deletions(-)
diff --git a/data/icons/24x24/Makefile.am b/data/icons/128x128/Makefile.am
similarity index 56%
copy from data/icons/24x24/Makefile.am
copy to data/icons/128x128/Makefile.am
index 9871c46..5bcf260 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/128x128/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
$(Data_DATA)
-Datadir = $(datadir)/icons/hicolor/24x24/apps
+Datadir = $(datadir)/icons/hicolor/128x128/apps
Data_DATA =\
parole.png
diff --git a/data/icons/128x128/parole.png b/data/icons/128x128/parole.png
new file mode 100644
index 000..7541458
Binary files /dev/null and b/data/icons/128x128/parole.png differ
diff --git a/data/icons/24x24/Makefile.am b/data/icons/64x64/Makefile.am
similarity index 57%
copy from data/icons/24x24/Makefile.am
copy to data/icons/64x64/Makefile.am
index 9871c46..196a29a 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/64x64/Makefile.am
@@ -1,7 +1,7 @@
EXTRA_DIST = \
$(Data_DATA)
-Datadir = $(datadir)/icons/hicolor/24x24/apps
+Datadir = $(datadir)/icons/hicolor/64x64/apps
Data_DATA =\
parole.png
diff --git a/data/icons/64x64/parole.png b/data/icons/64x64/parole.png
new file mode 100644
index 000..16ecc25
Binary files /dev/null and b/data/icons/64x64/parole.png differ
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 36090c0..bbc52de 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -3,7 +3,9 @@ SUBDIRS = \
16x16 \
24x24 \
32x32 \
- 48x48
+ 48x48 \
+ 64x64 \
+ 128x128
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
diff --git a/data/icons/scalable/parole.svg b/data/icons/scalable/parole.svg
index 61158ce..3b101b6 100644
--- a/data/icons/scalable/parole.svg
+++ b/data/icons/scalable/parole.svg
@@ -10,15 +10,37 @@
xmlns:xlink=http://www.w3.org/1999/xlink;
xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd;
xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape;
- width=64
- height=64
+ width=128
+ height=128
id=svg4405
version=1.1
inkscape:version=0.48.4 r9939
- sodipodi:docname=parole-64.svg
+ sodipodi:docname=parole.svg
defs
id=defs4407
linearGradient
+ id=linearGradient3921
+ stop
+ style=stop-color:#8d8d8d;stop-opacity:1;
+ offset=0
+ id=stop3923 /
+ stop
+ style=stop-color:#c3c3c3;stop-opacity:1;
+ offset=1
+ id=stop3925 /
+/linearGradient
+linearGradient
+ id=linearGradient3913
+ stop
+ style=stop-color:#767676;stop-opacity:1;
+ offset=0
+ id=stop3915 /
+ stop
+ style=stop-color:#a0a0a0;stop-opacity:1;
+ offset=1
+ id=stop3917 /
+/linearGradient
+linearGradient
id=linearGradient4009
stop
offset=0
@@ -671,7 +693,7 @@
xlink:href=#linearGradient3924-803
id=linearGradient3150
gradientUnits=userSpaceOnUse
-
gradientTransform=matrix(1.4864865,0,0,0.35135136,-3.6756703,27.567571)
+ gradientTransform=matrix(3.054054,0,0,0.78378384,-9.297286,7.1891975)
x1=23.9
y1=8.4357691
x2=23.9
@@ -681,7 +703,7 @@
xlink:href=#linearGradient3924-803
id=linearGradient3157
gradientUnits=userSpaceOnUse
- gradientTransform=matrix(1.4864865,0,0,1.1621622,-3.6756704,-17.89188)
+ gradientTransform=matrix(3.054054,0,0,2.3513514,-9.2972859,-85.432408)
x1=23.9
y1=4.89
x2=23.9
@@ -691,7 +713,7 @@
xlink:href=#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641
id=radialGradient3162
gradientUnits=userSpaceOnUse
-
gradientTransform=matrix(0,3.3941081,-3.6132983,-1.2481202e-7,62.531692,-37.350618)
+
gradientTransform=matrix(0,6.8709992,-7.2899876,-2.5266823e-7,125.59902,-123.80735)
cx=7.4956832
cy=8.4497671
fx=7.4956832
@@ -702,7 +724,7 @@
xlink:href=#linearGradient3707
[Xfce4-commits] parole:master Drop superfluous folders
Updating branch refs/heads/master to da3858b3d513e7fac1298f55f963352c9061ff11 (commit) from 1585aecab8b5a89902d7bb13e8600f75935e559e (commit) commit da3858b3d513e7fac1298f55f963352c9061ff11 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Jan 21 01:04:53 2014 +0100 Drop superfluous folders data/icons/scalable/apps/Makefile.am |7 - data/icons/scalable/apps/parole.svg| 911 data/icons/scalable/status/Makefile.am |6 - 3 files changed, 924 deletions(-) diff --git a/data/icons/scalable/apps/Makefile.am b/data/icons/scalable/apps/Makefile.am deleted file mode 100644 index 7c60db1..000 --- a/data/icons/scalable/apps/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -EXTRA_DIST = \ - $(Data_DATA) - -Datadir = $(datadir)/icons/hicolor/scalable/apps - -Data_DATA =\ - parole.svg diff --git a/data/icons/scalable/apps/parole.svg b/data/icons/scalable/apps/parole.svg deleted file mode 100644 index 062ba96..000 --- a/data/icons/scalable/apps/parole.svg +++ /dev/null @@ -1,911 +0,0 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? -!-- Created with Inkscape (http://www.inkscape.org/) -- - -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://creativecommons.org/ns#; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:xlink=http://www.w3.org/1999/xlink; - xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=48px - height=48px - id=svg4405 - version=1.1 - inkscape:version=0.48.4 r9939 - sodipodi:docname=parole-new.svg - defs - id=defs4407 -linearGradient - id=linearGradient4009 - stop - offset=0 - style=stop-color:#d4d4d4;stop-opacity:1; - id=stop4011 / - stop - id=stop4013 - style=stop-color:#d2d2d2;stop-opacity:1; - offset=0.25 / - stop - id=stop4015 - style=stop-color:#b2b2b2;stop-opacity:1; - offset=0.5 / - stop - offset=1 - style=stop-color:#929292;stop-opacity:1; - id=stop4017 / -/linearGradient -linearGradient - id=linearGradient4311 - stop - style=stop-color:#ff;stop-opacity:1; - offset=0 - id=stop4313 / - stop - style=stop-color:#ff;stop-opacity:0; - offset=1 - id=stop4315 / -/linearGradient -linearGradient - id=linearGradient3707-319-631-407-324-616 - stop - id=stop3246 - style=stop-color:#00;stop-opacity:1; - offset=0 / - stop - id=stop3248 - style=stop-color:#1c1c1c;stop-opacity:1; - offset=1 / -/linearGradient -linearGradient - id=linearGradient3924-803 - stop - offset=0 - style=stop-color:#ff;stop-opacity:1; - id=stop3252 / - stop - id=stop3254 - style=stop-color:#ff;stop-opacity:0.23529412; - offset=0.06316455 / - stop - offset=0.95056331 - style=stop-color:#ff;stop-opacity:0.15686275; - id=stop3256 / - stop - offset=1 - style=stop-color:#ff;stop-opacity:0.39215687; - id=stop3258 / -/linearGradient -linearGradient - id=linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641 - stop - id=stop3236 - style=stop-color:#404040;stop-opacity:1; - offset=0 / - stop - offset=0.25 - style=stop-color:#303030;stop-opacity:1; - id=stop4001 / - stop - offset=0.5 - style=stop-color:#202020;stop-opacity:1; - id=stop3999 / - stop - id=stop3242 - style=stop-color:#00;stop-opacity:1; - offset=1 / -/linearGradient -radialGradient - inkscape:collect=always - xlink:href=#linearGradient3688-166-749-2-324 - id=radialGradient3013-896 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(2.003784,0,0,1.4,27.98813,-17.4) - cx=4.9929786 - cy=43.5 - fx=4.9929786 - fy=43.5 - r=2.5 / -linearGradient - id=linearGradient3688-166-749-2-324 - stop - offset=0 - style=stop-color:#181818;stop-opacity:1 - id=stop3216 / - stop - offset=1 - style=stop-color:#181818;stop-opacity:0 - id=stop3218 / -/linearGradient -radialGradient - inkscape:collect=always - xlink:href=#linearGradient3688-464-309-8-331 - id=radialGradient3015-826 - gradientUnits=userSpaceOnUse - gradientTransform=matrix(2.003784,0,0,1.4,-20.01187,-104.4) - cx=4.9929786 - cy=43.5 - fx=4.9929786 - fy=43.5 - r=2.5 / -linearGradient - id
[Xfce4-commits] parole:0.5 Correctly close dir-handle (Fix Bug #10600)
Updating branch refs/heads/0.5 to ef420a0a4dd289bb67ac66be2d33b60ada27f659 (commit) from 17378c79a32e888df05593051e5b13bbd592bf15 (commit) commit ef420a0a4dd289bb67ac66be2d33b60ada27f659 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sat Jan 4 21:58:54 2014 +0100 Correctly close dir-handle (Fix Bug #10600) src/gst/parole-gst.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 336ee5b..98f32b4 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1168,8 +1168,8 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst) g_free(uri); g_free(filename); g_free(directory); -g_free(file_dir); g_free(lower); +g_dir_close(file_dir); if (!cover_filename) return NULL; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Correctly close dir-handle (Fix Bug #10600)
Updating branch refs/heads/master to 61821b73c94fa8f498fe3fe78a8fc686295275f8 (commit) from 6cf72a06c15fecf392d473146da94e4e9391c799 (commit) commit 61821b73c94fa8f498fe3fe78a8fc686295275f8 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sat Jan 4 01:10:41 2014 +0100 Correctly close dir-handle (Fix Bug #10600) src/gst/parole-gst.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c index 11e2334..e06ccc2 100644 --- a/src/gst/parole-gst.c +++ b/src/gst/parole-gst.c @@ -1073,8 +1073,8 @@ parole_gst_tag_list_get_cover_external (ParoleGst *gst) g_free(uri); g_free(filename); g_free(directory); -g_free(file_dir); g_free(lower); +g_dir_close(file_dir); if (!cover_filename) return NULL; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Switch to gstreamer1.0 by default
Updating branch refs/heads/master to b2d6681ea42a4d4c12f9e0b047695282badd0ae9 (commit) from 080dfa724089a423e378392a40e634ab8a846430 (commit) commit b2d6681ea42a4d4c12f9e0b047695282badd0ae9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Dec 18 01:33:50 2013 +0100 Switch to gstreamer1.0 by default configure.ac.in |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 8a27c7f..fb759e2 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -83,12 +83,12 @@ m4_define([glib_minimum_version], [2.32.0]) dnl gstreamer version AC_ARG_WITH([gstreamer], -[AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 0.10)])], +[AS_HELP_STRING([--with-gstreamer=0.10|1.0],[which gstreamer version to compile against (default: 1.0)])], [case $with_gstreamer in 0.10|1.0) ;; *) AC_MSG_ERROR([invalid gstreamer version specified]) ;; esac], -[with_gstreamer=0.10] +[with_gstreamer=1.0] ) case $with_gstreamer in ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Update mpris2 fallback artwork
Updating branch refs/heads/master to 080dfa724089a423e378392a40e634ab8a846430 (commit) from 9e961eae84c6265242336b4206e279ff0460a7be (commit) commit 080dfa724089a423e378392a40e634ab8a846430 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Dec 16 10:17:06 2013 +0100 Update mpris2 fallback artwork data/pixmaps/no-cover.png | Bin 11327 - 8131 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/pixmaps/no-cover.png b/data/pixmaps/no-cover.png index 2ff85ba..32e7692 100644 Binary files a/data/pixmaps/no-cover.png and b/data/pixmaps/no-cover.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Shrink the app icon when out of space
Updating branch refs/heads/ochosi/tabwin
to fa67b6a7247884cf9b0f53c65ac23b55c20260f0 (commit)
from edf7ad46c0686b483ebeb5bc206c83778580747e (commit)
commit fa67b6a7247884cf9b0f53c65ac23b55c20260f0
Author: Eric Koegel eric.koe...@gmail.com
Date: Sun Dec 15 11:46:25 2013 +0300
Shrink the app icon when out of space
In the standard icon grid and there's a lot of windows to display,
shrink the icon size until all the windows will fit. This does it
by halving the current icon size. If the icon size goes below 8,
it will stop there so the icons are still present.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 30 +++---
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index c5d8846..0c6e5f1 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -453,10 +453,32 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
gtk_widget_style_get (GTK_WIDGET (tbw), icon-size, icon_size, NULL);
tbw-widgets = NULL;
+/* We need to account for changes to the font size in the user's
+ * appearance theme and gtkrc settings */
+layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
+pango_layout_get_pixel_size (layout, NULL, app_label_height);
+g_object_unref (layout);
+
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-tbw-grid_cols = (monitor_width / (icon_size + 2 * WIN_ICON_BORDER)) *
0.75;
+tbw-grid_cols = (monitor_width / (icon_size+app_label_height+10)) *
0.75;
tbw-grid_rows = screen_info-client_count / tbw-grid_cols + 1;
+
+/* If we run out of space, halve the icon size to make more room. */
+while ((icon_size + app_label_height + 10) * tbw-grid_rows
monitor_height - app_label_height)
+{
+icon_size = icon_size / 2;
+/* recalculate with new icon size */
+tbw-grid_cols = (monitor_width / (icon_size+app_label_height+10))
* 0.75;
+tbw-grid_rows = screen_info-client_count / tbw-grid_cols + 1;
+
+/* Shrinking the icon too much makes it hard to see */
+if (icon_size 8)
+{
+icon_size = 8;
+break;
+}
+}
}
else
{
@@ -481,12 +503,6 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
g_signal_connect (window_button, leave-notify-event, G_CALLBACK
(cb_window_button_leave), tbw);
gtk_widget_add_events (window_button, GDK_ENTER_NOTIFY_MASK);
-/* We need to account for changes to the font size in the user's
- * appearance theme and gtkrc settings */
-layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
-pango_layout_get_pixel_size (layout, NULL, app_label_height);
-g_object_unref (layout);
-
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+app_label_height+10, icon_size+app_label_height+10);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Merge branch 'master' into ochosi/tabwin
Updating branch refs/heads/ochosi/tabwin
to 32337d3fa001f2fdea64c436c78d91d48ccadd38 (commit)
from 648537cffa9ab60e2e1a8444f2f4da7ac9eca47b (commit)
commit 32337d3fa001f2fdea64c436c78d91d48ccadd38
Merge: 648537c ce5f008
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Dec 12 09:40:14 2013 +0100
Merge branch 'master' into ochosi/tabwin
commit ce5f008584302362f6374201432f91e3d950715d
Author: Alistair Buxton a.j.bux...@gmail.com
Date: Tue Dec 10 01:32:05 2013 +
Fix crash when compositor is compiled in but disabled.
If user attempts to zoom in when compositor is disabled,
don't do anything. Also handle possible divide by zero
if the refresh rate is reported as zero.
src/compositor.c |2 ++
src/events.c |6 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/compositor.c b/src/compositor.c
index 01ff05f..843ce65 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -3056,6 +3056,8 @@ compositorZoomIn (ScreenInfo *screen_info, XButtonEvent
*ev)
if (screen_info-display_info-have_xrandr)
{
timeout_rate = screen_info-refresh_rate/2;
+if(timeout_rate 1)
+timeout_rate = 30;
}
#endif /* HAVE_RANDR */
screen_info-zoom_timeout_id = g_timeout_add ((1000/timeout_rate),
zoom_timeout_cb, screen_info);
diff --git a/src/events.c b/src/events.c
index e70ca16..ccdb2a5 100644
--- a/src/events.c
+++ b/src/events.c
@@ -904,11 +904,13 @@ handleButtonPress (DisplayInfo *display_info,
XButtonEvent * ev)
edgeButton (c, part, ev);
}
#ifdef HAVE_COMPOSITOR
-else if ((ev-button == Button4) (state) (state ==
screen_info-params-easy_click))
+else if ((ev-button == Button4) (state) (state ==
screen_info-params-easy_click)
+ (screen_info-compositor_active))
{
compositorZoomIn(screen_info, ev);
}
-else if ((ev-button == Button5) (state) (state ==
screen_info-params-easy_click))
+else if ((ev-button == Button5) (state) (state ==
screen_info-params-easy_click)
+ (screen_info-compositor_active))
{
compositorZoomOut(screen_info, ev);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Fix cursor wrapping in grid mode with only one row
Updating branch refs/heads/ochosi/tabwin
to 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52 (commit)
from 32337d3fa001f2fdea64c436c78d91d48ccadd38 (commit)
commit 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 11:53:19 2013 +0300
Fix cursor wrapping in grid mode with only one row
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 4572f06..4d6f887 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -974,7 +974,16 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
else if (col_current = cols)
{
col_current = 0;
-row_current++;
+if (rows 1)
+{
+row_current++;
+}
+else
+{
+/* If there's only 1 row then col needs to wrap back to
+ * the head of the grid */
+col_current = 0;
+}
}
/* Wrap row */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Tabwin list mode relative label width
Updating branch refs/heads/ochosi/tabwin
to ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5 (commit)
from 43c4cbe83ceb9e1e9deb416e785871fe9ebbdf52 (commit)
commit ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 12:46:43 2013 +0300
Tabwin list mode relative label width
The width of the application label in the tabwin window while in
list mode is now relative to the number of columns displays. This
is scaled to the width of the smallest monitor attached. Now there's
space for more label info when there are fewer columns and it properly
displays all the windows when there are lots of them open.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 4d6f887..545e749 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -435,7 +435,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
Client *c;
GList *client_list;
GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox,
*buttonlabel, *selected_label;
-int packpos, monitor_width, monitor_height, app_label_height;
+int packpos, monitor_width, monitor_height, app_label_height, label_width;
Tabwin *t;
PangoLayout *layout;
gint icon_size = WIN_ICON_SIZE;
@@ -495,10 +495,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
}
else
{
+label_width = monitor_width / (tbw-grid_cols + 1);
+
if (icon_size app_label_height)
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
label_width, app_label_height+8);
else
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, icon_size+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
label_width, icon_size+8);
buttonbox = gtk_hbox_new (FALSE, 6);
buttonlabel = gtk_label_new (c-name);
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0, 0.5);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Fix memory leak
Updating branch refs/heads/ochosi/tabwin
to 79cce29cf2451bc18bf676cd81d6126e2200633a (commit)
from ba64c3ab91dd6512dd7e3e06f3d119bdfaacd1b5 (commit)
commit 79cce29cf2451bc18bf676cd81d6126e2200633a
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Dec 12 13:17:46 2013 +0300
Fix memory leak
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |1 +
1 file changed, 1 insertion(+)
diff --git a/src/tabwin.c b/src/tabwin.c
index 545e749..f13f015 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -485,6 +485,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
* appearance theme and gtkrc settings */
layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
pango_layout_get_pixel_size (layout, NULL, app_label_height);
+g_object_unref (layout);
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Make buttons in tabwin square and account for more x/ythickness in themes
Updating branch refs/heads/ochosi/tabwin
to edf7ad46c0686b483ebeb5bc206c83778580747e (commit)
from 79cce29cf2451bc18bf676cd81d6126e2200633a (commit)
commit edf7ad46c0686b483ebeb5bc206c83778580747e
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Dec 12 17:40:41 2013 +0100
Make buttons in tabwin square and account for more x/ythickness in themes
Now themes with an x/ythickness of 3 should work fine, 3 might result in
cut labels
src/tabwin.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index f13f015..c5d8846 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -489,7 +489,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+app_label_height+8);
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+app_label_height+10, icon_size+app_label_height+10);
buttonbox = gtk_vbox_new (FALSE, 0);
buttonlabel = gtk_label_new ();
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Enable/Disable internal output on lid changed events
Updating branch refs/heads/bluesabre/display-settings to 4eaeaf0726dd89d9e3fd66fff37e7aaa117260c2 (commit) from 8beeb1f9177a1fc454aa37ba251e2d5ff484963f (commit) commit 4eaeaf0726dd89d9e3fd66fff37e7aaa117260c2 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Wed Nov 7 19:29:42 2012 +0100 Enable/Disable internal output on lid changed events Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at xfsettingsd/displays.c | 269 +--- 1 file changed, 233 insertions(+), 36 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index 597e0d9..7238f2c 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2008 Nick Schermer n...@xfce.org - * Copyright (C) 2010 Lionel Le Folgoc lio...@lefolgoc.net + * Copyright (C) 2010-2012 Lionel Le Folgoc lio...@lefolgoc.net * * 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 @@ -37,6 +37,9 @@ #include debug.h #include displays.h +#ifdef HAVE_UPOWERGLIB +#include displays-upower.h +#endif /* check for randr 1.3 or better */ #if RANDR_MAJOR 1 || (RANDR_MAJOR == 1 RANDR_MINOR = 3) @@ -69,6 +72,8 @@ static XfceRRCrtc *xfce_displays_helper_find_crtc_by_id (Xfc static void xfce_displays_helper_free_crtc (XfceRRCrtc *crtc); static XfceRRCrtc *xfce_displays_helper_find_usable_crtc (XfceDisplaysHelper *helper, RROutput output); +static void xfce_displays_helper_get_topleftmost_pos (XfceRRCrtc *crtc, + XfceDisplaysHelper *helper); static void xfce_displays_helper_normalize_crtc (XfceRRCrtc *crtc, XfceDisplaysHelper *helper); static Status xfce_displays_helper_disable_crtc (XfceDisplaysHelper *helper, @@ -79,12 +84,18 @@ static void xfce_displays_helper_apply_crtc (Xfc XfceDisplaysHelper *helper); static void xfce_displays_helper_set_outputs (XfceRRCrtc *crtc, RROutput output); +static void xfce_displays_helper_apply_all (XfceDisplaysHelper *helper); static void xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, const gchar *scheme); static void xfce_displays_helper_channel_property_changed (XfconfChannel *channel, const gchar *property_name, const GValue*value, XfceDisplaysHelper *helper); +#ifdef HAVE_UPOWERGLIB +static void xfce_displays_helper_toggle_internal (XfceDisplaysUPower *power, + gboolean lid_is_closed, + XfceDisplaysHelper *helper); +#endif @@ -106,6 +117,11 @@ struct _XfceDisplaysHelper gintprimary; #endif +#ifdef HAVE_UPOWERGLIB +XfceDisplaysUPower *power; +gintphandler; +#endif + GdkDisplay *display; GdkWindow *root_window; Display*xdisplay; @@ -166,6 +182,10 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper) gint major = 0, minor = 0; gint error_base, err; +#ifdef HAVE_UPOWERGLIB +helper-power = NULL; +helper-phandler = 0; +#endif helper-resources = NULL; helper-crtcs = NULL; helper-handler = 0; @@ -209,6 +229,14 @@ xfce_displays_helper_init (XfceDisplaysHelper *helper) xfce_displays_helper_screen_on_event, helper); +#ifdef HAVE_UPOWERGLIB +helper-power = g_object_new (XFCE_TYPE_DISPLAYS_UPOWER, NULL); +helper-phandler = g_signal_connect (G_OBJECT (helper-power), + lid-changed, + G_CALLBACK
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Ignore disabled CRTCs when we try to find the topleftmost one
Updating branch refs/heads/bluesabre/display-settings
to 641c6c4d7dda4ac41f811c8c0f9e26738f12a732 (commit)
from 4eaeaf0726dd89d9e3fd66fff37e7aaa117260c2 (commit)
commit 641c6c4d7dda4ac41f811c8c0f9e26738f12a732
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Nov 7 20:11:13 2012 +0100
Ignore disabled CRTCs when we try to find the topleftmost one
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
xfsettingsd/displays.c |3 +++
1 file changed, 3 insertions(+)
diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c
index 7238f2c..e53c49f 100644
--- a/xfsettingsd/displays.c
+++ b/xfsettingsd/displays.c
@@ -816,6 +816,9 @@ xfce_displays_helper_get_topleftmost_pos (XfceRRCrtc
*crtc,
{
g_assert (XFCE_IS_DISPLAYS_HELPER (helper) crtc);
+if (crtc-mode == None)
+return;
+
/* used to normalize positions later */
helper-min_x = MIN (helper-min_x, crtc-x);
helper-min_y = MIN (helper-min_y, crtc-y);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Re-enable the internal display when the external one is disconnected
Updating branch refs/heads/bluesabre/display-settings to dbd76eb58bd9d7a55de753daa5572ef24867d924 (commit) from 82ab3a355a4b7eff6cffa57ca5a8e8622feb2d31 (commit) commit dbd76eb58bd9d7a55de753daa5572ef24867d924 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Thu Nov 8 20:15:42 2012 +0100 Re-enable the internal display when the external one is disconnected (and add the possibility to start xfce4-display-settings --minimal when a new display is connected) Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at xfsettingsd/displays.c | 583 +++- 1 file changed, 373 insertions(+), 210 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index e53c49f..3497804 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -32,6 +32,7 @@ #include gdk/gdkx.h #include gtk/gtk.h #include xfconf/xfconf.h +#include libxfce4ui/libxfce4ui.h #include X11/extensions/Xrandr.h @@ -48,10 +49,25 @@ #undef HAS_RANDR_ONE_POINT_THREE #endif +/* Xfconf properties */ +#define APPLY_SCHEME_PROP /Schemes/Apply +#define DEFAULT_SCHEME_NAME Default +#define OUTPUT_FMT /%s/%s +#define PRIMARY_PROPOUTPUT_FMT /Primary +#define ACTIVE_PROP OUTPUT_FMT /Active +#define ROTATION_PROP OUTPUT_FMT /Rotation +#define REFLECTION_PROP OUTPUT_FMT /Reflection +#define RESOLUTION_PROP OUTPUT_FMT /Resolution +#define RRATE_PROP OUTPUT_FMT /RefreshRate +#define POSX_PROP OUTPUT_FMT /Position/X +#define POSY_PROP OUTPUT_FMT /Position/Y +#define NOTIFY_PROP /Notify + /* wrappers to avoid querying too often */ -typedef struct _XfceRRCrtc XfceRRCrtc; +typedef struct _XfceRRCrtc XfceRRCrtc; +typedef struct _XfceRROutput XfceRROutput; @@ -65,13 +81,15 @@ static void xfce_displays_helper_set_screen_size(Xfc static gboolean xfce_displays_helper_load_from_xfconf (XfceDisplaysHelper *helper, const gchar *scheme, GHashTable *saved_outputs, - RROutput output); + XfceRROutput*output); +static GPtrArray *xfce_displays_helper_list_outputs (XfceDisplaysHelper *helper); +static void xfce_displays_helper_free_output (XfceRROutput*output); static GPtrArray *xfce_displays_helper_list_crtcs (XfceDisplaysHelper *helper); static XfceRRCrtc *xfce_displays_helper_find_crtc_by_id (XfceDisplaysHelper *helper, RRCrtc id); static void xfce_displays_helper_free_crtc (XfceRRCrtc *crtc); static XfceRRCrtc *xfce_displays_helper_find_usable_crtc (XfceDisplaysHelper *helper, - RROutput output); + XfceRROutput*output); static void xfce_displays_helper_get_topleftmost_pos (XfceRRCrtc *crtc, XfceDisplaysHelper *helper); static void xfce_displays_helper_normalize_crtc (XfceRRCrtc *crtc, @@ -83,7 +101,7 @@ static void xfce_displays_helper_workaround_crtc_size (Xfc static void xfce_displays_helper_apply_crtc (XfceRRCrtc *crtc, XfceDisplaysHelper *helper); static void xfce_displays_helper_set_outputs (XfceRRCrtc *crtc, - RROutput output); + XfceRROutput*output); static void xfce_displays_helper_apply_all (XfceDisplaysHelper *helper); static void xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, const gchar *scheme); @@ -91,11 +109,9 @@ static void xfce_displays_helper_channel_property_changed (Xfc
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Add optional upower-glib support for lid-open/closed events
Updating branch refs/heads/bluesabre/display-settings
to 8beeb1f9177a1fc454aa37ba251e2d5ff484963f (commit)
from 7ef545b96688fd5797a3d422e50fa7be7c676af5 (commit)
commit 8beeb1f9177a1fc454aa37ba251e2d5ff484963f
Author: Lionel Le Folgoc lio...@lefolgoc.net
Date: Wed Nov 7 19:26:26 2012 +0100
Add optional upower-glib support for lid-open/closed events
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
configure.ac.in | 11
xfsettingsd/Makefile.am | 12
xfsettingsd/displays-upower.c | 143 +
xfsettingsd/displays-upower.h | 38 +++
4 files changed, 204 insertions(+)
diff --git a/configure.ac.in b/configure.ac.in
index 042d376..0e7907d 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -134,6 +134,12 @@ AC_ARG_WITH([pnp-ids-path],
PNP_IDS=$with_pnp_ids_path
AC_SUBST(PNP_IDS)
+dnl ***
+dnl *** Optional support for UPower ***
+dnl ***
+XDT_CHECK_OPTIONAL_PACKAGE([UPOWERGLIB], [upower-glib], [0.9.8],
+ [upower-glib], [UPower support])
+
dnl **
dnl *** Optional support for Libnotify ***
dnl **
@@ -251,6 +257,11 @@ echo * Xrandr support:yes
else
echo * Xrandr support:no
fi
+if test x$UPOWERGLIB_FOUND = xyes; then
+echo * UPower support:yes
+else
+echo * UPower support:no
+fi
if test x$LIBNOTIFY_FOUND = xyes; then
echo * Libnotify support: yes
else
diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am
index 1b2dabe..3b1386b 100644
--- a/xfsettingsd/Makefile.am
+++ b/xfsettingsd/Makefile.am
@@ -88,6 +88,18 @@ xfsettingsd_CFLAGS += \
xfsettingsd_LDADD += \
$(XRANDR_LIBS)
+
+if HAVE_UPOWERGLIB
+xfsettingsd_SOURCES += \
+ displays-upower.c \
+ displays-upower.h
+
+xfsettingsd_CFLAGS += \
+ $(UPOWERGLIB_CFLAGS)
+
+xfsettingsd_LDADD += \
+ $(UPOWERGLIB_LIBS)
+endif
endif
settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
diff --git a/xfsettingsd/displays-upower.c b/xfsettingsd/displays-upower.c
new file mode 100644
index 000..bbb3028
--- /dev/null
+++ b/xfsettingsd/displays-upower.c
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2012 Lionel Le Folgoc lio...@lefolgoc.net
+ *
+ * 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 Library 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
+
+#ifdef HAVE_STRING_H
+#include string.h
+#endif
+
+#include upower.h
+
+#include X11/extensions/Xrandr.h
+
+#include debug.h
+#include displays-upower.h
+
+
+
+static void xfce_displays_upower_dispose
(GObject *object);
+static void xfce_displays_upower_property_changed
(UpClient*client,
+
XfceDisplaysUPower *upower);
+
+
+
+struct _XfceDisplaysUPowerClass
+{
+GObjectClass __parent__;
+
+void (*lid_changed) (XfceDisplaysUPower *upower,
+ gbooleanlid_is_closed);
+};
+
+struct _XfceDisplaysUPower
+{
+GObject __parent__;
+
+UpClient *client;
+gint handler;
+
+guint lid_is_closed : 1;
+};
+
+enum
+{
+LID_CHANGED,
+LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL] = {0};
+
+
+
+G_DEFINE_TYPE (XfceDisplaysUPower, xfce_displays_upower, G_TYPE_OBJECT);
+
+
+
+static void
+xfce_displays_upower_class_init (XfceDisplaysUPowerClass *klass)
+{
+GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+gobject_class-dispose = xfce_displays_upower_dispose;
+
+signals[LID_CHANGED] =
+g_signal_new (lid-changed,
+ XFCE_TYPE_DISPLAYS_UPOWER,
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (XfceDisplaysUPowerClass, lid_changed),
+ NULL, NULL,
+ g_cclosure_marshal_VOID__BOOLEAN,
+ G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
+}
+
+
+
+static void
+xfce_displays_upower_init (XfceDisplaysUPower *upower)
+{
+upower-client = up_client_new ();
+upower
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Reset rotations and reflections when using clone mode
Updating branch refs/heads/bluesabre/display-settings to cb8ab60dc89ab61ef62fd85b4f11c11026e79794 (commit) from e49d166a97a0c4544f73e8f18b3501cc099b80a1 (commit) commit cb8ab60dc89ab61ef62fd85b4f11c11026e79794 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Tue Nov 6 22:57:49 2012 +0100 Reset rotations and reflections when using clone mode Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at dialogs/display-settings/main.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c index 3bc1d67..814d355 100644 --- a/dialogs/display-settings/main.c +++ b/dialogs/display-settings/main.c @@ -1119,7 +1119,7 @@ display_setting_mirror_displays_toggled (GtkToggleButton *togglebutton, xfce_randr-mode[n] = mode; xfce_randr-relation[n] = XFCE_RANDR_PLACEMENT_MIRROR; xfce_randr-related_to[n] = active_output; - +xfce_randr-rotation[n] = RR_Rotate_0; xfce_randr_save_output (xfce_randr, Default, display_channel, n, TRUE); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Refactor XfceDisplaysHelper to listen to screen changes
Updating branch refs/heads/bluesabre/display-settings to 7ef545b96688fd5797a3d422e50fa7be7c676af5 (commit) from cb8ab60dc89ab61ef62fd85b4f11c11026e79794 (commit) commit 7ef545b96688fd5797a3d422e50fa7be7c676af5 Author: Lionel Le Folgoc lio...@lefolgoc.net Date: Tue Nov 6 22:58:51 2012 +0100 Refactor XfceDisplaysHelper to listen to screen changes This will enable it to take some actions depending on the context, e.g. re-enable LVDS1 when VGA1 is disconnected, etc (to do for later). Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at xfsettingsd/displays.c | 1190 +++- 1 file changed, 675 insertions(+), 515 deletions(-) diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c index af6e6cd..597e0d9 100644 --- a/xfsettingsd/displays.c +++ b/xfsettingsd/displays.c @@ -47,12 +47,44 @@ -static voidxfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, - const gchar *scheme); -static voidxfce_displays_helper_channel_property_changed (XfconfChannel *channel, - const gchar *property_name, - const GValue*value, - XfceDisplaysHelper *helper); +/* wrappers to avoid querying too often */ +typedef struct _XfceRRCrtc XfceRRCrtc; + + + +static void xfce_displays_helper_dispose (GObject *object); +static void xfce_displays_helper_finalize (GObject *object); +static void xfce_displays_helper_reload (XfceDisplaysHelper *helper); +static GdkFilterReturn xfce_displays_helper_screen_on_event (GdkXEvent *xevent, + GdkEvent*event, + gpointer data); +static void xfce_displays_helper_set_screen_size (XfceDisplaysHelper *helper); +static gboolean xfce_displays_helper_load_from_xfconf (XfceDisplaysHelper *helper, + const gchar *scheme, + GHashTable *saved_outputs, + RROutput output); +static GPtrArray *xfce_displays_helper_list_crtcs (XfceDisplaysHelper *helper); +static XfceRRCrtc *xfce_displays_helper_find_crtc_by_id (XfceDisplaysHelper *helper, + RRCrtc id); +static void xfce_displays_helper_free_crtc (XfceRRCrtc *crtc); +static XfceRRCrtc *xfce_displays_helper_find_usable_crtc (XfceDisplaysHelper *helper, + RROutput output); +static void xfce_displays_helper_normalize_crtc (XfceRRCrtc *crtc, + XfceDisplaysHelper *helper); +static Status xfce_displays_helper_disable_crtc (XfceDisplaysHelper *helper, + RRCrtc crtc); +static void xfce_displays_helper_workaround_crtc_size (XfceRRCrtc *crtc, + XfceDisplaysHelper *helper); +static void xfce_displays_helper_apply_crtc (XfceRRCrtc *crtc, + XfceDisplaysHelper *helper); +static void xfce_displays_helper_set_outputs (XfceRRCrtc *crtc, + RROutput output); +static void xfce_displays_helper_channel_apply (XfceDisplaysHelper *helper, + const gchar *scheme); +static void xfce_displays_helper_channel_property_changed
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix bottom padding of checkbox (see previous commit)
Updating branch refs/heads/bluesabre/display-settings to 731f63f45ac24b48554dc81b41874c442372c5cc (commit) from ebfcb7e2caef61d5b65d17170ab90993f0528c01 (commit) commit 731f63f45ac24b48554dc81b41874c442372c5cc Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Fri Dec 7 01:01:11 2012 +0100 Fix bottom padding of checkbox (see previous commit) dialogs/display-settings/display-dialog.glade |1 + 1 file changed, 1 insertion(+) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 6561f58..db0dcf5 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -311,6 +311,7 @@ object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property +property name=bottom_padding6/property property name=left_padding12/property child object class=GtkCheckButton id=minimal-autoshow ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Update NEWS file with latest changes
Updating branch refs/heads/bluesabre/display-settings to 383614ed8b4b1bb80d3623339a496d5649acd861 (commit) from 9cf29762fda12c47d028aff03cae6f3ffb366562 (commit) commit 383614ed8b4b1bb80d3623339a496d5649acd861 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Nov 29 12:13:19 2012 +0100 Update NEWS file with latest changes NEWS |6 ++ 1 file changed, 6 insertions(+) diff --git a/NEWS b/NEWS index 7be614a..e135c6d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +4.11.x +== +- Automatically re-enable Laptop-displays if all other displays get disconnected +- Add option to automatically show minimal-display dialog when new display gets connected +- Fix bugs with mnemonic accelerators (bugs #9302 and #9308) + 4.11.0 == - Support circular scrolling in the synaptics settings. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Fix alignment of minimal-autoshow checkbox in display-dialog
Updating branch refs/heads/bluesabre/display-settings to 0a930958f7f331f38522d43920cb5b2b1c689c04 (commit) from b609baea269a6c54becf2b07bec61abd8d1c1995 (commit) commit 0a930958f7f331f38522d43920cb5b2b1c689c04 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Fri Dec 7 00:46:16 2012 +0100 Fix alignment of minimal-autoshow checkbox in display-dialog dialogs/display-settings/display-dialog.glade | 16 +--- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 478ec1b..8a4b1b1 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -308,32 +308,26 @@ /packing /child child - object class=GtkHBox id=hbox2 + object class=GtkAlignment id=alignment1 property name=visibleTrue/property property name=can_focusFalse/property +property name=left_padding12/property child object class=GtkCheckButton id=minimal-autoshow property name=label translatable=yesConfigure _new displays when connected/property property name=visibleTrue/property property name=can_focusTrue/property property name=receives_defaultFalse/property -property name=has_tooltipTrue/property -property name=tooltip_text translatable=yesAutomatically show the minimal dialog to quickly configure newly connected displays./property property name=use_action_appearanceFalse/property property name=use_underlineTrue/property property name=draw_indicatorTrue/property /object - packing -property name=expandTrue/property -property name=fillTrue/property -property name=padding12/property -property name=position0/property - /packing /child /object packing -property name=expandTrue/property -property name=fillTrue/property +property name=expandFalse/property +property name=fillFalse/property +property name=padding12/property property name=position2/property /packing /child ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-settings:bluesabre/display-settings Remove the top/bottom padding of previous commit
Updating branch refs/heads/bluesabre/display-settings to ebfcb7e2caef61d5b65d17170ab90993f0528c01 (commit) from 0a930958f7f331f38522d43920cb5b2b1c689c04 (commit) commit ebfcb7e2caef61d5b65d17170ab90993f0528c01 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Fri Dec 7 00:49:25 2012 +0100 Remove the top/bottom padding of previous commit dialogs/display-settings/display-dialog.glade |1 - 1 file changed, 1 deletion(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index 8a4b1b1..6561f58 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -327,7 +327,6 @@ packing property name=expandFalse/property property name=fillFalse/property -property name=padding12/property property name=position2/property /packing /child ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Restore grab mouse pointer based on commit 380c869 and restrict mouse interactions inside tabwin
Updating branch refs/heads/ochosi/tabwin
to cad561ca3a5f20aef750296be4d4d93b3c5a8fa3 (commit)
from 135067df3617c637a335faef1f8bf8e231d6a0a9 (commit)
commit cad561ca3a5f20aef750296be4d4d93b3c5a8fa3
Author: Cédric Leporcq ced...@gmail.com
Date: Thu Dec 5 00:08:30 2013 +0100
Restore grab mouse pointer based on commit 380c869 and restrict mouse
interactions inside tabwin
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 54 ++
src/events.c |2 +-
src/moveresize.c |6 --
src/screen.c |4 ++--
src/screen.h |1 +
5 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 3af6aea..6051d61 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -227,12 +227,14 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
DisplayInfo *display_info;
ClientCycleData *passdata;
Client *c, *removed;
+Client *c2 = NULL;
eventFilterStatus status;
KeyCode cancel, left, right, up, down;
int key, modifiers;
gboolean key_pressed, cycling, gone;
GList *li;
Window mouse_window = 0;
+XButtonEvent ev;
TRACE (entering clientCycleEventFilter);
@@ -281,7 +283,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
if (key_pressed)
{
-Client *c2 = NULL;
key = myScreenGetKeyPressed (screen_info, (XKeyEvent *)
xevent);
/*
* We cannot simply check for key == KEY_CANCEL here
because of the
@@ -360,30 +361,31 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
}
break;
case ButtonPress:
-case ButtonRelease:
status = EVENT_FILTER_STOP;
-cycling = FALSE;
+ev = xevent-xbutton;
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
+if (mouse_window != 0)
+{
+/* only accept events for the tab windows */
+for (li = passdata-tabwin-tabwin_list; li != NULL; li =
li-next)
+{
+if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
+{
+if (ev.button == Button1)
+{
+cycling = FALSE;
+c = tabwinSelectHoveredWidget (passdata-tabwin);
+break;
+}
+}
+}
+}
break;
default:
status = EVENT_FILTER_CONTINUE;
break;
}
-
-if (mouse_window != 0)
-{
-/* only accept events for the tab windows */
-for (li = passdata-tabwin-tabwin_list; li != NULL; li = li-next)
-{
-if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
-{
-c = tabwinSelectHoveredWidget (passdata-tabwin);
-
-break;
-}
-}
-}
if (!cycling)
{
@@ -391,14 +393,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
gtk_main_quit ();
}
-if (status == EVENT_FILTER_STOP)
-{
-/* If there's any chance of a leftover grab, release it. This happens
- * when the user clicks outside of the tabwin window area onto another
- * window */
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
-}
-
return status;
}
@@ -409,7 +403,7 @@ clientCycle (Client * c, XKeyEvent * ev)
DisplayInfo *display_info;
ClientCycleData passdata;
GList *client_list, *selected;
-gboolean g1;
+gboolean g1, g2;
int key, modifier;
Client *c2;
@@ -456,13 +450,16 @@ clientCycle (Client * c, XKeyEvent * ev)
}
g1 = myScreenGrabKeyboard (screen_info, ev-time);
+g2 = myScreenGrabPointer (screen_info, TRUE, LeaveWindowMask, None,
ev-time);
+
-if (!g1)
+if (!g1 || !g2)
{
TRACE (grab failed in clientCycle);
gdk_beep ();
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
+myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
g_list_free (client_list);
return;
@@ -477,7 +474,7 @@ clientCycle (Client * c, XKeyEvent * ev)
}
passdata.tabwin = tabwinCreate (client_list, selected,
screen_info-params-cycle_workspaces);
eventFilterPush (display_info-xfilter, clientCycleEventFilter, passdata);
-
+
c2 = myScreenGetClientFromWindow (screen_info, GDK_WINDOW_XID
(gtk_widget_get_window ( passdata.tabwin-tabwin_list-data)), SEARCH_FRAME);
g_message (%p, c2);
clientSetFocus (screen_info, c2, ev-time, NO_FOCUS_FLAG
[Xfce4-commits] xfwm4:ochosi/tabwin Allow cycle through windows with mouse wheel
Updating branch refs/heads/ochosi/tabwin
to 847306de342e94866670663795722760124aad26 (commit)
from cad561ca3a5f20aef750296be4d4d93b3c5a8fa3 (commit)
commit 847306de342e94866670663795722760124aad26
Author: Cédric Leporcq ced...@gmail.com
Date: Thu Dec 5 00:23:07 2013 +0100
Allow cycle through windows with mouse wheel
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 49 ++---
1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 6051d61..77bf9c7 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -330,21 +330,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
cycling = FALSE;
}
}
-
-if (cycling)
-{
-if (c)
-{
-if (passdata-wireframe)
-{
-wireframeUpdate (c, passdata-wireframe);
-}
-}
-else
-{
-cycling = FALSE;
-}
-}
}
break;
case KeyRelease:
@@ -378,8 +363,24 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
c = tabwinSelectHoveredWidget (passdata-tabwin);
break;
}
+else if (ev.button == Button4)
+{
+/* Mouse wheel scroll up */
+TRACE (Cycle: previous);
+c2 = tabwinSelectPrev(passdata-tabwin);
+}
+else if (ev.button == Button5)
+{
+/* Mouse wheel scroll down */
+TRACE (Cycle: next);
+c2 = tabwinSelectNext(passdata-tabwin);
+}
}
}
+if (c2)
+{
+c = c2;
+}
}
break;
default:
@@ -393,6 +394,24 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
gtk_main_quit ();
}
+if (status == EVENT_FILTER_STOP)
+{
+if (cycling)
+{
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
+{
+cycling = FALSE;
+}
+}
+}
+
return status;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Change tabwin focused buttons state from GTK_STATE_NORMAL to GTK_STATE_SELECTED
Updating branch refs/heads/ochosi/tabwin
to 69af4410a6a07f5237ef7af8b1f6fb5d144a8a51 (commit)
from 847306de342e94866670663795722760124aad26 (commit)
commit 69af4410a6a07f5237ef7af8b1f6fb5d144a8a51
Author: Cédric Leporcq ced...@gmail.com
Date: Thu Dec 5 00:42:03 2013 +0100
Change tabwin focused buttons state from GTK_STATE_NORMAL to
GTK_STATE_SELECTED
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 33 +
1 file changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 08d2f05..4572f06 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -175,11 +175,22 @@ tabwin_expose (GtkWidget *tbw, GdkEventExpose *event,
gpointer data)
}
static gboolean
-paint_selected (GtkWidget *w, GdkEventExpose *event, gpointer data)
+paint_selected (GtkWidget *w, GdkEventExpose *event, gpointer user_data)
{
+TabwinWidget *tbw = user_data;
+
g_return_val_if_fail (GTK_IS_WIDGET(w), FALSE);
TRACE (entering paint_selected);
+if (w == tbw-tabwin-hovered)
+{
+gtk_widget_set_state (w, GTK_STATE_ACTIVE);
+}
+else
+{
+gtk_widget_set_state (w, GTK_STATE_SELECTED);
+}
+
gtk_button_set_relief (GTK_BUTTON (w), GTK_RELIEF_NORMAL);
return FALSE;
@@ -254,7 +265,7 @@ tabwinSetSelected (TabwinWidget *tbw, GtkWidget *w,
GtkWidget *l)
tbw-selected_callback = g_signal_connect (G_OBJECT (tbw-selected),
expose-event,
G_CALLBACK (paint_selected),
- NULL);
+ tbw);
c = g_object_get_data (G_OBJECT (tbw-selected), client-ptr-val);
@@ -358,6 +369,11 @@ cb_window_button_enter (GtkWidget *widget, GdkEvent
*event, gpointer user_data)
* select it */
if (c != NULL)
{
+if (gtk_widget_is_focus (widget))
+{
+gtk_widget_set_state (widget, GTK_STATE_ACTIVE);
+}
+
/* we don't update the labels on mouse over for this mode */
if (c-screen_info-params-cycle_tabwin_mode == OVERFLOW_COLUMN_GRID)
{
@@ -385,14 +401,15 @@ cb_window_button_leave (GtkWidget *widget, GdkEvent
*event, gpointer user_data)
g_return_val_if_fail (tbw != NULL, FALSE);
+tbw-tabwin-hovered = NULL;
+
/* don't do anything if we have the focus */
if (gtk_widget_is_focus (widget))
{
+gtk_widget_set_state (widget, GTK_STATE_SELECTED);
return FALSE;
}
-tbw-tabwin-hovered = NULL;
-
c = g_object_get_data (G_OBJECT (widget), client-ptr-val);
/* when hovering over a window icon, display it's label but don't
@@ -708,6 +725,14 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
tabwinSetSelected (tbw, window_button, buttonlabel);
gtk_widget_queue_draw (GTK_WIDGET(tbw));
}
+else if (window_button == t-hovered)
+{
+gtk_widget_set_state (window_button, GTK_STATE_PRELIGHT);
+}
+else
+{
+gtk_widget_set_state (window_button, GTK_STATE_NORMAL);
+}
}
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Simplify string for checkbox to activate listview
Updating branch refs/heads/ochosi/tabwin to 135067df3617c637a335faef1f8bf8e231d6a0a9 (commit) from da430eb8ffc740cf26d344b77dafb57d8d761790 (commit) commit 135067df3617c637a335faef1f8bf8e231d6a0a9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Dec 5 13:01:18 2013 +0100 Simplify string for checkbox to activate listview settings-dialogs/xfwm4-tweaks-dialog.glade |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade b/settings-dialogs/xfwm4-tweaks-dialog.glade index 7f12809..6e48449 100644 --- a/settings-dialogs/xfwm4-tweaks-dialog.glade +++ b/settings-dialogs/xfwm4-tweaks-dialog.glade @@ -173,7 +173,7 @@ or skip taskbar properties set/property /child child object class=GtkCheckButton id=cycle_tabwin_mode -property name=label translatable=yesShow windows being cycled in a _list instead of an icon grid/property +property name=label translatable=yesCycle through windows in a _list/property property name=use_action_appearanceFalse/property property name=visibleTrue/property property name=can_focusTrue/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Update website-link in about dialog
Updating branch refs/heads/0.5 to f4b82c7e9c042ce3a5fe4e9f35b1b3f3777b1d3d (commit) from 77af7714c3a4fa28dcc1e46f5ff2b6c2783e93d9 (commit) commit f4b82c7e9c042ce3a5fe4e9f35b1b3f3777b1d3d Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Dec 5 00:27:52 2013 +0100 Update website-link in about dialog src/parole-about.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parole-about.c b/src/parole-about.c index 4f1ada2..df559f7 100644 --- a/src/parole-about.c +++ b/src/parole-about.c @@ -75,7 +75,7 @@ void parole_about (GtkWindow *parent) program-name, PACKAGE_NAME, translator-credits, _(translator-credits), version, PACKAGE_VERSION, -website, http://goodies.xfce.org/projects/applications/parole;, +website, http://docs.xfce.org/apps/parole/start;, website-label, _(Visit Parole website), NULL); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Replace deprecated goodies-website link with plugins-page of the docs
Updating branch refs/heads/0.5 to f7d0d88ab266aa7cb09918b5296859f37e893f1f (commit) from f4b82c7e9c042ce3a5fe4e9f35b1b3f3777b1d3d (commit) commit f7d0d88ab266aa7cb09918b5296859f37e893f1f Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Dec 5 00:28:50 2013 +0100 Replace deprecated goodies-website link with plugins-page of the docs data/interfaces/plugins.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui index e900d09..7481481 100644 --- a/data/interfaces/plugins.ui +++ b/data/interfaces/plugins.ui @@ -205,7 +205,7 @@ property name=has_tooltipTrue/property property name=use_action_appearanceFalse/property property name=reliefnone/property -property name=urihttp://goodies.xfce.org/property +property name=urihttp://docs.xfce.org/apps/parole/plugins/property /object packing property name=expandFalse/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Replace deprecated goodies-website link with plugins-page of the docs
Updating branch refs/heads/master to be01f0217333ef9e6d127d5965dbc16512eb4fa4 (commit) from eee4efefc42dfb2169086b87e5696bca85c660ed (commit) commit be01f0217333ef9e6d127d5965dbc16512eb4fa4 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Dec 3 09:27:16 2013 +0100 Replace deprecated goodies-website link with plugins-page of the docs data/interfaces/plugins.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui index 7aaf5db..4fcc264 100644 --- a/data/interfaces/plugins.ui +++ b/data/interfaces/plugins.ui @@ -191,7 +191,7 @@ property name=receives_defaultTrue/property property name=has_tooltipTrue/property property name=reliefnone/property -property name=urihttp://goodies.xfce.org/property +property name=urihttp://docs.xfce.org/apps/parole/plugins/property /object packing property name=expandFalse/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Expand the font-size fix to work for the listview
Updating branch refs/heads/ochosi/tabwin
to da430eb8ffc740cf26d344b77dafb57d8d761790 (commit)
from 034ff38453afbae11d9d0768609e83faace49fbf (commit)
commit da430eb8ffc740cf26d344b77dafb57d8d761790
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Dec 3 12:22:32 2013 +0100
Expand the font-size fix to work for the listview
src/tabwin.c | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 3fadbfe..08d2f05 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -464,13 +464,13 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
g_signal_connect (window_button, leave-notify-event, G_CALLBACK
(cb_window_button_leave), tbw);
gtk_widget_add_events (window_button, GDK_ENTER_NOTIFY_MASK);
+/* We need to account for changes to the font size in the user's
+ * appearance theme and gtkrc settings */
+layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
+pango_layout_get_pixel_size (layout, NULL, app_label_height);
+
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-/* We need to account for changes to the font size in the user's
- * appearance theme and gtkrc settings */
-layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
-pango_layout_get_pixel_size (layout, NULL, app_label_height);
-
gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+app_label_height+8);
buttonbox = gtk_vbox_new (FALSE, 0);
buttonlabel = gtk_label_new ();
@@ -478,7 +478,10 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
}
else
{
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, icon_size+8);
+if (icon_size app_label_height)
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, app_label_height+8);
+else
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+256, icon_size+8);
buttonbox = gtk_hbox_new (FALSE, 6);
buttonlabel = gtk_label_new (c-name);
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0, 0.5);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Fix mouse interactions with tabwin buttons
Updating branch refs/heads/ochosi/tabwin
to 4d7b5dc6fb070774ee464f6549d15c809f260412 (commit)
from 142904be056f9d469726848c61d8ff33e97fae4c (commit)
commit 4d7b5dc6fb070774ee464f6549d15c809f260412
Author: cedric ced...@gmail.com
Date: Sun Dec 1 01:36:11 2013 +0100
Fix mouse interactions with tabwin buttons
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index c25a403..e8713b8 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -673,13 +673,17 @@ tabwinChange2Selected (Tabwin *t, GList *selected)
if (c != NULL)
{
-if (c-screen_info-params-cycle_tabwin_mode ==
STANDARD_ICON_GRID)
+/* don't clear label if mouse is inside the previously
+ * selected button */
+if (c-screen_info-params-cycle_tabwin_mode ==
STANDARD_ICON_GRID
+ window_button != t-hovered)
{
gtk_label_set_text (GTK_LABEL (buttonlabel), );
}
if (c == t-selected-data)
{
+gtk_widget_grab_focus (window_button);
tabwinSetSelected (tbw, window_button, buttonlabel);
gtk_widget_queue_draw (GTK_WIDGET(tbw));
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Move realmedia audio-mimetype to the audio-filter
Updating branch refs/heads/master
to 869d190928958518725bfc7361c28c4cda41e49b (commit)
from 7745787d0af64893f6372733789ae57fdaf0b029 (commit)
commit 869d190928958518725bfc7361c28c4cda41e49b
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Dec 2 12:24:01 2013 +0100
Move realmedia audio-mimetype to the audio-filter
data/mime/mime-functions.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 118040b..2033324 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -3,12 +3,12 @@
get_audio_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep \/ | grep audio | grep -v
audio/x-pn-realaudio | grep -v audio/x-scpls | grep -v audio/mpegurl |
grep -v audio/x-mpegurl | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES application/x-flac
+ MIMETYPES=$MIMETYPES application/x-flac audio/x-pn-realaudio
}
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v application/x-flac | grep -v text/google-video-pointer | grep -v
application/x-quicktime-media-link | grep -v application/smil | grep -v
application/smil+xml | grep -v application/x-smil | grep -v
application/xspf+xml | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia
+ MIMETYPES=$MIMETYPES application/vnd.rn-realmedia
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Actually use the media-filters provided by Parole (really fixes Bug #10434) Also add new filters: audio, video, playlist
Updating branch refs/heads/master to 5e15d0e50b8c02bc3577c809fbdfc2a6c5cbdf54 (commit) from 869d190928958518725bfc7361c28c4cda41e49b (commit) commit 5e15d0e50b8c02bc3577c809fbdfc2a6c5cbdf54 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Dec 2 12:25:01 2013 +0100 Actually use the media-filters provided by Parole (really fixes Bug #10434) Also add new filters: audio, video, playlist src/parole-mediachooser.c | 16 +++- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c index 6185f30..1e3807c 100644 --- a/src/parole-mediachooser.c +++ b/src/parole-mediachooser.c @@ -214,7 +214,7 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) GtkWidget *file_chooser; GtkBuilder *builder; GtkWidget *recursive; -GtkFileFilter *filter, *all_files; +GtkFileFilter *filter, *audio_filter, *video_filter, *playlist_filter, *all_files; gbooleanscan_recursive; gbooleanreplace_playlist; gbooleanplay; @@ -230,13 +230,19 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, filechooserwidget)); /* Set filters for the filechooser */ -filter = gtk_file_filter_new(); -gtk_file_filter_set_name( filter, _(Supported files) ); -gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), audio/*); -gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), video/*); +filter = parole_get_supported_files_filter(); gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), application/x-cd-image); gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter ); +audio_filter = parole_get_supported_audio_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), audio_filter ); + +video_filter = parole_get_supported_video_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), video_filter ); + +playlist_filter = parole_get_supported_playlist_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), playlist_filter ); + all_files = gtk_file_filter_new(); gtk_file_filter_set_name( all_files, _(All files) ); gtk_file_filter_add_pattern ( all_files, *); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Actually use the media-filters provided by Parole (really fixes Bug #10434) Also add new filters: audio, video, playlist
Updating branch refs/heads/0.5 to 8cfb851c964f10089ce3e3adaa921e1589693713 (commit) from 2540493620d3750da06e557e97ba166dd9be62a7 (commit) commit 8cfb851c964f10089ce3e3adaa921e1589693713 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Dec 2 12:35:37 2013 +0100 Actually use the media-filters provided by Parole (really fixes Bug #10434) Also add new filters: audio, video, playlist src/parole-mediachooser.c | 17 - 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/parole-mediachooser.c b/src/parole-mediachooser.c index 8372f32..474305b 100644 --- a/src/parole-mediachooser.c +++ b/src/parole-mediachooser.c @@ -195,7 +195,7 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) GtkWidget *file_chooser; GtkBuilder *builder; GtkWidget *recursive; -GtkFileFilter *filter, *all_files; +GtkFileFilter *filter, *audio_filter, *video_filter, *playlist_filter, *all_files; gbooleanscan_recursive; gbooleanreplace_playlist; gbooleanplay; @@ -211,12 +211,19 @@ parole_media_chooser_open_internal (ParoleMediaChooser *media_chooser) file_chooser = GTK_WIDGET (gtk_builder_get_object (builder, filechooserwidget)); /* Set filters for the filechooser */ -filter = gtk_file_filter_new(); -gtk_file_filter_set_name( filter, _(Supported files) ); -gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), audio/*); -gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), video/*); +filter = parole_get_supported_files_filter(); +gtk_file_filter_add_mime_type (GTK_FILE_FILTER (filter), application/x-cd-image); gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), filter ); +audio_filter = parole_get_supported_audio_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), audio_filter ); + +video_filter = parole_get_supported_video_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), video_filter ); + +playlist_filter = parole_get_supported_playlist_filter(); +gtk_file_chooser_add_filter( GTK_FILE_CHOOSER(file_chooser), playlist_filter ); + all_files = gtk_file_filter_new(); gtk_file_filter_set_name( all_files, _(All files) ); gtk_file_filter_add_pattern ( all_files, *); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Move realmedia audio-mimetype to the audio-filter
Updating branch refs/heads/0.5
to 2540493620d3750da06e557e97ba166dd9be62a7 (commit)
from 4a14bbf081d1ee7986e67b0cd9c6f34280df5cda (commit)
commit 2540493620d3750da06e557e97ba166dd9be62a7
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Dec 2 12:30:19 2013 +0100
Move realmedia audio-mimetype to the audio-filter
data/mime/mime-functions.sh |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/mime/mime-functions.sh b/data/mime/mime-functions.sh
index 118040b..2033324 100644
--- a/data/mime/mime-functions.sh
+++ b/data/mime/mime-functions.sh
@@ -3,12 +3,12 @@
get_audio_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep \/ | grep audio | grep -v
audio/x-pn-realaudio | grep -v audio/x-scpls | grep -v audio/mpegurl |
grep -v audio/x-mpegurl | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES application/x-flac
+ MIMETYPES=$MIMETYPES application/x-flac audio/x-pn-realaudio
}
get_video_mimetypes ()
{
MIMETYPES=`grep -v '^#' $1 | grep -v x-content/ | grep -v audio | grep
-v application/x-flac | grep -v text/google-video-pointer | grep -v
application/x-quicktime-media-link | grep -v application/smil | grep -v
application/smil+xml | grep -v application/x-smil | grep -v
application/xspf+xml | grep -v x-scheme-handler/`
- MIMETYPES=$MIMETYPES audio/x-pn-realaudio application/vnd.rn-realmedia
+ MIMETYPES=$MIMETYPES application/vnd.rn-realmedia
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Update changelog
Updating branch refs/heads/0.5 to 77af7714c3a4fa28dcc1e46f5ff2b6c2783e93d9 (commit) from 8cfb851c964f10089ce3e3adaa921e1589693713 (commit) commit 77af7714c3a4fa28dcc1e46f5ff2b6c2783e93d9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Dec 2 12:39:23 2013 +0100 Update changelog ChangeLog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b468449..1a2f6d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ -2013-10-30: bluesa...@xfce.org +2013-12-02: bluesa...@xfce.org * Next: 0.5.4 * Fix loading of playlists with relative paths (bug #10436) -* Add realmedia video to supported video mimetypes (bug #10434) +* Fix file-filters for audio/video mimetypes (bug #10434) * Fix IF/ELSE for plugin installation on multiple platforms (bugs #10142, #10441) * Fix Remove Duplicates functionality. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Account for custom font sizes in the tabwin label
Updating branch refs/heads/ochosi/tabwin
to 7199f04e2164e84efc14990098056a289167dd41 (commit)
from 4d7b5dc6fb070774ee464f6549d15c809f260412 (commit)
commit 7199f04e2164e84efc14990098056a289167dd41
Author: Eric Koegel eric.koe...@gmail.com
Date: Mon Dec 2 08:29:53 2013 +0300
Account for custom font sizes in the tabwin label
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index e8713b8..237b44e 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -414,8 +414,9 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
Client *c;
GList *client_list;
GtkWidget *windowlist, *icon, *selected, *window_button, *buttonbox,
*buttonlabel, *selected_label;
-int packpos, monitor_width, monitor_height;
+int packpos, monitor_width, monitor_height, app_label_height;
Tabwin *t;
+PangoLayout *layout;
gint icon_size = WIN_ICON_SIZE;
TRACE (entering createWindowlist);
@@ -460,7 +461,12 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
if (screen_info-params-cycle_tabwin_mode == STANDARD_ICON_GRID)
{
-gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+24);
+/* We need to account for changes to the font size in the user's
+ * appearance theme and gtkrc settings */
+layout = gtk_widget_create_pango_layout (GTK_WIDGET (tbw), );
+pango_layout_get_pixel_size (layout, NULL, app_label_height);
+
+gtk_widget_set_size_request (GTK_WIDGET (window_button),
icon_size+24, icon_size+app_label_height+8);
buttonbox = gtk_vbox_new (FALSE, 0);
buttonlabel = gtk_label_new ();
gtk_misc_set_alignment (GTK_MISC (buttonlabel), 0.5, 1.0);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Install a new style property listview-icon-size themes can add Xfwm4TabwinWidget::listview-icon-size = $n to set the appicon-size in the tabwin's new listview
Updating branch refs/heads/ochosi/tabwin
to 034ff38453afbae11d9d0768609e83faace49fbf (commit)
from 7199f04e2164e84efc14990098056a289167dd41 (commit)
commit 034ff38453afbae11d9d0768609e83faace49fbf
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Dec 2 16:13:34 2013 +0100
Install a new style property listview-icon-size
themes can add Xfwm4TabwinWidget::listview-icon-size = $n to set the
appicon-size in the tabwin's new listview. Currently min=16 and max=48
src/tabwin.c | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/tabwin.c b/src/tabwin.c
index 237b44e..3fadbfe 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -28,6 +28,10 @@
#define WIN_ICON_SIZE 48
#endif
+#ifndef LISTVIEW_WIN_ICON_SIZE
+#define LISTVIEW_WIN_ICON_SIZE 24
+#endif
+
#ifndef WIN_ICON_BORDER
#define WIN_ICON_BORDER 5
#endif
@@ -439,7 +443,8 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
}
else
{
-icon_size = 24;
+icon_size = LISTVIEW_WIN_ICON_SIZE;
+gtk_widget_style_get (GTK_WIDGET (tbw), listview-icon-size,
icon_size, NULL);
tbw-grid_rows = (monitor_height / (icon_size + 2 * WIN_ICON_BORDER))
* 0.75;
tbw-grid_cols = screen_info-client_count / tbw-grid_rows + 1;
}
@@ -561,6 +566,13 @@ tabwin_widget_class_init (TabwinWidgetClass *klass)
WIN_ICON_SIZE,
G_PARAM_READABLE));
gtk_widget_class_install_style_property (widget_class,
+
g_param_spec_int(listview-icon-size,
+ listview icon
size,
+ the size of
the application icon in listview,
+ 16, 48,
+
LISTVIEW_WIN_ICON_SIZE,
+
G_PARAM_READABLE));
+gtk_widget_class_install_style_property (widget_class,
g_param_spec_int(border-width,
border width,
the width of
the colored border,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Update website-link in about dialog
Updating branch refs/heads/master to eee4efefc42dfb2169086b87e5696bca85c660ed (commit) from 5e15d0e50b8c02bc3577c809fbdfc2a6c5cbdf54 (commit) commit eee4efefc42dfb2169086b87e5696bca85c660ed Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Dec 3 03:25:06 2013 +0100 Update website-link in about dialog src/parole-about.c |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/parole-about.c b/src/parole-about.c index f275b1e..2d9218d 100644 --- a/src/parole-about.c +++ b/src/parole-about.c @@ -75,7 +75,7 @@ void parole_about (GtkWindow *parent) program-name, PACKAGE_NAME, translator-credits, _(translator-credits), version, PACKAGE_VERSION, -website, http://goodies.xfce.org/projects/applications/parole;, +website, http://docs.xfce.org/apps/parole/start;, website-label, _(Visit Parole website), NULL); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Implement column list overflow tabwin mode
Updating branch refs/heads/ochosi/tabwin
to 142904be056f9d469726848c61d8ff33e97fae4c (commit)
from 465cc5b73af615fe7a3ba7067637b7f32bb0fb6d (commit)
commit 142904be056f9d469726848c61d8ff33e97fae4c
Author: Eric Koegel eric.koe...@gmail.com
Date: Sat Nov 30 23:37:07 2013 +0300
Implement column list overflow tabwin mode
Adds an list view for the tabwin when cycling windows, as described
in the design SIG. An xfconf property and option to the wm tweaks
app has been added.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
defaults/defaults |1 +
settings-dialogs/tweaks-settings.c |5 +
settings-dialogs/xfwm4-tweaks-dialog.glade | 16 ++
src/settings.c |7 +
src/settings.h |1 +
src/tabwin.c | 252 +++-
src/tabwin.h |7 +
7 files changed, 247 insertions(+), 42 deletions(-)
diff --git a/defaults/defaults b/defaults/defaults
index 17dc3d7..78c15a5 100644
--- a/defaults/defaults
+++ b/defaults/defaults
@@ -10,6 +10,7 @@ cycle_draw_frame=true
cycle_apps_only=false
cycle_hidden=true
cycle_minimum=true
+cycle_tabwin_mode=0
cycle_workspaces=false
double_click_time=250
double_click_distance=5
diff --git a/settings-dialogs/tweaks-settings.c
b/settings-dialogs/tweaks-settings.c
index 0b6a7eb..8990f07 100644
--- a/settings-dialogs/tweaks-settings.c
+++ b/settings-dialogs/tweaks-settings.c
@@ -167,6 +167,7 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
GtkWidget *cycle_hidden_check = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_hidden_check));
GtkWidget *cycle_minimum_check = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_minimum_check));
GtkWidget *cycle_draw_frame = GTK_WIDGET (gtk_builder_get_object (builder,
cycle_draw_frame));
+GtkWidget *cycle_tabwin_mode = GTK_WIDGET (gtk_builder_get_object
(builder, cycle_tabwin_mode));
/* Focus tab */
GtkWidget *prevent_focus_stealing_check = GTK_WIDGET
(gtk_builder_get_object (builder, prevent_focus_stealing_check));
@@ -316,6 +317,10 @@ wm_tweaks_dialog_configure_widgets (GtkBuilder *builder)
/general/cycle_draw_frame,
G_TYPE_BOOLEAN,
(GObject *)cycle_draw_frame, active);
+xfconf_g_property_bind (xfwm4_channel,
+/general/cycle_tabwin_mode,
+G_TYPE_INT,
+(GObject *)cycle_tabwin_mode, active);
/* Focus tab */
xfconf_g_property_bind (xfwm4_channel,
diff --git a/settings-dialogs/xfwm4-tweaks-dialog.glade
b/settings-dialogs/xfwm4-tweaks-dialog.glade
index d026dfd..7f12809 100644
--- a/settings-dialogs/xfwm4-tweaks-dialog.glade
+++ b/settings-dialogs/xfwm4-tweaks-dialog.glade
@@ -171,6 +171,22 @@ or skip taskbar properties set/property
property name=position3/property
/packing
/child
+child
+ object class=GtkCheckButton id=cycle_tabwin_mode
+property name=label translatable=yesShow windows
being cycled in a _list instead of an icon grid/property
+property name=use_action_appearanceFalse/property
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=receives_defaultFalse/property
+property name=use_underlineTrue/property
+property name=draw_indicatorTrue/property
+ /object
+ packing
+property name=expandFalse/property
+property name=fillFalse/property
+property name=position4/property
+ /packing
+/child
/object
/child
child type=tab
diff --git a/src/settings.c b/src/settings.c
index a8a9e06..bfa8af3 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -678,6 +678,7 @@ loadSettings (ScreenInfo *screen_info)
{cycle_draw_frame, NULL, G_TYPE_BOOLEAN, TRUE},
{cycle_hidden, NULL, G_TYPE_BOOLEAN, TRUE},
{cycle_minimum, NULL, G_TYPE_BOOLEAN, TRUE},
+{cycle_tabwin_mode, NULL, G_TYPE_INT, FALSE},
{cycle_workspaces, NULL, G_TYPE_BOOLEAN, TRUE},
{double_click_time, NULL, G_TYPE_INT, TRUE},
{double_click_distance, NULL, G_TYPE_INT, TRUE},
@@ -768,6 +769,8 @@ loadSettings (ScreenInfo *screen_info)
getBoolValue (cycle_draw_frame, rc);
screen_info-params-cycle_hidden =
getBoolValue (cycle_hidden, rc);
+screen_info-params-cycle_tabwin_mode =
+CLAMP (getIntValue (cycle_tabwin_mode, rc), 0, 1);
screen_info-params-cycle_workspaces =
getBoolValue (cycle_workspaces
[Xfce4-commits] xfwm4:ochosi/tabwin Improve keyboard navigation in the tabwin
Updating branch refs/heads/ochosi/tabwin
to 465cc5b73af615fe7a3ba7067637b7f32bb0fb6d (commit)
from 3838e97f85af98b5daebdb55a3a0879624d9a2ef (commit)
commit 465cc5b73af615fe7a3ba7067637b7f32bb0fb6d
Author: Eric Koegel eric.koe...@gmail.com
Date: Wed Nov 27 17:25:10 2013 +0300
Improve keyboard navigation in the tabwin
When cycling applications have the keyboard wrap around when it
reaches the end of a row or column.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/tabwin.c | 37 +
1 file changed, 37 insertions(+)
diff --git a/src/tabwin.c b/src/tabwin.c
index 35e96b8..72f79d2 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -787,10 +787,20 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int
col_delta)
if (col_current 0)
{
col_current = cols - 1;
+row_current--;
+if (row_current 0)
+{
+row_current = rows - 1;
+}
}
else if (col_current = cols)
{
col_current = 0;
+row_current++;
+if (row_current = rows)
+{
+row_current = rows - 1;
+}
}
/* Wrap row */
@@ -798,10 +808,29 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int
col_delta)
if (row_current 0)
{
row_current = rows - 1;
+col_current--;
+if (col_current 0)
+{
+col_current = cols - 1;
+}
}
else if (row_current = rows)
{
row_current = 0;
+col_current++;
+if (col_current = cols)
+{
+if (rows != 1)
+{
+col_current = cols - 1;
+}
+else
+{
+/* If there's only 1 row then col needs to wrap back to
+ * the head of the grid */
+col_current = 0;
+}
+}
}
/* So here we are at the new (wrapped) position in the rectangle */
@@ -812,7 +841,10 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
{
if (col_delta 0)
{
+/* In this case we're going past the tail, reset to the head
+ * of the grid */
col_current = 0;
+row_current = 0;
}
else
{
@@ -824,6 +856,11 @@ tabwinSelectDelta (Tabwin *t, int row_delta, int col_delta)
if (row_delta 0)
{
row_current = 0;
+col_current++;
+if (col_current = cols)
+{
+col_current = 0;
+}
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfwm4:ochosi/tabwin Don't select the window when it gets mouse focus
Updating branch refs/heads/ochosi/tabwin
to 3838e97f85af98b5daebdb55a3a0879624d9a2ef (commit)
from fe99c2fb53ab9c0532e006f7f974b369b1295003 (commit)
commit 3838e97f85af98b5daebdb55a3a0879624d9a2ef
Author: Eric Koegel eric.koe...@gmail.com
Date: Tue Nov 26 16:14:05 2013 +0300
Don't select the window when it gets mouse focus
Instead of selecting the window, just update the labels in the
tabwin window when the window icon gets the focus. If the user
clicks on the window icon then the widget the mouse is hovering
over will be selected and the tabwin window will disappear.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 33 +++
src/tabwin.c | 71 --
src/tabwin.h |4 +++-
3 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 79989ed..3af6aea 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -227,7 +227,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
DisplayInfo *display_info;
ClientCycleData *passdata;
Client *c, *removed;
-static Client *last_selected = NULL;
eventFilterStatus status;
KeyCode cancel, left, right, up, down;
int key, modifiers;
@@ -329,8 +328,18 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
cycling = FALSE;
}
+}
-if (!c)
+if (cycling)
+{
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
{
cycling = FALSE;
}
@@ -357,11 +366,6 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
break;
-case MotionNotify:
-status = EVENT_FILTER_CONTINUE;
-/* window of the event, we might accept it later */
-mouse_window = xevent-xcrossing.window;
-break;
default:
status = EVENT_FILTER_CONTINUE;
break;
@@ -374,20 +378,9 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
{
-c = tabwinSelectWidget (passdata-tabwin, li-data);
-break;
-}
-}
-}
+c = tabwinSelectHoveredWidget (passdata-tabwin);
-if (cycling)
-{
-if (c)
-{
-if (passdata-wireframe last_selected != c)
-{
-last_selected = c;
-wireframeUpdate (c, passdata-wireframe);
+break;
}
}
}
diff --git a/src/tabwin.c b/src/tabwin.c
index 0758d36..35e96b8 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -312,15 +312,54 @@ getMinMonitorWidth (ScreenInfo *screen_info)
static gboolean
cb_window_button_enter (GtkWidget *widget, GdkEvent *event, gpointer user_data)
{
-Tabwin *t = user_data;
+TabwinWidget *tbw = user_data;
+Client *c;
+GtkWidget *buttonbox, *buttonlabel;
+gchar *classname;
+
+TRACE (entering);
+
+g_return_val_if_fail (tbw != NULL, FALSE);
+
+c = g_object_get_data (G_OBJECT (widget), client-ptr-val);
+
+/* keep track of which widget we're hovered over */
+tbw-tabwin-hovered = widget;
+
+/* when hovering over a window icon, display it's label but don't
+ * select it */
+if (c != NULL)
+{
+buttonbox = GTK_WIDGET(
gtk_container_get_children(GTK_CONTAINER(widget))[0].data );
+buttonlabel = GTK_WIDGET( g_list_nth_data(
gtk_container_get_children(GTK_CONTAINER(buttonbox)), 1) );
+
+classname = g_strdup(c-class.res_class);
+tabwinSetLabel (tbw, buttonlabel, classname, c-name,
c-win_workspace);
+g_free (classname);
+}
+
+return FALSE;
+}
+
+static gboolean
+cb_window_button_leave (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+TabwinWidget *tbw = user_data;
TRACE (entering);
-g_return_val_if_fail (t != NULL, FALSE);
+g_return_val_if_fail (tbw != NULL, FALSE);
+
+/* don't do anything if we have the focus */
+if (gtk_widget_is_focus (widget))
+{
+return FALSE;
+}
+
+tbw-tabwin-hovered = NULL;
-/* On mouse over we grab the focus for the window button and select it */
-gtk_widget_grab_focus (widget);
-tabwinSelectWidget (t, widget);
+/* reselect the selected widget, it will clear everything else out */
+tabwinSelectWidget (tbw-tabwin);
return FALSE
[Xfce4-commits] xfwm4:ochosi/tabwin Select window button on mouse over
Updating branch refs/heads/ochosi/tabwin
to fe99c2fb53ab9c0532e006f7f974b369b1295003 (commit)
from 380c869951d6da19eeccc41b62b7c5f9f920ec0d (commit)
commit fe99c2fb53ab9c0532e006f7f974b369b1295003
Author: Eric Koegel eric.koe...@gmail.com
Date: Thu Nov 21 17:05:25 2013 +0300
Select window button on mouse over
When the mouse goes over a window button in the tabwin, give that
window button the focus and select it. This way the mouse functions
the same way as the keyboard. When the user clicks on a window
button, focus and raise that winodw and get rid of the tabwin.
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 54 +++---
src/tabwin.c | 19 +++
2 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index d405d9b..79989ed 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -227,6 +227,7 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
DisplayInfo *display_info;
ClientCycleData *passdata;
Client *c, *removed;
+static Client *last_selected = NULL;
eventFilterStatus status;
KeyCode cancel, left, right, up, down;
int key, modifiers;
@@ -328,18 +329,8 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
{
cycling = FALSE;
}
-}
-if (cycling)
-{
-if (c)
-{
-if (passdata-wireframe)
-{
-wireframeUpdate (c, passdata-wireframe);
-}
-}
-else
+if (!c)
{
cycling = FALSE;
}
@@ -361,11 +352,16 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
break;
case ButtonPress:
case ButtonRelease:
-status = EVENT_FILTER_CONTINUE;
+status = EVENT_FILTER_STOP;
+cycling = FALSE;
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
break;
-
+case MotionNotify:
+status = EVENT_FILTER_CONTINUE;
+/* window of the event, we might accept it later */
+mouse_window = xevent-xcrossing.window;
+break;
default:
status = EVENT_FILTER_CONTINUE;
break;
@@ -373,38 +369,26 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
if (mouse_window != 0)
{
-Client *c2 = NULL;
-
/* only accept events for the tab windows */
for (li = passdata-tabwin-tabwin_list; li != NULL; li = li-next)
{
if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
{
-c2 = tabwinSelectWidget (passdata-tabwin, li-data);
-if (c2)
-{
-c = c2;
-}
-
-if (c)
-{
-if (passdata-wireframe)
-{
-wireframeUpdate (c, passdata-wireframe);
-}
-}
-else
-{
-cycling = FALSE;
-}
+c = tabwinSelectWidget (passdata-tabwin, li-data);
break;
}
}
+}
-if (c2 == NULL)
+if (cycling)
+{
+if (c)
{
-status = EVENT_FILTER_STOP;
-cycling = FALSE;
+if (passdata-wireframe last_selected != c)
+{
+last_selected = c;
+wireframeUpdate (c, passdata-wireframe);
+}
}
}
diff --git a/src/tabwin.c b/src/tabwin.c
index 747ec2f..0758d36 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -309,6 +309,22 @@ getMinMonitorWidth (ScreenInfo *screen_info)
return min_width;
}
+static gboolean
+cb_window_button_enter (GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+Tabwin *t = user_data;
+
+TRACE (entering);
+
+g_return_val_if_fail (t != NULL, FALSE);
+
+/* On mouse over we grab the focus for the window button and select it */
+gtk_widget_grab_focus (widget);
+tabwinSelectWidget (t, widget);
+
+return FALSE;
+}
+
static GtkWidget *
createWindowlist (ScreenInfo *screen_info, TabwinWidget *tbw)
{
@@ -343,6 +359,9 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
gtk_button_set_relief (GTK_BUTTON (window_button), GTK_RELIEF_NONE);
gtk_widget_set_size_request (GTK_WIDGET (window_button), icon_size+24,
icon_size+24);
g_object_set_data (G_OBJECT (window_button), client-ptr-val, c);
+g_signal_connect (window_button, enter
[Xfce4-commits] xfwm4:ochosi/tabwin Tabwin buttons are clickable
Updating branch refs/heads/ochosi/tabwin
to 380c869951d6da19eeccc41b62b7c5f9f920ec0d (commit)
from 1e3925e01cfe9584cc35cd46b96c5ee8b0db3523 (commit)
commit 380c869951d6da19eeccc41b62b7c5f9f920ec0d
Author: Eric Koegel eric.koe...@gmail.com
Date: Tue Nov 19 06:50:52 2013 +0300
Tabwin buttons are clickable
Signed-off-by: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
src/cycle.c | 50 ++---
src/tabwin.c | 59 +-
src/tabwin.h |1 +
3 files changed, 86 insertions(+), 24 deletions(-)
diff --git a/src/cycle.c b/src/cycle.c
index 6913ff4..d405d9b 100644
--- a/src/cycle.c
+++ b/src/cycle.c
@@ -361,14 +361,11 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
break;
case ButtonPress:
case ButtonRelease:
+status = EVENT_FILTER_CONTINUE;
/* window of the event, we might accept it later */
mouse_window = xevent-xbutton.window;
break;
-case EnterNotify:
-case LeaveNotify:
-/* window of the event, we might accept it later */
-mouse_window = xevent-xcrossing.window;
-break;
+
default:
status = EVENT_FILTER_CONTINUE;
break;
@@ -376,13 +373,39 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
if (mouse_window != 0)
{
+Client *c2 = NULL;
+
/* only accept events for the tab windows */
for (li = passdata-tabwin-tabwin_list; li != NULL; li = li-next)
+{
if (GDK_WINDOW_XID (gtk_widget_get_window (li-data)) ==
mouse_window)
{
-status = EVENT_FILTER_CONTINUE;
+c2 = tabwinSelectWidget (passdata-tabwin, li-data);
+if (c2)
+{
+c = c2;
+}
+
+if (c)
+{
+if (passdata-wireframe)
+{
+wireframeUpdate (c, passdata-wireframe);
+}
+}
+else
+{
+cycling = FALSE;
+}
break;
}
+}
+
+if (c2 == NULL)
+{
+status = EVENT_FILTER_STOP;
+cycling = FALSE;
+}
}
if (!cycling)
@@ -391,6 +414,14 @@ clientCycleEventFilter (XEvent * xevent, gpointer data)
gtk_main_quit ();
}
+if (status == EVENT_FILTER_STOP)
+{
+/* If there's any chance of a leftover grab, release it. This happens
+ * when the user clicks outside of the tabwin window area onto another
+ * window */
+myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
+}
+
return status;
}
@@ -401,7 +432,7 @@ clientCycle (Client * c, XKeyEvent * ev)
DisplayInfo *display_info;
ClientCycleData passdata;
GList *client_list, *selected;
-gboolean g1, g2;
+gboolean g1;
int key, modifier;
Client *c2;
@@ -448,15 +479,13 @@ clientCycle (Client * c, XKeyEvent * ev)
}
g1 = myScreenGrabKeyboard (screen_info, ev-time);
-g2 = myScreenGrabPointer (screen_info, EnterWindowMask | LeaveWindowMask |
ButtonPressMask | ButtonMotionMask | PointerMotionMask | ButtonReleaseMask,
None, ev-time);
-if (!g1 || !g2)
+if (!g1)
{
TRACE (grab failed in clientCycle);
gdk_beep ();
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
g_list_free (client_list);
return;
@@ -496,7 +525,6 @@ clientCycle (Client * c, XKeyEvent * ev)
g_list_free (client_list);
myScreenUngrabKeyboard (screen_info, myDisplayGetCurrentTime
(display_info));
-myScreenUngrabPointer (screen_info, myDisplayGetCurrentTime
(display_info));
}
gboolean
diff --git a/src/tabwin.c b/src/tabwin.c
index bad1e56..747ec2f 100644
--- a/src/tabwin.c
+++ b/src/tabwin.c
@@ -365,6 +365,7 @@ createWindowlist (ScreenInfo *screen_info, TabwinWidget
*tbw)
{
selected = window_button;
selected_label = buttonlabel;
+gtk_widget_grab_focus (selected);
}
}
if (selected)
@@ -493,20 +494,12 @@ tabwinCreateWidget (Tabwin *tabwin, ScreenInfo
*screen_info, gint monitor_num)
gtk_label_set_use_markup (GTK_LABEL (tbw-label), TRUE);
gtk_label_set_justify (GTK_LABEL (tbw-label), GTK_JUSTIFY_CENTER);
gtk_label_set_ellipsize (GTK_LABEL (tbw-label), PANGO_ELLIPSIZE_END);
-//gtk_widget_set_size_request (GTK_WIDGET (tbw-label), 240, -1);
gtk_box_pack_end (GTK_BOX (vbox), tbw-label, TRUE, TRUE, 0);
windowlist = createWindowlist (screen_info, tbw);
tbw-container = windowlist
[Xfce4-commits] parole:master Tiny string fix
Updating branch refs/heads/master to 6b1f3707ac046d9d0f03f2561e75d1bf2983b3cb (commit) from a46c5be3706caf25557b14b1910afe9c8813cb3f (commit) commit 6b1f3707ac046d9d0f03f2561e75d1bf2983b3cb Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Nov 13 01:34:23 2013 +0100 Tiny string fix data/interfaces/parole.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index f3472d0..ffb9781 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -217,7 +217,7 @@ /child child object class=GtkImageMenuItem id=menu-open-disc -property name=label translatable=yesInsert Disk/property +property name=label translatable=yesInsert Disc/property property name=visibleTrue/property property name=sensitiveFalse/property property name=can_focusFalse/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Replace old email-address with more useful link for bugreporting
Updating branch refs/heads/master to aee790e393bc6d27d97c860ef37c1d1fc9555f76 (commit) from 6b1f3707ac046d9d0f03f2561e75d1bf2983b3cb (commit) commit aee790e393bc6d27d97c860ef37c1d1fc9555f76 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Nov 13 01:43:38 2013 +0100 Replace old email-address with more useful link for bugreporting configure.ac.in |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac.in b/configure.ac.in index 3386947..6edce23 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -8,7 +8,7 @@ m4_define([parole_version_build], []) m4_define([parole_version_tag], []) m4_define([parole_version], [parole_version_major().parole_version_minor().parole_version_micro()ifelse(parole_version_tag(), [git], [parole_version_tag().parole_version_build()], [parole_version_tag()])]) -AC_INIT([parole], [parole_version], [al...@xfce.org]) +AC_INIT([parole], [parole_version], [http://docs.xfce.org/apps/parole/bugs]) AC_PREREQ(2.59c) AC_CONFIG_MACRO_DIR([m4]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Remove unused variable
Updating branch refs/heads/master to 1768158096763a6735c06da519a06784b4c2ee62 (commit) from 7db869c5da74c8a8f6f63d4e380c348077ad39b9 (commit) commit 1768158096763a6735c06da519a06784b4c2ee62 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:31:48 2013 +0100 Remove unused variable src/parole-conf-dialog.c |1 - 1 file changed, 1 deletion(-) diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index bf410b7..238dfb5 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -420,7 +420,6 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent) GtkWidget *dialog; GtkWidget *combox; gbooleanwith_display; -gbooleanreset_saver; GtkWidget *switch_widget; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix one more build-error (missing declaration)
Updating branch refs/heads/master to b1628f069d23ef1ebac3769e3f71d976e9b3b56e (commit) from 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d (commit) commit b1628f069d23ef1ebac3769e3f71d976e9b3b56e Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:36:43 2013 +0100 Fix one more build-error (missing declaration) src/parole-conf.c |2 ++ 1 file changed, 2 insertions(+) diff --git a/src/parole-conf.c b/src/parole-conf.c index fe2ee55..a18e001 100644 --- a/src/parole-conf.c +++ b/src/parole-conf.c @@ -91,6 +91,8 @@ static void parole_conf_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); +gchar +*parole_conf_map_xfconf_property_name (const gchar *prop_name); static void parole_conf_set_property(GObject*object, guint prop_id, const GValue *value, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add missing declaration of parole_conf_dialog_enable_vis_changed_cb
Updating branch refs/heads/master to 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d (commit) from 1768158096763a6735c06da519a06784b4c2ee62 (commit) commit 9f93b29c7fa2920626eb1b8c6c0e7d8454cbfe1d Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Nov 11 10:33:42 2013 +0100 Add missing declaration of parole_conf_dialog_enable_vis_changed_cb src/parole-conf-dialog.c |5 + 1 file changed, 5 insertions(+) diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index 238dfb5..2377977 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -56,6 +56,11 @@ void parole_conf_dialog_subtitle_encoding_changed_cb (GtkComboBox *widget, ParoleConfDialog *self); +void +parole_conf_dialog_enable_vis_changed_cb(GObject *object, + GParamSpec *pspec, + gpointer *data); + voidbrightness_value_changed_cb (GtkRange *range, ParoleConfDialog *self); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix loading of playlists with relative paths (Fixes #10436) Thanks to Alexander De Sousa for the patch
Updating branch refs/heads/master
to 2983de5d5e8c527e3da9659046881c5e8b0c567e (commit)
from ea4f998a2d35fb37b50a1682917ad8c19b1212cf (commit)
commit 2983de5d5e8c527e3da9659046881c5e8b0c567e
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 28 09:24:58 2013 +0100
Fix loading of playlists with relative paths (Fixes #10436)
Thanks to Alexander De Sousa for the patch
src/misc/parole-pl-parser.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 5de12e2..57c495b 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -375,7 +375,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
}
else {
-pl_filename = g_strjoin(, path, lines[i], NULL);
+pl_filename = g_strjoin(/, path, lines[i], NULL);
}
list = g_slist_append (list, parole_file_new (pl_filename));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:0.5 Fix loading of playlists with relative paths (Fixes #10436) Thanks to Alexander De Sousa for the patch
Updating branch refs/heads/0.5
to 74815a4b1e1cce4a81b0d29ec9c7e8eac4682b6e (commit)
from 9e27aa0ba60d02f98609abcaa722260f927fae72 (commit)
commit 74815a4b1e1cce4a81b0d29ec9c7e8eac4682b6e
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 28 11:23:47 2013 +0100
Fix loading of playlists with relative paths (Fixes #10436)
Thanks to Alexander De Sousa for the patch
src/misc/parole-pl-parser.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 9f9e98a..71951d7 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -375,7 +375,7 @@ parole_pl_parser_parse_m3u (const gchar *filename)
}
else {
- pl_filename = g_strjoin(, path, lines[i], NULL);
+ pl_filename = g_strjoin(/, path, lines[i], NULL);
}
list = g_slist_append (list, parole_file_new (pl_filename));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Shrink most of the overlay-control-icons to 16px Makes the icons look sharper, only play-button is left large, because it's kinda the most important button
Updating branch refs/heads/master to b30fa93f0ec1d1338954314bd63fa9963dde0c4b (commit) from 1d025cebfd147172f26257b23738fed0a1231a20 (commit) commit b30fa93f0ec1d1338954314bd63fa9963dde0c4b Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sat Oct 12 01:51:41 2013 +0200 Shrink most of the overlay-control-icons to 16px Makes the icons look sharper, only play-button is left large, because it's kinda the most important button data/interfaces/parole.ui | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index bb4964b..614299e 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -30,14 +30,14 @@ object class=GtkImage id=image_media_fullscreen property name=visibleTrue/property property name=can_focusFalse/property -property name=pixel_size24/property +property name=pixel_size16/property property name=icon_nameview-fullscreen-symbolic/property property name=use_fallbackTrue/property /object object class=GtkImage id=image_media_next property name=visibleTrue/property property name=can_focusFalse/property -property name=pixel_size24/property +property name=pixel_size16/property property name=icon_namemedia-skip-forward-symbolic/property property name=use_fallbackTrue/property /object @@ -51,7 +51,7 @@ object class=GtkImage id=image_media_previous property name=visibleTrue/property property name=can_focusFalse/property -property name=pixel_size24/property +property name=pixel_size16/property property name=icon_namemedia-skip-backward-symbolic/property property name=use_fallbackTrue/property /object @@ -108,7 +108,7 @@ object class=GtkImage id=image_toggleplaylist property name=visibleTrue/property property name=can_focusFalse/property -property name=pixel_size24/property +property name=pixel_size16/property property name=icon_nameview-list-symbolic/property property name=use_fallbackTrue/property /object @@ -422,8 +422,8 @@ property name=use_underlineTrue/property property name=imageimage_volume_up/property property name=use_stockFalse/property -accelerator key=plus signal=activate/ accelerator key=equal signal=activate/ +accelerator key=plus signal=activate/ signal name=activate handler=parole_player_volume_up swapped=no/ /object /child @@ -983,7 +983,7 @@ property name=reliefnone/property property name=focus_on_clickFalse/property property name=orientationvertical/property -property name=sizelarge-toolbar/property +property name=sizemenu/property property name=iconsaudio-volume-muted-symbolic audio-volume-high-symbolic audio-volume-low-symbolic ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Drop gtkrc file
Updating branch refs/heads/master
to f1f727cfa13fdc345f44353ecd0ef86d07f36509 (commit)
from 107c5ac67a3fbf933a4735282f464a1054c1ac24 (commit)
commit f1f727cfa13fdc345f44353ecd0ef86d07f36509
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Aug 20 14:00:47 2013 +0200
Drop gtkrc file
data/Makefile.am |1 -
data/gtk-2.0/Makefile.am |7 ---
data/gtk-2.0/parole.gtkrc | 19 ---
src/parole-player.c |9 -
4 files changed, 36 deletions(-)
diff --git a/data/Makefile.am b/data/Makefile.am
index 4a0719d..6b0d93e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,4 @@
SUBDIRS = \
- gtk-2.0 \
interfaces \
pixmaps \
icons \
diff --git a/data/gtk-2.0/Makefile.am b/data/gtk-2.0/Makefile.am
deleted file mode 100644
index ce7ad47..000
--- a/data/gtk-2.0/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST = \
- $(gtkrc_DATA)
-
-gtkrcdir = $(datadir)/parole/gtk-2.0
-
-gtkrc_DATA = \
- parole.gtkrc
diff --git a/data/gtk-2.0/parole.gtkrc b/data/gtk-2.0/parole.gtkrc
deleted file mode 100644
index b1eef3d..000
--- a/data/gtk-2.0/parole.gtkrc
+++ /dev/null
@@ -1,19 +0,0 @@
-style parole-fullscreen
-{
- fg[NORMAL] = #EE
- fg[PRELIGHT]= #FF
-
- bg[NORMAL] = #00
- bg[ACTIVE] = #6D6D6D
- bg[PRELIGHT]= #505050
- bg[SELECTED]= #398EE7
- bg[INSENSITIVE] = #C4C4C4
-}
-
-style parole-scale = parole-fullscreen
-{
- bg[NORMAL] = #CECECE
-}
-
-widget *ParoleFullscreen*style parole-fullscreen
-widget *ParoleFullscreen*ParoleScale*style parole-scale
diff --git a/src/parole-player.c b/src/parole-player.c
index 0df3291..c3c2f2c 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -72,12 +72,6 @@
#include common/parole-common.h
-#define RC_STYLE \
- include \ GTKRC_DIR /parole.gtkrc\
-
-#define RC_STYLE_FILE \
- GTKRC_DIR /parole.gtkrc
-
int GTK_ICON_SIZE_ARTWORK_FALLBACK;
static void
@@ -3176,9 +3170,6 @@ parole_player_init (ParolePlayer *player)
player-priv-play_pause = GTK_WIDGET (gtk_builder_get_object (builder,
media_play));
player-priv-seekf = GTK_WIDGET (gtk_builder_get_object (builder,
media_next));
player-priv-seekb = GTK_WIDGET (gtk_builder_get_object (builder,
media_prev));
-
-// FIXME: parole-player.c:3057:5: warning: ‘gtk_rc_parse’ is deprecated
(declared at /usr/include/gtk-3.0/gtk/deprecated/gtkrc.h:172): Use
'GtkStyleContext' instead [-Wdeprecated-declarations]
-gtk_rc_parse( RC_STYLE_FILE );
player-priv-range = GTK_WIDGET (gtk_builder_get_object (builder,
media_progress_slider));
gtk_widget_set_name( player-priv-range, ParoleScale );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix icon not being shown on fullscreen-button
Updating branch refs/heads/master to f046c0f08298da556cbfba9a83dea650847ed1e6 (commit) from 5698714a4e4235fa457dcc349487945b8bf93773 (commit) commit f046c0f08298da556cbfba9a83dea650847ed1e6 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Aug 20 09:25:37 2013 +0200 Fix icon not being shown on fullscreen-button data/interfaces/parole-3.ui |1 + 1 file changed, 1 insertion(+) diff --git a/data/interfaces/parole-3.ui b/data/interfaces/parole-3.ui index f147a29..4ec2bcc 100644 --- a/data/interfaces/parole-3.ui +++ b/data/interfaces/parole-3.ui @@ -818,6 +818,7 @@ audio-volume-medium-symbolic/property property name=tooltip_text translatable=yesFullscreen/property property name=imageimage_media_fullscreen/property property name=reliefnone/property +property name=always_show_imageTrue/property signal name=clicked handler=parole_player_full_screen_activated_cb swapped=no/ /object packing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Use the osd-class for the fullscreen-widget Is present in most themes, because the OSDs are widespread in newer Gnome-apps, so we can get dark theming without the overh
Updating branch refs/heads/master to cd5ff993de30e9245ae85450ca8e8a451ba35f82 (commit) from f046c0f08298da556cbfba9a83dea650847ed1e6 (commit) commit cd5ff993de30e9245ae85450ca8e8a451ba35f82 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Aug 20 11:37:58 2013 +0200 Use the osd-class for the fullscreen-widget Is present in most themes, because the OSDs are widespread in newer Gnome-apps, so we can get dark theming without the overhead of adding our own custom class/stylesheet src/parole-player.c |3 +++ 1 file changed, 3 insertions(+) diff --git a/src/parole-player.c b/src/parole-player.c index ab6f403..e3f7ba5 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -3015,6 +3015,7 @@ parole_player_init (ParolePlayer *player) gint w, h; gboolean showhide; GdkColor background; +GtkStyleContext *fullscreen_mode; gint volume; @@ -3367,6 +3368,8 @@ parole_player_init (ParolePlayer *player) gtk_window_set_opacity( GTK_WINDOW(player-priv-fs_window), 0.70 ); gtk_window_set_gravity (GTK_WINDOW (player-priv-fs_window), GDK_GRAVITY_SOUTH_WEST); gtk_window_set_position (GTK_WINDOW (player-priv-fs_window), GTK_WIN_POS_NONE); +fullscreen_mode = gtk_widget_get_style_context(GTK_WIDGET(player-priv-fs_window)); +gtk_style_context_add_class (fullscreen_mode, osd); parole_gst_set_default_aspect_ratio (player, builder); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Set icon-size back to 16px for crisper icons
Updating branch refs/heads/master to aeb88a608f158b5a8e6145ef1d5ffddd1a39f103 (commit) from 89453a6cce9ddbd50a960d15bc277ef2212ddac4 (commit) commit aeb88a608f158b5a8e6145ef1d5ffddd1a39f103 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Aug 21 18:17:55 2013 +0200 Set icon-size back to 16px for crisper icons data/interfaces/playlist.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/playlist.ui b/data/interfaces/playlist.ui index 1fa5466..7676d20 100644 --- a/data/interfaces/playlist.ui +++ b/data/interfaces/playlist.ui @@ -209,7 +209,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=show_arrowFalse/property -property name=icon_size2/property +property name=icon_size1/property style class name=inline-toolbar/ /style ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Improve 16px app-icon
Updating branch refs/heads/master to 8ab5d96b3a6b1449f1611003044e1cc1827fc410 (commit) from aeb88a608f158b5a8e6145ef1d5ffddd1a39f103 (commit) commit 8ab5d96b3a6b1449f1611003044e1cc1827fc410 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Aug 21 21:32:04 2013 +0200 Improve 16px app-icon data/icons/16x16/parole.png | Bin 682 - 500 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/icons/16x16/parole.png b/data/icons/16x16/parole.png index 05202ad..7337216 100644 Binary files a/data/icons/16x16/parole.png and b/data/icons/16x16/parole.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix build-error Forgot to remove more gtk-2.0 stuff
Updating branch refs/heads/master
to e7e93e678b6d07b99fb0dbb1004f0641889879fe (commit)
from ebf026d2bbc2cba656c581bf952567892fd61b72 (commit)
commit e7e93e678b6d07b99fb0dbb1004f0641889879fe
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Aug 21 11:33:10 2013 +0200
Fix build-error
Forgot to remove more gtk-2.0 stuff
configure.ac.in | 14 --
1 file changed, 14 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 6c640a8..94c1279 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -149,19 +149,6 @@ fi
XDT_CHECK_LIBX11()
-#===#
-# Gtkrc files#
-#===#
-if test x${prefix} = xNONE; then
- AC_DEFINE_UNQUOTED(GTKRC_DIR,
${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0, [gtkrc directory])
- gtkrcdir=${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0
-else
- AC_DEFINE_UNQUOTED(GTKRC_DIR, ${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0,
[pixmaps directory])
- gtkrcdir=${prefix}/${DATADIRNAME}/${PACKAGE}/gtk-2.0
-fi
-
-AC_SUBST(gtkrcdir)
-
# Taken from Gnome system tools
#===#
# Pixmaps files #
@@ -249,7 +236,6 @@ GTK_DOC_CHECK(1.9)
AC_OUTPUT([
Makefile
data/Makefile
-data/gtk-2.0/Makefile
data/pixmaps/Makefile
data/interfaces/Makefile
data/icons/Makefile
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Drop fullscreen-widget-name as we're using the osd-class in Gtk3 anyway
Updating branch refs/heads/master to e00256f810a195e6ce79dcce4e7a4c26d2083fa9 (commit) from f1f727cfa13fdc345f44353ecd0ef86d07f36509 (commit) commit e00256f810a195e6ce79dcce4e7a4c26d2083fa9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Aug 20 15:12:08 2013 +0200 Drop fullscreen-widget-name as we're using the osd-class in Gtk3 anyway src/parole-player.c |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index c3c2f2c..c3c2d4f 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -3352,9 +3352,8 @@ parole_player_init (ParolePlayer *player) shuffle); parole_media_list_set_shuffle_toggled(player-priv-list, shuffle); - + player-priv-fs_window = gtk_window_new (GTK_WINDOW_POPUP); -gtk_widget_set_name(GTK_WIDGET(player-priv-fs_window), ParoleFullscreen); gtk_window_set_opacity( GTK_WINDOW(player-priv-fs_window), 0.70 ); gtk_window_set_gravity (GTK_WINDOW (player-priv-fs_window), GDK_GRAVITY_SOUTH_WEST); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3
Updating branch refs/heads/master to 9e9ae122090074909f06920cef016b68ada90b20 (commit) from 8e4fb48b1bdce6f920d7db093163a402fa92fb81 (commit) commit 9e9ae122090074909f06920cef016b68ada90b20 Merge: 8e4fb48 520cd96 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Aug 22 01:30:26 2013 +0200 Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3 commit 520cd967196f6291bd5415830d49683bc64a1752 Author: Sean Davis smd.seanda...@gmail.com Date: Wed Aug 21 19:22:24 2013 -0400 More symbolics data/interfaces/parole.ui | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index b897553..567729b 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -35,7 +35,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_namemedia-cdrom/property +property name=icon_namemedia-optical-symbolic/property /object object class=GtkImage id=image2 property name=visibleTrue/property @@ -80,6 +80,12 @@ property name=pixel_size16/property property name=icon_nameparole-extension/property /object + object class=GtkImage id=image9 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixel_size16/property +property name=icon_namedocument-properties-symbolic/property + /object object class=GtkWindow id=main-window property name=can_focusFalse/property property name=title translatable=yesParole Media Player/property @@ -166,7 +172,6 @@ property name=labelgtk-quit/property property name=visibleTrue/property property name=can_focusFalse/property -property name=use_underlineTrue/property property name=use_stockTrue/property accelerator key=q signal=activate modifiers=GDK_CONTROL_MASK/ signal name=activate handler=parole_player_menu_exit_cb swapped=no/ @@ -221,11 +226,11 @@ /child child object class=GtkImageMenuItem id=preferences -property name=labelgtk-preferences/property +property name=labelPreferences/property property name=visibleTrue/property property name=can_focusFalse/property -property name=use_underlineTrue/property -property name=use_stockTrue/property +property name=imageimage9/property +property name=use_stockFalse/property signal name=activate handler=parole_player_open_preferences_cb swapped=no/ /object /child @@ -456,8 +461,8 @@ property name=use_underlineTrue/property property name=imageimage3/property property name=use_stockFalse/property -accelerator key=equal signal=activate/ accelerator key=plus signal=activate/ +accelerator key=equal signal=activate/ signal name=activate handler=parole_player_volume_up swapped=no/ /object /child ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Test new logo
Updating branch refs/heads/master to 416c64fbbf0534620de26effdab71525c515bcb9 (commit) from 7478b8ba62276915e07d49859369faf760f8d9b0 (commit) commit 416c64fbbf0534620de26effdab71525c515bcb9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Aug 21 12:26:59 2013 +0200 Test new logo data/pixmaps/parole.png | Bin 40546 - 4531 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/pixmaps/parole.png b/data/pixmaps/parole.png index bc7c2d4..2a92b74 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 Make a few more menuitems use symbolic icons
Updating branch refs/heads/master
to 8e4fb48b1bdce6f920d7db093163a402fa92fb81 (commit)
from 6717712c86eacb83296c8b979b7115b2a1f61882 (commit)
commit 8e4fb48b1bdce6f920d7db093163a402fa92fb81
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Thu Aug 22 01:28:05 2013 +0200
Make a few more menuitems use symbolic icons
src/parole-player.c | 35 ---
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 9b9064e..b12cc4e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2015,7 +2015,7 @@ void parole_player_leave_fs_cb (GtkButton *button,
ParolePlayer *player)
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
-GtkWidget *menu, *mi;
+GtkWidget *menu, *mi, *icon;
gboolean sensitive;
player-priv-current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player-priv-gst));
@@ -2024,9 +2024,10 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*Play menu item
*/
-mi = gtk_image_menu_item_new_from_stock (player-priv-state ==
PAROLE_STATE_PLAYING
-? GTK_STOCK_MEDIA_PAUSE :
GTK_STOCK_MEDIA_PLAY,
-NULL);
+mi = gtk_image_menu_item_new_with_mnemonic (player-priv-state ==
PAROLE_STATE_PLAYING ? _(_Pause):_(_Play));
+icon = gtk_image_new_from_icon_name (player-priv-state ==
PAROLE_STATE_PLAYING ?
media-playback-pause-symbolic:media-playback-start-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
+
g_object_get (G_OBJECT (player-priv-play_pause),
sensitive, sensitive,
@@ -2039,10 +2040,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Previous item in playlist.
+ * Next item in playlist.
*/
-mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_NEXT, NULL);
-
+mi = gtk_image_menu_item_new_with_mnemonic (_(_Next));
+icon = gtk_image_new_from_icon_name (media-skip-forward-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player-priv-state =
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, activate,
@@ -2050,10 +2052,11 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/*
- * Next item in playlist.
+ * Previous item in playlist.
*/
-mi = gtk_image_menu_item_new_from_stock (GTK_STOCK_MEDIA_PREVIOUS, NULL);
-
+mi = gtk_image_menu_item_new_with_mnemonic (_(_Previous));
+icon = gtk_image_new_from_icon_name (media-skip-backward-symbolic,
GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_set_sensitive (mi, (player-priv-state =
PAROLE_STATE_PAUSED));
gtk_widget_show (mi);
g_signal_connect (mi, activate,
@@ -2063,8 +2066,9 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
/*
* Un/Full screen
*/
-mi = gtk_image_menu_item_new_from_stock (player-priv-full_screen ?
GTK_STOCK_LEAVE_FULLSCREEN:
-GTK_STOCK_FULLSCREEN, NULL);
+mi = gtk_image_menu_item_new_with_mnemonic (player-priv-full_screen ?
_(_Leave Fullscreen):_(_Fullscreen));
+icon = gtk_image_new_from_icon_name (player-priv-full_screen ?
view-restore-symbolic:view-fullscreen-symbolic, GTK_ICON_SIZE_MENU);
+gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM(mi), GTK_WIDGET(icon));
gtk_widget_show (mi);
g_signal_connect_swapped (mi, activate,
G_CALLBACK
(parole_player_full_screen_menu_item_activate), player);
@@ -2906,7 +2910,7 @@ parole_player_setup_multimedia_keys (ParolePlayer *player)
static void
parole_player_init (ParolePlayer *player)
{
-GtkWidget *output;
+GtkWidget *output, *icon;
GtkBuilder *builder;
GdkScreen *screen;
gint w, h;
@@ -3060,8 +3064,9 @@ parole_player_init (ParolePlayer *player)
gtk_menu_shell_append(GTK_MENU_SHELL(player-priv-recent_menu),
recent_separator);
/* Clear Recent Menu Item */
-clear_recent = gtk_image_menu_item_new_from_stock(GTK_STOCK_CLEAR, NULL);
-gtk_menu_item_set_label (GTK_MENU_ITEM(clear_recent), _(Clear recent
items...));
+clear_recent = gtk_image_menu_item_new_with_mnemonic (_(_Clear recent
items...));
+icon = gtk_image_new_from_icon_name (edit-clear-symbolic
[Xfce4-commits] parole:master Improve parole-logo
Updating branch refs/heads/master to 89453a6cce9ddbd50a960d15bc277ef2212ddac4 (commit) from 757525ea245d009e685218c2f80535f486fb942d (commit) commit 89453a6cce9ddbd50a960d15bc277ef2212ddac4 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Aug 21 18:10:58 2013 +0200 Improve parole-logo data/pixmaps/parole.png | Bin 4531 - 5622 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/pixmaps/parole.png b/data/pixmaps/parole.png index 2a92b74..b6fb8cc 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 More symbolic icon fixes for the media-menu
Updating branch refs/heads/master to 428a3218bb322d09cc1e06796a0956a9b4c454b8 (commit) from d0d209f31fc81971bc2c49368ad96619b06f9165 (commit) commit 428a3218bb322d09cc1e06796a0956a9b4c454b8 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Aug 22 02:18:22 2013 +0200 More symbolic icon fixes for the media-menu data/interfaces/parole.ui | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 567729b..250f17f 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -7,6 +7,12 @@ property name=pixel_size24/property property name=icon_nameview-fullscreen-symbolic/property /object + object class=GtkImage id=image_quit +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixel_size16/property +property name=icon_namesystem-shutdown-symbolic/property + /object object class=GtkImage id=image_media_next property name=visibleTrue/property property name=can_focusFalse/property @@ -41,7 +47,7 @@ property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_namenetwork-server-symbolic/property +property name=icon_namefolder-remote-symbolic/property property name=icon-size1/property /object object class=GtkImage id=image3 @@ -172,7 +178,8 @@ property name=labelgtk-quit/property property name=visibleTrue/property property name=can_focusFalse/property -property name=use_stockTrue/property +property name=use_stockFalse/property +property name=imageimage_quit/property accelerator key=q signal=activate modifiers=GDK_CONTROL_MASK/ signal name=activate handler=parole_player_menu_exit_cb swapped=no/ /object ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Disable scrollbars in logo-area
Updating branch refs/heads/master to ebf026d2bbc2cba656c581bf952567892fd61b72 (commit) from 0379f945b101376530b57fc782ba8bc6cf5721bc (commit) commit ebf026d2bbc2cba656c581bf952567892fd61b72 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Aug 21 10:47:24 2013 +0200 Disable scrollbars in logo-area data/interfaces/parole.ui |2 ++ 1 file changed, 2 insertions(+) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index c9c97ef..8658cde 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -659,6 +659,8 @@ object class=GtkScrolledWindow id=logo_window property name=visibleTrue/property property name=can_focusFalse/property +property name=hscrollbar_policynever/property +property name=vscrollbar_policynever/property child object class=GtkViewport id=viewport1 property name=visibleTrue/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Improve 32px app-icon
Updating branch refs/heads/master to 99321f39ffe24c137e22d9457665456d76a25402 (commit) from 9e9ae122090074909f06920cef016b68ada90b20 (commit) commit 99321f39ffe24c137e22d9457665456d76a25402 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Thu Aug 22 01:31:00 2013 +0200 Improve 32px app-icon data/icons/32x32/parole.png | Bin 1257 - 1171 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/icons/32x32/parole.png b/data/icons/32x32/parole.png index bcbb91b..f60a5db 100644 Binary files a/data/icons/32x32/parole.png and b/data/icons/32x32/parole.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3
Updating branch refs/heads/master to 66c981627a7ba288fd9a8a07d15a00b0d4bad694 (commit) from 989232e92255ebb86ac32e6ea60e9ac60f2f8668 (commit) commit 66c981627a7ba288fd9a8a07d15a00b0d4bad694 Merge: 989232e 7cc8fd3 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Aug 25 22:22:55 2013 +0200 Merge branch 'bluesabre/gtk3' of ssh://git.xfce.org/apps/parole into bluesabre/gtk3 commit 7cc8fd3a03d89062fc3afac461af6aa78b9699bf Author: Sean Davis smd.seanda...@gmail.com Date: Sun Aug 25 16:17:38 2013 -0400 Use symbolics in parole.desktop (for use with plank) data/desktop/desktop.sh |6 +++--- data/desktop/parole.desktop.in.in |6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/desktop/desktop.sh b/data/desktop/desktop.sh index 9a1b9b0..8ccc56a 100755 --- a/data/desktop/desktop.sh +++ b/data/desktop/desktop.sh @@ -17,18 +17,18 @@ echo echo [Desktop Action Play] echo Exec=parole --play echo _Name=Play/Pause -echo Icon=media-playback-start +echo Icon=media-playback-start-symbolic echo OnlyShowIn=Unity; echo echo [Desktop Action Previous] echo Exec=parole --previous-track echo _Name=Previous Track -echo Icon=media-skip-backward +echo Icon=media-skip-backward-symbolic echo OnlyShowIn=Unity; echo echo [Desktop Action Next] echo Exec=parole --next-track echo _Name=Next Track -echo Icon=media-skip-forward +echo Icon=media-skip-forward-symbolic echo OnlyShowIn=Unity; echo \ No newline at end of file diff --git a/data/desktop/parole.desktop.in.in b/data/desktop/parole.desktop.in.in index a5d70e3..d0bd629 100644 --- a/data/desktop/parole.desktop.in.in +++ b/data/desktop/parole.desktop.in.in @@ -13,17 +13,17 @@ Actions=Play;Previous;Next; [Desktop Action Play] Exec=parole --play _Name=Play/Pause -Icon=media-playback-start +Icon=media-playback-start-symbolic OnlyShowIn=Unity; [Desktop Action Previous] Exec=parole --previous-track _Name=Previous Track -Icon=media-skip-backward +Icon=media-skip-backward-symbolic OnlyShowIn=Unity; [Desktop Action Next] Exec=parole --next-track _Name=Next Track -Icon=media-skip-forward +Icon=media-skip-forward-symbolic OnlyShowIn=Unity; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Bump icon-size of scalable to 64px
Updating branch refs/heads/master to 989232e92255ebb86ac32e6ea60e9ac60f2f8668 (commit) from a7b166bb88b51cd4f05fb2b5d9ecfca184d27a2d (commit) commit 989232e92255ebb86ac32e6ea60e9ac60f2f8668 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Aug 25 22:22:44 2013 +0200 Bump icon-size of scalable to 64px data/icons/scalable/parole.svg | 174 1 file changed, 88 insertions(+), 86 deletions(-) diff --git a/data/icons/scalable/parole.svg b/data/icons/scalable/parole.svg index 062ba96..61158ce 100644 --- a/data/icons/scalable/parole.svg +++ b/data/icons/scalable/parole.svg @@ -10,12 +10,12 @@ xmlns:xlink=http://www.w3.org/1999/xlink; xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - width=48px - height=48px + width=64 + height=64 id=svg4405 version=1.1 inkscape:version=0.48.4 r9939 - sodipodi:docname=parole-new.svg + sodipodi:docname=parole-64.svg defs id=defs4407 linearGradient @@ -671,7 +671,7 @@ xlink:href=#linearGradient3924-803 id=linearGradient3150 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,0.24324325,1.17e-5,33.162164) + gradientTransform=matrix(1.4864865,0,0,0.35135136,-3.6756703,27.567571) x1=23.9 y1=8.4357691 x2=23.9 @@ -681,7 +681,7 @@ xlink:href=#linearGradient3924-803 id=linearGradient3157 gradientUnits=userSpaceOnUse - gradientTransform=translate(1.17e-5,1.1) + gradientTransform=matrix(1.4864865,0,0,1.1621622,-3.6756704,-17.89188) x1=23.9 y1=4.89 x2=23.9 @@ -691,7 +691,7 @@ xlink:href=#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-641 id=radialGradient3162 gradientUnits=userSpaceOnUse - gradientTransform=matrix(0,2.3179275,-2.4722567,-8.5237477e-8,44.890112,-11.471154) + gradientTransform=matrix(0,3.3941081,-3.6132983,-1.2481202e-7,62.531692,-37.350618) cx=7.4956832 cy=8.4497671 fx=7.4956832 @@ -702,7 +702,7 @@ xlink:href=#linearGradient3707-319-631-407-324-616 id=linearGradient3164 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,0.69230769,9.2e-6,2.384616) + gradientTransform=matrix(1.4615385,0,0,1.0137363,-3.0769217,-17.061813) x1=24 y1=44 x2=24 @@ -712,7 +712,7 @@ xlink:href=#linearGradient3600 id=linearGradient3167 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,0.84615385,0,6.8461538) + gradientTransform=matrix(1.4615385,0,0,1.1538462,-3.0769351,-7.8461555) x1=32.455086 y1=32.134663 x2=32.455086 @@ -722,7 +722,7 @@ xlink:href=#linearGradient3104 id=linearGradient3169 gradientUnits=userSpaceOnUse - gradientTransform=matrix(1,0,0,0.84615385,0,6.8461538) + gradientTransform=matrix(1.4615385,0,0,1.1538462,-3.0769351,-7.8461555) x1=13.96882 y1=43.669865 x2=13.96882 @@ -736,14 +736,14 @@ inkscape:pageopacity=0.0 inkscape:pageshadow=2 inkscape:zoom=7 - inkscape:cx=5.7188271 - inkscape:cy=19.310735 + inkscape:cx=22.234484 + inkscape:cy=35.473176 inkscape:current-layer=layer1 showgrid=true inkscape:grid-bbox=true inkscape:document-units=px - inkscape:window-width=1280 - inkscape:window-height=751 + inkscape:window-width=1920 + inkscape:window-height=1151 inkscape:window-x=0 inkscape:window-y=25 inkscape:window-maximized=1 @@ -752,7 +752,11 @@ inkscape:guide-bbox=true inkscape:grid type=xygrid - id=grid4022 / + id=grid4022 + empspacing=5 + visible=true + enabled=true + snapvisiblegridlinesonly=true / /sodipodi:namedview metadata id=metadata4410 @@ -762,16 +766,17 @@ dc:formatimage/svg+xml/dc:format dc:type rdf:resource=http://purl.org/dc/dcmitype/StillImage; / -dc:title / +dc:title/dc:title /cc:Work /rdf:RDF /metadata g id=layer1 inkscape:label=Layer 1 - inkscape:groupmode=layer + inkscape:groupmode=layer + transform=translate(0,16) g - transform=matrix(1.1578952,0,0,0.57142859,-3.789476,19.142856) + transform=matrix(1.6315789,0,0,0.5904762,-7.1578945,18.247618) id=g3712-0 style=opacity:0.4 rect @@ -798,113 +803,110 @@ style=fill:url(#linearGradient4395);fill-opacity:1;stroke:none / /g path - style=color:#00;fill:url(#linearGradient3167);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3169);stroke-width:0.9994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none
[Xfce4-commits] parole:master Add some minimal cairo-drawing to the GtkOverlay Mainly to illustrate spacing problems and help test/fix them
Updating branch refs/heads/master
to e55884cbfff3c2bc36e1b8d58b4ff87da4fc83fa (commit)
from 97c2d23589e6b3f916107c7c8a9ddf056fab8f44 (commit)
commit e55884cbfff3c2bc36e1b8d58b4ff87da4fc83fa
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Sep 3 11:11:38 2013 +0200
Add some minimal cairo-drawing to the GtkOverlay
Mainly to illustrate spacing problems and help test/fix them
src/parole-player.c | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 9782544..7d087f1 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -108,7 +108,9 @@ static void parole_player_disc_selected_cb
(ParoleDisc *disc,
ParolePlayer *player);
static void parole_player_select_custom_subtitle(GtkMenuItem *widget,
gpointer data);
-
+
+static gboolean parole_overlay_expose_event(GtkWidget *widget, cairo_t
*cr, gpointer user_data);
+
static gboolean parole_audiobox_expose_event(GtkWidget *w,
GdkEventExpose *ev, ParolePlayer *player);
/*
@@ -2670,6 +2672,18 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer
*player)
}
static gboolean
+parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer
user_data)
+{
+GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+/* Draw a simple rectangular border around the GtkOverlay */
+gtk_widget_get_allocation(widget, allocation);
+cairo_rectangle (cr, 0, 0, allocation-width, allocation-height);
+cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
+cairo_stroke (cr);
+return FALSE;
+}
+
+static gboolean
parole_audiobox_expose_event (GtkWidget *w, GdkEventExpose *ev, ParolePlayer
*player)
{
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
@@ -3153,7 +3167,7 @@ parole_player_init (ParolePlayer *player)
/* Show/Hide Playlist button */
player-priv-show_hide_playlist_button = GTK_WIDGET
(gtk_builder_get_object (builder, media_toggleplaylist));
/* End Media Controls */
-
+g_signal_connect(player-priv-control, draw,
G_CALLBACK(parole_overlay_expose_event), NULL);
/* Info Bar */
/* placeholder widget */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Improve 24 and 48px version of appicon
Updating branch refs/heads/master to c2f47b715a6f8aafd65db4a66e3a417ac576ffa3 (commit) from 66c981627a7ba288fd9a8a07d15a00b0d4bad694 (commit) commit c2f47b715a6f8aafd65db4a66e3a417ac576ffa3 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Aug 25 23:01:41 2013 +0200 Improve 24 and 48px version of appicon data/icons/24x24/parole.png | Bin 918 - 656 bytes data/icons/48x48/parole.png | Bin 1806 - 1858 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/data/icons/24x24/parole.png b/data/icons/24x24/parole.png index 81d017f..357b186 100644 Binary files a/data/icons/24x24/parole.png and b/data/icons/24x24/parole.png differ diff --git a/data/icons/48x48/parole.png b/data/icons/48x48/parole.png index 9438bd7..5b20b5f 100644 Binary files a/data/icons/48x48/parole.png and b/data/icons/48x48/parole.png differ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Small layout tweaks to account for the marks on the scales
Updating branch refs/heads/master to ce6db476014edc3bbe7f92bf0e3ef121c919fc23 (commit) from 278101c8baad399ee572bcd96cd9d89a2ee9096e (commit) commit ce6db476014edc3bbe7f92bf0e3ef121c919fc23 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Sep 3 15:38:34 2013 +0200 Small layout tweaks to account for the marks on the scales data/interfaces/parole-settings.ui |6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui index 4cfb709..2ef0cd8 100644 --- a/data/interfaces/parole-settings.ui +++ b/data/interfaces/parole-settings.ui @@ -331,12 +331,13 @@ object class=GtkGrid id=grid1 property name=visibleTrue/property property name=can_focusFalse/property -property name=row_spacing3/property +property name=row_spacing6/property property name=column_spacing6/property child object class=GtkLabel id=label9 property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesBrightness:/property /object packing @@ -350,6 +351,7 @@ object class=GtkLabel id=label10 property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesContrast:/property /object packing @@ -363,6 +365,7 @@ object class=GtkLabel id=label11 property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesHue:/property /object packing @@ -376,6 +379,7 @@ object class=GtkLabel id=label12 property name=visibleTrue/property property name=can_focusFalse/property +property name=xalign1/property property name=label translatable=yesSaturation:/property /object packing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add marks to display-manipulation scales to make resetting to 0 easier
Updating branch refs/heads/master to 278101c8baad399ee572bcd96cd9d89a2ee9096e (commit) from 133a53a86c4d18e86e7fc0eda68b6f90f132e4f0 (commit) commit 278101c8baad399ee572bcd96cd9d89a2ee9096e Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Sep 3 15:09:09 2013 +0200 Add marks to display-manipulation scales to make resetting to 0 easier src/parole-conf-dialog.c |4 1 file changed, 4 insertions(+) diff --git a/src/parole-conf-dialog.c b/src/parole-conf-dialog.c index 3fa5212..ed0741b 100644 --- a/src/parole-conf-dialog.c +++ b/src/parole-conf-dialog.c @@ -589,6 +589,10 @@ void parole_conf_dialog_open (ParoleConfDialog *self, GtkWidget *parent) gtk_range_set_range (GTK_RANGE (self-priv-contrast), -1000, 1000); gtk_range_set_range (GTK_RANGE (self-priv-saturation), -1000, 1000); gtk_range_set_range (GTK_RANGE (self-priv-hue), -1000, 1000); +gtk_scale_add_mark (GTK_SCALE (self-priv-brightness), 0, GTK_POS_BOTTOM, NULL); +gtk_scale_add_mark (GTK_SCALE (self-priv-contrast), 0, GTK_POS_BOTTOM, NULL); +gtk_scale_add_mark (GTK_SCALE (self-priv-saturation), 0, GTK_POS_BOTTOM, NULL); +gtk_scale_add_mark (GTK_SCALE (self-priv-hue), 0, GTK_POS_BOTTOM, NULL); g_object_get (G_OBJECT (self-priv-conf), brightness, brightness_value, ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Drop border on xfcetitleddialog in Preferences
Updating branch refs/heads/master to 97c2d23589e6b3f916107c7c8a9ddf056fab8f44 (commit) from 44bc193a56da8fd75fc312df4cbf4571b996da6d (commit) commit 97c2d23589e6b3f916107c7c8a9ddf056fab8f44 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Sep 3 09:29:57 2013 +0200 Drop border on xfcetitleddialog in Preferences data/interfaces/parole-settings.ui |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/interfaces/parole-settings.ui b/data/interfaces/parole-settings.ui index 89f790c..ec77e7c 100644 --- a/data/interfaces/parole-settings.ui +++ b/data/interfaces/parole-settings.ui @@ -15,7 +15,7 @@ /object object class=XfceTitledDialog id=settings-dialog property name=can_focusFalse/property -property name=border_width5/property +property name=border_width0/property property name=title translatable=yesParole Settings/property property name=modalTrue/property property name=icon_nameparole/property ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Remove/clear auto-saved-playlist file upon using the clear-playlist button
Updating branch refs/heads/master
to 8cb12d45f65f64ee68991b23907114e9d9372db7 (commit)
from 071acfe9893612c7a498029993e311fa358b61c5 (commit)
commit 8cb12d45f65f64ee68991b23907114e9d9372db7
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Sep 21 09:57:12 2013 +0200
Remove/clear auto-saved-playlist file upon using the clear-playlist button
src/parole-medialist.c |8
1 file changed, 8 insertions(+)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index f309d47..618d2f8 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -572,7 +572,15 @@ parole_media_list_add_clicked_cb (GtkButton *button,
ParoleMediaList *list)
void
parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
{
+gchar *playlist_filename;
+GFile *playlist_file;
parole_media_list_clear_list (list);
+playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+
PAROLE_AUTO_SAVED_PLAYLIST,
+ FALSE);
+playlist_file = g_file_new_for_path(playlist_filename);
+g_file_delete(playlist_file, NULL, NULL);
+g_free(playlist_filename);
}
/**
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add symbolic menu-icon for Parole plugins
Updating branch refs/heads/master to 8c5dc571db71c194941a553da72314e6c532b807 (commit) from 98281fce85445656b1a03e093b968eda1394faa9 (commit) commit 8c5dc571db71c194941a553da72314e6c532b807 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Aug 25 21:32:07 2013 +0200 Add symbolic menu-icon for Parole plugins data/icons/16x16/parole-extension-symbolic.svg | 136 1 file changed, 136 insertions(+) diff --git a/data/icons/16x16/parole-extension-symbolic.svg b/data/icons/16x16/parole-extension-symbolic.svg new file mode 100644 index 000..64de67c --- /dev/null +++ b/data/icons/16x16/parole-extension-symbolic.svg @@ -0,0 +1,136 @@ +?xml version=1.0 encoding=UTF-8 standalone=no? +!-- Created with Inkscape (http://www.inkscape.org/) -- + +svg + xmlns:dc=http://purl.org/dc/elements/1.1/; + xmlns:cc=http://creativecommons.org/ns#; + xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; + xmlns:svg=http://www.w3.org/2000/svg; + xmlns=http://www.w3.org/2000/svg; + xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; + xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; + version=1.0 + width=16 + height=16 + id=svg3783 + sodipodi:version=0.32 + inkscape:version=0.48.4 r9939 + sodipodi:docname=libpeas-plugin.svg + inkscape:output_extension=org.inkscape.output.svg.inkscape + metadata + id=metadata43 +rdf:RDF + cc:Work + rdf:about= +dc:formatimage/svg+xml/dc:format +dc:type + rdf:resource=http://purl.org/dc/dcmitype/StillImage; / +dc:title/dc:title + /cc:Work +/rdf:RDF + /metadata + sodipodi:namedview + inkscape:window-height=789 + inkscape:window-width=1280 + inkscape:pageshadow=2 + inkscape:pageopacity=0.0 + guidetolerance=10.0 + gridtolerance=10.0 + objecttolerance=10.0 + borderopacity=1.0 + bordercolor=#66 + pagecolor=#ff + id=base + showgrid=true + inkscape:zoom=14.672466 + inkscape:cx=-1.2039169 + inkscape:cy=5.8880948 + inkscape:window-x=0 + inkscape:window-y=25 + inkscape:current-layer=svg3783 + inkscape:window-maximized=0 +inkscape:grid + type=xygrid + id=grid3037 + empspacing=5 + visible=true + enabled=true + snapvisiblegridlinesonly=true / + /sodipodi:namedview + defs + id=defs3785 +linearGradient + id=linearGradient3702 + stop + id=stop3704 + style=stop-color:#00;stop-opacity:0 + offset=0 / + stop + id=stop3710 + style=stop-color:#00;stop-opacity:1 + offset=0.5 / + stop + id=stop3706 + style=stop-color:#00;stop-opacity:0 + offset=1 / +/linearGradient +linearGradient + id=linearGradient3688 + stop + id=stop3690 + style=stop-color:#00;stop-opacity:1 + offset=0 / + stop + id=stop3692 + style=stop-color:#00;stop-opacity:0 + offset=1 / +/linearGradient +linearGradient + id=linearGradient2490 + stop + id=stop2492 + style=stop-color:#455f0e;stop-opacity:1 + offset=0 / + stop + id=stop2494 + style=stop-color:#84a718;stop-opacity:1 + offset=1 / +/linearGradient +linearGradient + id=linearGradient3242 + stop + id=stop3244 + style=stop-color:#eef87e;stop-opacity:1 + offset=0 / + stop + id=stop3246 + style=stop-color:#cde34f;stop-opacity:1 + offset=0.26238 / + stop + id=stop3248 + style=stop-color:#93b723;stop-opacity:1 + offset=0.66093999 / + stop + id=stop3250 + style=stop-color:#5a7e0d;stop-opacity:1 + offset=1 / +/linearGradient +linearGradient + id=linearGradient4222 + stop + id=stop4224 + style=stop-color:#ff;stop-opacity:1 + offset=0 / + stop + id=stop4226 + style=stop-color:#ff;stop-opacity:0 + offset=1 / +/linearGradient + /defs + path + style=font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#00;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.0012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans + d=M 6.5,0 C 5.8744713,0 5.278362,0.22816067 4.8125,0.625 4.346638,1.0218393 4,1.6177 4,2.28125 4,3.0575395 4.5024904,3.60552 5,4 l 0,0.0625 -3.71875,0 C 0.57553015,4.0625 0,4.6380301 0,5.34375 L 0,8.6875 C
[Xfce4-commits] parole:master Drop gstreamer colorkey as Cairo keeps GtkOverlay on top of Video FIXME: Use theme-colors to draw instead of hardcoded white and black
Updating branch refs/heads/master
to 703503a83226f4dc9c43c0286faabcf7db9fea30 (commit)
from ce6db476014edc3bbe7f92bf0e3ef121c919fc23 (commit)
commit 703503a83226f4dc9c43c0286faabcf7db9fea30
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Sep 4 18:06:52 2013 +0200
Drop gstreamer colorkey as Cairo keeps GtkOverlay on top of Video
FIXME: Use theme-colors to draw instead of hardcoded white and black
src/gst/parole-gst.c | 36
src/parole-player.c | 15 ++-
2 files changed, 10 insertions(+), 41 deletions(-)
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index f43a10c..ec7d9d7 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -466,12 +466,6 @@ static void
parole_gst_set_video_overlay (ParoleGst *gst)
{
GstElement *video_sink;
-//GtkWidget *label;
-//GtkStyleContext *context;
-//GdkRGBA *rgba;
-//gchar *converting_value, *hex_value;
-//gint hex_int;
-//char *endptr;
g_object_get (G_OBJECT (gst-priv-playbin),
video-sink, video_sink,
@@ -487,36 +481,6 @@ parole_gst_set_video_overlay (ParoleGst *gst)
gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (video_sink),
GDK_WINDOW_XID ( gtk_widget_get_window(GTK_WIDGET
(gst)) ));
#endif
-/* The below code is an attempt to dynamically support theming on the
controls.
-label = GTK_WIDGET(gtk_label_new());
-context = gtk_widget_get_style_context(GTK_WIDGET(label));
-gtk_style_context_add_class (context, osd);
-gtk_style_context_get(context, GTK_STATE_FLAG_NORMAL,
-GTK_STYLE_PROPERTY_BACKGROUND_COLOR, rgba, NULL);
-
-hex_value = g_strdup();
-converting_value = g_strdup_printf(%X, (int)(rgba-red * 255.0));
-if ((int)strlen(converting_value) == 1)
-hex_value = g_strjoin(, hex_value, 0, NULL);
-hex_value = g_strjoin(, hex_value, converting_value, NULL);
-
-converting_value = g_strdup_printf(%X, (int)(rgba-green * 255.0));
-if ((int)strlen(converting_value) == 1)
-hex_value = g_strjoin(, hex_value, 0, NULL);
-hex_value = g_strjoin(, hex_value, converting_value, NULL);
-
-converting_value = g_strdup_printf(%X, (int)(rgba-blue * 255.0));
-if ((int)strlen(converting_value) == 1)
-hex_value = g_strjoin(, hex_value, 0, NULL);
-hex_value = g_strjoin(, hex_value, converting_value, NULL);
-
-hex_int = (int)strtol(hex_value, endptr, 16);
-
-g_object_set(video_sink, autopaint-colorkey, FALSE,
- colorkey, hex_int, NULL);
-*/
-g_object_set(video_sink, autopaint-colorkey, FALSE,
- colorkey, 0x080810, NULL);
gst_object_unref (video_sink);
}
diff --git a/src/parole-player.c b/src/parole-player.c
index 7d087f1..658e80f 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2675,9 +2675,18 @@ static gboolean
parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer
user_data)
{
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
+/* FIXME: Get the theme-color and use that to draw the overlay
+GtkStyleContext *context;
+GdkRGBA acolor;
+context = gtk_widget_get_style_context(GTK_WIDGET(widget));
+gtk_style_context_get_background_color (context, GTK_STATE_NORMAL,
acolor);
+gdk_cairo_set_source_rgba (cr, acolor); */
+
/* Draw a simple rectangular border around the GtkOverlay */
gtk_widget_get_allocation(widget, allocation);
+cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
cairo_rectangle (cr, 0, 0, allocation-width, allocation-height);
+cairo_fill_preserve (cr);
cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
cairo_stroke (cr);
return FALSE;
@@ -3130,12 +3139,8 @@ parole_player_init (ParolePlayer *player)
gtk_widget_set_margin_bottom(tmp_box, 10);
gtk_widget_set_margin_top(tmp_box, 10);
gtk_widget_set_valign(tmp_box, GTK_ALIGN_END);
-controls_style = gtk_widget_get_style_context(GTK_WIDGET(tmp_box));
-//gtk_style_context_add_class (controls_style, osd);
-gdk_color_parse(#080810, background);
+controls_style =
gtk_widget_get_style_context(GTK_WIDGET(controls_overlay));
gtk_style_context_add_class (controls_style, osd);
-//gtk_widget_modify_bg(GTK_WIDGET(tmp_box), GTK_STATE_NORMAL, background);
-gtk_widget_modify_bg(GTK_WIDGET(controls_overlay), GTK_STATE_NORMAL,
background);
gtk_widget_reparent(GTK_WIDGET(player-priv-control), tmp_box);
gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), tmp_box);
gtk_box_set_child_packing( GTK_BOX(player-priv-control),
GTK_WIDGET(player-priv-play_box), TRUE, TRUE, 2, GTK_PACK_START );
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Change bug-reporting URL to http://docs.xfce.org/apps/parole/bugs
Updating branch refs/heads/master
to ce2d71b625142f5b161a711ad98368c6e089e764 (commit)
from 87aec01f5e087534257f77f02670da9ea50e4f52 (commit)
commit ce2d71b625142f5b161a711ad98368c6e089e764
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Sep 11 15:23:56 2013 +0200
Change bug-reporting URL to http://docs.xfce.org/apps/parole/bugs
src/parole-player.c |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index 602f16d..f3908c4 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2569,7 +2569,7 @@ static void
on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
{
GtkWidget *dialog;
-if (!gtk_show_uri(NULL,
https://bugzilla.xfce.org/enter_bug.cgi?product=Parole;, GDK_CURRENT_TIME,
NULL))
+if (!gtk_show_uri(NULL, http://docs.xfce.org/apps/parole/bugs;,
GDK_CURRENT_TIME, NULL))
{
dialog = gtk_message_dialog_new(GTK_WINDOW(player-priv-window),
GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -2577,7 +2577,7 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer *player)
GTK_BUTTONS_CLOSE,
_(Unable to open default web
browser));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
-_(https://bugzilla.xfce.org/enter_bug.cgi?product=Parole to
report your bug.));
+_(Please go to http://docs.xfce.org/apps/parole/bugs to
report your bug.));
gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Use theme-colors to draw the overlay background and border Add 3px padding (=border-width) to the play-box
Updating branch refs/heads/master
to 3c4f9f5d6b46149931311d5e19df6de831d0fbc6 (commit)
from f258ca80b8a990a8d8830faad05a265280570846 (commit)
commit 3c4f9f5d6b46149931311d5e19df6de831d0fbc6
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Tue Sep 10 17:34:46 2013 +0200
Use theme-colors to draw the overlay background and border
Add 3px padding (=border-width) to the play-box
src/parole-player.c | 30 --
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index e537275..09a9a62 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2583,24 +2583,35 @@ on_bug_report_clicked (GtkWidget *w, ParolePlayer
*player)
}
}
+/**
+ *
+ * Draw a simple rectangular GtkOverlay
+ * using the theme's background and border-color
+ * to keep it on top of the gst-video-widget with Gtk3.8 and above
+ *
+ * NOTE: Transparency is not supported, so there's also no fadeout.
+ **/
static gboolean
parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer
user_data)
{
GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
-/* FIXME: Get the theme-color and use that to draw the overlay
GtkStyleContext *context;
GdkRGBA acolor;
-context = gtk_widget_get_style_context(GTK_WIDGET(widget));
-gtk_style_context_get_background_color (context, GTK_STATE_NORMAL,
acolor);
-gdk_cairo_set_source_rgba (cr, acolor); */
-/* Draw a simple rectangular border around the GtkOverlay */
gtk_widget_get_allocation(widget, allocation);
-cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0);
cairo_rectangle (cr, 0, 0, allocation-width, allocation-height);
+
+context = gtk_widget_get_style_context(GTK_WIDGET(widget));
+gtk_style_context_add_class (context, background);
+gtk_style_context_add_class (context, osd);
+gtk_style_context_get_background_color (context, GTK_STATE_NORMAL,
acolor);
+gdk_cairo_set_source_rgba (cr, acolor);
cairo_fill_preserve (cr);
-cairo_set_source_rgba (cr, 0.95, 0.95, 0.95, 0.3);
+
+gtk_style_context_get_border_color (context, GTK_STATE_NORMAL, acolor);
+gdk_cairo_set_source_rgba (cr, acolor);
cairo_stroke (cr);
+
return FALSE;
}
@@ -2808,7 +2819,6 @@ parole_player_init (ParolePlayer *player)
GtkWidget *controls_overlay, *tmp_box;
GtkWidget *controls_parent;
-GtkStyleContext *controls_style;
GtkWidget *action_widget;
@@ -3117,8 +3127,7 @@ parole_player_init (ParolePlayer *player)
gtk_widget_set_margin_bottom(tmp_box, 10);
gtk_widget_set_margin_top(tmp_box, 10);
gtk_widget_set_valign(tmp_box, GTK_ALIGN_END);
-controls_style =
gtk_widget_get_style_context(GTK_WIDGET(controls_overlay));
-gtk_style_context_add_class (controls_style, osd);
+
#if GTK_CHECK_VERSION(3,8,0)
#else
gdk_color_parse(#080810, background);
@@ -3127,6 +3136,7 @@ parole_player_init (ParolePlayer *player)
gtk_widget_reparent(GTK_WIDGET(player-priv-control), tmp_box);
gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), tmp_box);
gtk_box_set_child_packing( GTK_BOX(player-priv-control),
GTK_WIDGET(player-priv-play_box), TRUE, TRUE, 2, GTK_PACK_START );
+gtk_container_set_border_width(GTK_CONTAINER(player-priv-play_box), 3);
gtk_widget_show_all(controls_parent);
/* Previous, Play/Pause, Next */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add option to hide the menubar to the context-menu
Updating branch refs/heads/master
to d7594d0c7bd9cf706e36b8beb9055ded57e020a0 (commit)
from 080c0cc842363c01880d8ebc91be73ceb6ff1cd5 (commit)
commit d7594d0c7bd9cf706e36b8beb9055ded57e020a0
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Sep 16 22:24:28 2013 +0200
Add option to hide the menubar to the context-menu
src/parole-player.c | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index d6f70bc..f2c21f2 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -153,7 +153,7 @@ voidparole_player_toggle_playlist_action_cb
(GtkAction *action,
voidparole_player_fullscreen_action_cb (GtkAction *action,
ParolePlayer *player);
-
+
voidparole_player_seekf_cb (GtkWidget *widget,
ParolePlayer *player,
gdouble seek);
@@ -2003,6 +2003,11 @@ void parole_player_fullscreen_action_cb (GtkAction
*action, ParolePlayer *player
parole_player_full_screen (player, !player-priv-full_screen);
}
+void parole_player_hide_menubar_cb (GtkWidget *widget, ParolePlayer *player)
+{
+gtk_widget_set_visible(player-priv-menu_bar,
!gtk_widget_get_visible(player-priv-menu_bar));
+}
+
static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
@@ -2035,6 +2040,16 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
mi = gtk_action_create_menu_item(player-priv-media_fullscreen_action);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+/*
+ * Un/Hide menubar
+ */
+mi =
gtk_check_menu_item_new_with_label(gtk_widget_get_visible(player-priv-menu_bar)
? _(Hide menubar) : _(Show menubar));
+g_signal_connect (mi, activate,
+G_CALLBACK (parole_player_hide_menubar_cb), player);
+gtk_widget_show (mi);
+gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+
+
g_signal_connect_swapped (menu, selection-done,
G_CALLBACK (gtk_widget_destroy), menu);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Force LTR orientation on some of the controls (Bug #9822) The controls now use this layout in RTL: [Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Next] [Play
Updating branch refs/heads/master to 5e2bc996c1db4f0b081526d212df02f5cd86f856 (commit) from 4de371b7136f6d3d65778aac9a1cd9a14dfade10 (commit) commit 5e2bc996c1db4f0b081526d212df02f5cd86f856 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Oct 7 11:12:14 2013 +0200 Force LTR orientation on some of the controls (Bug #9822) The controls now use this layout in RTL: [Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Next] [Playtime] data/interfaces/parole.ui | 209 - src/parole-player.c |1 + 2 files changed, 111 insertions(+), 99 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 007d497..bb4964b 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -6,11 +6,11 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkImage id=image_help_reportbug + object class=GtkImage id=image_about property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_nameface-sick-symbolic/property +property name=icon_namegtk-about-symbolic/property property name=use_fallbackTrue/property /object object class=GtkImage id=image_disc @@ -20,6 +20,13 @@ property name=icon_namemedia-optical-symbolic/property property name=use_fallbackTrue/property /object + object class=GtkImage id=image_help_reportbug +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixel_size16/property +property name=icon_nameface-sick-symbolic/property +property name=use_fallbackTrue/property + /object object class=GtkImage id=image_media_fullscreen property name=visibleTrue/property property name=can_focusFalse/property @@ -48,13 +55,6 @@ property name=icon_namemedia-skip-backward-symbolic/property property name=use_fallbackTrue/property /object - object class=GtkImage id=image_about -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixel_size16/property -property name=icon_namegtk-about-symbolic/property -property name=use_fallbackTrue/property - /object object class=GtkImage id=image_menu_fullscreen property name=visibleTrue/property property name=can_focusFalse/property @@ -864,85 +864,109 @@ property name=visibleTrue/property property name=can_focusFalse/property child - object class=GtkButton id=media_previous -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_previous/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=media_playpause -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_playpause/property -property name=reliefnone/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position1/property - /packing -/child -child - object class=GtkButton id=media_next -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_next/property -property name=reliefnone/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position2/property - /packing -/child -child - object class=GtkLabel id
[Xfce4-commits] parole:master Add keyboard-shortcut (Control+m) to hide menubar
Updating branch refs/heads/master to 497cd7e12e737e214b8acbffe601589949d73ee1 (commit) from d7594d0c7bd9cf706e36b8beb9055ded57e020a0 (commit) commit 497cd7e12e737e214b8acbffe601589949d73ee1 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Wed Sep 18 10:25:50 2013 +0200 Add keyboard-shortcut (Control+m) to hide menubar src/parole-player.c |5 + 1 file changed, 5 insertions(+) diff --git a/src/parole-player.c b/src/parole-player.c index f2c21f2..9adce06 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2487,6 +2487,11 @@ parole_player_handle_key_press (GdkEventKey *ev, ParolePlayer *player) case GDK_KEY_Escape: parole_player_full_screen (player, FALSE); break; +case GDK_KEY_m: +if (ev-state GDK_CONTROL_MASK) +parole_player_hide_menubar_cb(NULL, player); +ret_val = TRUE; +break; #ifdef HAVE_XF86_KEYSYM case XF86XK_OpenURL: parole_player_full_screen (player, FALSE); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Fix small leak
Updating branch refs/heads/master to 4de371b7136f6d3d65778aac9a1cd9a14dfade10 (commit) from 802f64f142e1198cb10c3f52149d6e3e559376d0 (commit) commit 4de371b7136f6d3d65778aac9a1cd9a14dfade10 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Oct 6 18:25:33 2013 +0200 Fix small leak src/parole-player.c |1 + 1 file changed, 1 insertion(+) diff --git a/src/parole-player.c b/src/parole-player.c index f73d2fa..6c2172b 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2687,6 +2687,7 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data) gtk_widget_get_allocation(widget, allocation); cairo_rectangle (cr, 0, 0, allocation-width, allocation-height); +g_free (allocation); context = gtk_widget_get_style_context(GTK_WIDGET(widget)); gtk_style_context_add_class (context, background); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Drop column-title for the checkbox to activate Plugins
Updating branch refs/heads/master to 25fad955b1b2c0e8ba64660b1d60a43dc1bef4e9 (commit) from 661219642ad8b4c871017a232dea6a94a16f47a1 (commit) commit 25fad955b1b2c0e8ba64660b1d60a43dc1bef4e9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Sep 24 16:38:16 2013 +0200 Drop column-title for the checkbox to activate Plugins data/interfaces/plugins.ui |1 - 1 file changed, 1 deletion(-) diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui index 597353e..7aaf5db 100644 --- a/data/interfaces/plugins.ui +++ b/data/interfaces/plugins.ui @@ -73,7 +73,6 @@ /child child object class=GtkTreeViewColumn id=treeviewcolumn1 -property name=title translatable=yesEnabled/property child object class=GtkCellRendererToggle id=cellrenderertoggle signal name=toggled handler=parole_plugins_manager_cell_toggled_cb swapped=no/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add a menu accelerator to make the keyboard-shortcut more discoverable
Updating branch refs/heads/master
to 01bf90e358e4580553d6a0d6cd03cc825c291e60 (commit)
from 497cd7e12e737e214b8acbffe601589949d73ee1 (commit)
commit 01bf90e358e4580553d6a0d6cd03cc825c291e60
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Wed Sep 18 12:18:42 2013 +0200
Add a menu accelerator to make the keyboard-shortcut more discoverable
src/parole-player.c |5 +
1 file changed, 5 insertions(+)
diff --git a/src/parole-player.c b/src/parole-player.c
index 9adce06..a7b5be9 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2012,6 +2012,9 @@ static void
parole_player_show_menu (ParolePlayer *player, guint button, guint
activate_time)
{
GtkWidget *menu, *mi;
+GtkAccelGroup *accels = gtk_accel_group_new();
+
+gtk_window_add_accel_group(GTK_WINDOW(player-priv-window), accels);
player-priv-current_media_type = parole_gst_get_current_stream_type
(PAROLE_GST (player-priv-gst));
@@ -2046,6 +2049,8 @@ parole_player_show_menu (ParolePlayer *player, guint
button, guint activate_time
mi =
gtk_check_menu_item_new_with_label(gtk_widget_get_visible(player-priv-menu_bar)
? _(Hide menubar) : _(Show menubar));
g_signal_connect (mi, activate,
G_CALLBACK (parole_player_hide_menubar_cb), player);
+gtk_widget_add_accelerator(mi, activate, accels,
+ GDK_KEY_m, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
gtk_widget_show (mi);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Add a dummy-test to see whether plugin-loading fails
Updating branch refs/heads/master
to 071acfe9893612c7a498029993e311fa358b61c5 (commit)
from 01bf90e358e4580553d6a0d6cd03cc825c291e60 (commit)
commit 071acfe9893612c7a498029993e311fa358b61c5
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Sep 21 01:54:54 2013 +0200
Add a dummy-test to see whether plugin-loading fails
src/parole-plugins-manager.c | 10 --
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index ee4a6c0..bef4b80 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -269,8 +269,14 @@ parole_plugins_manager_cell_toggled_cb
(GtkCellRendererToggle *cell_renderer,
{
if ( active )
{
-g_type_module_use (G_TYPE_MODULE (module));
-parole_provider_module_new_plugin (module);
+if (g_type_module_use (G_TYPE_MODULE (module)))
+parole_provider_module_new_plugin (module);
+else
+{
+g_warning(Failed to load plugin.);
+parole_provider_module_free_plugin (module);
+g_type_module_unuse (G_TYPE_MODULE (module));
+}
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Drop unused var
Updating branch refs/heads/master
to 498c4e30332227259d1dc522ee040528043f9282 (commit)
from ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
commit 498c4e30332227259d1dc522ee040528043f9282
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 7 11:54:31 2013 +0200
Drop unused var
src/parole-player.c |2 --
1 file changed, 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index ffe5c2e..21ca0ae 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1951,7 +1951,6 @@ void
parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
{
static gint current_page = 0;
-GdkWindow *gdkwindow;
gboolean show_playlist;
@@ -1972,7 +1971,6 @@ parole_player_reset_controls (ParolePlayer *player,
gboolean fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player-priv-window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player-priv-playlist_nt), current_page);
-gdkwindow = gtk_widget_get_window (player-priv-gst);
parole_gst_set_cursor_visible (PAROLE_GST (player-priv-gst),
FALSE);
player-priv-full_screen = FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Properly hide the mouse-cursor again in fullscreen mode
Updating branch refs/heads/master
to ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
from 5e2bc996c1db4f0b081526d212df02f5cd86f856 (commit)
commit ecdfdc33de4d432af56d71705f87ad836fb8abab
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 7 11:38:51 2013 +0200
Properly hide the mouse-cursor again in fullscreen mode
src/common/parole-common.c |3 +--
src/parole-player.c|2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index 29cdd7c..927aa90 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -99,7 +99,6 @@ void parole_window_invisible_cursor (GdkWindow *window)
gdk_window_set_cursor (window, cursor);
-if (cursor) {
+if (cursor)
g_object_unref (cursor);
-}
}
diff --git a/src/parole-player.c b/src/parole-player.c
index 27c8ffa..ffe5c2e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1973,7 +1973,7 @@ parole_player_reset_controls (ParolePlayer *player,
gboolean fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player-priv-window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player-priv-playlist_nt), current_page);
gdkwindow = gtk_widget_get_window (player-priv-gst);
-gdk_window_set_cursor (gdkwindow, NULL);
+parole_gst_set_cursor_visible (PAROLE_GST (player-priv-gst),
FALSE);
player-priv-full_screen = FALSE;
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:master Remove previous dummy-warning and add another
Updating branch refs/heads/master
to 661219642ad8b4c871017a232dea6a94a16f47a1 (commit)
from e543e3a646ae4b7832a75c00d02fd569a7b57537 (commit)
commit 661219642ad8b4c871017a232dea6a94a16f47a1
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Sep 23 11:33:37 2013 +0200
Remove previous dummy-warning and add another
src/misc/parole-provider-plugin.c |6 +-
src/parole-plugins-manager.c | 10 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/misc/parole-provider-plugin.c
b/src/misc/parole-provider-plugin.c
index cea6cea..9162f9b 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -110,7 +110,11 @@ void parole_provider_plugin_configure
(ParoleProviderPlugin *provider, GtkWidget
**/
void parole_provider_plugin_set_player (ParoleProviderPlugin *provider,
ParoleProviderPlayer *player)
{
-g_return_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider));
+if (!PAROLE_IS_PROVIDER_PLUGIN (provider))
+{
+g_warning (Loading plugins failed, a warning dialog is in order.);
+return;
+}
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)-set_player )
{
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index de15205..0195455 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -269,14 +269,8 @@ parole_plugins_manager_cell_toggled_cb
(GtkCellRendererToggle *cell_renderer,
{
if ( active )
{
-if (g_type_module_use (G_TYPE_MODULE (module)))
-parole_provider_module_new_plugin (module);
-else
-{
-g_warning(Failed to load plugin.);
-parole_provider_module_free_plugin (module);
-g_type_module_unuse (G_TYPE_MODULE (module));
-}
+g_type_module_use (G_TYPE_MODULE (module));
+parole_provider_module_new_plugin (module);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Force LTR orientation on some of the controls (Bug #9822) The controls now use this layout in RTL: [Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Nex
Updating branch refs/heads/bluesabre/gtk3 to 5e2bc996c1db4f0b081526d212df02f5cd86f856 (commit) from 4de371b7136f6d3d65778aac9a1cd9a14dfade10 (commit) commit 5e2bc996c1db4f0b081526d212df02f5cd86f856 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Mon Oct 7 11:12:14 2013 +0200 Force LTR orientation on some of the controls (Bug #9822) The controls now use this layout in RTL: [Show/Hide playlist] [Fullscreen] [Volume] [Previous/Play/Next] [Playtime] data/interfaces/parole.ui | 209 - src/parole-player.c |1 + 2 files changed, 111 insertions(+), 99 deletions(-) diff --git a/data/interfaces/parole.ui b/data/interfaces/parole.ui index 007d497..bb4964b 100644 --- a/data/interfaces/parole.ui +++ b/data/interfaces/parole.ui @@ -6,11 +6,11 @@ property name=step_increment1/property property name=page_increment10/property /object - object class=GtkImage id=image_help_reportbug + object class=GtkImage id=image_about property name=visibleTrue/property property name=can_focusFalse/property property name=pixel_size16/property -property name=icon_nameface-sick-symbolic/property +property name=icon_namegtk-about-symbolic/property property name=use_fallbackTrue/property /object object class=GtkImage id=image_disc @@ -20,6 +20,13 @@ property name=icon_namemedia-optical-symbolic/property property name=use_fallbackTrue/property /object + object class=GtkImage id=image_help_reportbug +property name=visibleTrue/property +property name=can_focusFalse/property +property name=pixel_size16/property +property name=icon_nameface-sick-symbolic/property +property name=use_fallbackTrue/property + /object object class=GtkImage id=image_media_fullscreen property name=visibleTrue/property property name=can_focusFalse/property @@ -48,13 +55,6 @@ property name=icon_namemedia-skip-backward-symbolic/property property name=use_fallbackTrue/property /object - object class=GtkImage id=image_about -property name=visibleTrue/property -property name=can_focusFalse/property -property name=pixel_size16/property -property name=icon_namegtk-about-symbolic/property -property name=use_fallbackTrue/property - /object object class=GtkImage id=image_menu_fullscreen property name=visibleTrue/property property name=can_focusFalse/property @@ -864,85 +864,109 @@ property name=visibleTrue/property property name=can_focusFalse/property child - object class=GtkButton id=media_previous -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_previous/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=media_playpause -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_playpause/property -property name=reliefnone/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position1/property - /packing -/child -child - object class=GtkButton id=media_next -property name=visibleTrue/property -property name=can_focusFalse/property -property name=receives_defaultTrue/property -property name=imageimage_media_next/property -property name=reliefnone/property - /object - packing -property name=expandFalse/property -property name=fillTrue/property -property name=position2/property - /packing -/child -child - object class
[Xfce4-commits] parole:bluesabre/gtk3 Properly hide the mouse-cursor again in fullscreen mode
Updating branch refs/heads/bluesabre/gtk3
to ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
from 5e2bc996c1db4f0b081526d212df02f5cd86f856 (commit)
commit ecdfdc33de4d432af56d71705f87ad836fb8abab
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 7 11:38:51 2013 +0200
Properly hide the mouse-cursor again in fullscreen mode
src/common/parole-common.c |3 +--
src/parole-player.c|2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index 29cdd7c..927aa90 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -99,7 +99,6 @@ void parole_window_invisible_cursor (GdkWindow *window)
gdk_window_set_cursor (window, cursor);
-if (cursor) {
+if (cursor)
g_object_unref (cursor);
-}
}
diff --git a/src/parole-player.c b/src/parole-player.c
index 27c8ffa..ffe5c2e 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1973,7 +1973,7 @@ parole_player_reset_controls (ParolePlayer *player,
gboolean fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player-priv-window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player-priv-playlist_nt), current_page);
gdkwindow = gtk_widget_get_window (player-priv-gst);
-gdk_window_set_cursor (gdkwindow, NULL);
+parole_gst_set_cursor_visible (PAROLE_GST (player-priv-gst),
FALSE);
player-priv-full_screen = FALSE;
}
else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Drop unused var
Updating branch refs/heads/bluesabre/gtk3
to 498c4e30332227259d1dc522ee040528043f9282 (commit)
from ecdfdc33de4d432af56d71705f87ad836fb8abab (commit)
commit 498c4e30332227259d1dc522ee040528043f9282
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Oct 7 11:54:31 2013 +0200
Drop unused var
src/parole-player.c |2 --
1 file changed, 2 deletions(-)
diff --git a/src/parole-player.c b/src/parole-player.c
index ffe5c2e..21ca0ae 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -1951,7 +1951,6 @@ void
parole_player_reset_controls (ParolePlayer *player, gboolean fullscreen)
{
static gint current_page = 0;
-GdkWindow *gdkwindow;
gboolean show_playlist;
@@ -1972,7 +1971,6 @@ parole_player_reset_controls (ParolePlayer *player,
gboolean fullscreen)
gtk_window_unfullscreen (GTK_WINDOW (player-priv-window));
gtk_notebook_set_current_page (GTK_NOTEBOOK
(player-priv-playlist_nt), current_page);
-gdkwindow = gtk_widget_get_window (player-priv-gst);
parole_gst_set_cursor_visible (PAROLE_GST (player-priv-gst),
FALSE);
player-priv-full_screen = FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Fix small leak
Updating branch refs/heads/bluesabre/gtk3 to 4de371b7136f6d3d65778aac9a1cd9a14dfade10 (commit) from 802f64f142e1198cb10c3f52149d6e3e559376d0 (commit) commit 4de371b7136f6d3d65778aac9a1cd9a14dfade10 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Sun Oct 6 18:25:33 2013 +0200 Fix small leak src/parole-player.c |1 + 1 file changed, 1 insertion(+) diff --git a/src/parole-player.c b/src/parole-player.c index f73d2fa..6c2172b 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2687,6 +2687,7 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data) gtk_widget_get_allocation(widget, allocation); cairo_rectangle (cr, 0, 0, allocation-width, allocation-height); +g_free (allocation); context = gtk_widget_get_style_context(GTK_WIDGET(widget)); gtk_style_context_add_class (context, background); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Drop column-title for the checkbox to activate Plugins
Updating branch refs/heads/bluesabre/gtk3 to 25fad955b1b2c0e8ba64660b1d60a43dc1bef4e9 (commit) from 661219642ad8b4c871017a232dea6a94a16f47a1 (commit) commit 25fad955b1b2c0e8ba64660b1d60a43dc1bef4e9 Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at Date: Tue Sep 24 16:38:16 2013 +0200 Drop column-title for the checkbox to activate Plugins data/interfaces/plugins.ui |1 - 1 file changed, 1 deletion(-) diff --git a/data/interfaces/plugins.ui b/data/interfaces/plugins.ui index 597353e..7aaf5db 100644 --- a/data/interfaces/plugins.ui +++ b/data/interfaces/plugins.ui @@ -73,7 +73,6 @@ /child child object class=GtkTreeViewColumn id=treeviewcolumn1 -property name=title translatable=yesEnabled/property child object class=GtkCellRendererToggle id=cellrenderertoggle signal name=toggled handler=parole_plugins_manager_cell_toggled_cb swapped=no/ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Remove previous dummy-warning and add another
Updating branch refs/heads/bluesabre/gtk3
to 661219642ad8b4c871017a232dea6a94a16f47a1 (commit)
from e543e3a646ae4b7832a75c00d02fd569a7b57537 (commit)
commit 661219642ad8b4c871017a232dea6a94a16f47a1
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Mon Sep 23 11:33:37 2013 +0200
Remove previous dummy-warning and add another
src/misc/parole-provider-plugin.c |6 +-
src/parole-plugins-manager.c | 10 ++
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/misc/parole-provider-plugin.c
b/src/misc/parole-provider-plugin.c
index cea6cea..9162f9b 100644
--- a/src/misc/parole-provider-plugin.c
+++ b/src/misc/parole-provider-plugin.c
@@ -110,7 +110,11 @@ void parole_provider_plugin_configure
(ParoleProviderPlugin *provider, GtkWidget
**/
void parole_provider_plugin_set_player (ParoleProviderPlugin *provider,
ParoleProviderPlayer *player)
{
-g_return_if_fail (PAROLE_IS_PROVIDER_PLUGIN (provider));
+if (!PAROLE_IS_PROVIDER_PLUGIN (provider))
+{
+g_warning (Loading plugins failed, a warning dialog is in order.);
+return;
+}
if ( PAROLE_PROVIDER_PLUGIN_GET_INTERFACE (provider)-set_player )
{
diff --git a/src/parole-plugins-manager.c b/src/parole-plugins-manager.c
index de15205..0195455 100644
--- a/src/parole-plugins-manager.c
+++ b/src/parole-plugins-manager.c
@@ -269,14 +269,8 @@ parole_plugins_manager_cell_toggled_cb
(GtkCellRendererToggle *cell_renderer,
{
if ( active )
{
-if (g_type_module_use (G_TYPE_MODULE (module)))
-parole_provider_module_new_plugin (module);
-else
-{
-g_warning(Failed to load plugin.);
-parole_provider_module_free_plugin (module);
-g_type_module_unuse (G_TYPE_MODULE (module));
-}
+g_type_module_use (G_TYPE_MODULE (module));
+parole_provider_module_new_plugin (module);
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] parole:bluesabre/gtk3 Remove/clear auto-saved-playlist file upon using the clear-playlist button
Updating branch refs/heads/bluesabre/gtk3
to 8cb12d45f65f64ee68991b23907114e9d9372db7 (commit)
from 071acfe9893612c7a498029993e311fa358b61c5 (commit)
commit 8cb12d45f65f64ee68991b23907114e9d9372db7
Author: Simon Steinbeiss simon.steinbe...@elfenbeinturm.at
Date: Sat Sep 21 09:57:12 2013 +0200
Remove/clear auto-saved-playlist file upon using the clear-playlist button
src/parole-medialist.c |8
1 file changed, 8 insertions(+)
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index f309d47..618d2f8 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -572,7 +572,15 @@ parole_media_list_add_clicked_cb (GtkButton *button,
ParoleMediaList *list)
void
parole_media_list_clear_clicked_cb (GtkButton *button, ParoleMediaList *list)
{
+gchar *playlist_filename;
+GFile *playlist_file;
parole_media_list_clear_list (list);
+playlist_filename = xfce_resource_save_location (XFCE_RESOURCE_DATA,
+
PAROLE_AUTO_SAVED_PLAYLIST,
+ FALSE);
+playlist_file = g_file_new_for_path(playlist_filename);
+g_file_delete(playlist_file, NULL, NULL);
+g_free(playlist_filename);
}
/**
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
