Merge pull request #24 from NiceandGently/master

update Menta theme to final version

9 files changed, 74 insertions, 59 deletions

diff --git a/desktop-themes/Menta/INSTALL b/desktop-themes/Menta/INSTALL
deleted file mode 100644
index d0d8f3b8..00000000
--- a/desktop-themes/Menta/INSTALL
+++ /dev/null
@@ -1,46 +0,0 @@
-############################

-#      HOW TO INSTALL      #

-############################

-

-To use this theme you'll need the LATEST stable versions of the following software:

-

-- GTK 3.6

-- The package gnome-themes-standard installed. (Usually installed by default in most distros.)

-- The Murrine GTK2 engine 0.98.1.1 or later. (Package name varies between distributions. This engine should be installed by default in Ubuntu.)

-- The Pixbuf GTK2 engine (Package name varies between distributions. This engine should be installed by default in Ubuntu. In arch, fedora and some other non-debian distributions it's included in the gtk2-engines or gtk-engines package. In Debian based distros it's called gtk2-engines-pixbuf.)

-- gnome-tweak-tool (If you're using Gnome 3.)

-- Gnome-shell-extension-user-theme (To enable 3rd party themes in gnome-shell.)

-

-## INSTALLING THE GTK2 THEME ##

-

-Unzip the included folder(s) to 1 of the following locations:

-/usr/share/themes

-/home/your username/.themes

-

-Open your desktop environment's customization settings.

-Select the theme(s) from the menus there.

-

-Note: The /.themes folder is only for your user. If you for example open Synaptic or any other administrative application it will not be styled.

-

-## INSTALLING THE GTK3 & GNOME-SHELL THEME ##

-

-Unzip the included folder(s) to 1 of the following locations:

-/usr/share/themes

-/home/your username/.themes

-

-You also need to copy the window border (mutter) theme to:

-/home/your username/.local/share/themes or /usr/share/themes

-For example: .local/share/themes/Zukitwo/metacity-1

-

-Note: The /.themes folder is only for your user. If you for example use an application as root it will not be styled.

-

-Open gnome-tweak-tool.

-In gnome-tweak-tool you can select the Gnome-shell theme, GTK theme and Mutter window theme.

-

-To use the GNOME-Shell theme you need to install the user theme extension.

-Availble here - https://extensions.gnome.org/

-

-If changes doesn't take place after selecting the themes you can try to log out and back in. If you're in Gnome-shell you can just press ALT+F2 and type r to restart the shell.

-

-## USING A TRANSPARENT PANEL BACKGROUND IN XFCE ##

-Rightclick on your XFCE panel and go to the background settings. Select the custom background image provided with this theme. (Needs composition effects enabled.)

diff --git a/desktop-themes/Menta/Makefile.am b/desktop-themes/Menta/Makefile.am
index b9cd3ffe..1de25b44 100644
--- a/desktop-themes/Menta/Makefile.am
+++ b/desktop-themes/Menta/Makefile.am
@@ -5,7 +5,6 @@ themedir = $(datadir)/themes/$(THEME_NAME)
 theme_DATA = \
 	COPYING \
 	index.theme \
-	INSTALL \
 	panelbg.png \
 	README
 
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
index 1c54af7c..74355a23 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Makefile.am
@@ -4,7 +4,8 @@ themedir = $(datadir)/themes/Menta/gtk-2.0/widgets
 theme_DATA = \
 	panel.rc \
 	panel-black.rc \
-	panel-dark-grey.rc
+	panel-dark-grey.rc \
+	README
 
 EXTRA_DIST = $(theme_DATA)
 
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/Panel/panel-button-active.png b/desktop-themes/Menta/gtk-2.0/widgets/Panel/panel-button-active.png
index 6fe52aec..fbc8605f 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/Panel/panel-button-active.png
+++ b/desktop-themes/Menta/gtk-2.0/widgets/Panel/panel-button-active.png
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/README b/desktop-themes/Menta/gtk-2.0/widgets/README
new file mode 100644
index 00000000..29ebffbc
--- /dev/null
+++ b/desktop-themes/Menta/gtk-2.0/widgets/README
@@ -0,0 +1,60 @@
+The Menta theme comes with 3 different panel.rc files in
+gtk-2.0/widgets folder.
+
+-- panel.rc for light grey  panel background (default)
+-- panel-dark-grey.rc for a dark grey panel background
+-- panel-black.rc for a black panel background
+
+You simply edit the gtk-2.0/gtkrc file to choose your
+favorite background.
+Example for choose a black panel background.
+Edit those lines:
+
+### EXTERNAL FILES ###
+# This includes the file that handles the panels with a light grey background.
+include "widgets/panel.rc"
+# This includes the file that handles the panels with a dark grey background.
+#include "widgets/panel-dark-grey.rc"
+# This includes the file that handles the panels with a black background.
+#include "widgets/panel-black.rc"
+
+to
+
+### EXTERNAL FILES ###
+# This includes the file that handles the panels with a light grey background.
+#include "widgets/panel.rc"
+# This includes the file that handles the panels with a dark grey background.
+#include "widgets/panel-dark-grey.rc"
+# This includes the file that handles the panels with a black background.
+include "widgets/panel-black.rc"
+
+Than reload the theme.
+
+For getting a full transparancy panel edit this line in
+your choosen panel.rc
+
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
+
+change to
+
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
+#	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
+
+Note: maybe you have to change the text color, depends on you DE background
+in your choosen panel.rc edit:
+
+style "theme-panel-text"
+{
+	fg[NORMAL]	= "#000000"
+	fg[PRELIGHT]	= "#000000"
+	fg[ACTIVE]	= "#ffffff"
+	text[NORMAL]	= "#000000"
+	text[PRELIGHT]	= "#000000"
+	text[ACTIVE]	= "#ffffff"
+}
+
+Have fun ;)
+
+
+
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
index 38fbf98c..ffe8155c 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-black.rc
@@ -3,7 +3,7 @@ style "theme-panel"
 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
 	ythickness = 0
 
