diff options
Diffstat (limited to 'uidesigner')
25 files changed, 760 insertions, 112 deletions
diff --git a/uidesigner/icon_16.png b/uidesigner/icon_16.png Binary files differnew file mode 100644 index 00000000..d19b0e1b --- /dev/null +++ b/uidesigner/icon_16.png diff --git a/uidesigner/icon_32.png b/uidesigner/icon_32.png Binary files differnew file mode 100644 index 00000000..55ff5268 --- /dev/null +++ b/uidesigner/icon_32.png diff --git a/uidesigner/icons.inc b/uidesigner/icons.inc index b52534f6..20efd4dd 100644 --- a/uidesigner/icons.inc +++ b/uidesigner/icons.inc @@ -1946,9 +1946,9 @@ Const 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,255, 0,255,128,128, 128, 0, 0, 0,255,255,255,255,255,255,255,255,255, 0, 0, 0,255, - 255,255, 0, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0, - 255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, - 0,255, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, + 255,255, 0, 0, 0,221,150,106,221,150,106,221,150,106,221,150,106, + 221,150,106,221,150,106,221,150,106,221,150,106,221,150,106,221,150, + 106,221,150,106, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255,255,255,255,255,255,255,255,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, 0, @@ -2679,9 +2679,9 @@ Const 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,255, 0,255,128,128, 128, 0, 0, 0,255,255,255,255,255,255,255,255,255, 0, 0, 0,255, - 255,255, 0, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0, - 255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, 0,255, 0, - 0,255, 0, 0, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, + 255,255, 0, 0, 0,221,150,106,221,150,106,221,150,106,221,150,106, + 221,150,106,221,150,106,221,150,106,221,150,106,221,150,106,221,150, + 106,221,150,106, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255,255,255, 0, 0, 0,255,255,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, 0, @@ -2818,3 +2818,402 @@ 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_colorlistbox : Array[0..1397] of byte = ( + 66, 77,118, 5, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0, + 0, 21, 0, 0, 0, 21, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, + 64, 5, 0, 0,215, 13, 0, 0,215, 13, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0, + 229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, + 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229, + 255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229, 0,128, + 128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0,255, 0,229, 0,128,128,128,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255, 0, 0, 0,200,208,212,200,208,212,200,208,212,200,208, + 212, 0, 0, 0,255, 0,229, 0,128,128,128,255,255,255, 54,177,119, + 54,177,119, 54,177,119,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, 0, + 0, 0,255,255,255,128,128,128,128,128,128,200,208,212, 0, 0, 0, + 255, 0,229, 0,128,128,128,255,255,255, 54,177,119, 54,177,119, 54, + 177,119,255,255,255,255,255,255, 51, 49, 49, 51, 49, 49, 51, 49, 49, + 51, 49, 49, 51, 49, 49,255,255,255,255,255,255, 0, 0, 0,255,255, + 255, 0, 0, 0, 0, 0, 0,200,208,212, 0, 0, 0,255, 0,229, 0, + 128,128,128,255,255,255, 54,177,119, 54,177,119, 54,177,119,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255, 0, 0, 0,255,255,255,255,255,255, + 255,255,255,200,208,212, 0, 0, 0,255, 0,229, 0,128,128,128,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0,255, 0,229, 0,128,128,128,188,187,189, 64, 64, + 255, 64, 64,255, 64, 64,255,188,187,189,188,187,189,188,187,189,188, + 187,189,188,187,189,188,187,189,188,187,189,188,187,189,188,187,189, + 0, 0, 0,255,255,255,200,208,212,255,255,255,200,208,212, 0, 0, + 0,255, 0,229, 0,128,128,128,188,187,189, 64, 64,255, 64, 64,255, + 64, 64,255,188,187,189,188,187,189, 51, 49, 49, 51, 49, 49, 51, 49, + 49, 51, 49, 49, 51, 49, 49, 51, 49, 49,188,187,189, 0, 0, 0,200, + 208,212,255,255,255,200,208,212,255,255,255, 0, 0, 0,255, 0,229, + 0,128,128,128,188,187,189, 64, 64,255, 64, 64,255, 64, 64,255,188, + 187,189,188,187,189,188,187,189,188,187,189,188,187,189,188,187,189, + 188,187,189,188,187,189,188,187,189, 0, 0, 0,255,255,255,200,208, + 212,255,255,255,200,208,212, 0, 0, 0,255, 0,229, 0,128,128,128, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255, 0, 0, 0,200,208,212,255,255,255,200,208,212, + 255,255,255, 0, 0, 0,255, 0,229, 0,128,128,128,255,255,255,255, + 74, 74,255, 74, 74,255, 74, 74,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255, 0, 0, 0,255,255,255,200,208,212,255,255,255,200,208,212, 0, + 0, 0,255, 0,229, 0,128,128,128,255,255,255,255, 74, 74,255, 74, + 74,255, 74, 74,255,255,255,255,255,255, 51, 49, 49, 51, 49, 49, 51, + 49, 49, 51, 49, 49,255,255,255,255,255,255,255,255,255, 0, 0, 0, + 200,208,212,255,255,255,200,208,212,255,255,255, 0, 0, 0,255, 0, + 229, 0,128,128,128,255,255,255,255, 74, 74,255, 74, 74,255, 74, 74, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255, 0, 0, 0,255,255,255,200, + 208,212,255,255,255,200,208,212, 0, 0, 0,255, 0,229, 0,128,128, + 128,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0,255, 0,229, 0,128,128,128,255,255,255, + 115,170,255,115,170,255,115,170,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255, 0, 0, 0,200,208,212,200,208,212,200,208,212,200,208,212, + 0, 0, 0,255, 0,229, 0,128,128,128,255,255,255,115,170,255,115, + 170,255,115,170,255,255,255,255,255,255,255, 51, 49, 49, 51, 49, 49, + 51, 49, 49, 51, 49, 49, 51, 49, 49, 51, 49, 49,255,255,255, 0, 0, + 0,255,255,255, 0, 0, 0, 0, 0, 0,200,208,212, 0, 0, 0,255, + 0,229, 0,128,128,128,255,255,255,115,170,255,115,170,255,115,170, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255, 0, 0, 0,255,255,255, + 128,128,128,128,128,128,200,208,212, 0, 0, 0,255, 0,229, 0,128, + 128,128,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255, 0, 0, 0,255,255,255,255,255,255,255, + 255,255,200,208,212, 0, 0, 0,255, 0,229, 0,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0,255, 0,229, 0,255, 0,229,255, 0,229,255, 0,229, + 255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0, + 229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, + 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229,255, 0,229, + 255, 0,229, 0); + +Const + stdimg_vfd_editfilename : Array[0..1709] of byte = ( + 66, 77,174, 6, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0, + 0, 23, 0, 0, 0, 23, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, + 120, 6, 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,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 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,128,128,128,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,192,192,192,192,192,192,192, + 192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,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,192,192,192, + 192,192,192,188,188,188,192,192,192, 0, 0, 0, 0, 0, 0,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128, + 128,128,192,192,192,192,192,192,192,192,192,205,137, 89,205,137, 89, + 205,137, 89,205,137, 89,205,137, 89,205,137, 89,205,137, 89,205,137, + 89,192,192,192,192,192,192,192,192,192,192,192,192, 0, 0, 0, 0, + 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,128,128,128,192,192,192,192,192,192,192,192,192,205,137, + 89,255,247,240,255,247,240,255,247,240,255,247,240,255,247,240,255, + 247,240,205,137, 89,192,192,192,192,192,192,192,192,192,192,192,192, + 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192,192, + 192,192,205,137, 89,255,247,240,255,234,219,255,233,217,255,231,215, + 255,229,210,255,247,241,204,135, 87,192,192,192,192,192,192,192,192, + 192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192, + 192,192,192,192,192,192,205,137, 89,255,247,240,253,231,214,253,230, + 212,252,228,208,251,227,203,254,243,232,205,136, 88,192,192,192,192, + 192,192,192,192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128, + 128,192,192,192,192,192,192,192,192,192,205,137, 89,255,247,242,254, + 231,213,253,229,209,250,224,202,249,222,196,253,242,231,205,137, 89, + 192,192,192,194,194,194,194,194,194,192,192,192, 0, 0, 0, 0, 0, + 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, + 0,255,128,128,128,192,192,192,192,192,192,192,192,192,205,137, 89, + 254,247,241,252,228,209,251,226,204,249,221,196,246,215,187,250,239, + 228,205,137, 90,192,192,192,192,192,192,192,192,192,192,192,192, 0, + 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192,192,192, + 192,205,137, 89,254,245,237,251,224,199,249,220,194,245,211,180,254, + 249,243,236,193,147,205,137, 89,190,190,191,192,192,192,192,192,192, + 192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192,192, + 192,192,193,193,193,205,137, 89,253,243,234,253,243,234,252,242,232, + 250,239,227,250,242,231,205,137, 89,219,223,223,192,192,192,192,192, + 192,195,195,195,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128, + 192,192,192,192,192,192,192,192,192,205,137, 89,205,137, 89,205,137, + 89,205,137, 89,205,137, 89,205,137, 89,219,223,223,219,223,223,192, + 192,192,192,192,192,197,197,197,192,192,192, 0, 0, 0, 0, 0, 0, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,128,128,128,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,192,192,192,192,192,192,192,192,192,192,192,192, 0, 0, + 0, 0, 0, 0,255, 0,255,128,128,128,255,255,255,255,255,255,255, + 255,255,255,255,255,128,128,128,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,192,192,192,192,192,192,192,192,192,192, + 192,192, 0, 0, 0, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0, + 192,192,192,192,192,192,192,192,192, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255, 0,255,128,128, + 128, 0, 0, 0,255,255,255,255,255,255,255,255,255, 0, 0, 0,255, + 255,255, 0, 0, 0,221,150,106,221,150,106,221,150,106,221,150,106, + 221,150,106,221,150,106,221,150,106,221,150,106,221,150,106,221,150, + 106,221,150,106, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, + 0,255,128,128,128, 0, 0, 0,255,255,255,255,255,255,255,255,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, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,192,192,192,255,255,255,192,192,192, + 0, 0, 0, 0, 0, 0,192,192,192,128,128,128,192,192,192,255,255, + 255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,255, + 255,192,192,192,192,192,192,192,192,192,192,192,192,128,128,128,192, + 192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, + 0, 0, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192, + 192,192,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,192,192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0, + 255,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255,255, 0,255, 0, + 0, 0,255, 0,255,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 255, 0,255, 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, 0,255, 0, 0, 0); + +Const + stdimg_vfd_editdirectory : Array[0..1709] of byte = ( + 66, 77,174, 6, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0, + 0, 23, 0, 0, 0, 23, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, + 120, 6, 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,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 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,128,128,128,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,192,192,192,192,192,192,192, + 192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,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,192,192,192, + 192,192,192,188,188,188,192,192,192, 0, 0, 0, 0, 0, 0,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128, + 128,128,192,192,192,192,192,192,185,216,243, 59,144,219, 59,144,219, + 59,144,219, 59,144,219, 59,144,219, 59,144,219, 59,144,219, 59,144, + 219,163,203,239,192,192,192,192,192,192,192,192,192, 0, 0, 0, 0, + 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,128,128,128,192,192,192,192,192,192, 59,144,219,224,242, + 251,158,219,244,150,218,243,134,215,243,127,212,242,121,211,242,108, + 208,241,105,207,241, 59,144,219,192,192,192,192,192,192,192,192,192, + 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192, 59, + 144,219,242,250,253,164,233,249,149,230,248,118,222,246,101,219,245, + 87,215,244, 59,209,242, 48,206,241, 59,144,219,192,192,192,192,192, + 192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192, + 192,192,192, 59,144,219,246,252,254,185,239,251,172,236,250,139,227, + 247,124,224,246,108,220,246, 79,214,244, 68,211,243, 59,144,219,192, + 192,192,192,192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128, + 128,192,192,192,192,192,192, 59,144,219,254,255,255, 59,144,219, 59, + 144,219,115,193,233,148,230,248,133,227,247,104,219,245, 92,216,244, + 59,144,219,194,194,194,194,194,194,192,192,192, 0, 0, 0, 0, 0, + 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, + 0,255,128,128,128,192,192,192,192,192,192, 59,144,219,232,246,251, + 136,206,238,115,193,233, 59,144,219, 59,144,219, 59,144,219, 59,144, + 219, 59,144,219, 59,144,219,192,192,192,192,192,192,192,192,192, 0, + 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192, 59,144, + 219,247,252,254,145,222,245,159,224,245,239,251,254,244,253,254,243, + 252,254,239,251,254,238,251,254, 59,144,219,192,192,192,192,192,192, + 192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192,192, + 192,192, 59,144,219,253,254,254,254,254,255,253,254,255,234,247,251, + 59,144,219, 59,144,219, 59,144,219, 59,144,219,202,235,245,192,192, + 192,195,195,195,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128, + 192,192,192,192,192,192,185,216,243, 59,144,219, 59,144,219, 59,144, + 219, 59,144,219,219,223,223,219,223,223,219,223,223,219,223,223,219, + 223,223,192,192,192,197,197,197,192,192,192, 0, 0, 0, 0, 0, 0, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,128,128,128,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,192,192,192,192,192,192,192,192,192,192,192,192, 0, 0, + 0, 0, 0, 0,255, 0,255,128,128,128,255,255,255,255,255,255,255, + 255,255,255,255,255,128,128,128,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,192,192,192,192,192,192,192,192,192,192, + 192,192, 0, 0, 0, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0, + 192,192,192,192,192,192,192,192,192, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255, 0,255,128,128, + 128, 0, 0, 0,255,255,255,255,255,255,255,255,255, 0, 0, 0,255, + 255,255, 0, 0, 0,221,150,106,221,150,106,221,150,106,221,150,106, + 221,150,106,221,150,106,221,150,106,221,150,106,221,150,106,221,150, + 106,221,150,106, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, + 0,255,128,128,128, 0, 0, 0,255,255,255,255,255,255,255,255,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, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,192,192,192,255,255,255,192,192,192, + 0, 0, 0, 0, 0, 0,192,192,192,128,128,128,192,192,192,255,255, + 255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,255, + 255,192,192,192,192,192,192,192,192,192,192,192,192,128,128,128,192, + 192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, + 0, 0, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192, + 192,192,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,192,192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0, + 255,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255,255, 0,255, 0, + 0, 0,255, 0,255,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 255, 0,255, 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, 0,255, 0, 0, 0); + +Const + stdimg_vfd_editfont : Array[0..1709] of byte = ( + 66, 77,174, 6, 0, 0, 0, 0, 0, 0, 54, 0, 0, 0, 40, 0, 0, + 0, 23, 0, 0, 0, 23, 0, 0, 0, 1, 0, 24, 0, 0, 0, 0, 0, + 120, 6, 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,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 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,128,128,128,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,192,192,192,192,192,192,192, + 192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,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,192,192,192, + 192,192,192,188,188,188,192,192,192, 0, 0, 0, 0, 0, 0,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128, + 128,128,192,192,192,192,192,192,192,192,192,192,192,192,109,109,109, + 85, 85, 85, 88, 88, 88,152,152,152,192,192,192,148,148,148, 55, 55, + 55,145,145,145,192,192,192,192,192,192,192,192,192, 0, 0, 0, 0, + 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,128,128,128,192,192,192,192,192,192,192,192,192,192,192, + 192,161,161,161, 64, 64, 64,121,121,121,192,192,192,192,192,192,192, + 192,192, 17, 17, 17,192,192,192,192,192,192,192,192,192,192,192,192, + 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192,192, + 192,192,192,192,192,163,163,163, 72, 72, 72,126,126,126,192,192,192, + 192,192,192,192,192,192, 24, 24, 24,192,192,192,192,192,192,192,192, + 192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192, + 192,192,192,192,192,192,192,192,192,166,166,166, 80, 80, 80,130,130, + 130,192,192,192,147,147,147,192,192,192, 32, 32, 32,192,192,192,137, + 137,137,192,192,192,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128, + 128,192,192,192,192,192,192,192,192,192,192,192,192,168,168,168, 88, + 88, 88,135,135,135,192,192,192,117,117,117, 94, 94, 94, 41, 41, 41, + 92, 92, 92, 87, 87, 87,194,194,194,192,192,192, 0, 0, 0, 0, 0, + 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, + 0,255,128,128,128,192,192,192,192,192,192,168,168,168,192,192,192, + 169,169,169, 95, 95, 95,139,139,139,192,192,192,177,177,177,175,175, + 175,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, 0, + 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0,255,255, 0,255, + 255, 0,255,255, 0,255,128,128,128,192,192,192,192,192,192,132,132, + 132,178,178,178,171,171,171,101,101,101,143,143,143,192,192,192, 99, + 99, 99,161,161,161,192,192,192,192,192,192,192,192,192,192,192,192, + 192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, 0,255,255, 0, + 255,255, 0,255,255, 0,255,255, 0,255,128,128,128,192,192,192,192, + 192,192,137,137,137,137,137,137,149,149,149,130,130,130,136,136,136, + 125,125,125, 93, 93, 93,192,192,192,192,192,192,192,192,192,192,192, + 192,195,195,195,192,192,192, 0, 0, 0, 0, 0, 0,255, 0,255,255, + 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,128,128,128, + 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,192, + 192,192,192,192,192,197,197,197,192,192,192, 0, 0, 0, 0, 0, 0, + 255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0,255,255, 0, + 255,128,128,128,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,192,192,192,192,192,192,192,192,192,192,192,192, 0, 0, + 0, 0, 0, 0,255, 0,255,128,128,128,255,255,255,255,255,255,255, + 255,255,255,255,255,128,128,128,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,192,192,192,192,192,192,192,192,192,192, + 192,192, 0, 0, 0, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0, + 192,192,192,192,192,192,192,192,192, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255, 0,255,128,128, + 128, 0, 0, 0,255,255,255,255,255,255,255,255,255, 0, 0, 0,255, + 255,255, 0, 0, 0,221,150,106,221,150,106,221,150,106,221,150,106, + 221,150,106,221,150,106,221,150,106,221,150,106,221,150,106,221,150, + 106,221,150,106, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0, 0,255, + 0,255,128,128,128, 0, 0, 0,255,255,255,255,255,255,255,255,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, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,192,192,192,255,255,255,192,192,192, + 0, 0, 0, 0, 0, 0,192,192,192,128,128,128,192,192,192,255,255, + 255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, 0, 0, 0,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,192,192,192,255,255, + 255,192,192,192,192,192,192,192,192,192,192,192,192,128,128,128,192, + 192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0,255,128,128,128, + 0, 0, 0,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,192, + 192,192,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,192,192,192,255,255,255,255, 0,255, 0, 0, 0,255, 0, + 255,128,128,128, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,255,255,255,255, 0,255, 0, + 0, 0,255, 0,255,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128,128, + 255, 0,255, 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, 0,255, 0, 0, 0); + diff --git a/uidesigner/images/checkdateedit.bmp b/uidesigner/images/checkdateedit.bmp Binary files differnew file mode 100644 index 00000000..1cec0503 --- /dev/null +++ b/uidesigner/images/checkdateedit.bmp diff --git a/uidesigner/images/colorlistbox.bmp b/uidesigner/images/colorlistbox.bmp Binary files differnew file mode 100644 index 00000000..1cd703d7 --- /dev/null +++ b/uidesigner/images/colorlistbox.bmp diff --git a/uidesigner/images/dateedit.bmp b/uidesigner/images/dateedit.bmp Binary files differindex 7e075c10..79cf0234 100644 --- a/uidesigner/images/dateedit.bmp +++ b/uidesigner/images/dateedit.bmp diff --git a/uidesigner/images/editbutton.bmp b/uidesigner/images/editbutton.bmp Binary files differnew file mode 100644 index 00000000..b543260d --- /dev/null +++ b/uidesigner/images/editbutton.bmp diff --git a/uidesigner/images/editdirectory.bmp b/uidesigner/images/editdirectory.bmp Binary files differnew file mode 100644 index 00000000..eaf064e1 --- /dev/null +++ b/uidesigner/images/editdirectory.bmp diff --git a/uidesigner/images/editfilename.bmp b/uidesigner/images/editfilename.bmp Binary files differnew file mode 100644 index 00000000..abdf0c82 --- /dev/null +++ b/uidesigner/images/editfilename.bmp diff --git a/uidesigner/images/editfont.bmp b/uidesigner/images/editfont.bmp Binary files differnew file mode 100644 index 00000000..6fde0715 --- /dev/null +++ b/uidesigner/images/editfont.bmp diff --git a/uidesigner/images/listbox.bmp b/uidesigner/images/listbox.bmp Binary files differnew file mode 100644 index 00000000..f0f2b151 --- /dev/null +++ b/uidesigner/images/listbox.bmp diff --git a/uidesigner/newformdesigner.pas b/uidesigner/newformdesigner.pas index 20324e95..b974d262 100644 --- a/uidesigner/newformdesigner.pas +++ b/uidesigner/newformdesigner.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -224,7 +224,7 @@ begin FontDesc := '#Label1'; Hint := ''; ImageName := 'stdimg.close'; - ModalResult := 1; + ModalResult := mrOK; TabOrder := 2; end; @@ -403,7 +403,7 @@ begin begin Name := 'setmenu'; SetPosition(464, 29, 120, 20); - AddMenuItem('General options ...', '', @(maindsgn.OnOptionsClick)); + AddMenuItem('General options...', '', @(maindsgn.OnOptionsClick)); end; miOpenRecentMenu := TfpgPopupMenu.Create(self); @@ -418,8 +418,8 @@ begin begin Name := 'helpmenu'; SetPosition(328, 52, 120, 20); - AddMenuItem('Product Information', '', @miHelpAboutClick); - AddMenuItem('About fpGUI', '', @miHelpAboutGUI); + AddMenuItem('About fpGUI Toolkit...', '', @miHelpAboutGUI); + AddMenuItem('Product Information...', '', @miHelpAboutClick); end; previewmenu := TfpgPopupMenu.Create(self); @@ -839,6 +839,8 @@ begin NameDrag := False else inherited; + if (Editor <> nil) and (Editor.Visible) then + Editor.SetFocus; end; procedure TwgPropertyList.HandleMouseScroll(x, y: integer; @@ -908,8 +910,7 @@ end; procedure TfrmMain.miHelpAboutGUI(Sender: TObject); begin - ShowMessage('This product was created using ' + fpGUIName + ' v' + - fpGUIVersion, 'About fpGUI'); + TfpgMessageDialog.AboutFPGui; end; procedure TfrmMain.miMRUClick(Sender: TObject; const FileName: string); diff --git a/uidesigner/uidesigner.lpi b/uidesigner/uidesigner.lpi index ec91edc2..597c7e3c 100644 --- a/uidesigner/uidesigner.lpi +++ b/uidesigner/uidesigner.lpi @@ -10,7 +10,6 @@ <SessionStorage Value="InProjectDir"/> <MainUnit Value="0"/> <TargetFileExt Value=""/> - <Title Value="uiDesigner"/> </General> <VersionInfo> <ProjectVersion Value=""/> @@ -23,7 +22,7 @@ <RunParams> <local> <FormatVersion Value="1"/> - <LaunchingApplication Use="True" PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> + <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> <RequiredPackages Count="1"> @@ -114,14 +113,23 @@ </ProjectOptions> <CompilerOptions> <Version Value="8"/> + <SearchPaths> + <UnitOutputDirectory Value="units/$(TargetCPU)-$(TargetOS)"/> + </SearchPaths> <Parsing> <SyntaxOptions> <AllowLabel Value="False"/> <CPPInline Value="False"/> + <UseAnsiStrings Value="True"/> </SyntaxOptions> </Parsing> + <CodeGeneration> + <Optimizations> + <OptimizationLevel Value="0"/> + </Optimizations> + </CodeGeneration> <Other> - <CustomOptions Value="-FUunits + <CustomOptions Value=" "/> <CompilerPath Value="$(CompPath)"/> </Other> diff --git a/uidesigner/vfddesigner.pas b/uidesigner/vfddesigner.pas index 992815cc..5405b9bb 100644 --- a/uidesigner/vfddesigner.pas +++ b/uidesigner/vfddesigner.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -82,9 +82,11 @@ type TFormDesigner = class(TObject) + private + FOneClickMove: boolean; protected FWidgets: TList; - FForm: TDesignedForm; + FForm: TfpgForm; FFormOther: string; FDragging: boolean; FDragPosX, @@ -101,7 +103,6 @@ type procedure MsgActivate(var msg: TfpgMessageRec); message FPGM_ACTIVATE; procedure DesignerKeyPress(var keycode: word; var shiftstate: TShiftState; var consumed: boolean); public - OneClickMove: boolean; // the widgets can be selected and dragged within one click constructor Create; destructor Destroy; override; procedure ClearForm; @@ -130,7 +131,9 @@ type function GetFormSourceDecl: string; function GetFormSourceImpl: string; function GetWidgetSourceImpl(wd: TWidgetDesigner; ident: string): string; - property Form: TDesignedForm read FForm; + // The widgets can be selected and dragged within one click + property OneClickMove: boolean read FOneClickMove write FOneClickMove; + property Form: TfpgForm read FForm; property FormOther: string read FFormOther write FFormOther; end; @@ -158,6 +161,7 @@ begin Widget.MouseCursor := mcDefault; for n := 1 to 8 do + begin if FSelected then resizer[n] := TwgResizer.Create(self, n) else @@ -166,6 +170,7 @@ begin resizer[n].Free; resizer[n] := nil; end; + end; UpdateResizerPositions; @@ -178,6 +183,7 @@ constructor TWidgetDesigner.Create(AFormDesigner: TFormDesigner; wg: TfpgWidget; var n: integer; begin + inherited Create; FFormDesigner := AFormDesigner; FWidget := wg; FVFDClass := wgc; @@ -450,7 +456,7 @@ begin FWidgets := TList.Create; FWasDrag := False; - OneClickMove := True; + FOneClickMove := True; FForm := TDesignedForm.Create(nil); FForm.FormDesigner := self; @@ -502,9 +508,8 @@ begin // writeln('TFormDesigner.AddWidget'); cd := TWidgetDesigner.Create(self, wg, wgc); FWidgets.Add(cd); - //cd.Selected := true; - if wg is TDesignedForm then - TDesignedForm(wg).FormDesigner := self; + if wg is TfpgForm then + wg.FormDesigner := self; Result := cd; end; @@ -671,7 +676,7 @@ begin if fi <= frm.list.ItemCount then frm.list.FocusItem := fi; - if frm.ShowModal = 1 then + if frm.ShowModal = mrOK then begin for n := 0 to FWidgets.Count - 1 do TWidgetDesigner(FWidgets.Items[n]).Widget.Visible := False; @@ -742,7 +747,7 @@ begin if fi <= frm.list.ItemCount then frm.list.FocusItem := fi; - if frm.ShowModal = 1 then + if frm.ShowModal = mrOK then begin taborder := 1; for n := 0 to frm.List.Items.Count - 1 do @@ -1046,7 +1051,7 @@ begin end; posval := -9999; - if frm.ShowModal = 1 then + if frm.ShowModal = mrOK then posval := StrToIntDef(frm.edPos.Text, -9999); frm.Free; @@ -1149,7 +1154,6 @@ begin Result := newname; end; - procedure TFormDesigner.MsgActivate(var msg: TfpgMessageRec); begin msg.Stop := True; @@ -1219,7 +1223,15 @@ begin } s := s + ' WindowTitle := ' + QuotedStr(FForm.WindowTitle) + ';' + LineEnding; - // ShowHint property - This is ugly, Form's properties or not handled well!! + // Hint property - This is ugly, Form's properties are not handled well!! + PropInfo := GetPropInfo(FForm.ClassType, 'Hint'); + t := GetStrProp(FForm, 'Hint'); + if IsStoredProp(FForm, PropInfo) then + begin + s := s + ' Hint := ' + QuotedStr(t) + ';' + LineEnding; + end; + + // ShowHint property - This is ugly, Form's properties are not handled well!! PropInfo := GetPropInfo(FForm.ClassType, 'ShowHint'); i := GetOrdProp(FForm, 'ShowHint'); if IsStoredProp(FForm, PropInfo) then @@ -1410,7 +1422,7 @@ begin //frmie.Top := ay; frmie.edItems.Lines.Assign(sl); - if frmie.ShowModal = 1 then + if frmie.ShowModal = mrOK then begin // Writeln('OK'); sl.Assign(frmie.edItems.Lines); @@ -1456,7 +1468,7 @@ begin cfrm := TInsertCustomForm.Create(nil); cfrm.edName.Text := GenerateNewName(wgc.NameBase); cfrm.edClass.Text := 'Tfpg'; - if cfrm.ShowModal = 1 then + if cfrm.ShowModal = mrOK then begin newname := cfrm.edName.Text; newClassName := cfrm.edClass.Text; @@ -1476,8 +1488,8 @@ begin if wgc.WidgetClass = TOtherWidget then TOtherWidget(wg).wgClassName := newclassname; wgd := AddWidget(wg, wgc); - wg.Visible := True; wg.SetPosition(x, y, wg.Width, wg.Height); + wg.Visible := True; DeSelectAll; wgd.Selected := True; UpdatePropWin; diff --git a/uidesigner/vfdeditors.pas b/uidesigner/vfdeditors.pas index 9e65245f..50acb0d5 100644 --- a/uidesigner/vfdeditors.pas +++ b/uidesigner/vfdeditors.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -73,8 +73,8 @@ begin btnClear := CreateButton(self, 8, 200, 80, 'Clear', @btnClearClicked); btnClear.Anchors := [anLeft, anBottom]; - btnOK := CreateButton(self, btnClear.Right + 4, 200, 80, 'OK', @OnButtonClick); - btnOK.Anchors := [anLeft, anBottom]; + btnOK := CreateButton(self, Width-168, 200, 80, 'OK', @OnButtonClick); + btnOK.Anchors := [anRight, anBottom]; btnCancel := CreateButton(self, Width-84, 200, 80, 'Cancel', @OnButtonClick); btnCancel.Anchors := [anRight, anBottom]; diff --git a/uidesigner/vfdfile.pas b/uidesigner/vfdfile.pas index 043a7fa1..ea7bf268 100644 --- a/uidesigner/vfdfile.pas +++ b/uidesigner/vfdfile.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -58,7 +58,7 @@ type procedure AddNewFormImpl(formname, formbody: string); function FindFormBlock(blockid, formname: string): TVFDFileBlock; procedure SetFormData(formname, headblock, bodyblock: string); - procedure NewFileSkeleton(unitname: string); + procedure NewFileSkeleton(AUnitname: string); end; @@ -323,10 +323,10 @@ begin Result := rs; end; -procedure TVFDFile.NewFileSkeleton(unitname: string); +procedure TVFDFile.NewFileSkeleton(AUnitname: string); begin FFileData := - 'unit ' + unitname + ';'+ LineEnding + LineEnding + + 'unit ' + AUnitname + ';'+ LineEnding + LineEnding + '{$mode objfpc}{$H+}' + LineEnding + LineEnding + 'interface' + LineEnding + LineEnding + 'uses' + LineEnding + diff --git a/uidesigner/vfdformparser.pas b/uidesigner/vfdformparser.pas index 71de141d..e08d9ce2 100644 --- a/uidesigner/vfdformparser.pas +++ b/uidesigner/vfdformparser.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, diff --git a/uidesigner/vfdforms.pas b/uidesigner/vfdforms.pas index 3fcbc62e..ec60265d 100644 --- a/uidesigner/vfdforms.pas +++ b/uidesigner/vfdforms.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -33,7 +33,8 @@ uses fpg_listbox, fpg_combobox, fpg_trackbar, - fpg_checkbox; + fpg_checkbox, + fpg_panel; type @@ -114,12 +115,16 @@ type btnCancel: TfpgButton; lblRecentFiles: TfpgLabel; tbMRUFileCount: TfpgTrackBar; - cbFullPath: TfpgCheckBox; + chkFullPath: TfpgCheckBox; lblName1: TfpgLabel; lblName2: TfpgLabel; - eDefaultExt: TfpgEdit; + edtDefaultExt: TfpgEdit; lblName3: TfpgLabel; - cbUndoOnExit: TfpgCheckBox; + chkUndoOnExit: TfpgCheckBox; + chkOneClick: TfpgCheckBox; + Bevel1: TfpgBevel; + Bevel2: TfpgBevel; + Bevel3: TfpgBevel; {@VFD_HEAD_END: frmVFDSetup} procedure AfterCreate; override; procedure BeforeDestruction; override; @@ -159,9 +164,9 @@ end; procedure TInsertCustomForm.OnButtonClick(Sender: TObject); begin if Sender = btnOK then - ModalResult := 1 + ModalResult := mrOK else - ModalResult := 2; + ModalResult := mrCancel; end; { TNewFormForm } @@ -191,9 +196,9 @@ end; procedure TNewFormForm.OnButtonClick(Sender: TObject); begin if Sender = btnOK then - ModalResult := 1 + ModalResult := mrOK else - ModalResult := 2; + ModalResult := mrCancel; end; { TEditPositionForm } @@ -224,9 +229,9 @@ end; procedure TEditPositionForm.OnButtonClick(Sender: TObject); begin if Sender = btnOK then - ModalResult := 1 + ModalResult := mrOK else - ModalResult := 2; + ModalResult := mrCancel; end; { TWidgetOrderForm } @@ -251,6 +256,7 @@ begin Name := 'WidgetOrderForm'; SetPosition(534, 173, 312, 258); WindowTitle := 'Widget order'; + Hint := ''; WindowPosition := wpScreenCenter; l1 := TfpgLabel.Create(self); @@ -259,6 +265,7 @@ begin Name := 'l1'; SetPosition(4, 4, 108, 16); FontDesc := '#Label1'; + Hint := ''; Text := 'Form widget order:'; end; @@ -269,6 +276,9 @@ begin SetPosition(4, 24, 220, 228); Anchors := [anLeft,anRight,anTop,anBottom]; FontDesc := '#List'; + Hint := ''; + HotTrack := False; + PopupFrame := False; TabOrder := 1; end; @@ -280,6 +290,7 @@ begin Anchors := [anRight,anTop]; Text := 'OK'; FontDesc := '#Label1'; + Hint := ''; ImageName := 'stdimg.ok'; TabOrder := 2; OnClick := @OnButtonClick; @@ -293,6 +304,7 @@ begin Anchors := [anRight,anTop]; Text := 'Cancel'; FontDesc := '#Label1'; + Hint := ''; ImageName := 'stdimg.cancel'; TabOrder := 3; OnClick := @OnButtonClick; @@ -306,6 +318,7 @@ begin Anchors := [anRight,anTop]; Text := 'Up'; FontDesc := '#Label1'; + Hint := ''; ImageName := ''; TabOrder := 4; OnClick := @OnButtonClick; @@ -319,6 +332,7 @@ begin Anchors := [anRight,anTop]; Text := 'Down'; FontDesc := '#Label1'; + Hint := ''; ImageName := ''; TabOrder := 5; OnClick := @OnButtonClick; @@ -350,9 +364,9 @@ var begin if Sender = btnOK then - ModalResult := 1 + ModalResult := mrOK else if Sender = btnCancel then - ModalResult := 2 + ModalResult := mrCancel else begin // up / down @@ -408,8 +422,8 @@ procedure TVFDDialog.HandleKeyPress(var keycode: word; var shiftstate: TShiftSta begin if keycode = keyEscape then begin - ModalResult := 2; consumed := True; + ModalResult := mrCancel; end; inherited HandleKeyPress(keycode, shiftstate, consumed); end; @@ -418,41 +432,45 @@ procedure TfrmVFDSetup.LoadSettings; begin chlGrid.FocusItem := gINI.ReadInteger('Options', 'GridResolution', 2); tbMRUFileCount.Position := gINI.ReadInteger('Options', 'MRUFileCount', 4); - cbFullPath.Checked := gINI.ReadBool('Options', 'ShowFullPath', True); - eDefaultExt.Text := gINI.ReadString('Options', 'DefaultFileExt', '.pas'); - cbUndoOnExit.Checked := gINI.ReadBool('Options', 'UndoOnExit', UndoOnPropExit); + chkFullPath.Checked := gINI.ReadBool('Options', 'ShowFullPath', True); + edtDefaultExt.Text := gINI.ReadString('Options', 'DefaultFileExt', '.pas'); + chkUndoOnExit.Checked := gINI.ReadBool('Options', 'UndoOnExit', UndoOnPropExit); + chkOneClick.Checked := gINI.ReadBool('Options', 'OneClickMove', True); end; procedure TfrmVFDSetup.SaveSettings; begin gINI.WriteInteger('Options', 'GridResolution', chlGrid.FocusItem); gINI.WriteInteger('Options', 'MRUFileCount', tbMRUFileCount.Position); - gINI.WriteBool('Options', 'ShowFullPath', cbFullPath.Checked); - gINI.WriteString('Options', 'DefaultFileExt', eDefaultExt.Text); - gINI.WriteBool('Options', 'UndoOnExit', cbUndoOnExit.Checked); + gINI.WriteBool('Options', 'ShowFullPath', chkFullPath.Checked); + gINI.WriteString('Options', 'DefaultFileExt', edtDefaultExt.Text); + gINI.WriteBool('Options', 'UndoOnExit', chkUndoOnExit.Checked); + gINI.WriteBool('Options', 'OneClickMove', chkOneClick.Checked); end; procedure TfrmVFDSetup.btnOKClick(Sender: TObject); begin SaveSettings; - ModalResult := 1; + ModalResult := mrOK; end; procedure TfrmVFDSetup.AfterCreate; begin {@VFD_BODY_BEGIN: frmVFDSetup} Name := 'frmVFDSetup'; - SetPosition(394, 399, 253, 225); + SetPosition(392, 386, 398, 283); WindowTitle := 'General settings'; + Hint := ''; WindowPosition := wpScreenCenter; - gINI.ReadFormState(self); + gINI.ReadFormState(self); // after form created but before creating widgets lb1 := TfpgLabel.Create(self); with lb1 do begin Name := 'lb1'; - SetPosition(28, 28, 116, 16); + SetPosition(28, 32, 112, 16); FontDesc := '#Label1'; + Hint := ''; Text := 'Grid resolution:'; end; @@ -460,8 +478,9 @@ begin with chlGrid do begin Name := 'chlGrid'; - SetPosition(140, 24, 88, 22); + SetPosition(144, 28, 88, 22); FontDesc := '#List'; + Hint := ''; Items.Add('1'); Items.Add('4'); Items.Add('8'); @@ -473,10 +492,11 @@ begin with btnOK do begin Name := 'btnOK'; - SetPosition(93, 195, 75, 24); + SetPosition(238, 253, 75, 24); Anchors := [anRight,anBottom]; Text := 'OK'; FontDesc := '#Label1'; + Hint := ''; ImageName := 'stdimg.ok'; TabOrder := 6; OnClick := @btnOKClick; @@ -486,12 +506,13 @@ begin with btnCancel do begin Name := 'btnCancel'; - SetPosition(172, 195, 75, 24); + SetPosition(317, 253, 75, 24); Anchors := [anRight,anBottom]; Text := 'Cancel'; FontDesc := '#Label1'; + Hint := ''; ImageName := 'stdimg.cancel'; - ModalResult := -1; + ModalResult := mrCancel; TabOrder := 7; end; @@ -499,8 +520,9 @@ begin with lblRecentFiles do begin Name := 'lblRecentFiles'; - SetPosition(28, 92, 124, 16); + SetPosition(28, 132, 124, 16); FontDesc := '#Label1'; + Hint := ''; Text := 'Recent files count:'; end; @@ -508,7 +530,8 @@ begin with tbMRUFileCount do begin Name := 'tbMRUFileCount'; - SetPosition(156, 84, 76, 30); + SetPosition(156, 124, 76, 30); + Hint := ''; Max := 10; Min := 2; Position := 4; @@ -516,12 +539,13 @@ begin TabOrder := 3; end; - cbFullPath := TfpgCheckBox.Create(self); - with cbFullPath do + chkFullPath := TfpgCheckBox.Create(self); + with chkFullPath do begin - Name := 'cbFullPath'; - SetPosition(24, 112, 204, 20); + Name := 'chkFullPath'; + SetPosition(24, 156, 204, 20); FontDesc := '#Label1'; + Hint := ''; TabOrder := 4; Text := 'Show the full file path'; end; @@ -532,6 +556,7 @@ begin Name := 'lblName1'; SetPosition(8, 8, 176, 16); FontDesc := '#Label2'; + Hint := ''; Text := 'Form designer'; end; @@ -539,16 +564,18 @@ begin with lblName2 do begin Name := 'lblName2'; - SetPosition(8, 72, 232, 16); + SetPosition(8, 108, 232, 16); FontDesc := '#Label2'; + Hint := ''; Text := 'Open Recent menu settings'; end; - eDefaultExt := TfpgEdit.Create(self); - with eDefaultExt do + edtDefaultExt := TfpgEdit.Create(self); + with edtDefaultExt do begin - Name := 'eDefaultExt'; - SetPosition(28, 160, 68, 22); + Name := 'edtDefaultExt'; + SetPosition(28, 216, 68, 24); + Hint := ''; TabOrder := 5; Text := ''; FontDesc := '#Edit1'; @@ -558,21 +585,65 @@ begin with lblName3 do begin Name := 'lblName3'; - SetPosition(12, 140, 152, 16); + SetPosition(12, 192, 152, 16); FontDesc := '#Label2'; + Hint := ''; Text := 'Default file extension'; end; - cbUndoOnExit := TfpgCheckBox.Create(self); - with cbUndoOnExit do + chkUndoOnExit := TfpgCheckBox.Create(self); + with chkUndoOnExit do begin - Name := 'cbUndoOnExit'; - SetPosition(24, 48, 204, 18); + Name := 'chkUndoOnExit'; + SetPosition(24, 56, 204, 18); FontDesc := '#Label1'; + Hint := ''; TabOrder := 2; Text := 'Undo on property editor exit'; end; + chkOneClick := TfpgCheckBox.Create(self); + with chkOneClick do + begin + Name := 'chkOneClick'; + SetPosition(24, 76, 224, 20); + Checked := True; + FontDesc := '#Label1'; + Hint := ''; + TabOrder := 12; + Text := 'One click select and move'; + end; + + Bevel1 := TfpgBevel.Create(self); + with Bevel1 do + begin + Name := 'Bevel1'; + SetPosition(108, 4, 280, 14); + Hint := ''; + Style := bsLowered; + Shape := bsBottomLine; + end; + + Bevel2 := TfpgBevel.Create(self); + with Bevel2 do + begin + Name := 'Bevel2'; + SetPosition(192, 104, 196, 14); + Hint := ''; + Style := bsLowered; + Shape := bsBottomLine; + end; + + Bevel3 := TfpgBevel.Create(self); + with Bevel3 do + begin + Name := 'Bevel3'; + SetPosition(156, 188, 232, 14); + Hint := ''; + Style := bsLowered; + Shape := bsBottomLine; + end; + {@VFD_BODY_END: frmVFDSetup} LoadSettings; @@ -580,6 +651,8 @@ end; procedure TfrmVFDSetup.BeforeDestruction; begin + // We don't put this in SaveSettings because it needs to be called even if + // user cancels the dialog with btnCancel or ESC key press. gINI.WriteFormState(self); inherited BeforeDestruction; end; diff --git a/uidesigner/vfdmain.pas b/uidesigner/vfdmain.pas index 043d42ca..a6b8f0b2 100644 --- a/uidesigner/vfdmain.pas +++ b/uidesigner/vfdmain.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -24,6 +24,8 @@ interface uses Classes, SysUtils, + fpg_base, + fpg_main, fpg_widget, fpg_dialogs, vfdprops, @@ -33,7 +35,7 @@ uses newformdesigner; const - program_version = '0.7 beta'; + program_version = FPGUI_VERSION; type @@ -84,11 +86,11 @@ implementation uses vfdformparser, fpg_iniutils, - fpg_utils, - fpg_main; + fpg_utils; -Var +var DefaultPasExt : String = '.pas'; + OneClickMove: Boolean; { TMainDesigner } @@ -277,12 +279,13 @@ var nfrm: TNewFormForm; begin nfrm := TNewFormForm.Create(nil); - if nfrm.ShowModal = 1 then + if nfrm.ShowModal = mrOK then if nfrm.edName.Text <> '' then begin fd := TFormDesigner.Create; fd.Form.Name := nfrm.edName.Text; fd.Form.WindowTitle := nfrm.edName.Text; + fd.OneClickMove := OneClickMove; FDesigners.Add(fd); fd.Show; end; @@ -373,6 +376,7 @@ var begin fp := TVFDFormParser.Create(FormName, FormHead, FormBody); fd := fp.ParseForm; + fd.OneClickMove := OneClickMove; fp.Free; FDesigners.Add(fd); @@ -409,7 +413,7 @@ var begin frm := TfrmVFDSetup.Create(nil); try - if frm.ShowModal = 1 then + if frm.ShowModal = mrOK then begin LoadDefaults; frmMain.mru.MaxItems := gINI.ReadInteger('Options', 'MRUFileCount', 4); @@ -440,6 +444,7 @@ begin end; DefaultPasExt := gINI.ReadString('Options', 'DefaultFileExt', '.pas'); UndoOnPropExit := gINI.ReadBool('Options', 'UndoOnExit', DefUndoOnPropExit); + OneClickMove := gINI.ReadBool('Options', 'OneClickMove', True); fpgApplication.HintPause := 1000; end; diff --git a/uidesigner/vfdpropeditgrid.pas b/uidesigner/vfdpropeditgrid.pas index e9f0be4b..1a6944cb 100644 --- a/uidesigner/vfdpropeditgrid.pas +++ b/uidesigner/vfdpropeditgrid.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -227,7 +227,6 @@ begin Text := 'New'; FontDesc := '#Label1'; ImageName := ''; - ModalResult := 0; OnClick := @NewButtonClick; end; @@ -239,7 +238,6 @@ begin Text := 'Delete'; FontDesc := '#Label1'; ImageName := ''; - ModalResult := 0; OnClick := @DeleteButtonClick; end; @@ -251,7 +249,6 @@ begin Text := 'UP'; FontDesc := '#Label1'; ImageName := ''; - ModalResult := 0; OnClick := @UpDownButtonClick; end; @@ -263,7 +260,6 @@ begin Text := 'DOWN'; FontDesc := '#Label1'; ImageName := ''; - ModalResult := 0; OnClick := @UpDownButtonClick; end; @@ -275,7 +271,6 @@ begin Text := 'Close'; FontDesc := '#Label1'; ImageName := 'stdimg.close'; - ModalResult := 0; OnClick := @CloseButtonClick; end; diff --git a/uidesigner/vfdprops.pas b/uidesigner/vfdprops.pas index 90dd29e4..687254ea 100644 --- a/uidesigner/vfdprops.pas +++ b/uidesigner/vfdprops.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -115,6 +115,7 @@ type procedure StoreStrValue(wg: TfpgWidget); procedure LoadFloatValue(wg: TfpgWidget); procedure StoreFloatValue(wg: TfpgWidget); + procedure SetFocus; override; end; @@ -124,6 +125,7 @@ type procedure CreateLayout; override; procedure LoadValue(wg: TfpgWidget); override; procedure StoreValue(wg: TfpgWidget); override; + procedure SetFocus; override; end; @@ -173,7 +175,7 @@ begin frm := TItemEditorForm.Create(nil); try frm.edItems.Lines.Assign(sl); - if frm.ShowModal = 1 then + if frm.ShowModal = mrOK then sl.Assign(frm.edItems.Lines); finally frm.Free; @@ -398,6 +400,11 @@ begin end; end; +procedure TGeneralPropertyEditor.SetFocus; +begin + Edit.SetFocus; +end; + procedure TGeneralPropertyEditor.StoreValue(wg: TfpgWidget); begin case etype of @@ -692,6 +699,11 @@ begin SetEnumProp(wg, prop.Name, chl.Text); end; +procedure TChoicePropertyEditor.SetFocus; +begin + chl.SetFocus; +end; + { TBooleanPropertyEditor } procedure TBooleanPropertyEditor.LoadValue(wg: TfpgWidget); diff --git a/uidesigner/vfdresizer.pas b/uidesigner/vfdresizer.pas index 03e83618..657746b6 100644 --- a/uidesigner/vfdresizer.pas +++ b/uidesigner/vfdresizer.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -98,8 +98,8 @@ begin wgd := TWidgetDesigner(wgdesigner); gridc := maindsgn.GridResolution; - dx := dx - dx mod gridc; - dy := dy - dy mod gridc; + dx := dx - (dx mod gridc); + dy := dy - (dy mod gridc); case direction of 1: wgd.Widget.MoveAndResizeBy(dx, dy, -dx, -dy); @@ -134,7 +134,6 @@ begin 7: MouseCursor := mcSizeNESW; // bottom left 8: MouseCursor := mcSizeEW; // left end; - Visible := True; end; procedure TwgResizer.Show; diff --git a/uidesigner/vfdutils.pas b/uidesigner/vfdutils.pas index 851cd518..14b1c561 100644 --- a/uidesigner/vfdutils.pas +++ b/uidesigner/vfdutils.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, diff --git a/uidesigner/vfdwidgetclass.pas b/uidesigner/vfdwidgetclass.pas index 0fe62171..059aaf79 100644 --- a/uidesigner/vfdwidgetclass.pas +++ b/uidesigner/vfdwidgetclass.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -47,6 +47,7 @@ type procedure CreateLayout; virtual; procedure LoadValue(wg: TfpgWidget); virtual; procedure StoreValue(wg: TfpgWidget); virtual; + procedure SetFocus; virtual; end; @@ -96,7 +97,7 @@ uses type // used to get to SetDesigning() in Form Designer - TComponentFriendClass = class(TComponent); + TWidgetFriendClass = class(TfpgWidget); { TVFDWidgetClass } @@ -122,7 +123,7 @@ end; function TVFDWidgetClass.CreateWidget(AOwner: TComponent): TfpgWidget; begin Result := WidgetClass.Create(AOwner); - TComponentFriendClass(Result).SetDesigning(True); + TWidgetFriendClass(Result).SetDesigning(True); end; function TVFDWidgetClass.CreatePopupMenu(AWidget: TfpgWidget): TfpgPopupMenu; @@ -239,5 +240,10 @@ begin // if PPropInfo^.PropType^.name = end; +procedure TVFDPropertyEditor.SetFocus; +begin + // do nothing +end; + end. diff --git a/uidesigner/vfdwidgets.pas b/uidesigner/vfdwidgets.pas index 61b56dec..654abf5f 100644 --- a/uidesigner/vfdwidgets.pas +++ b/uidesigner/vfdwidgets.pas @@ -1,7 +1,7 @@ { fpGUI - Free Pascal GUI Toolkit - Copyright (C) 2006 - 2009 See the file AUTHORS.txt, included in this + Copyright (C) 2006 - 2010 See the file AUTHORS.txt, included in this distribution, for details of the copyright. See the file COPYING.modifiedLGPL, included in this distribution, @@ -63,6 +63,7 @@ uses fpg_tab, fpg_popupcalendar, fpg_gauge, + fpg_editbtn, vfdpropeditgrid, vfdmain; @@ -94,7 +95,7 @@ function TVFDPageControlWidgetClass.CreatePopupMenu(AWidget: TfpgWidget): TfpgPo begin FWidget := TfpgPageControl(AWidget); Result := TfpgPopupMenu.Create(nil); - { TODO : These are disabled for now, because a TabSheet component is used + { TODO : These are disabled for now, because a TabSheet component are used instead of a menu item - for adding tabs. } Result.AddMenuItem('Add Tab', '', @AddTabSClicked).Enabled := False; Result.AddMenuItem('Delete Tab', '', @DeleteTabClicked).Enabled := False; @@ -164,6 +165,12 @@ begin 0, 0); fpgImages.AddMaskedBMP( + 'vfd.colorlistbox', @stdimg_vfd_colorlistbox, + sizeof(stdimg_vfd_colorlistbox), + 0, 0); + + + fpgImages.AddMaskedBMP( 'vfd.combobox', @stdimg_vfd_combobox, sizeof(stdimg_vfd_combobox), 0, 0); @@ -273,6 +280,20 @@ begin sizeof(stdimg_vfd_combodatecheckedit), 0, 0); + fpgImages.AddMaskedBMP( + 'vfd.editfilename', @stdimg_vfd_editfilename, + sizeof(stdimg_vfd_editfilename), + 0, 0); + + fpgImages.AddMaskedBMP( + 'vfd.editdirectory', @stdimg_vfd_editdirectory, + sizeof(stdimg_vfd_editdirectory), + 0, 0); + + fpgImages.AddMaskedBMP( + 'vfd.editfont', @stdimg_vfd_editfont, + sizeof(stdimg_vfd_editfont), + 0, 0); end; procedure AddWidgetPosProps(wgc: TVFDWidgetClass); @@ -293,6 +314,7 @@ begin wc.NameBase := 'frm'; wc.AddProperty('WindowTitle', TPropertyString, ''); // wc.AddProperty('WindowPosition', TPropertyEnum, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ShowHint', TPropertyBoolean, ''); FVFDFormWidget := wc; @@ -301,7 +323,7 @@ begin wc.NameBase := 'Label'; wc.AddProperty('Alignment', TPropertyEnum, 'Horizontal text alignment'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the label text'); - wc.AddProperty('Hint', TPropertyString, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Layout', TPropertyEnum, 'Vertical text layout'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); @@ -314,9 +336,15 @@ begin wc := TVFDWidgetClass.Create(TfpgEdit); wc.NameBase := 'Edit'; // wc.AddProperty('Color', TPropertyColor, 'Text color'); + wc.AddProperty('AutoSelect', TPropertyBoolean, 'On receiving focus, auto select text'); + wc.AddProperty('AutoSize', TPropertyBoolean, 'Change Height based on FontDesc being set'); + wc.AddProperty('BorderStyle', TPropertyEnum, ''); + wc.AddProperty('ExtraHint', TPropertyString, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); wc.AddProperty('Text', TPropertyString, 'Initial text'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('IgnoreMouseCursor', TPropertyBoolean, 'If True, then mouse pointer doesn''t change'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.WidgetIconName := 'vfd.edit'; @@ -325,6 +353,7 @@ begin // Memo wc := TVFDWidgetClass.Create(TfpgMemo); wc.NameBase := 'Memo'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Lines', TPropertyStringList, ''); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); @@ -342,12 +371,12 @@ begin wc.AddProperty('Flat', TPropertyBoolean, 'Only draw button borders when mouse hovers over button'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('GroupIndex', TPropertyInteger, ''); - wc.AddProperty('Hint', TPropertyString, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ImageLayout', TPropertyEnum, 'Which side of the button contains the image'); wc.AddProperty('ImageMargin', TPropertyInteger, 'Space between image and border, -1 centers image/text'); wc.AddProperty('ImageName', TPropertyString, ''); wc.AddProperty('ImageSpacing', TPropertyInteger, 'Space between image and text, -1 centers text'); - wc.AddProperty('ModalResult', TPropertyInteger, ''); + wc.AddProperty('ModalResult', TPropertyEnum, 'Modal Result returned and overrides the OnClick event handler'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowImage', TPropertyBoolean, 'Boolean value'); @@ -360,6 +389,7 @@ begin wc.NameBase := 'CheckBox'; wc.AddProperty('Checked', TPropertyBoolean, 'Boolean value'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); @@ -373,6 +403,7 @@ begin wc.AddProperty('Checked', TPropertyBoolean, 'Boolean value'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('GroupIndex', TPropertyInteger, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); @@ -384,6 +415,7 @@ begin wc := TVFDWidgetClass.Create(TfpgComboBox); wc.NameBase := 'ComboBox'; wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Items', TPropertyStringList, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); @@ -396,6 +428,7 @@ begin wc.NameBase := 'CalendarCombo'; wc.AddProperty('DateFormat', TPropertyString, 'Standard RTL date formatting applies'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('WeekStartDay', TPropertyInteger, '0 = Sun, 1 = Mon, etc.'); @@ -409,6 +442,7 @@ begin wc.AddProperty('Checked', TPropertyBoolean, 'Boolean value'); wc.AddProperty('DateFormat', TPropertyString, 'Standard RTL date formatting applies'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('WeekStartDay', TPropertyInteger, '0 = Sun, 1 = Mon, etc.'); @@ -419,7 +453,10 @@ begin // ListBox wc := TVFDWidgetClass.Create(TfpgListBox); wc.NameBase := 'ListBox'; + wc.AddProperty('AutoHeight', TPropertyBoolean, ''); + wc.Addproperty('DragToReorder', TPropertyBoolean, ''); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('HotTrack', TPropertyBoolean, ''); wc.AddProperty('Items', TPropertyStringList, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); @@ -429,12 +466,30 @@ begin wc.WidgetIconName := 'vfd.listbox'; RegisterVFDWidget(wc); + // Color ListBox + wc := TVFDWidgetClass.Create(TfpgColorListBox); + wc.NameBase := 'ColorListBox'; + wc.AddProperty('AutoHeight', TPropertyBoolean, ''); + wc.AddProperty('ColorPalette', TPropertyEnum, ''); + wc.Addproperty('DragToReorder', TPropertyBoolean, ''); + wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); + wc.AddProperty('HotTrack', TPropertyBoolean, ''); + wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + wc.AddProperty('PopupFrame', TPropertyBoolean, ''); + wc.AddProperty('ShowColorNames', TPropertyBoolean, ''); + wc.AddProperty('ShowHint', TPropertyBoolean, ''); + wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + wc.WidgetIconName := 'vfd.colorlistbox'; + RegisterVFDWidget(wc); + // StringGrid wc := TVFDWidgetClass.Create(TfpgStringGrid); wc.NameBase := 'Grid'; wc.AddProperty('Columns', TPropertyDBColumns, ''); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('HeaderFontDesc', TPropertyFontDesc, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('RowCount', TPropertyInteger, ''); wc.AddProperty('RowSelect', TPropertyBoolean, ''); @@ -449,6 +504,8 @@ begin wc := TVFDWidgetClass.Create(TfpgBevel); wc.NameBase := 'Bevel'; wc.AddProperty('BorderStyle', TPropertyEnum, 'Single or Double'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); + wc.AddProperty('ParentBackgroundColor', TPropertyBoolean, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('Style', TPropertyEnum, 'Raised or Lower look'); wc.AddProperty('Shape', TPropertyEnum, 'Box, Frame, TopLine, Spacer etc..'); @@ -462,9 +519,11 @@ begin wc.NameBase := 'Panel'; wc.AddProperty('Alignment', TPropertyEnum, 'Text alignment'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Layout', TPropertyEnum, 'Layout of the caption'); wc.AddProperty('LineSpace', TPropertyInteger, 'Line spacing between wrapped caption'); wc.AddProperty('Margin', TPropertyInteger, 'Margin of text'); + wc.AddProperty('ParentBackgroundColor', TPropertyBoolean, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('Style', TPropertyEnum, 'Raised or Lower look'); @@ -480,6 +539,7 @@ begin wc.AddProperty('Alignment', TPropertyEnum, 'Text alignment'); wc.AddProperty('BorderStyle', TPropertyEnum, 'Single or Double'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Margin', TPropertyInteger, 'Margin of text'); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('Style', TPropertyEnum, 'Raised or Lower look'); @@ -492,6 +552,7 @@ begin // ProgressBar wc := TVFDWidgetClass.Create(TfpgProgressBar); wc.NameBase := 'ProgressBar'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Min', TPropertyInteger, ''); wc.AddProperty('Max', TPropertyInteger, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); @@ -504,6 +565,7 @@ begin // TrackBar wc := TVFDWidgetClass.Create(TfpgTrackBar); wc.NameBase := 'TrackBar'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Max', TPropertyInteger, ''); wc.AddProperty('Min', TPropertyInteger, ''); wc.AddProperty('Orientation', TPropertyEnum, ''); @@ -518,6 +580,7 @@ begin // ListView wc := TVFDWidgetClass.Create(TfpgListView); wc.NameBase := 'ListView'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('MultiSelect', TPropertyBoolean, ''); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHeaders', TPropertyBoolean, ''); @@ -531,6 +594,7 @@ begin wc.NameBase := 'TreeView'; wc.AddProperty('DefaultColumnWidth',TPropertyInteger, ''); wc.AddProperty('FontDesc',TPropertyFontDesc, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ScrollWheelDelta', TPropertyInteger, 'Scroll amount with mouse wheel'); wc.AddProperty('ShowColumns',TPropertyBoolean, 'Boolean value'); @@ -546,6 +610,7 @@ begin wc.NameBase := 'PageControl'; wc.AddProperty('ActivePageIndex', TPropertyInteger, ''); wc.AddProperty('FixedTabWidth', TPropertyInteger, ''); + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('SortPages', TPropertyBoolean, 'Boolean value'); @@ -568,6 +633,7 @@ begin // Gauge wc := TVFDWidgetClass.Create(TfpgGauge); wc.NameBase := 'Gauge'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('Kind', TPropertyEnum, ''); wc.AddProperty('MinValue', TPropertyInteger, ''); wc.AddProperty('MaxValue', TPropertyInteger, ''); @@ -582,9 +648,11 @@ begin // Integer Edit wc := TVFDWidgetClass.Create(TfpgEditInteger); wc.NameBase := 'EditInteger'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + wc.AddProperty('ReadOnly', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('ShowThousand', TPropertyBoolean, 'Show thousand separator'); // wc.AddProperty('CustomThousandSeparator', TPropertyString, 'Thousand separator character'); @@ -595,9 +663,11 @@ begin // Float Edit wc := TVFDWidgetClass.Create(TfpgEditFloat); wc.NameBase := 'EditFloat'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + wc.AddProperty('ReadOnly', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('Value', TPropertyFloat, 'Initial value'); wc.AddProperty('ShowThousand', TPropertyBoolean, 'Show thousand separator'); @@ -611,9 +681,11 @@ begin // Currency Edit wc := TVFDWidgetClass.Create(TfpgEditCurrency); wc.NameBase := 'EditCurrency'; + wc.AddProperty('Hint', TPropertyString, 'Tooltip hint'); wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + wc.AddProperty('ReadOnly', TPropertyBoolean, ''); wc.AddProperty('ShowHint', TPropertyBoolean, ''); wc.AddProperty('Value', TPropertyFloat, 'Initial value'); wc.AddProperty('ShowThousand', TPropertyBoolean, 'Show thousand separator'); @@ -623,6 +695,72 @@ begin wc.WidgetIconName := 'vfd.editcurrency'; RegisterVFDWidget(wc); + { TODO : UI Designer still has problems with components that have child components. } + // Spin Edit + //wc := TVFDWidgetClass.Create(TfpgSpinEdit); + //wc.NameBase := 'SpinEdit'; + //wc.AddProperty('ButtonWidth', TPropertyInteger, 'Spin button width'); + //wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + //wc.Addproperty('Hint', TPropertyString, ''); + //wc.AddProperty('Increment', TPropertyInteger, 'Increment value on short press'); + //wc.AddProperty('LargeIncrement', TPropertyInteger, 'Large increment value on long press'); + //wc.AddProperty('MaxValue', TPropertyInteger, 'Maximum value'); + //wc.AddProperty('MinValue', TPropertyInteger, 'Minimum value'); + //wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + //wc.AddProperty('ShowHint', TPropertyBoolean, ''); + //wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + //wc.AddProperty('Value', TPropertyInteger, 'Initial value'); + //wc.WidgetIconName := 'vfd.editinteger'; + //RegisterVFDWidget(wc); + + // Spin Edit Float + //wc := TVFDWidgetClass.Create(TfpgSpinEditFloat); + //wc.NameBase := 'SpinEditFloat'; + //wc.AddProperty('ButtonWidth', TPropertyInteger, 'Spin button width'); + //wc.Addproperty('Decimals', TPropertyInteger, ''); + //wc.Addproperty('FixedDecimals', TPropertyBoolean, ''); + //wc.AddProperty('FontDesc', TPropertyFontDesc, 'The font used for displaying the text'); + //wc.Addproperty('Hint', TPropertyString, ''); + //wc.AddProperty('Increment', TPropertyFloat, 'Increment value on short press'); + //wc.AddProperty('LargeIncrement', TPropertyFloat, 'Large increment value on long press'); + //wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + //wc.AddProperty('MaxValue', TPropertyFloat, 'Maximum value'); + //wc.AddProperty('MinValue', TPropertyFloat, 'Minimum value'); + //wc.AddProperty('ParentShowHint', TPropertyBoolean, ''); + //wc.AddProperty('ShowHint', TPropertyBoolean, ''); + //wc.AddProperty('Value', TPropertyFloat, 'Initial value'); + //wc.WidgetIconName := 'vfd.editfloat'; + //RegisterVFDWidget(wc); + + // Filename Edit + wc := TVFDWidgetClass.Create(TfpgFileNameEdit); + wc.NameBase := 'FilenameEdit'; + wc.AddProperty('ExtraHint', TPropertyString, ''); + wc.AddProperty('FileName', TPropertyString, 'Preset filename in edit component'); + wc.AddProperty('InitialDir', TPropertyString, 'Initial starting directory of the dialog'); + wc.AddProperty('Filter', TPropertyString, 'Filename filters used in the dialog'); + wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + wc.WidgetIconName := 'vfd.editfilename'; + RegisterVFDWidget(wc); + + // Directory Edit + wc := TVFDWidgetClass.Create(TfpgDirectoryEdit); + wc.NameBase := 'DirectoryEdit'; + wc.AddProperty('ExtraHint', TPropertyString, ''); + wc.AddProperty('Directory', TPropertyString, 'Preset directory name in edit component'); + wc.AddProperty('RootDirectory', TPropertyString, 'Initial starting directory of the dialog'); + wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + wc.WidgetIconName := 'vfd.editdirectory'; + RegisterVFDWidget(wc); + + // Font Edit + wc := TVFDWidgetClass.Create(TfpgFontEdit); + wc.NameBase := 'DirectoryEdit'; + wc.AddProperty('FontDesc', TPropertyString, 'Specify a preset font description'); + wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order'); + wc.WidgetIconName := 'vfd.editfont'; + RegisterVFDWidget(wc); + // Other - do not delete!!! this should be the last... wc := TVFDWidgetClass.Create(TOtherWidget); wc.NameBase := 'Custom'; |
