Merge pull request #8 from EMH-Mark-I/master

Some more updates

README.md

@@ -30,7 +30,7 @@ I decided that the pop-overs were almost exactly as annoying/ugly as Clippy was
 ## Installation
 
 ### Themes
-Copy the folder `Theme/Chicago95` to the themes directory i.e. `/usr/share/themes/` or `~/.themes`.
+For system wide install, copy the folder `Theme/Chicago95` to the themes directory i.e. `/usr/share/themes/` or `~/.themes`.
 
 In XFCE select Settings -> Appearance. Click on 'Style' and select `Chicago95`.
 
@@ -102,19 +102,18 @@ Next, open Window Manager.
 
 ### Where’s the classic Start Button?
 
-If you want a classic style start button for the Whisker Menu or Application-Menu plugins instead of it defaulting to only an icon without the button borders, there are a few steps required to set this up. 
+If you want a classic style start button for the Whisker Menu or Application-Menu plugins instead of it defaulting to only an icon without the button borders, there are a few steps required to set this up.
-I didn’t include this in the installer script because there’s too much potential for it to go wrong. 
 
 Note: Your panel has to be 32px high if you wish to have the classic style Start button. If it’s any other size, the button won’t look correct. You’re more than welcomed to make your own Start button.
 This is a work around because I’ve been unable to find a more sane means of making something that should be so simple to work...
 
-1. Go to this directory on your system. `/home/$USER/.themes/Chicago95-custom/gtk-2.0/`
+1. Go to the install directory of the theme, i.e.`~/.themes/Chicago95/gtk-2.0/` or `/usr/share/themes/Chicago95/gtk-2.0/.`
-2. You will see a file named `panel.rc` and another one named `panel.rc.alt`. Rename `panel.rc` to `panel.rc.bak`. Rename `panel.rc.alt` to `panel.rc`.
+2. You will see a file named `panel.rc` and another one named `panel.rc.alt`. Rename `panel.rc` to `panel.rc.bak`. Then rename `panel.rc.alt` to `panel.rc`.
-3. Open the properties menu of either Whisker Menu or Application Menu and change the icon. The Start Button is located in the following directory: `/home/$USER/.themes/Chicago95-custom/gtk-2.0/panel/`. Select the file name `start-button.png`.
+3. Open the properties menu of either Whisker Menu or Application Menu and change the icon. The Start Button is located in the following directory: `~/.themes/Chicago95/gtk-2.0/panel` or `/usr/share/themes/Chicago95/gtk-2.0/panel.` Select the file name `start-button_windows` or `start-button_tux.`
 4. The icon will appear crunched. Log out and log back in or run `xfce4-panel -r` to reset the panel interface. The icon should appear a regular size.
 
-### Pulse Audio Fix
+### Pulse Audio Icon Fix
-Copy the `pulseaudio_fix.css` file from the `gtk-3.0 Override` directory into `/home/$USER/.config/gtk-3.0/` (This will fix the oversized pulse audio button and battery icon in the panel.)
+Copy the `pulseaudio_fix.css` file from the `Extras\gtk-3.0 Override` directory into `/home/$USER/.config/gtk-3.0/` (This will fix the oversized pulse audio button and battery icon in the panel.)
 
 Next, execute the following command as a regular user to import the pulseaudio fix:
 
@@ -122,10 +121,10 @@ Next, execute the following command as a regular user to import the pulseaudio f
 
 ### Setting up the panel
 
-1. Panel 1. Horizontal, 32px high ONLY, and 100% Length. Below or above and it won’t look correct. (Make sure you set the background style to "None" so that it inherits the theme style.)
+1. Panel 1. Horizontal, 32px high ONLY, and 100% Length. Currently no proper vertical panel support so below or above only. (Make sure you set the background style to "None" so that it inherits the theme style.)
 2. Application Menu; 
 3. Separator (Handle Style); 
-4. Custom Launcher, Custom Launcher, Custom Launcher, etc.
+4. Custom Launcher, Custom Launcher, Custom Launcher, etc. (Try using 16px icons for the launchers.)
 5. “Show Desktop” plugin; 
 6. Separator (Handle Style); 
 7. Window Buttons (Sorting Order: Timestamp and Window Grouping is Always. Uncheck “Show Handle” if it’s enabled.); 
@@ -143,6 +142,9 @@ Disable shadows in compositing for an authentic appearance, or at the very least
 
 For the icon theme, I made a small adjustment that replaces the MS Windows logos with tux penguins. You can install this if you want. To install it, copy the `Chicago95-tux` directory into “/home/$USER/.icons.”
 
+### Notification baloon theme
+There is a notification baloon theme with Chicago95.
+
 
 ## Requirements
 

Theme/Chicago95/gtk-2.0/gtkrc

