From 789d509eba887db6f632c521ce847d11b765914b Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 30 May 2016 00:01:25 +0200 Subject: merge xfce-notify theme into the gtk2 theme --- README.md | 1 - common/Makefile.am | 7 ----- common/gtk-2.0/gtkrc | 1 + common/gtk-2.0/gtkrc-dark | 1 + common/gtk-2.0/gtkrc-darker | 1 + common/gtk-2.0/xfce-notify.rc | 72 +++++++++++++++++++++++++++++++++++++++++++ common/xfce-notify-4.0/gtkrc | 72 ------------------------------------------- configure.ac | 1 - 8 files changed, 75 insertions(+), 81 deletions(-) create mode 100644 common/gtk-2.0/xfce-notify.rc delete mode 100644 common/xfce-notify-4.0/gtkrc diff --git a/README.md b/README.md index cd2be86..065f8f0 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,6 @@ Other options to pass to autogen.sh are --disable-metacity disable Metacity support --disable-unity disable Unity support --disable-xfwm disable XFWM support - --disable-xfce-notify disable XFCE Notify support --with-gnome= build the theme for a specific Gnome version (3.14, 3.16, 3.18, 3.20) Note: Normally the correct version is detected automatically and this diff --git a/common/Makefile.am b/common/Makefile.am index 7966da8..c603f5c 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -247,12 +247,6 @@ endif # ENABLE_DARK endif # ENABLE_UNITY -if ENABLE_XFCE_NOTIFY - $(MKDIR_P) $(ithemedir) - cp -R $(srcdir)/xfce-notify-4.0 $(ithemedir) -endif # ENABLE_XFCE_NOTIFY - - if ENABLE_XFWM if ENABLE_LIGHT @@ -288,7 +282,6 @@ EXTRA_DIST = $(srcdir)/cinnamon \ $(srcdir)/gtk-3.0 \ $(srcdir)/metacity-1 \ $(srcdir)/unity \ - $(srcdir)/xfce-notify-4.0 \ $(srcdir)/xfwm4 \ $(srcdir)/xfwm4-dark \ $(srcdir)/index.theme \ diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc index 60e5559..8d54f3b 100644 --- a/common/gtk-2.0/gtkrc +++ b/common/gtk-2.0/gtkrc @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar.rc" diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark index 51e1285..9f85145 100644 --- a/common/gtk-2.0/gtkrc-dark +++ b/common/gtk-2.0/gtkrc-dark @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar-dark.rc" diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker index 3c933f1..73dbfcb 100644 --- a/common/gtk-2.0/gtkrc-darker +++ b/common/gtk-2.0/gtkrc-darker @@ -20,4 +20,5 @@ gtk-primary-button-warps-slider = 1 include "main.rc" include "apps.rc" include "panel.rc" +include "xfce-notify.rc" include "menubar-toolbar/menubar-toolbar-dark.rc" diff --git a/common/gtk-2.0/xfce-notify.rc b/common/gtk-2.0/xfce-notify.rc new file mode 100644 index 0000000..aa8a02c --- /dev/null +++ b/common/gtk-2.0/xfce-notify.rc @@ -0,0 +1,72 @@ +style "notify-window" { + XfceNotifyWindow::summary-bold = 1 + XfceNotifyWindow::border-color = "#17191F" + XfceNotifyWindow::border-color-hover = "#17191F" + XfceNotifyWindow::border-radius = 3.0 + XfceNotifyWindow::border-width = 1.0 + XfceNotifyWindow::border-width-hover = 1.0 + + bg[NORMAL] = "#292C36" +} + +style "notify-button" { + bg[NORMAL] = "#434652" + bg[PRELIGHT] = "#5C6070" + bg[ACTIVE] = "#5294E2" + + fg[NORMAL] = "#BAC3CF" + fg[PRELIGHT] = "#BAC3CF" + fg[ACTIVE] = "#ffffff" + + engine "murrine" { + gradient_shades = { 1.0, 1.0, 1.0, 1.0 } + border_shades = { 1.0, 1.0 } + roundness = 2 + textstyle = 0 + } +} + +style "notify-text" { + GtkWidget::link-color = "#5294E2" + + fg[NORMAL] = "#BAC3CF" + fg[PRELIGHT] = "#BAC3CF" + fg[ACTIVE] = "#BAC3CF" + + engine "murrine" { + textstyle = 0 + } +} + +style "notify-summary" { + font_name = "Bold" +} + +style "notify-progressbar" { + GtkProgressBar::min-horizontal-bar-height = 4 + + xthickness = 0 + ythickness = 0 + + fg[PRELIGHT] = "#000000" + bg[NORMAL] = "#5294E2" + bg[ACTIVE] = "#1D1F26" + bg[SELECTED] = "#5294E2" + + engine "murrine" { + gradient_shades = { 1.0, 1.0, 1.0, 1.0 } + border_shades = { 1.0, 1.0 } + trough_shades = { 1.0, 1.0 } + trough_border_shades = { 1.0, 1.0 } + progressbarstyle = 0 + roundness = 2 + textstyle = 0 + } +} + +class "XfceNotifyWindow" style "notify-window" +widget "XfceNotifyWindow.*.summary" style "notify-summary" +widget_class "XfceNotifyWindow.*" style "notify-button" +widget_class "XfceNotifyWindow.*." style "notify-text" +widget_class "XfceNotifyWindow.*." style "notify-progressbar" +widget_class "XfceNotifyWindow.*." style "notify-progressbar" diff --git a/common/xfce-notify-4.0/gtkrc b/common/xfce-notify-4.0/gtkrc deleted file mode 100644 index aa8a02c..0000000 --- a/common/xfce-notify-4.0/gtkrc +++ /dev/null @@ -1,72 +0,0 @@ -style "notify-window" { - XfceNotifyWindow::summary-bold = 1 - XfceNotifyWindow::border-color = "#17191F" - XfceNotifyWindow::border-color-hover = "#17191F" - XfceNotifyWindow::border-radius = 3.0 - XfceNotifyWindow::border-width = 1.0 - XfceNotifyWindow::border-width-hover = 1.0 - - bg[NORMAL] = "#292C36" -} - -style "notify-button" { - bg[NORMAL] = "#434652" - bg[PRELIGHT] = "#5C6070" - bg[ACTIVE] = "#5294E2" - - fg[NORMAL] = "#BAC3CF" - fg[PRELIGHT] = "#BAC3CF" - fg[ACTIVE] = "#ffffff" - - engine "murrine" { - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - border_shades = { 1.0, 1.0 } - roundness = 2 - textstyle = 0 - } -} - -style "notify-text" { - GtkWidget::link-color = "#5294E2" - - fg[NORMAL] = "#BAC3CF" - fg[PRELIGHT] = "#BAC3CF" - fg[ACTIVE] = "#BAC3CF" - - engine "murrine" { - textstyle = 0 - } -} - -style "notify-summary" { - font_name = "Bold" -} - -style "notify-progressbar" { - GtkProgressBar::min-horizontal-bar-height = 4 - - xthickness = 0 - ythickness = 0 - - fg[PRELIGHT] = "#000000" - bg[NORMAL] = "#5294E2" - bg[ACTIVE] = "#1D1F26" - bg[SELECTED] = "#5294E2" - - engine "murrine" { - gradient_shades = { 1.0, 1.0, 1.0, 1.0 } - border_shades = { 1.0, 1.0 } - trough_shades = { 1.0, 1.0 } - trough_border_shades = { 1.0, 1.0 } - progressbarstyle = 0 - roundness = 2 - textstyle = 0 - } -} - -class "XfceNotifyWindow" style "notify-window" -widget "XfceNotifyWindow.*.summary" style "notify-summary" -widget_class "XfceNotifyWindow.*" style "notify-button" -widget_class "XfceNotifyWindow.*." style "notify-text" -widget_class "XfceNotifyWindow.*." style "notify-progressbar" -widget_class "XfceNotifyWindow.*." style "notify-progressbar" diff --git a/configure.ac b/configure.ac index eb1f431..a77f31a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,6 @@ ARC_ENABLE([GTK3], [gtk3], [GTK3], [disable]) ARC_ENABLE([METACITY], [metacity], [Metacity], [disable]) ARC_ENABLE([UNITY], [unity], [Unity], [disable]) ARC_ENABLE([XFWM], [xfwm], [XFWM], [disable]) -ARC_ENABLE([XFCE_NOTIFY], [xfce-notify], [XFCE Notify], [disable]) ARC_ENABLE([TRANSPARENCY], [transparency], [transparency], [disable]) ARC_GNOME -- cgit v1.2.3