Merge branch 'master' into dark_headerbars

6 files changed, 147 insertions, 1 deletions

diff --git a/README.md b/README.md
index 3cf4fa4..1b85966 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ 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
     --disable-transparency     disable transparency in the GTK3 theme
 
     --with-gnome=<version>     build the theme for a specific Gnome version (3.14, 3.16)
@@ -98,10 +99,13 @@ from the same directory as this README resides in, or
 
 ### Extras
 
-The `extra` directory in the same directory as this README resides in contains a Chrome/Chromium  theme.
+The `extra` directory in the same directory as this README resides in contains a Chrome/Chromium and a Plank theme.
 
 To install the Chrome/Chromium theme go to the `extra/Chrome` folder and drag and drop the arc-theme.crx into the Chrome/Chromium window. The source of the Chrome themes is located in the source "Chrome/arc-theme" folder.
 
+To install the Plank theme, copy the `extra/Arc-Plank` folder to `~/.local/share/plank/themes` or to `/usr/share/plank/themes` for system-wide use.
+Now open the Plank preferences window by executing `plank --preferences` from a terminal and select `Arc-Plank` as the theme.
+
 ### Troubleshooting
 
 If you get artifacts like black or invisible backgrounds under Unity, disable overlay scrollbars with
diff --git a/common/Makefile.am b/common/Makefile.am
index 5b6e995..eb681fb 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -44,6 +44,11 @@ if ENABLE_UNITY
 endif # ENABLE_UNITY
 
 
+if ENABLE_XFCE_NOTIFY
+	cp -r --no-preserve=mode,ownership $(srcdir)/xfce-notify-4.0 $(ithemedir)
+endif # ENABLE_XFCE_NOTIFY
+
+
 if ENABLE_XFWM
 	cp -r --no-preserve=mode,ownership $(srcdir)/xfwm4 $(ithemedir)
 endif # ENABLE_XFWM
diff --git a/common/xfce-notify-4.0/gtkrc b/common/xfce-notify-4.0/gtkrc
new file mode 100644
index 0000000..5958d45
--- /dev/null
+++ b/common/xfce-notify-4.0/gtkrc
@@ -0,0 +1,72 @@
+style "notify-window" {
+  XfceNotifyWindow::summary-bold = 1
+  XfceNotifyWindow::border-color = "#101114"
+  XfceNotifyWindow::border-color-hover = "#101114"
+  XfceNotifyWindow::border-radius = 3.0
+  XfceNotifyWindow::border-width = 1.0
+  XfceNotifyWindow::border-width-hover = 1.0
+
+  bg[NORMAL] = "#25272D"
+}
+
+style "notify-button" {
+  bg[NORMAL] = "#434652"
+  bg[PRELIGHT] = "#5C6070"
+  bg[ACTIVE] = @selected_bg_color
+
+  fg[NORMAL] = "#A8ADB5"
+  fg[PRELIGHT] = "#A8ADB5"
+  fg[ACTIVE] = @selected_fg_color
+
+  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 = @link_color
+
+  fg[NORMAL] = "#C0C5CF"
+  fg[PRELIGHT] = "#C0C5CF"
+  fg[ACTIVE] = "#C0C5CF"
+
+  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]   = @selected_bg_color
+  bg[ACTIVE] = "#131417"
+  bg[SELECTED] = @selected_bg_color
+
+  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.*<GtkButton>" style "notify-button"
+widget_class "XfceNotifyWindow.*.<GtkLabel>" style "notify-text"
+widget_class "XfceNotifyWindow.*.<GtkProgress>" style "notify-progressbar"
+widget_class "XfceNotifyWindow.*.<GtkProgressBar>" style "notify-progressbar"
diff --git a/configure.ac b/configure.ac
index 01db563..9e0c45f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,7 @@ 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
diff --git a/extra/Arc-Plank/dock.theme b/extra/Arc-Plank/dock.theme
new file mode 100644
index 0000000..dd13b0e
--- /dev/null
+++ b/extra/Arc-Plank/dock.theme
@@ -0,0 +1,63 @@
+# Arc theme for Plank
+# Author: Horst3180
+# Adapted from the default Plank theme
+
+[PlankDrawingTheme]
+#The roundness of the top corners.
+TopRoundness=2
+#The roundness of the bottom corners.
+BottomRoundness=0
+#The thickness (in pixels) of lines drawn.
+LineWidth=1
+#The color (RGBA) of the outer stroke.
+OuterStrokeColor=16;;17;;20;;255
+#The starting color (RGBA) of the fill gradient.
+FillStartColor=37;;39;;45;;222
+#The ending color (RGBA) of the fill gradient.
+FillEndColor=37;;39;;45;;222
+#The color (RGBA) of the inner stroke.
+InnerStrokeColor=37;;39;;45;;0
+
+[PlankDrawingDockTheme]
+#The padding on the left/right dock edges, in tenths of a percent of IconSize.
+HorizPadding=1
+#The padding on the top dock edge, in tenths of a percent of IconSize.
+TopPadding= 1
+#The padding on the bottom dock edge, in tenths of a percent of IconSize.
+BottomPadding=1
+#The padding between items on the dock, in tenths of a percent of IconSize.
+ItemPadding=2
+#The size of item indicators, in tenths of a percent of IconSize.
+IndicatorSize=3
+#The size of the icon-shadow behind every item, in tenths of a percent of IconSize.
+IconShadowSize=0
+#The height (in percent of IconSize) to bounce an icon when the application sets urgent.
+UrgentBounceHeight=1.6666666666666667
+#The height (in percent of IconSize) to bounce an icon when launching an application.
+LaunchBounceHeight=0.625
+#The opacity value (0 to 1) to fade the dock to when hiding it.
+FadeOpacity=1
+#The amount of time (in ms) for click animations.
+ClickTime=300
+#The amount of time (in ms) to bounce an urgent icon.
+UrgentBounceTime=600
+#The amount of time (in ms) to bounce an icon when launching an application.
+LaunchBounceTime=600
+#The amount of time (in ms) for active window indicator animations.
+ActiveTime=300
+#The amount of time (in ms) to slide icons into/out of the dock.
+SlideTime=300
+#The time (in ms) to fade the dock in/out on a hide (if FadeOpacity is < 1).
+FadeTime=250
+#The time (in ms) to slide the dock in/out on a hide (if FadeOpacity is 1).
+HideTime=150
+#The size of the urgent glow (shown when dock is hidden), in tenths of a percent of IconSize.
+GlowSize=30
+#The total time (in ms) to show the hidden-dock urgent glow.
+GlowTime=10000
+#The time (in ms) of each pulse of the hidden-dock urgent glow.
+GlowPulseTime=2000
+#The hue-shift (-180 to 180) of the urgent indicator color.
+UrgentHueShift=150
+#The time (in ms) to move an item to its new position or its addition/removal to/from the dock.
+ItemMoveTime=450
diff --git a/extra/Makefile.am b/extra/Makefile.am
index a1c75c7..706c601 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -1,4 +1,5 @@
 dist-hook:
 	cp -r \
 		Chrome \
+		Arc-Plank \
 		$(distdir)