-# Disable (comment out) for normal panel backgrounds or to get an transparancy panel.
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-black.png"
 
 	fg[NORMAL]	= "#F7F7F7"
@@ -72,10 +72,10 @@ style "theme-panel-light"
 style "theme-panel-text"
 {
 	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#CEFF9B"
+	fg[PRELIGHT]	= "#000000"
 	fg[ACTIVE]	= "#F7F7F7"
 	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#CEFF9B"
+	text[PRELIGHT]	= "#000000"
 	text[ACTIVE]	= "#F7F7F7"
 }
 
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
index 97ccd2b0..5d0ccad2 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel-dark-grey.rc
@@ -3,7 +3,7 @@ style "theme-panel"
 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
 	ythickness = 0
 
-# Disable (comment out) for normal panel backgrounds or to get an transparancy panel.
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg-dark-grey.png"
 
 	fg[NORMAL]	= "#F7F7F7"
@@ -72,10 +72,10 @@ style "theme-panel-light"
 style "theme-panel-text"
 {
 	fg[NORMAL]	= "#F7F7F7"
-	fg[PRELIGHT]	= "#CEFF9B"
+	fg[PRELIGHT]	= "#000000"
 	fg[ACTIVE]	= "#F7F7F7"
 	text[NORMAL]	= "#F7F7F7"
-	text[PRELIGHT]	= "#CEFF9B"
+	text[PRELIGHT]	= "#000000"
 	text[ACTIVE]	= "#F7F7F7"
 }
 
diff --git a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
index a78cd02b..a199a171 100644
--- a/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
+++ b/desktop-themes/Menta/gtk-2.0/widgets/panel.rc
@@ -3,7 +3,7 @@ style "theme-panel"
 	xthickness = 4 # The spacing (padding) inside and between applets. Add a lower value for a more compact look.
 	ythickness = 0
 
-# Disable (comment out) for normal panel backgrounds or to get an transparancy panel.
+# Disable (comment out) for normal panel backgrounds or to get a transparancy panel.
 	bg_pixmap[NORMAL] = "/Panel/panel-bg.png"
 
 	fg[NORMAL]	= "#000000"
@@ -72,11 +72,11 @@ style "theme-panel-light"
 style "theme-panel-text"
 {
 	fg[NORMAL]	= "#000000"
-	fg[PRELIGHT]	= "#ffffff"
-	fg[ACTIVE]	= "#000000"
+	fg[PRELIGHT]	= "#000000"
+	fg[ACTIVE]	= "#ffffff"
 	text[NORMAL]	= "#000000"
-	text[PRELIGHT]	= "#ffffff"
-	text[ACTIVE]	= "#000000"
+	text[PRELIGHT]	= "#000000"
+	text[ACTIVE]	= "#ffffff"
 }
 
 style "theme-main-menu-text" = "theme-panel-text"
diff --git a/desktop-themes/TraditionalOkTest/index.theme.in b/desktop-themes/TraditionalOkTest/index.theme.in
index c58fd5ae..488b7640 100644
--- a/desktop-themes/TraditionalOkTest/index.theme.in
+++ b/desktop-themes/TraditionalOkTest/index.theme.in
@@ -6,3 +6,4 @@ Encoding=UTF-8
 GtkTheme=TraditionalOkTest
 MetacityTheme=TraditionalOk
 IconTheme=mate
+NotificationTheme=Coco