[commits] (jeffrey) [11424] Finish bug 6233, calendar UI update

Wed, 16 Aug 2006 11:16:53 -0700

Title: [commits] (jeffrey) [11424] Finish bug 6233, calendar UI update
Revision
11424
Author
jeffrey
Date
2006-08-16 11:16:42 -0700 (Wed, 16 Aug 2006)

Log Message

Finish bug 6233, calendar UI update

- Add Mimi's tweaks to colors and color names
- Work with float -> int rounding errors so color
overrides work

Modified Paths

Added Paths

Removed Paths

Diff

Deleted: trunk/chandler/Chandler.egg-info/resources/images/AquaMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/AquaMenuIconChecked.png

(Binary files differ)

Copied: trunk/chandler/Chandler.egg-info/resources/images/GoldMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/YellowMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/GoldMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/YellowMenuIconChecked.png)

Copied: trunk/chandler/Chandler.egg-info/resources/images/IndigoMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/VioletMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/IndigoMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/VioletMenuIconChecked.png)

Copied: trunk/chandler/Chandler.egg-info/resources/images/OrangeMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/SalmonMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/OrangeMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/SalmonMenuIconChecked.png)

Copied: trunk/chandler/Chandler.egg-info/resources/images/PlumMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/PurpleMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/PlumMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/PurpleMenuIconChecked.png)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/PurpleMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/PurpleMenuIconChecked.png

(Binary files differ)

Copied: trunk/chandler/Chandler.egg-info/resources/images/RedMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/RoseMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/RedMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/RoseMenuIconChecked.png)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/RoseMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/RoseMenuIconChecked.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/SalmonMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/SalmonMenuIconChecked.png

(Binary files differ)

Copied: trunk/chandler/Chandler.egg-info/resources/images/TurquoiseMenuIcon.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/AquaMenuIcon.png) ( => )

Copied: trunk/chandler/Chandler.egg-info/resources/images/TurquoiseMenuIconChecked.png (from rev 11418, trunk/chandler/Chandler.egg-info/resources/images/AquaMenuIconChecked.png)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/VioletMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/VioletMenuIconChecked.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/YellowMenuIcon.png

(Binary files differ)

Deleted: trunk/chandler/Chandler.egg-info/resources/images/YellowMenuIconChecked.png

(Binary files differ)

Modified: trunk/chandler/application/styles.conf (11423 => 11424)

--- trunk/chandler/application/styles.conf	2006-08-16 17:40:04 UTC (rev 11423)
+++ trunk/chandler/application/styles.conf	2006-08-16 18:16:42 UTC (rev 11424)
@@ -16,23 +16,24 @@
 
 [colororder]
 # listed colors must all be on one line
-order = Blue, Green, Rose, Aqua, Salmon, Purple, Yellow, Violet, Fuschia
+order = Blue, Green, Red, Orange, Gold, Plum, Turquoise, Fuschia, Indigo
 
 [colors]
 # Names of colors and their hue.  To be used, a color must appear in colors
 # and colororder.  Also, checked and unchecked icons for the color should
-# be added to resources/images, these images are used on Windows for menu
+# be added to Chandler.egg-info/resources/images, these images are used for menu
 # icons
-Rose    = 0
-Salmon  = 30
-Yellow  = 50
-Green   = 120
-Aqua    = 170
-Blue    = 210
-Violet  = 270
-Purple  = 300
-Fuschia = 330
+Blue        = 210
+Green       = 120
+Red         = 0
+Orange      = 30
+Gold        = 50
+Plum        = 300
+Turquoise   = 170
+Fuschia     = 330
+Indigo      = 270
 
+
 [calendarcanvas]
 
 ######### Selected Lozenges ################
@@ -43,8 +44,8 @@
 SelectedGradientRightSaturation   = 1.0
 SelectedGradientRightValue        = 0.8
 
