--- a/styles/macosx.style Sat Nov 22 04:44:03 2014 +0000
+++ b/styles/macosx.style Sat Nov 22 23:52:59 2014 +0100
@@ -1,6 +1,6 @@
; View defaultStyle:#mswindowsVista
;
-; $Header: /cvs/stx/stx/libview/styles/macosx.style,v 1.4 2014-10-21 19:39:18 cg Exp $
+; $Header: /cvs/stx/stx/libview/styles/macosx.style,v 1.5 2014-11-22 22:52:59 cg Exp $
#include 'Adwaita.style'
@@ -52,18 +52,20 @@
;; enable this, when old menuView cares for it also
;; menu.itemMargin 1
-menu.hilightBackgroundColor (Color rgbValue:16rEDEDED)
+menu.backgroundColor (Color white)
+menu.hilightBackgroundColor (Color red:37 green:50 blue:95)
+menu.hilightForegroundColor (Color white)
menu.selectionFollowsMouse true
menu.enteredBackgroundColor =menu.hilightBackgroundColor
menu.enteredForegroundColor =menu.hilightForegroundColor
-menu.iconIndicationOn.bitmapFile 'CheckOn_xp.xpm'
-menu.iconIndicationOff.bitmapFile 'CheckOff_xp.xpm'
-menu.iconRadioOn.bitmap (Windows8ToolbarIconLibrary radioOn12x12Icon)
-menu.iconRadioOff.bitmap (Windows8ToolbarIconLibrary radioOff12x12Icon)
-menu.iconDisabledIndicationOn.bitmapFile 'CheckOn_disabled_xp.xpm'
-menu.iconDisabledIndicationOff.bitmapFile 'CheckOff_disabled_xp.xpm'
-menu.iconDisabledRadioOn.bitmap (Windows8ToolbarIconLibrary radioOnDisabled12x12Icon)
-menu.iconDisabledRadioOff.bitmap (Windows8ToolbarIconLibrary radioOffDisabled12x12Icon)
+menu.iconIndicationOn.bitmap (MacOSXToolbarIconLibrary checkToggleOnIcon)
+menu.iconIndicationOff.bitmap (MacOSXToolbarIconLibrary checkToggleOffIcon)
+menu.iconDisabledIndicationOn.bitmapFile (MacOSXToolbarIconLibrary checkToggleOnDisabledIcon)
+menu.iconDisabledIndicationOff.bitmapFile (MacOSXToolbarIconLibrary checkToggleOffDisabledIcon)
+menu.iconRadioOn.bitmap (MacOSXToolbarIconLibrary radioOnIcon)
+menu.iconRadioOff.bitmap (MacOSXToolbarIconLibrary radioOffIcon)
+menu.iconDisabledRadioOn.bitmap (MacOSXToolbarIconLibrary radioOnDisabledIcon)
+menu.iconDisabledRadioOff.bitmap (MacOSXToolbarIconLibrary radioOffDisabledIcon)
button.edgeStyle nil
@@ -169,28 +171,28 @@
;noteBook.passiveBackgroundColor =lightenedViewGrey
;
;checkToggle.bitmapFile 'CheckOn10_xp.xpm'
-;radioButton.passiveImage [Windows8ToolbarIconLibrary radioOff12x12Icon]
-;radioButton.activeImage [Windows8ToolbarIconLibrary radioOn12x12Icon]
-;radioButton.enteredPassiveImage [Windows8ToolbarIconLibrary radioOffEntered12x12Icon]
-;radioButton.enteredActiveImage [Windows8ToolbarIconLibrary radioOnEntered12x12Icon]
-;radioButton.disabledPassiveImage [Windows8ToolbarIconLibrary radioOffDisabled12x12Icon]
-;radioButton.disabledActiveImage [Windows8ToolbarIconLibrary radioOnDisabled12x12Icon]
-;checkToggle.disabledActiveImage [Windows8ToolbarIconLibrary checkToggleOnDisabledIcon]
-;checkToggle.disabledPassiveImage [Windows8ToolbarIconLibrary checkToggleOffDisabledIcon]
-;checkToggle.activeImage [Windows8ToolbarIconLibrary checkToggleOnIcon]
-;checkToggle.passiveImage [Windows8ToolbarIconLibrary checkToggleOffIcon]
-;checkToggle.enteredPassiveImage [Windows8ToolbarIconLibrary checkToggleOffEnteredIcon]
-;checkToggle.enteredActiveImage [Windows8ToolbarIconLibrary checkToggleOnEnteredIcon]
-;checkToggle.activeLevel 0
-;checkToggle.passiveLevel 0
-;checkToggle.disabledBackgroundColor =viewGrey
-;checkToggle.backgroundColor =viewGrey
-;checkToggle.activeBackgroundColor =viewGrey
+radioButton.passiveImage [MacOSXToolbarIconLibrary radioOffIcon]
+radioButton.activeImage [MacOSXToolbarIconLibrary radioOnIcon]
+radioButton.enteredPassiveImage [MacOSXToolbarIconLibrary radioOffIcon]
+radioButton.enteredActiveImage [MacOSXToolbarIconLibrary radioOnIcon]
+radioButton.disabledPassiveImage [MacOSXToolbarIconLibrary radioOffDisabledIcon]
+radioButton.disabledActiveImage [MacOSXToolbarIconLibrary radioOnDisabledIcon]
+checkToggle.disabledActiveImage [MacOSXToolbarIconLibrary checkToggleOnDisabledIcon]
+checkToggle.disabledPassiveImage [MacOSXToolbarIconLibrary checkToggleOffDisabledIcon]
+checkToggle.activeImage [MacOSXToolbarIconLibrary checkToggleOnIcon]
+checkToggle.passiveImage [MacOSXToolbarIconLibrary checkToggleOffIcon]
+checkToggle.enteredPassiveImage [MacOSXToolbarIconLibrary checkToggleOffEnteredIcon]
+checkToggle.enteredActiveImage [MacOSXToolbarIconLibrary checkToggleOnEnteredIcon]
+checkToggle.activeLevel 0
+checkToggle.passiveLevel 0
+checkToggle.disabledBackgroundColor =viewGrey
+checkToggle.backgroundColor =viewGrey
+checkToggle.activeBackgroundColor =viewGrey
;
-;menu.iconIndicationOn [Windows8ToolbarIconLibrary checkToggleOnIcon]
-;menu.iconIndicationOff [Windows8ToolbarIconLibrary checkToggleOffIcon]
-;menu.iconDisabledIndicationOn [Windows8ToolbarIconLibrary checkToggleOffDisabledIcon]
-;menu.iconDisabledIndicationOff [Windows8ToolbarIconLibrary checkToggleOffIcon]
+menu.iconIndicationOn [MacOSXToolbarIconLibrary checkToggleOnIcon]
+menu.iconIndicationOff [MacOSXToolbarIconLibrary checkToggleOffIcon]
+menu.iconDisabledIndicationOn [MacOSXToolbarIconLibrary checkToggleOffDisabledIcon]
+menu.iconDisabledIndicationOff [MacOSXToolbarIconLibrary checkToggleOffIcon]
;
;noteBook.activeTabMarkerColor (Color red:100 green:78 blue:23)
;