Mercurial Mercurial > hg > stx-libwidg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow activeImage/passiveImage to be specified
authorClaus Gittinger <cg@exept.de>
Tue, 19 May 1998 16:03:12 +0200
changeset 1528 02fc96381147
parent 1527 9ac160fcad3b
child 1529 509edab0a08b
allow activeImage/passiveImage to be specified
ChckTggle.st file | annotate | diff | comparison | revisions
CheckToggle.st file | annotate | diff | comparison | revisions 
--- a/ChckTggle.st	Tue May 19 16:00:53 1998 +0200
+++ b/ChckTggle.st	Tue May 19 16:03:12 1998 +0200
@@ -15,7 +15,7 @@
 	classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
 		DefaultActiveBGColor DefaultFGColor DefaultBGColor
 		DefaultActiveLevel DefaultPassiveLevel DefaultBorderWidth
-		LabelOverMargin'
+		LabelOverMargin DefaultActiveImage DefaultPassiveImage'
 	poolDictionaries:''
 	category:'Views-Interactors'
 !
@@ -63,6 +63,12 @@
         checkTogglePassiveLevel <Number>        active level - defaults to value of #buttonPassiveLevel
         checkToggleBorderWidth  <Number>        borderWidth - defaults buttons default
 
+        checkToggleActiveImage  <Image>         image to draw when active; if non-nil,
+                                                this overwrites activeColor & bitmapFile above.
+
+        checkTogglePassiveImage <Image>         image to draw when passive; if non-nil,
+                                                this overwrites passiveColor & bitmapFile above.
+
     (if not set in the styleSheet, Toggle values are taken)
 
     See examples.
@@ -366,12 +372,13 @@
                        #'checkToggle.backgroundColor' #'checkToggleForegroundColor'
                        #'checkToggle.activeBackgroundColor' #'checkToggleActiveForegroundColor'
                        #'checkToggle.activeLevel' #'checkTogglePassiveLevel'
+                       #'checkToggle.activeImage' #'checkTogglePassiveImage'
                        #'checkToggle.borderWidth' 
                        #'checkToggle.bitmapFile'
                        #'checkToggle.labelOverMargin' 
                        #'checkToggle.style')>
 
-    |checkFileName checkStyle|
+    |checkFileName checkStyle f|
 
     DefaultCheckColor    := StyleSheet colorAt:'checkToggle.checkColor'.
     DefaultFGColor       := StyleSheet colorAt:'checkToggle.foregroundColor'.
@@ -403,11 +410,14 @@
         DefaultCheckForm := DefaultCheckForm subImageIn: (0@0 extent: 15@15)
     ].
 
+    DefaultActiveImage := StyleSheet at:'checkToggle.activeImage'.
+    DefaultPassiveImage := StyleSheet at:'checkToggle.passiveImage'.
+
     "
      self updateStyleCache
     "
 
-    "Modified: 20.10.1997 / 13:53:33 / cg"
+    "Modified: / 19.5.1998 / 16:01:33 / cg"
 ! !
 
 !CheckToggle methodsFor:'event handling'!
@@ -432,20 +442,27 @@
     activeLogo := DefaultCheckForm onDevice:device.
     passiveLogo := nil.
 
+    DefaultActiveImage notNil ifTrue:[
+        activeLogo := DefaultActiveImage onDevice:device.
+    ].
+    DefaultPassiveImage notNil ifTrue:[
+        passiveLogo := DefaultPassiveImage onDevice:device.
+    ].
+
     DefaultActiveFGColor notNil ifTrue:[
-	self activeForegroundColor:DefaultActiveFGColor
+        self activeForegroundColor:DefaultActiveFGColor
     ].
     DefaultCheckColor notNil ifTrue:[
-	self activeForegroundColor:DefaultCheckColor
+        self activeForegroundColor:DefaultCheckColor
     ].
     DefaultActiveBGColor notNil ifTrue:[
-	self activeBackgroundColor:DefaultActiveBGColor
+        self activeBackgroundColor:DefaultActiveBGColor
     ].
     DefaultFGColor notNil ifTrue:[
-	self foregroundColor:DefaultFGColor
+        self foregroundColor:DefaultFGColor
     ].
     DefaultBGColor notNil ifTrue:[
-	self backgroundColor:DefaultBGColor
+        self backgroundColor:DefaultBGColor
     ].
 
     showLamp := false.
@@ -454,13 +471,15 @@
 
     offLevel ~~ level ifTrue:[self level:offLevel].
 
-    "Modified: 22.1.1997 / 11:57:05 / cg"
+    "Modified: / 19.5.1998 / 15:50:29 / cg"
 !
 
 initialize
     super initialize.
-    passiveLogo := nil.
+    passiveLogo := DefaultPassiveImage.
     self label:activeLogo. "/ to let me compute some defaultExtent
+
+    "Modified: / 19.5.1998 / 15:51:49 / cg"
 ! !
 
 !CheckToggle methodsFor:'queries'!
