summaryrefslogtreecommitdiff
path: root/uidesigner
diff options
context:
space:
mode:
Diffstat (limited to 'uidesigner')
-rw-r--r--uidesigner/icons.inc104
-rw-r--r--uidesigner/images/colorwheel.bmpbin0 -> 822 bytes
-rw-r--r--uidesigner/images/valuebar.bmpbin0 -> 822 bytes
-rw-r--r--uidesigner/vfddesigner.pas2
-rw-r--r--uidesigner/vfdwidgets.pas29
5 files changed, 134 insertions, 1 deletions
diff --git a/uidesigner/icons.inc b/uidesigner/icons.inc
index 20efd4dd..1f55a115 100644
--- a/uidesigner/icons.inc
+++ b/uidesigner/icons.inc
@@ -3217,3 +3217,107 @@ Const
255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
255,255, 0,255,255, 0,255, 0, 0, 0);
+
+Const
+ stdimg_vfd_colorwheel : Array[0..821] of byte = (
+ 66, 77, 54, 3, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0,
+ 0, 16, 0, 0, 0, 16, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0,
+ 0, 3, 0, 0, 19, 11, 0, 0, 19, 11, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 93, 93,255,115,114,244,131,137,218,135,157,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,255, 70, 70,255, 92, 93,255,114,
+ 114,255,137,137,246,154,158,219,157,178,193,154,198,166,148,216,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 70, 70,255, 92, 92,255,115,115,255,137,137,255,159,
+ 159,248,176,181,222,177,201,195,173,219,168,164,238,141,141,240,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,219, 70, 60,
+ 238, 92, 86,255,115,114,255,137,137,255,159,159,255,181,182,250,200,
+ 203,223,198,222,196,191,240,169,169,244,143,143,241,116,117,237,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,196, 91, 70,215,114, 97,
+ 235,137,125,254,158,158,255,181,181,255,204,203,251,223,226,225,219,
+ 245,199,198,248,171,171,244,145,145,241,118,119,238,255, 0,255,255,
+ 0,255,255, 0,255,153, 92, 55,174,113, 78,193,136,102,212,158,132,
+ 232,181,164,251,203,201,255,226,226,254,246,248,227,227,251,200,200,
+ 248,174,173,244,147,147,241,120,120,238, 93, 94,234,255, 0,255,255,
+ 0,255,132,114, 58,151,136, 81,170,158,106,189,180,133,209,203,166,
+ 229,226,202,248,248,241,255,255,255,229,229,251,202,202,248,176,175,
+ 244,149,149,241,122,122,237, 96, 96,234,255, 0,255,255, 0,255,109,
+ 136, 58,127,158, 79,148,180,105,167,203,133,186,225,164,206,247,200,
+ 225,255,225,244,255,244,231,231,251,204,204,249,177,177,245,150,151,
+ 241,124,124,238, 97, 97,234,255, 0,255,255, 0,255, 86,157, 53,106,
+ 180, 74,124,203,100,144,225,127,164,248,159,183,255,183,203,255,202,
+ 222,255,222,219,233,238,206,206,249,179,179,245,152,153,241,126,126,
+ 238,100, 99,235,255, 0,255,255, 0,255,255, 0,255, 83,203, 65,102,
+ 225, 90,121,247,118,141,255,141,160,255,160,180,255,180,199,255,199,
+ 200,234,216,194,208,232,181,181,245,154,154,242,128,128,239,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255, 60,225, 53, 79,247, 77, 98,
+ 255, 99,119,255,119,138,255,137,157,255,157,177,255,176,182,237,194,
+ 177,210,210,169,183,225,156,156,241,129,130,239,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255, 57,255, 57, 76,255, 76, 95,
+ 255, 95,115,255,115,135,255,134,154,255,154,162,239,172,160,212,189,
+ 154,185,205,144,158,220,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255, 53,255, 53, 73,255, 73, 93,
+ 255, 92,111,255,112,131,255,131,142,240,149,143,213,166,139,188,182,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255, 69,255, 70, 89,
+ 255, 89,108,255,109,121,243,127,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255);
+
+Const
+ stdimg_vfd_valuebar : Array[0..821] of byte = (
+ 66, 77, 54, 3, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0,
+ 0, 16, 0, 0, 0, 16, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0,
+ 0, 3, 0, 0, 19, 11, 0, 0, 19, 11, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,242,209,
+ 0,243,209, 0,242,209, 0,242,209, 0,243,209, 0,242,210, 0,242,
+ 210, 0,243,209, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,231,199, 0,231,199,
+ 0,231,198, 0,230,199, 0,230,199, 0,231,198, 0,231,199, 0,231,
+ 198, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,219,188, 0,220,188, 0,219,188,
+ 0,219,188, 0,219,188, 0,220,188, 0,219,188, 0,219,188, 0,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,
+ 0, 0, 0,192,192,192,192,192,192,192,192,192,192,192,192,192,192,
+ 192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,
+ 192,192,255, 0,255,255, 0,255,255, 0,255,255, 0,255, 0, 0, 0,
+ 196,167, 0,196,167, 0,196,167, 0,196,167, 0,196,167, 0,195,167,
+ 0,195,167, 0,196,167, 0,196,167, 0,196,167, 0,192,192,192,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255, 0, 0, 0,196,167, 0,
+ 196,167, 0,196,167, 0,196,167, 0,196,167, 0,196,167, 0,196,167,
+ 0,196,167, 0,196,167, 0,196,167, 0,192,192,192,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0,192,192,192,255, 0,255,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255,255, 0,255,161,135, 0,161,135, 0,
+ 161,135, 0,161,136, 0,161,135, 0,161,135, 0,161,135, 0,161,136,
+ 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255,
+ 0,255,255, 0,255,255, 0,255,149,125, 0,150,125, 0,150,125, 0,
+ 149,124, 0,150,125, 0,150,124, 0,149,125, 0,150,125, 0,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255,
+ 0,255,255, 0,255,137,114, 0,138,114, 0,137,114, 0,138,114, 0,
+ 137,115, 0,138,114, 0,138,114, 0,138,115, 0,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255,
+ 0,255,126,104, 0,126,104, 0,126,104, 0,126,103, 0,126,103, 0,
+ 126,103, 0,126,103, 0,126,104, 0,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,115,
+ 93, 0,115, 93, 0,115, 93, 0,114, 93, 0,114, 93, 0,115, 93, 0,
+ 115, 93, 0,115, 93, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,102, 83, 0,103,
+ 83, 0,103, 83, 0,103, 82, 0,103, 82, 0,103, 82, 0,103, 83, 0,
+ 102, 83, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255,255, 0,255, 91, 72, 0, 91, 72, 0, 91,
+ 72, 0, 92, 72, 0, 91, 72, 0, 91, 72, 0, 91, 72, 0, 91, 72, 0,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255,255, 0,255, 80, 62, 0, 80, 61, 0, 79, 61, 0, 79,
+ 62, 0, 80, 61, 0, 80, 62, 0, 80, 62, 0, 79, 61, 0,255, 0,255,
+ 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,
+ 255,255, 0,255, 68, 51, 0, 68, 51, 0, 68, 51, 0, 68, 51, 0, 68,
+ 50, 0, 68, 51, 0, 68, 51, 0, 68, 51, 0,255, 0,255,255, 0,255,
+ 255, 0,255,255, 0,255);
diff --git a/uidesigner/images/colorwheel.bmp b/uidesigner/images/colorwheel.bmp
new file mode 100644
index 00000000..b4d8bf6b
--- /dev/null
+++ b/uidesigner/images/colorwheel.bmp
Binary files differ
diff --git a/uidesigner/images/valuebar.bmp b/uidesigner/images/valuebar.bmp
new file mode 100644
index 00000000..904c0455
--- /dev/null
+++ b/uidesigner/images/valuebar.bmp
Binary files differ
diff --git a/uidesigner/vfddesigner.pas b/uidesigner/vfddesigner.pas
index b55bc475..74499d3b 100644
--- a/uidesigner/vfddesigner.pas
+++ b/uidesigner/vfddesigner.pas
@@ -1496,7 +1496,7 @@ constructor TOtherWidget.Create(AOwner: TComponent);
begin
inherited;
wgClassName := 'TfpgWidget';
- FBackgroundColor := $C0E0C0;
+ FBackgroundColor := clUIDesignerGreen;
FFont := fpgStyle.DefaultFont;
FWidth := 120;
FHeight := 32;
diff --git a/uidesigner/vfdwidgets.pas b/uidesigner/vfdwidgets.pas
index 1713336a..b1b9392d 100644
--- a/uidesigner/vfdwidgets.pas
+++ b/uidesigner/vfdwidgets.pas
@@ -64,6 +64,7 @@ uses
fpg_popupcalendar,
fpg_gauge,
fpg_editbtn,
+ fpg_ColorWheel,
vfdpropeditgrid,
vfdmain;
@@ -294,6 +295,16 @@ begin
'vfd.editfont', @stdimg_vfd_editfont,
sizeof(stdimg_vfd_editfont),
0, 0);
+
+ fpgImages.AddMaskedBMP(
+ 'vfd.colorwheel', @stdimg_vfd_colorwheel,
+ sizeof(stdimg_vfd_colorwheel),
+ 0, 0);
+
+ fpgImages.AddMaskedBMP(
+ 'vfd.valuebar', @stdimg_vfd_valuebar,
+ sizeof(stdimg_vfd_valuebar),
+ 0, 0);
end;
procedure AddWidgetPosProps(wgc: TVFDWidgetClass);
@@ -763,6 +774,24 @@ begin
wc.WidgetIconName := 'vfd.editfont';
RegisterVFDWidget(wc);
+ // Color wheel
+ wc := TVFDWidgetClass.Create(TfpgColorWheel);
+ wc.NameBase := 'ColorWheel';
+ wc.AddProperty('MarginWidth', TPropertyInteger, 'The margin that will not be painted on four sides of widget');
+ wc.AddProperty('CursorSize', TPropertyInteger, 'Size of cross-hair in color wheel');
+ wc.AddProperty('WhiteAreaPercent', TPropertyInteger, 'The percentage of the centre of the wheel which is white');
+ wc.WidgetIconName := 'vfd.colorwheel';
+ RegisterVFDWidget(wc);
+
+ // Value Bar - works in accordance with color wheel
+ wc := TVFDWidgetClass.Create(TfpgValueBar);
+ wc.NameBase := 'ValueBar';
+ wc.AddProperty('MarginWidth', TPropertyInteger, 'The margin that will not be painted on four sides of widget');
+ wc.AddProperty('CursorHeight', TPropertyInteger, 'Size of selection cursor');
+ wc.AddProperty('Value', TPropertyFloat, '');
+ wc.WidgetIconName := 'vfd.valuebar';
+ RegisterVFDWidget(wc);
+
// Other - do not delete!!! this should be the last...
wc := TVFDWidgetClass.Create(TOtherWidget);
wc.NameBase := 'Custom';