[Xfce4-commits] [apps/xfce4-notifyd] 01/01: Add compile-time support for Gtk3.20 themes

noreply at xfce.org noreply at xfce.org
Tue Jul 12 00:16:10 CEST 2016


This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-notifyd.

commit 7c835da37d7d6f2f04f77101cd59160e715770a1
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date:   Mon Jul 11 23:27:22 2016 +0200

    Add compile-time support for Gtk3.20 themes
---
 Makefile.am                                | 18 ++++++++++------
 configure.ac.in                            |  6 +++++-
 themes/{ => gtk-3.0}/Default/gtk.css       |  0
 themes/{ => gtk-3.0}/Smoke/gtk.css         |  0
 themes/{ => gtk-3.0}/ZOMG-PONIES!/gtk.css  |  0
 themes/{ => gtk-3.20}/Default/gtk.css      |  0
 themes/gtk-3.20/Smoke/gtk.css              | 34 ++++++++++++++++++++++++++++++
 themes/{ => gtk-3.20}/ZOMG-PONIES!/gtk.css | 18 ++++++----------
 8 files changed, 56 insertions(+), 20 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7456a0c..2fa81ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,16 +99,20 @@ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(icon_dir)
 icons48dir = $(icon_dir)/48x48/apps
 dist_icons48_DATA = icons/48x48/xfce4-notifyd.png
 
-theme_dir = $(datadir)/themes
+if HAVE_GTK_320
+theme_dir = gtk-3.20
+else
+theme_dir = gtk-3.0
+endif
 
-defaultthemedir = $(theme_dir)/Default/xfce-notify-4.0
-dist_defaulttheme_DATA = themes/Default/gtk.css
+defaultthemedir = $(datadir)/themes/$(theme_dir)/Default/xfce-notify-4.0
+dist_defaulttheme_DATA = themes/$(theme_dir)/Default/gtk.css
 
-smokethemedir = $(theme_dir)/Smoke/xfce-notify-4.0
-dist_smoketheme_DATA = themes/Smoke/gtk.css
+smokethemedir = $(datadir)/themes/$(theme_dir)/Smoke/xfce-notify-4.0
+dist_smoketheme_DATA = themes/$(theme_dir)/Smoke/gtk.css
 
-zomgponiesthemedir = $(theme_dir)/ZOMG-PONIES!/xfce-notify-4.0
-dist_zomgponiestheme_DATA = themes/ZOMG-PONIES!/gtk.css
+zomgponiesthemedir = $(datadir)/themes/$(theme_dir)/ZOMG-PONIES!/xfce-notify-4.0
+dist_zomgponiestheme_DATA = themes/$(theme_dir)/ZOMG-PONIES!/gtk.css
 
 built_xfce4_notifyd = \
 	xfce4-notifyd/xfce-notify-gbus.c \
diff --git a/configure.ac.in b/configure.ac.in
index 59f66a9..e4e1ee5 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -64,11 +64,15 @@ dnl required
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
 XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.14.0])
 XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.26.0])
 XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.26.0])
 XDT_CHECK_PACKAGE([LIBNOTIFY], [libnotify], [0.7.0])
 
+PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.20], [HAVE_GTK_320=true], [
+  PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.14], [HAVE_GTK_320=false], [])
+])
+AM_CONDITIONAL([HAVE_GTK_320], [test "x$HAVE_GTK_320" = "xtrue"])
+
 dnl ***********************************
 dnl *** Check for gdbus-codegen ***
 dnl ***********************************
diff --git a/themes/Default/gtk.css b/themes/gtk-3.0/Default/gtk.css
similarity index 100%
copy from themes/Default/gtk.css
copy to themes/gtk-3.0/Default/gtk.css
diff --git a/themes/Smoke/gtk.css b/themes/gtk-3.0/Smoke/gtk.css
similarity index 100%
rename from themes/Smoke/gtk.css
rename to themes/gtk-3.0/Smoke/gtk.css
diff --git a/themes/ZOMG-PONIES!/gtk.css b/themes/gtk-3.0/ZOMG-PONIES!/gtk.css
similarity index 100%
copy from themes/ZOMG-PONIES!/gtk.css
copy to themes/gtk-3.0/ZOMG-PONIES!/gtk.css
diff --git a/themes/Default/gtk.css b/themes/gtk-3.20/Default/gtk.css
similarity index 100%
rename from themes/Default/gtk.css
rename to themes/gtk-3.20/Default/gtk.css
diff --git a/themes/gtk-3.20/Smoke/gtk.css b/themes/gtk-3.20/Smoke/gtk.css
new file mode 100644
index 0000000..c174d5a
--- /dev/null
+++ b/themes/gtk-3.20/Smoke/gtk.css
@@ -0,0 +1,34 @@
+#XfceNotifyWindow {
+    background-color: #4d4d4d;
+    border-radius: 20px;
+    border: 1px solid #fff;
+    padding: 20px;
+}
+
+#XfceNotifyWindow:hover {
+    border-width: 2px;
+    border-color: #ffffff;
+}
+
+#XfceNotifyWindow label {
+    color: #ffffff;
+    -GtkWidget-link-color: #a7a7a7;
+}
+
+#XfceNotifyWindow label#summary {
+    font: Bold;
+}
+
+#XfceNotifyWindow button {
+    border-style: none;
+    background-image: none;
+    background-color: #202020;
+    color: #ffffff;
+}
+
+#XfceNotifyWindow button:hover {
+    border-style: none;
+    background-image: none;
+    background-color: #404040;
+    color: #ffffff;
+}
diff --git a/themes/ZOMG-PONIES!/gtk.css b/themes/gtk-3.20/ZOMG-PONIES!/gtk.css
similarity index 56%
rename from themes/ZOMG-PONIES!/gtk.css
rename to themes/gtk-3.20/ZOMG-PONIES!/gtk.css
index 4a26bad..120c790 100644
--- a/themes/ZOMG-PONIES!/gtk.css
+++ b/themes/gtk-3.20/ZOMG-PONIES!/gtk.css
@@ -1,29 +1,23 @@
 #XfceNotifyWindow {
-
     background-color: #ff69b4;
     border-radius: 10px;
-    border-color : #ffff00;
-    border-style: outset;
-    border-width: 6px;
+    border: 6px solid #ffff00;
 }
 
-
-#XfceNotifyWindow GtkLabel {
+#XfceNotifyWindow label {
     font : Comic Sans MS 26;
     color: #ffff00;
     -GtkWidget-link-color:#c17800;
 }
 
-
-#XfceNotifyWindow GtkButton {
-    border-image: none;
+#XfceNotifyWindow button {
+    border-style: none;
     background-image: none;
     background-color : #9400d3;
 }
 
-
-#XfceNotifyWindow GtkButton:hover {
-    border-image: none;
+#XfceNotifyWindow button:hover {
+    border-style: none;
     background-image: none;
     background-color : #5e0086;
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list