@@ -452,9 +452,6 @@ engine "pixmap" {
 
 class "GtkWidget" style "standard-default"
 
-
-
-
 style "standard-menu"
 {
   bg[PRELIGHT] = @selected_bg_color
@@ -477,8 +474,8 @@ widget_class "*MenuBar.*MenuItem*" style "standard-menubar-item"
 
 style "standard-list"
 {
-   bg[NORMAL] = lighter (@bg_color) # { 0.9, 0.9, 0.9 }
+  bg[NORMAL] = lighter (@bg_color) # { 0.9, 0.9, 0.9 }
-   bg[PRELIGHT] = @fg_color #{ 0.0, 0.0, 0.0 }
+  bg[PRELIGHT] = @fg_color #{ 0.0, 0.0, 0.0 }
 }
 
 class "GtkList" style "standard-list"
@@ -489,20 +486,15 @@ style "standard-scrollbar"
   GtkRange::slider-width = 16
   GtkRange::stepper-size = 16
   GtkRange::stepper-spacing = 0
-
-
 }
 
 class "GtkScrollbar" style "standard-scrollbar"
 
-
 style "standard-scales"
 {
   GtkRange::slider-width = 11
   GtkScale::slider-length = 21
-
   bg[ACTIVE]        = shade (1.1,@bg_color)
-
 }
 
 #class "*Scale*" style "standard-scales"
@@ -518,25 +510,26 @@ class "GtkOptionMenu" style "standard-option-menu"
 
 style "gnome-color-chooser-tooltips"
 {
-bg[NORMAL] = "#ffffe1"
+  bg[NORMAL] = "#ffffe1"
-fg[NORMAL] = "#000000"
+  fg[NORMAL] = "#000000"
 }
 widget "gtk-tooltip*" style "gnome-color-chooser-tooltips"
 
+# Desktop shortcut icon style & text shadow
 style "xfdesktop-icon-view" {
-  XfdesktopIconView::label-radius = 0.99				#Enable this  if you want a small shadow behind text.
+  XfdesktopIconView::label-radius = 0.99
   XfdesktopIconView::label-alpha = 0
   XfdesktopIconView::selected-label-alpha = 255
-#  XfdesktopIconView::shadow-x-offset = 0				#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::shadow-x-offset = 1				#Enable these if you want a shadow behind text
-#  XfdesktopIconView::shadow-y-offset = 1				#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::shadow-y-offset = 1				#Enable these if you want a shadow behind text
-#  XfdesktopIconView::selected-shadow-x-offset = 0			#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::selected-shadow-x-offset = 1			#Enable these if you want a shadow behind text
-#  XfdesktopIconView::selected-shadow-y-offset = 1			#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::selected-shadow-y-offset = 1			#Enable these if you want a shadow behind text
-#  XfdesktopIconView::shadow-color = "#000000"				#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::shadow-color = "#000000"				#Enable these if you want a shadow behind text
-#  XfdesktopIconView::selected-shadow-color = "#000000"			#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::selected-shadow-color = "#000000"			#Enable these if you want a shadow behind text
-#  XfdesktopIconView::shadow-blur-radius = 2				#Enable these if you want a big shadow behind text
+#  XfdesktopIconView::shadow-blur-radius = 2				#Enable this if you want a a blurry shadow behind text
-  XfdesktopIconView::cell-spacing = 2
+  XfdesktopIconView::cell-spacing = 5
-  XfdesktopIconView::cell-padding = 6
+  XfdesktopIconView::cell-padding = 0
-  XfdesktopIconView::cell-text-width-proportion = 1.9
+  XfdesktopIconView::cell-text-width-proportion = 2
 
   fg[NORMAL] = @selected_fg_color
   fg[ACTIVE] = @selected_fg_color
@@ -545,6 +538,26 @@ style "xfdesktop-icon-view" {
 
 widget_class "*XfdesktopIconView*"	style "xfdesktop-icon-view"
 
+#Frame around orage
+style "frame"
+{
+  xthickness      = 1
+  ythickness      = 1
+
+  engine "pixmap"
+	{
+    image
+	{
+		function				= SHADOW
+		file					= "Shadows/frame.png"
+		border					= { 1, 1, 1, 1 }
+		stretch					= TRUE
+		shadow					= IN
+	}
+	}
+}
+
+class "GtkFrame"	                style "frame"
 
 include "tabwin.rc"
 include "panel.rc"
@@ -555,4 +568,4 @@ include "menu_item.rc"
 include "slider.rc"
 include "toolbutton.rc"
 include "tabs.rc"
-include "menubar.rc"
+include "menubar.rc"

Theme/Chicago95/gtk-2.0/panel.rc.alt

@@ -424,7 +424,7 @@ style "whiskerbutton"
 		recolorable     		= TRUE
 		shadow				= IN
 		state				= PRELIGHT
-		file            		= "Others/null.png"
+		file            		= "panel/start-button-shade.png" #Sets a backdrop colour.
 		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}
@@ -435,7 +435,7 @@ style "whiskerbutton"
 		function        		= BOX
 		recolorable     		= TRUE
 		state				= ACTIVE
-		file            		= "panel/start-button-shade.png"
+		file            		= "panel/start-button-shade.png" #Sets a backdrop colour.
 		border          		= { 0, 0, 0, 0 }
 		stretch         		= TRUE
 	}  

Theme/Chicago95/gtk-3.0/gtk-widgets.css

@@ -3235,13 +3235,13 @@ GtkBubbleWindow .toolbar {
      box-shadow: none; 
 }
 
-GtkWindow.csd,
+#GtkWindow.csd,
-GtkWindows.ssd {
+#GtkWindows.ssd {
-    padding: 4px;
+#    padding: 4px;
-    border-radius: 0;
+#    border-radius: 0;
-    border-width: 0px 1px 1px 1px;
+#    border-width: 0px 1px 1px 1px;
-    border-style: solid;
+#    border-style: solid;
-    border-color: #c0c0c0 #000 #000 #c0c0c0;
+#    border-color: #c0c0c0 #000 #000 #c0c0c0;
-    box-shadow: inset 1px 0px #FFF, inset -1px -1px #808080;
+#    box-shadow: inset 1px 0px #FFF, inset -1px -1px #808080;
-
+#
-}
+#}