added pixmaps for menu check/radio

21 files changed, 394 insertions, 3 deletions

diff --git a/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow-prelight.png b/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow-prelight.png
new file mode 100644
index 0000000..9a2d7de
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow-prelight.png
diff --git a/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow.png b/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow.png
new file mode 100644
index 0000000..d481aa7
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Arrows/menu-arrow.png
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png
new file mode 100644
index 0000000..ae0cc6a
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck.png
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png
new file mode 100644
index 0000000..35dc5a7
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Check-Radio/menucheck_prelight.png
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png
new file mode 100644
index 0000000..ca3b939
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption.png
diff --git a/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png
new file mode 100644
index 0000000..0a409ab
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Check-Radio/menuoption_prelight.png
diff --git a/Kogaion-daylight/gtk-2.0/Others/focus.png b/Kogaion-daylight/gtk-2.0/Others/focus.png
new file mode 100644
index 0000000..24b65d3
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Others/focus.png
diff --git a/Kogaion-daylight/gtk-2.0/Others/null.png b/Kogaion-daylight/gtk-2.0/Others/null.png
new file mode 100644
index 0000000..9d7e6be
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Others/null.png
diff --git a/Kogaion-daylight/gtk-2.0/Others/tree_header.png b/Kogaion-daylight/gtk-2.0/Others/tree_header.png
new file mode 100644
index 0000000..b5b4b3d
--- /dev/null
+++ b/Kogaion-daylight/gtk-2.0/Others/tree_header.png
diff --git a/Kogaion-daylight/gtk-2.0/gtkrc b/Kogaion-daylight/gtk-2.0/gtkrc
index 1da7270..429b768 100755
--- a/Kogaion-daylight/gtk-2.0/gtkrc
+++ b/Kogaion-daylight/gtk-2.0/gtkrc
@@ -361,6 +361,201 @@ style "menu_item_white" {
 	}
 }
 