-SelectedOutlineSaturation         = 0.75
-SelectedOutlineValue              = 0.75
+SelectedOutlineSaturation         = 1.0
+SelectedOutlineValue              = 0.8
 
 SelectedTextSaturation            = 0.0
 SelectedTextValue                 = 1.0
@@ -56,7 +57,7 @@
 UnSelectedGradientRightSaturation   = 0.8
 UnSelectedGradientRightValue        = 1.0
 
-UnSelectedOutlineSaturation         = 0.6
+UnSelectedOutlineSaturation         = 0.8
 UnSelectedOutlineValue              = 1.0
 
 UnSelectedTextSaturation            = 0.0
@@ -69,7 +70,7 @@
 OverlayGradientRightSaturation   = 0.33
 OverlayGradientRightValue        = 1.0
 
-OverlayOutlineSaturation         = 0.3
+OverlayOutlineSaturation         = 0.33
 OverlayOutlineValue              = 1.0
 
 OverlayTextSaturation            = 1.0
@@ -77,10 +78,10 @@
 
 #### Selected FYI/Anytime/@Time Lozenges ########
 
-SelectedFYIGradientLeftSaturation    = 0.4
+SelectedFYIGradientLeftSaturation    = 0.33
 SelectedFYIGradientLeftValue         = 1.0
 
-SelectedFYIGradientRightSaturation   = 0.1
+SelectedFYIGradientRightSaturation   = 0.15
 SelectedFYIGradientRightValue        = 1.0
 
 SelectedFYIOutlineSaturation         = 0.8
@@ -90,7 +91,7 @@
 SelectedFYITextValue                 = 0.8
 
 #### Unselected FYI/Anytime/@Time Lozenges ######
-UnSelectedFYIGradientLeftSaturation    = 0.1
+UnSelectedFYIGradientLeftSaturation    = 0.11
 UnSelectedFYIGradientLeftValue         = 1.0
 
 UnSelectedFYIGradientRightSaturation   = 0.05
@@ -103,20 +104,21 @@
 UnSelectedFYITextValue                 = 0.8
 
 #### Overlaid FYI/Anytime/@Time Lozenges ########
-OverlayFYIGradientLeftSaturation    = 0.1
+OverlayFYIGradientLeftSaturation    = 0.05
 OverlayFYIGradientLeftValue         = 1.0
 
-OverlayFYIGradientRightSaturation   = 0.1
+OverlayFYIGradientRightSaturation   = 0.05
 OverlayFYIGradientRightValue        = 1.0
 
-OverlayFYIOutlineSaturation         = 0.3
+OverlayFYIOutlineSaturation         = 0.15
 OverlayFYIOutlineValue              = 1.0
 
 OverlayFYITextSaturation            = 1.0
 OverlayFYITextValue                 = 0.8
 
-#### Default swatch colors
 
+######## Default swatch colors ##########
+
 SelectedSwatchOutlineSaturation     = 0.0
 SelectedSwatchOutlineValue          = 1.0
 
@@ -135,9 +137,79 @@
 # add an entry whose key is Color + Type where type matches one of the
 # default keys above.
 
-GreenSelectedGradientLeftValue           = 0.45
-GreenSelectedGradientRightValue          = 0.70
+BlueBlueUnSelectedGradientRightValue        = 0.95
+BlueUnSelectedOutlineValue                  = 0.95
 
