panel fixing stage 1, also code cleanup

1 files changed, 40 insertions, 43 deletions

diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc
index 4f81c99..4d03ce6 100755
--- a/Kogaion-nighttime/gtk-2.0/gtkrc
+++ b/Kogaion-nighttime/gtk-2.0/gtkrc
@@ -170,7 +170,7 @@ style "default" {
 		scrollbarstyle			= 0 # 0 = nothing
 		separatorstyle 			= 1	# 0 = Hard separators
 									# 1 = Smooth separators
-		shadow_shades			= {0.95, 1.0}
+		shadow_shades			= {1.1, 1.0}
 		sliderstyle				= 0 # 0 = nothing added
 		stepperstyle			= 1 # 0 = standard
 									# 1 = integrated stepper handles
@@ -344,8 +344,8 @@ style "menubar_menuitem" {
     fg[INSENSITIVE] = mix(0.60, @fg_color, @window_active_color)	    # menu item disabled
 	fg[PRELIGHT]	= @selected_fg_color										# menu item selected
 
-   	bg[PRELIGHT]    = shade (0.94, @selected_bg_color)
-    bg[SELECTED]    = shade (1.2, @selected_bg_color)
+	bg[PRELIGHT]    = shade (0.94, @selected_bg_color)
+	bg[SELECTED]    = shade (1.2, @selected_bg_color)
 
 	engine "murrine" {
         gradient_shades		= {1.03, 1.00, 1.00, 1.00}
@@ -567,7 +567,7 @@ style "treeview" {
 
 	engine "murrine" {
 		gradient_shades	= {1.00, 1.04, 1.06, 1.10}
-        separatorstyle 	= 1
+        separatorstyle 	= 0
 		contrast 		= 1.7
 	}
 }
@@ -804,7 +804,6 @@ widget "MozillaGtkWidget*GtkMenuBar" 			style "FireFox-MenuBar"
 #widget	"MozillaGtkWidget*Toolbar*"		style	"theme-toolbar"
 #widget	"MozillaGtkWidget*Statusbar*"	style	"ff-statusbar"
 
-
 widget	"MozillaGtkWidget*"	style	"ff-default"
 
 ####  Firefox  ###
@@ -819,7 +818,6 @@ style "firefox-base-entry" {
 	engine "murrine" {
 
 	}
-
 }
 
 # widget	"MozillaGtkWidget*GtkFixed*GtkEntry*"	style:highest	"firefox-base-entry"
@@ -857,33 +855,33 @@ widget_class "*<OsThumb>" 		style "overlay_scrollbar"
 
 # General matching follows. The order is choosen so that the right styles override
 # each other. EG. progressbar needs to be more important than the menu match.
-widget_class "*<GtkButton>"			    style "button"
-widget_class "*<GtkButton>*<GtkLabel>"  style "button_label"
+widget_class "*<GtkButton>"			    		style "button"
+widget_class "*<GtkButton>*<GtkLabel>"  			style "button_label"
 
-widget_class "*<GtkNotebook>"			style "notebook"
+widget_class "*<GtkNotebook>"					style "notebook"
 widget_class "*<GtkNotebook>*<GtkDrawingArea>"  style "notebook"
 widget_class "*<GtkNotebook>*<GtkLayout>"       style "notebook"
 widget_class "*<GtkNotebook>*<GtkLabel>"        style "notebook"
 
-widget_class "*<GtkMenuBar>*"			style "menubar"
-widget_class "*<GtkMenu>*"			    style "menu"
-widget_class "*<GtkMenuItem>*"			style "menu_item_white"
+widget_class "*<GtkMenuBar>*"					style "menubar"
+widget_class "*<GtkMenu>*"			    		style "menu"
+widget_class "*<GtkMenuItem>*"					style "menu_item_white"
 
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menubar_menuitem"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*"		style "menubar_menuitem"
 
 widget_class "*<GtkToolbar>"                    style "toolbar"
 widget_class "*<GtkHandleBox>"                  style "toolbar"
-widget_class "*<GtkToolbar>.*.<GtkButton>*"     style "toolbar_button"
+widget_class "*<GtkToolbar>.*.<GtkButton>*"     	style "toolbar_button"
 class "GtkSeparatorToolItem"		            style "toolbar_separator"
-widget_class "*<GtkSeparatorToolItem>*" 		style "separator_tool_item"
-widget_class "*<GtkSeparatorMenuItem>*" 		style "separator_menu_item"
+widget_class "*<GtkSeparatorToolItem>*" 			style "separator_tool_item"
+widget_class "*<GtkSeparatorMenuItem>*" 			style "separator_menu_item"
 
 widget_class "*.<GtkFrame>.<GtkLabel>"			style "frame_title"
-widget_class "*.<GtkTreeView>*"				style "treeview"
+widget_class "*.<GtkTreeView>*"					style "treeview"
 
-class "*GtkExpander*"  					style "expander"
+class "*GtkExpander*"  							style "expander"
 
-widget_class "*<GtkProgress>"				style "progressbar"
+widget_class "*<GtkProgress>"					style "progressbar"
 
 # Treeview headers (and similar stock GTK+ widgets)
 widget_class "*.<GtkTreeView>.<GtkButton>"		style "treeview_header"
@@ -894,9 +892,8 @@ widget_class "*.<GtkCList>.<GtkButton>"			style "treeview_header"
 # The window of the tooltip is called "gtk-tooltip"
 widget "gtk-tooltip*"							style "tooltips"
 
-
-widget_class "*<GtkCheckButton>*"			style "checkradio-pixmap"
-widget_class "*<GtkRadioButton>*"			style "checkradio-pixmap"
+widget_class "*<GtkCheckButton>*"				style "checkradio-pixmap"
+widget_class "*<GtkRadioButton>*"				style "checkradio-pixmap"
 widget_class "*<GtkCheckButton>*<GtkLabel>"		style:highest "checkradio_label"
 widget_class "*<GtkRadioButton>*<GtkLabel>"		style:highest "checkradio_label"
 
@@ -980,26 +977,26 @@ widget "*swt*toolbar*"			style "default"
 # ---------------------------------
 # Xfce panel theming
 # ---------------------------------
-style "xfce-panel" {
-    fg[NORMAL]          = @fg_color
-    fg[PRELIGHT]        = @selected_fg_color
-    fg[ACTIVE]          = @selected_fg_color
-    fg[SELECTED]        = @selected_fg_color
-
-    bg[NORMAL]          = shade (1.00, @window_active_color)
-    bg[PRELIGHT]        = shade (0.80, @window_active_color)
-    bg[ACTIVE]          = shade (0.50, @window_active_color)
-    bg[SELECTED]        = shade (1.20, @selected_bg_color)
-    engine "murrine" {
-        gradient_shades         = {0.80, 0.85, 0.95, 1.00}
-        roundness           = 2
-        contrast            = 0.2
-    }
-    xthickness = 3
-    ythickness = 3
-}
-widget "*Xfce*Panel*"   style "xfce-panel"
-class "*Xfce*Panel*"    style "xfce-panel"
+#style "xfce-panel" {
+#    fg[NORMAL]          = @fg_color
+#    fg[PRELIGHT]        = @selected_fg_color
+#    fg[ACTIVE]          = @selected_fg_color
+#    fg[SELECTED]        = @selected_fg_color
+#
+#    bg[NORMAL]          = shade (1.00, @window_active_color)
+#    bg[PRELIGHT]        = shade (0.80, @window_active_color)
+#    bg[ACTIVE]          = shade (0.50, @window_active_color)
+#    bg[SELECTED]        = shade (1.20, @selected_bg_color)
+#    engine "murrine" {
+#        gradient_shades         = {0.80, 0.85, 0.95, 1.00}
+#        roundness           = 2
+#        contrast            = 0.2
+#    }
+#    xthickness = 3
+#    ythickness = 3
+#}
+#widget "*Xfce*Panel*"   style "xfce-panel"
+#class "*Xfce*Panel*"    style "xfce-panel"
 
 style "xfdesktop-icon-view" {
     XfdesktopIconView::label-alpha = 0
@@ -1031,4 +1028,4 @@ widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
 # widget "xfwm4-tabwin*" style "murrine-dark"
 include "apps/thunar.rc"		# thunar especific
 include "apps/terminal.rc"
-
+include "apps/panel.rc"