* Minor X11 debugging improvements.

* Named internal components
* Introduced TfpgBaseCheckbox class.
* Refactored text drawing in ComboBox to a method that can be overridden in descendants.
* Implemented a new (experimental) Calendar Combo with Checkbox for optional date selection.
* Added Calendar Combo Check component to UI Designer.
* Fixed some missing properties from Calendar Combo component in UI Designer.

2 files changed, 125 insertions, 0 deletions

diff --git a/uidesigner/icons.inc b/uidesigner/icons.inc
index bad1d570..8a288283 100644
--- a/uidesigner/icons.inc
+++ b/uidesigner/icons.inc
@@ -2607,3 +2607,108 @@ 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_combodatecheckedit : 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,  0,  0,  0,128,  0,  0,  0,  0,  0,128,  0,  0,  0,
+       0,  0,128,  0,  0,128,  0,  0,  0,  0,  0,128,  0,  0,  0,  0,  0,
+     128,  0,  0,  0,  0,  0,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,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,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,255,255,255,255,255,
+     255,  0,  0,128,  0,  0,128,  0,  0,128,255,255,255,  0,  0,128,  0,
+       0,128,  0,  0,128,192,192,192,255,255,255,255,255,255,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,255,
+     255,255,255,255,255,255,255,255,  0,  0,128,255,255,255,255,255,255,
+     192,192,192,255,255,255,192,192,192,  0,  0,128,255,255,255,255,255,
+     255,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,255,255,255,255,255,255,255,255,255,  0,  0,128,255,255,
+     255,255,255,255,255,255,255,255,255,255,255,255,255,  0,  0,128,255,
+     255,255,255,255,255,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,255,255,255,255,255,255,255,255,255,  0,
+       0,128,255,255,255,255,255,255,  0,  0,128,  0,  0,128,  0,  0,128,
+     192,192,192,255,255,255,255,255,255,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,255,255,255,255,255,255,
+       0,  0,128,  0,  0,128,255,255,255,255,255,255,  0,  0,128,255,255,
+     255,255,255,255,255,255,255,255,255,255,255,255,255,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,255,255,
+     255,255,255,255,255,255,255,  0,  0,128,255,255,255,255,255,255,  0,
+       0,128,  0,  0,128,  0,  0,128,  0,  0,128,255,255,255,255,255,255,
+     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,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,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,255,255,255,192,192,192,192,192,192,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,255,255,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,  0,  0,  0,  0,  0,  0,  0,
+       0,  0,  0,  0,  0,  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,  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,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,
+       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,
+       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,  0,  0,  0,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,  0,  0,  0,255,255,255,  0,  0,  0,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/vfdwidgets.pas b/uidesigner/vfdwidgets.pas
index d002e5ac..65057c84 100644
--- a/uidesigner/vfdwidgets.pas
+++ b/uidesigner/vfdwidgets.pas
@@ -268,6 +268,11 @@ begin
     sizeof(stdimg_vfd_groupbox),
     0, 0);
 
+  fpgImages.AddMaskedBMP(
+    'vfd.combodatecheckedit', @stdimg_vfd_combodatecheckedit,
+    sizeof(stdimg_vfd_combodatecheckedit),
+    0, 0);
+
 end;
 
 procedure AddWidgetPosProps(wgc: TVFDWidgetClass);
@@ -389,13 +394,28 @@ begin
   // Calendar ComboBox
   wc          := TVFDWidgetClass.Create(TfpgCalendarCombo);
   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('ParentShowHint', TPropertyBoolean, '');
   wc.AddProperty('ShowHint', TPropertyBoolean, '');
+  wc.AddProperty('WeekStartDay', TPropertyInteger, '0 = Sun, 1 = Mon, etc.');
   wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order');
   wc.WidgetIconName := 'vfd.combodateedit';
   RegisterVFDWidget(wc);
 
+  // Calendar ComboBox Checkbox
+  wc          := TVFDWidgetClass.Create(TfpgCalendarCheckCombo);
+  wc.NameBase := 'CalendarCombo';
+  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('ParentShowHint', TPropertyBoolean, '');
+  wc.AddProperty('ShowHint', TPropertyBoolean, '');
+  wc.AddProperty('WeekStartDay', TPropertyInteger, '0 = Sun, 1 = Mon, etc.');
+  wc.AddProperty('TabOrder', TPropertyInteger, 'The tab order');
+  wc.WidgetIconName := 'vfd.combodatecheckedit';
+  RegisterVFDWidget(wc);
+
   // ListBox
   wc          := TVFDWidgetClass.Create(TfpgListBox);
   wc.NameBase := 'ListBox';