Revision: 4663
http://sourceforge.net/p/vexi/code/4663
Author: mkpg2
Date: 2014-02-15 22:19:30 +0000 (Sat, 15 Feb 2014)
Log Message:
-----------
Colorpicker. Remove unnecessary bevels, padding, margin ... etc. (keep in demo)
Default colour to medium gray.
Modified Paths:
--------------
branches/vexi3/org.vexi-vexi.demo/src_main/org/vexi/demo/feature/colorpicker.t
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
Modified:
branches/vexi3/org.vexi-vexi.demo/src_main/org/vexi/demo/feature/colorpicker.t
===================================================================
---
branches/vexi3/org.vexi-vexi.demo/src_main/org/vexi/demo/feature/colorpicker.t
2014-02-15 01:57:36 UTC (rev 4662)
+++
branches/vexi3/org.vexi-vexi.demo/src_main/org/vexi/demo/feature/colorpicker.t
2014-02-15 22:19:30 UTC (rev 4663)
@@ -1,6 +1,9 @@
<!-- Copyright 2007 - see COPYING for details [LGPL] -->
-<vexi xmlns:ui="vexi://ui" xmlns:meta="vexi://meta" xmlns="org.vexi.tool">
+<vexi xmlns:ui="vexi://ui"
+ xmlns:meta="vexi://meta"
+ xmlns:wi="vexi.widget"
+ xmlns="org.vexi.tool">
<meta:doc>
<about>
A complex 24-bit colorpicker, modeled after the Gimp's.
@@ -13,6 +16,11 @@
static.category = "Contributed";
<ui:box>
- <colorpicker />
+ <ui:box />
+ <wi:bevel align="topleft" form="thinup" margin="20" padding="20"
vshrink="true">
+ <ui:box width="5" shrink="true" />
+ <colorpicker />
+ </wi:bevel>
+ <ui:box />
</ui:box>
</vexi>
Modified:
branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
===================================================================
--- branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
2014-02-15 01:57:36 UTC (rev 4662)
+++ branches/vexi3/org.vexi-vexi.widgets/src_main/org/vexi/tool/colorpicker.t
2014-02-15 22:19:30 UTC (rev 4663)
@@ -20,78 +20,72 @@
</todo>
</meta:doc>
- <util:redirect />
<ui:box>
- <ui:box />
- <wi:bevel align="topleft" form="thinup" margin="20" padding="20"
vshrink="true">
- <ui:box width="5" shrink="true" />
- <ui:box orient="vertical" shrink="true">
- <ui:box>
- <ui:box fill=":.image.colorpicker" id="colorpicker"
layout="layer" shrink="true">
- <ui:box fill=":.image.colorpicker_circle" id="circle"
shrink="true"/>
- </ui:box>
- <ui:box width="5"/>
- <ui:box align="bottom" layout="layer">
- <wi:bevel margintop="4" thickness="2" form="down"
orient="vertical" width="34" shrink="true" id="grad_back">
- <ui:box shrink="true" fill=":.image.gradient"
layout="layer" id="gradient" />
- </wi:bevel>
- <ui:box shrink="true" x="0" y="0" id="marker"
fill=":.image.colorpicker_marker" />
- </ui:box>
- $gradient.marker = $marker;
+ <ui:box orient="vertical" shrink="true">
+ <ui:box>
+ <ui:box fill=":.image.colorpicker" id="colorpicker"
layout="layer" shrink="true">
+ <ui:box fill=":.image.colorpicker_circle" id="circle"
shrink="true"/>
</ui:box>
- <ui:box height="5"/>
- <ui:box>
- <wi:bevel thickness="2" form="down" width="135"
height="30">
- <ui:box fill="#000000" id="colorleft"/>
- <ui:box fill="#000000" id="targetcolor"/>
- <ui:box fill="#FFFFFF" id="colorright"/>
+ <ui:box width="5"/>
+ <ui:box align="bottom" layout="layer">
+ <wi:bevel margintop="4" thickness="2" form="down"
orient="vertical" width="34" shrink="true" id="grad_back">
+ <ui:box shrink="true" fill=":.image.gradient"
layout="layer" id="gradient" />
</wi:bevel>
- <ui:box width="35"/>
+ <ui:box shrink="true" x="0" y="0" id="marker"
fill=":.image.colorpicker_marker" />
</ui:box>
- <ui:box height="3"/>
- <ui:box>
- <ui:box shrink="true" width="65" text="HTML Code:"/>
- <ui:box width="3"/>
- // FIXME: replace box with edit once edit field cummlative
bug is gone.
- <wi:textfield width="70" vshrink="true" fill="white"
text="#000000" editable="false" id="hexcode" />
- <ui:box width="30"/>
- </ui:box>
+ $gradient.marker = $marker;
</ui:box>
- <ui:box width="20" shrink="true" />
- <ui:box orient="vertical" shrink="true">
- <ui:box>
- <ui:box align="left" width="60" vshrink="true" text="Hue:"
/>
- <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Hue" margin="5" />
- <ui:box align="left" width="55" id="HueValue" />
- </ui:box>
- <ui:box>
- <ui:box align="left" width="60" vshrink="true"
text="Saturation:" />
- <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Saturation" margin="5" />
- <ui:box align="left" width="55" id="SaturationValue" />
- </ui:box>
- <ui:box>
- <ui:box align="left" width="60" vshrink="true"
text="Intensity:" />
- <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Intensity" margin="5" />
- <ui:box align="left" width="55" id="IntensityValue"/>
- </ui:box>
- <ui:box>
- <ui:box align="left" width="60" vshrink="true" text="Red:"
/>
- <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Red" margin="5" />
- <ui:box align="left" width="55" id="RedValue" />
- </ui:box>
- <ui:box>
- <ui:box align="left" width="60" vshrink="true"
text="Green:" />
- <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Green" margin="5" />
- <ui:box align="left" width="55" id="GreenValue" />
- </ui:box>
- <ui:box>
- <ui:box align="left" width="60" vshrink="true"
text="Blue:" />
- <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Blue" margin="5" />
- <ui:box align="left" width="55" id="BlueValue" />
- </ui:box>
+ <ui:box height="5"/>
+ <ui:box>
+ <wi:bevel thickness="2" form="down" width="135" height="30">
+ <ui:box fill="#000000" id="colorleft"/>
+ <ui:box fill="#000000" id="targetcolor"/>
+ <ui:box fill="#FFFFFF" id="colorright"/>
+ </wi:bevel>
+ <ui:box width="35"/>
</ui:box>
- </wi:bevel>
- <ui:box />
+ <ui:box height="3"/>
+ <ui:box>
+ <ui:box shrink="true" width="65" text="HTML Code:"/>
+ <ui:box width="3"/>
+ // FIXME: replace box with edit once edit field cummlative bug
is gone.
+ <wi:textfield width="70" vshrink="true" fill="white"
text="#000000" editable="false" id="hexcode" />
+ <ui:box width="30"/>
+ </ui:box>
+ </ui:box>
+ <ui:box width="20" shrink="true" />
+ <ui:box orient="vertical" shrink="true">
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true" text="Hue:" />
+ <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Hue" margin="5" />
+ <ui:box align="left" width="55" id="HueValue" />
+ </ui:box>
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true"
text="Saturation:" />
+ <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Saturation" margin="5" />
+ <ui:box align="left" width="55" id="SaturationValue" />
+ </ui:box>
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true"
text="Intensity:" />
+ <wi:slider minvalue="0" maxvalue="1" interval="0.001"
width="100" id="Intensity" margin="5" />
+ <ui:box align="left" width="55" id="IntensityValue"/>
+ </ui:box>
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true" text="Red:" />
+ <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Red" margin="5" />
+ <ui:box align="left" width="55" id="RedValue" />
+ </ui:box>
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true" text="Green:" />
+ <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Green" margin="5" />
+ <ui:box align="left" width="55" id="GreenValue" />
+ </ui:box>
+ <ui:box>
+ <ui:box align="left" width="60" vshrink="true" text="Blue:" />
+ <wi:slider minvalue="0" maxvalue="255" interval="1"
vshrink="true" width="100" id="Blue" margin="5" />
+ <ui:box align="left" width="55" id="BlueValue" />
+ </ui:box>
+ </ui:box>
////////
// api
@@ -389,7 +383,7 @@
// external value
sync..sync(thisbox, $hexcode, "value", "text");
// initialize values
- value = null;
+ value = "#7F7F7F";
</ui:box>
</vexi>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Android apps run on BlackBerry 10
Introducing the new BlackBerry 10.2.1 Runtime for Android apps.
Now with support for Jelly Bean, Bluetooth, Mapview and more.
Get your Android app in front of a whole new audience. Start now.
http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
