Revision: 2775 http://vexi.svn.sourceforge.net/vexi/?rev=2775&view=rev Author: clrg Date: 2008-01-31 07:25:34 -0800 (Thu, 31 Jan 2008)
Log Message: ----------- Improved usage of theme settings over hardcoded values in classic theme Modified Paths: -------------- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/button.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/check.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/radio.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/settings.t trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/textfield.t Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/button.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/button.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/button.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -22,7 +22,7 @@ static.enableFunc = function(v) { if (trapee.th_content) - trapee.th_content.textcolor = v ? "#000000" : "#888888"; + trapee.th_content.textcolor = v ? .settings..textcolor : .settings..textcolor_disabled; cascade = v; } Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/check.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/check.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/check.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -43,8 +43,8 @@ static.normalFunc = function(v) { cascade = v; - trapee.th_bg.fill = trapee.enabled ? "#ffffff" : "#d4d0c8"; - trapee.th_content.textcolor = v ? "#000000" : "#888888"; + trapee.th_bg.fill = trapee.enabled ? .settings..fill : .settings..fill_disabled; + trapee.th_content.textcolor = trapee.enabled ? .settings..textcolor : .settings..textcolor_disabled; } static.selectFunc = function(v) { Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/option.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -73,7 +73,7 @@ /** set visual indicators */ static.enableWrite = function(v) { cascade = v; - trapee.th_focus.fill = trapee.enabled ? "white" : "#d4d0c8"; + trapee.th_focus.fill = trapee.enabled ? .settings..fill : .settings..fill_disabled; } /** change button on popup */ Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/radio.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/radio.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/radio.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -34,7 +34,7 @@ static.enableFunc = function(v) { cascade = v; trapee.normal = true; - trapee.th_content.textcolor = trapee.enabled ? "#000000" : "#888888"; + trapee.th_content.textcolor = trapee.enabled ? .settings..fill : .settings..fill_disabled; } static.mixedFunc = function(v) { Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/settings.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/settings.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/settings.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -7,15 +7,16 @@ <ui:box /> - static.fill = "white"; - static.fill_selected = "darkblue"; + static.fill = "#ffffff"; // white + static.fill_disabled = "#d4d0c8"; + static.fill_selected = "#00008b"; // darkblue static.fill_selected_unfocused = "#666666"; static.surfacefill = "#d4d0c8"; static.tabfill = "#d4d0c8"; static.tabfill_unselected = "#c4c0b8"; - static.textcolor = "black"; + static.textcolor = "#000000"; // black static.textcolor_disabled = "#888888"; - static.textcolor_selected = "white"; + static.textcolor_selected = "#ffffff"; static.themeauthor = "Charles Goodwin"; static.themename = "Classic"; static.themepath = "org.vexi.theme.classic"; Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/textfield.t =================================================================== --- trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/textfield.t 2008-01-31 15:15:04 UTC (rev 2774) +++ trunk/widgets/org.vexi.widgets/src/org/vexi/theme/classic/textfield.t 2008-01-31 15:25:34 UTC (rev 2775) @@ -23,7 +23,7 @@ thisbox.th_view = $pad; thisbox.th_viewport = $inset; - thisbox.prevfill = "white"; + thisbox.prevfill = .settings..fill; thisbox.enabled ++= static.enabledFunc; @@ -35,7 +35,7 @@ static.enabledFunc = function(v) { if (!v and trapee.enabled) trapee.prevfill = trapee.fill; cascade = v; - trapee.fill = trapee.enabled ? trapee.prevfill : "#d4d0c8"; + trapee.fill = trapee.enabled ? trapee.prevfill : .settings..fill_disabled; } </vexi> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Vexi-svn mailing list Vexi-svn@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/vexi-svn