+#better items view, but ugly inactive icons
+style "menu_item_pixmap" {
+
+	xthickness	= 2
+	ythickness	= 3
+
+        # HACK: Gtk doesn't actually read this value
+        # while rendering the menu items, but Libreoffice
+        # does; setting this value equal to the one in
+        # fg[PRELIGHT] ensures a code path in the LO theming code
+        # that falls back to a dark text color for menu item text
+        # highlight. The price to pay is black text on menus as well,
+        # but at least it's readable.
+        # See https://bugs.freedesktop.org/show_bug.cgi?id=38038
+	bg[SELECTED]    = shade (1.00, @selected_bg_color)
+
+	bg[PRELIGHT]	= @selected_bg_color
+	fg[PRELIGHT]	= @selected_fg_color
+	text[PRELIGHT]	= @selected_fg_color
+
+	engine "pixmap"
+	{
+
+	# Check Buttons
+
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= NORMAL
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= PRELIGHT
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= ACTIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= INSENSITIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+	    	state	 				= NORMAL
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck.png"
+            overlay_stretch	 	= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state                   = PRELIGHT
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck_prelight.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+	    state                       = ACTIVE
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+  	{
+ 	    	function        		= CHECK
+   	    	recolorable     		= TRUE
+       	    state 					= INSENSITIVE
+       	    shadow          		= IN
+       	    overlay_file   			= "Others/null.png"
+       	    overlay_stretch 		= FALSE
+	}
+
+	# Radio Buttons
+
+	image 
+	{
+            function        		= OPTION
+            state 					= NORMAL
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= PRELIGHT
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= ACTIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= INSENSITIVE
+            shadow         			= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state 					= NORMAL
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption.png"
+            overlay_stretch 		= FALSE
+        }
+ 	image 
+	{
+            function        		= OPTION
+	    	state					= PRELIGHT
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption_prelight.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state					= ACTIVE
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption.png"
+            overlay_stretch	 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state 					= INSENSITIVE
+            shadow          		= IN
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+      	{
+            function                    = SHADOW # This fixes boxy Qt menu items
+	    	file        		= "Others/null.png"
+	    	border      		= { 4, 4, 4, 4 }
+	    	stretch         	        = TRUE
+      	}
+
+	# Arrow Buttons
+
+	image
+		{
+	  	function			= ARROW
+	  	state				= NORMAL
+	  	overlay_file		= "Arrows/menu-arrow.png"
+	  	overlay_border		= { 0, 0, 0, 0 }
+	  	overlay_stretch		= FALSE
+	  	arrow_direction		= RIGHT
+		}
+	image
+		{
+	  	function			= ARROW
+	  	state				= PRELIGHT
+	  	overlay_file		= "Arrows/menu-arrow-prelight.png"
+	  	overlay_border		= { 0, 0, 0, 0 }
+	  	overlay_stretch		= FALSE
+	  	arrow_direction		= RIGHT
+		}
+    }
+}
+
 style "menubar_menuitem" {
 	xthickness	= 2
 	ythickness	= 3
@@ -918,7 +1113,7 @@ 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>.<GtkMenuItem>*"	style "menu_item_white"
+
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menubar_menuitem"
 
 widget_class "*<GtkToolbar>"                    style "toolbar"
diff --git a/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow-prelight.png b/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow-prelight.png
new file mode 100644
index 0000000..9a2d7de
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow-prelight.png
diff --git a/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow.png b/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow.png
new file mode 100644
index 0000000..9a2d7de
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Arrows/menu-arrow.png
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png
new file mode 100644
index 0000000..ae0cc6a
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck.png
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png
new file mode 100644
index 0000000..35dc5a7
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Check-Radio/menucheck_prelight.png
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png
new file mode 100644
index 0000000..ca3b939
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption.png
diff --git a/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png
new file mode 100644
index 0000000..0a409ab
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Check-Radio/menuoption_prelight.png
diff --git a/Kogaion-nighttime/gtk-2.0/Others/focus.png b/Kogaion-nighttime/gtk-2.0/Others/focus.png
new file mode 100644
index 0000000..24b65d3
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Others/focus.png
diff --git a/Kogaion-nighttime/gtk-2.0/Others/null.png b/Kogaion-nighttime/gtk-2.0/Others/null.png
new file mode 100644
index 0000000..9d7e6be
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Others/null.png
diff --git a/Kogaion-nighttime/gtk-2.0/Others/tree_header.png b/Kogaion-nighttime/gtk-2.0/Others/tree_header.png
new file mode 100644
index 0000000..b5b4b3d
--- /dev/null
+++ b/Kogaion-nighttime/gtk-2.0/Others/tree_header.png
diff --git a/Kogaion-nighttime/gtk-2.0/gtkrc b/Kogaion-nighttime/gtk-2.0/gtkrc
index 203e8b5..e6f4b73 100755
--- a/Kogaion-nighttime/gtk-2.0/gtkrc
+++ b/Kogaion-nighttime/gtk-2.0/gtkrc
@@ -361,6 +361,201 @@ style "menu_item_white" {
 	}
 }
 
+#better items view, but ugly inactive icons
+style "menu_item_pixmap" {
+
+	xthickness	= 2
+	ythickness	= 3
+
+        # HACK: Gtk doesn't actually read this value
+        # while rendering the menu items, but Libreoffice
+        # does; setting this value equal to the one in
+        # fg[PRELIGHT] ensures a code path in the LO theming code
+        # that falls back to a dark text color for menu item text
+        # highlight. The price to pay is black text on menus as well,
+        # but at least it's readable.
+        # See https://bugs.freedesktop.org/show_bug.cgi?id=38038
+	bg[SELECTED]    = shade (1.00, @selected_bg_color)
+
+	bg[PRELIGHT]	= @selected_bg_color
+	fg[PRELIGHT]	= @selected_fg_color
+	text[PRELIGHT]	= @selected_fg_color
+
+	engine "pixmap"
+	{
+
+	# Check Buttons
+
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= NORMAL
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= PRELIGHT
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= ACTIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state 					= INSENSITIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+	    	state	 				= NORMAL
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck.png"
+            overlay_stretch	 	= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+            state                   = PRELIGHT
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck_prelight.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= CHECK
+            recolorable     		= TRUE
+	    state                       = ACTIVE
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menucheck.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+  	{
+ 	    	function        		= CHECK
+   	    	recolorable     		= TRUE
+       	    state 					= INSENSITIVE
+       	    shadow          		= IN
+       	    overlay_file   			= "Others/null.png"
+       	    overlay_stretch 		= FALSE
+	}
+
+	# Radio Buttons
+
+	image 
+	{
+            function        		= OPTION
+            state 					= NORMAL
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= PRELIGHT
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= ACTIVE
+            shadow          		= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+            state 					= INSENSITIVE
+            shadow         			= OUT
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state 					= NORMAL
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption.png"
+            overlay_stretch 		= FALSE
+        }
+ 	image 
+	{
+            function        		= OPTION
+	    	state					= PRELIGHT
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption_prelight.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state					= ACTIVE
+            shadow          		= IN
+            overlay_file    		= "Check-Radio/menuoption.png"
+            overlay_stretch	 		= FALSE
+        }
+	image 
+	{
+            function        		= OPTION
+	    	state 					= INSENSITIVE
+            shadow          		= IN
+            overlay_file    		= "Others/null.png"
+            overlay_stretch 		= FALSE
+        }
+	image 
+      	{
+            function                    = SHADOW # This fixes boxy Qt menu items
+	    	file        		= "Others/null.png"
+	    	border      		= { 4, 4, 4, 4 }
+	    	stretch         	        = TRUE
+      	}
+
+	# Arrow Buttons
+
+	image
+		{
+	  	function			= ARROW
+	  	state				= NORMAL
+	  	overlay_file		= "Arrows/menu-arrow.png"
+	  	overlay_border		= { 0, 0, 0, 0 }
+	  	overlay_stretch		= FALSE
+	  	arrow_direction		= RIGHT
+		}
+	image
+		{
+	  	function			= ARROW
+	  	state				= PRELIGHT
+	  	overlay_file		= "Arrows/menu-arrow-prelight.png"
+	  	overlay_border		= { 0, 0, 0, 0 }
+	  	overlay_stretch		= FALSE
+	  	arrow_direction		= RIGHT
+		}
+    }
+}
+
 style "menubar_menuitem" {
 	xthickness	= 2
 	ythickness	= 3
@@ -917,7 +1112,7 @@ 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>.<GtkMenuItem>*"	style "menu_item_white"
+
 widget_class "*<GtkMenuBar>.<GtkMenuItem>*"	style "menubar_menuitem"
 
 widget_class "*<GtkToolbar>"                    style "toolbar"
diff --git a/README.md b/README.md
index 97d3bff..d87b10a 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,10 @@
 #### gtk2
 	Ongoing, TBD:
 	- panel to be refined
-	- checkboxes to be refined - remaining menu items and treeview
+	- checkboxes to be refined - remaining treeview
 	- more code cleaning
 	- see also 'to review' file
+	- find solution for ugly inactive icons in pixmap
 
 #### gtk3
 	missing in action