-GreenUnSelectedGradientLeftValue         = 0.66
-GreenUnSelectedGradientRightValue        = 0.80
-GreenUnSelectedGradientRightSaturation   = 1.0
+GreenSelectedGradientLeftValue              = 0.44
+GreenSelectedGradientRightValue             = 0.66
+GreenSelectedOutlineValue                   = 0.66
+
+GreenUnSelectedGradientLeftValue            = 0.6
+GreenUnSelectedGradientRightSaturation      = 1.0
+GreenUnSelectedGradientRightValue           = 0.77
+GreenUnSelectedOutlineSaturation            = 1.0
+GreenUnSelectedOutlineValue                 = 0.77
+GreenOverlayGradientLeftValue               = 0.95
+GreenOverlayGradientRightValue              = 0.95
+GreenOverlayOutlineValue                    = 0.95
+GreenOverlayTextValue                       = 0.66
+
+GreenSelectedFYIOutlineValue                = 0.66
+GreenSelectedFYITextValue                   = 0.66
+GreenUnselectedFYIOutlineValue              = 0.66
+GreenUnselectedFYITextValue                 = 0.66
+GreenOverlayFYIOutlineValue                 = 0.95
+GreenOverlayFYITextValue                    = 0.66
+
+GoldUnselectedGradientLeftValue             = 0.75
+GoldUnselectedGradientRightValue            = 0.9
+GoldUnselectedOutlineValue                  = 0.9
+GoldOverlayGradientLeftValue                = 0.95
+GoldOverlayGradientRightValue               = 0.95
+GoldOverlayOutlineValue                     = 0.95
+GoldOverlayTextValue                        = 0.66
+
+GoldSelectedFYIOutlineValue                 = 0.66
+GoldSelectedFYITextValue                    = 0.66
+GoldUnSelectedFYIOutlineValue               = 0.66
+GoldUnSelectedFYITextValue                  = 0.66
+GoldOverlayFYIOutlineValue                  = 0.95
+GoldOverlayFYITextValue                     = 0.66
+
+PlumSelectedGradientLeftValue               = 0.44
+PlumSelectedGradientRightValue              = 0.66
+PlumSelectedOutlineValue                    = 0.66
+
+PlumUnSelectedGradientLeftValue             = 0.66
+PlumUnSelectedGradientRightSaturation       = 1.0
+PlumUnSelectedGradientRightValue            = 0.88
+PlumUnSelectedOutlineSaturation             = 1.0
+PlumUnSelectedOutlineValue                  = 0.88
+PlumOverlayTextValue                        = 0.66
+
+PlumSelectedFYIOutlineValue                 = 0.66
+PlumSelectedFYITextValue                    = 0.66
+PlumUnselectedFYIOutlineValue               = 0.66
+PlumUnselectedFYITextValue                  = 0.66
+PlumOverlayFYITextValue                     = 0.66
+
+TurquoiseSelectedGradientRightValue         = 0.75
+TurquoiseSelectedOutlineValue               = 0.75
+TurquoiseUnSelectedGradientLeftValue        = 0.66
+TurquoiseUnSelectedGradientRightSaturation  = 1.0
+TurquoiseUnSelectedGradientRightValue       = 0.85
+TurquoiseOverlayGradientLeftValue           = 0.95
+TurquoiseOverlayGradientRightValue          = 0.95
+TurquoiseOverlayOutlineValue                = 0.95
+TurquoiseOverlayTextValue                   = 0.66
+
+TurquoiseSelectedFYIOutlineValue            = 0.66
+TurquoiseSelectedFYITextValue               = 0.66
+TurquoiseUnSelectedFYIOutlineValue          = 0.66
+TurquoiseUnSelectedFYITextValue             = 0.66
+TurquoiseOverlayFYIOutlineValue             = 0.95
+TurquoiseOverlayFYITextValue                = 0.66
+
+
+
+

Modified: trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py (11423 => 11424)

--- trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-16 17:40:04 UTC (rev 11423)
+++ trunk/chandler/parcels/osaf/framework/blocks/calendar/CalendarCanvas.py	2006-08-16 18:16:42 UTC (rev 11424)
@@ -141,7 +141,11 @@
 suffixes = 'GradientLeft', 'GradientRight', 'Outline', 'Text'
 
 def colorValWithDefault(hue, name):
-    hueName = hueMap.get(int(hue*360))
+    hueDegrees = int(hue*360)
+    hueName = hueMap.get(hueDegrees)
+    if hueName is None:
+        # int rounds floats down, try rounding up
+        hueName = hueMap.get(hueDegrees + 1)
     if hueName is not None:
         val = confstyles.cfg.get('calendarcanvas', hueName + name)
         if val is not None:


_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

Reply via email to