@@ -528,5 +547,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.42 1998-03-30 12:32:15 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Attic/ChckTggle.st,v 1.43 1998-05-19 14:03:12 cg Exp $'
 ! !
--- a/CheckToggle.st	Tue May 19 16:00:53 1998 +0200
+++ b/CheckToggle.st	Tue May 19 16:03:12 1998 +0200
@@ -15,7 +15,7 @@
 	classVariableNames:'DefaultCheckForm DefaultCheckColor DefaultActiveFGColor
 		DefaultActiveBGColor DefaultFGColor DefaultBGColor
 		DefaultActiveLevel DefaultPassiveLevel DefaultBorderWidth
-		LabelOverMargin'
+		LabelOverMargin DefaultActiveImage DefaultPassiveImage'
 	poolDictionaries:''
 	category:'Views-Interactors'
 !
@@ -63,6 +63,12 @@
         checkTogglePassiveLevel <Number>        active level - defaults to value of #buttonPassiveLevel
         checkToggleBorderWidth  <Number>        borderWidth - defaults buttons default
 
+        checkToggleActiveImage  <Image>         image to draw when active; if non-nil,
+                                                this overwrites activeColor & bitmapFile above.
+
+        checkTogglePassiveImage <Image>         image to draw when passive; if non-nil,
+                                                this overwrites passiveColor & bitmapFile above.
+
     (if not set in the styleSheet, Toggle values are taken)
 
     See examples.
@@ -366,12 +372,13 @@
                        #'checkToggle.backgroundColor' #'checkToggleForegroundColor'
                        #'checkToggle.activeBackgroundColor' #'checkToggleActiveForegroundColor'
                        #'checkToggle.activeLevel' #'checkTogglePassiveLevel'
+                       #'checkToggle.activeImage' #'checkTogglePassiveImage'
                        #'checkToggle.borderWidth' 
                        #'checkToggle.bitmapFile'
                        #'checkToggle.labelOverMargin' 
                        #'checkToggle.style')>
 
-    |checkFileName checkStyle|
+    |checkFileName checkStyle f|
 
     DefaultCheckColor    := StyleSheet colorAt:'checkToggle.checkColor'.
     DefaultFGColor       := StyleSheet colorAt:'checkToggle.foregroundColor'.
@@ -403,11 +410,14 @@
         DefaultCheckForm := DefaultCheckForm subImageIn: (0@0 extent: 15@15)
     ].
 
+    DefaultActiveImage := StyleSheet at:'checkToggle.activeImage'.
+    DefaultPassiveImage := StyleSheet at:'checkToggle.passiveImage'.
+
     "
      self updateStyleCache
     "
 
-    "Modified: 20.10.1997 / 13:53:33 / cg"
+    "Modified: / 19.5.1998 / 16:01:33 / cg"
 ! !
 
 !CheckToggle methodsFor:'event handling'!
@@ -432,20 +442,27 @@
     activeLogo := DefaultCheckForm onDevice:device.
     passiveLogo := nil.
 
+    DefaultActiveImage notNil ifTrue:[
+        activeLogo := DefaultActiveImage onDevice:device.
+    ].
+    DefaultPassiveImage notNil ifTrue:[
+        passiveLogo := DefaultPassiveImage onDevice:device.
+    ].
+
     DefaultActiveFGColor notNil ifTrue:[
-	self activeForegroundColor:DefaultActiveFGColor
+        self activeForegroundColor:DefaultActiveFGColor
     ].
     DefaultCheckColor notNil ifTrue:[
-	self activeForegroundColor:DefaultCheckColor
+        self activeForegroundColor:DefaultCheckColor
     ].
     DefaultActiveBGColor notNil ifTrue:[
-	self activeBackgroundColor:DefaultActiveBGColor
+        self activeBackgroundColor:DefaultActiveBGColor
     ].
     DefaultFGColor notNil ifTrue:[
-	self foregroundColor:DefaultFGColor
+        self foregroundColor:DefaultFGColor
     ].
     DefaultBGColor notNil ifTrue:[
-	self backgroundColor:DefaultBGColor
+        self backgroundColor:DefaultBGColor
     ].
 
     showLamp := false.
@@ -454,13 +471,15 @@
 
     offLevel ~~ level ifTrue:[self level:offLevel].
 
-    "Modified: 22.1.1997 / 11:57:05 / cg"
+    "Modified: / 19.5.1998 / 15:50:29 / cg"
 !
 
 initialize
     super initialize.
-    passiveLogo := nil.
+    passiveLogo := DefaultPassiveImage.
     self label:activeLogo. "/ to let me compute some defaultExtent
+
+    "Modified: / 19.5.1998 / 15:51:49 / cg"
 ! !
 
 !CheckToggle methodsFor:'queries'!
@@ -528,5 +547,5 @@
 !CheckToggle class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.42 1998-03-30 12:32:15 tz Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/CheckToggle.st,v 1.43 1998-05-19 14:03:12 cg Exp $'
 ! !
hg/stx-libwidg