mbColorLib: Fix layout of FullDemo project. Add widgetset name to form caption.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8064 8e941d3f-bd1b-0410-a28a-d453659cc2b4

components/mbColorLib/examples/fulldemo/Demo.lpi

@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="12"/>
     <PathDelim Value="\"/>
     <General>
+      <Flags>
+        <CompatibilityMode Value="True"/>
+      </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <MainUnit Value="0"/>
       <Title Value="Demo"/>
       <ResourceType Value="res"/>
       <UseXPManifest Value="True"/>
@@ -20,9 +22,10 @@
       <Version Value="2"/>
     </PublishOptions>
     <RunParams>
-      <local>
-        <FormatVersion Value="1"/>
-      </local>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default"/>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -57,9 +60,6 @@
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Linking>
-      <Debugging>
-        <UseExternalDbgSyms Value="True"/>
-      </Debugging>
       <Options>
         <Win32>
           <GraphicApplication Value="True"/>

components/mbColorLib/examples/fulldemo/main.lfm

@@ -2,19 +2,19 @@ object Form1: TForm1
   Left = 447
   Height = 416
   Top = 197
-  Width = 594
+  Width = 593
   Caption = 'mbColor Lib v2.2 Demo'
   ClientHeight = 416
-  ClientWidth = 594
+  ClientWidth = 593
   Font.Color = clWindowText
   OnCreate = FormCreate
   ShowHint = True
-  LCLVersion = '1.7'
+  LCLVersion = '2.2.0.1'
   object PageControl1: TPageControl
     Left = 6
     Height = 404
     Top = 6
-    Width = 476
+    Width = 475
     ActivePage = TabSheet1
     Align = alClient
     BorderSpacing.Around = 6
@@ -25,12 +25,13 @@ object Form1: TForm1
     object TabSheet1: TTabSheet
       Caption = 'HSLColorPicker'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       object HSLColorPicker1: THSLColorPicker
         Left = 8
         Height = 360
         Top = 8
-        Width = 454
+        Width = 453
+        SelectedColor = 66047
         Luminance = 128
         HSPickerHintFormat = 'H: %h S: %s'#13'Hex: #%hex'
         LPickerHintFormat = 'Luminance: %l'
@@ -44,7 +45,7 @@ object Form1: TForm1
     object TabSheet2: TTabSheet
       Caption = 'HexaColorPicker'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 1
       object Label4: TLabel
         AnchorSideLeft.Control = CheckBox1
@@ -57,7 +58,6 @@ object Form1: TForm1
         Width = 40
         BorderSpacing.Left = 24
         Caption = 'Marker:'
-        ParentColor = False
       end
       object HexaColorPicker1: THexaColorPicker
         AnchorSideTop.Control = TabSheet2
@@ -65,7 +65,7 @@ object Form1: TForm1
         Left = 64
         Height = 351
         Top = 0
-        Width = 336
+        Width = 335
         Anchors = [akTop, akLeft, akRight, akBottom]
         HintFormat = 'RGB(%r, %g, %b)'#13'Hex: #%hex'
         IntensityText = 'Intensity'
@@ -129,7 +129,7 @@ object Form1: TForm1
     object TabSheet3: TTabSheet
       Caption = 'mbColorPalette'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 2
       object LblSort: TLabel
         AnchorSideLeft.Control = TabSheet3
@@ -145,7 +145,6 @@ object Form1: TForm1
         BorderSpacing.Left = 6
         BorderSpacing.Bottom = 12
         Caption = 'Sort:'
-        ParentColor = False
       end
       object LblStyle: TLabel
         AnchorSideLeft.Control = CbSortMode
@@ -158,7 +157,6 @@ object Form1: TForm1
         Width = 28
         BorderSpacing.Left = 8
         Caption = 'Style:'
-        ParentColor = False
       end
       object LblSize: TLabel
         AnchorSideLeft.Control = CbStyle
@@ -171,7 +169,6 @@ object Form1: TForm1
         Width = 23
         BorderSpacing.Left = 6
         Caption = 'Size:'
-        ParentColor = False
       end
       object BtnBluePalette: TButton
         AnchorSideLeft.Control = LblSort
@@ -222,20 +219,20 @@ object Form1: TForm1
         Left = 6
         Height = 300
         Top = 8
-        Width = 458
+        Width = 457
         HorzScrollBar.Page = 75
         VertScrollBar.Page = 50
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Bottom = 4
         BorderStyle = bsNone
         ClientHeight = 300
-        ClientWidth = 458
+        ClientWidth = 457
         TabOrder = 3
         object mbColorPalette1: TmbColorPalette
           Left = 0
           Height = 298
           Top = 0
-          Width = 451
+          Width = 450
           Anchors = [akTop, akLeft, akRight, akBottom]
           Colors.Strings = (
             'clBlack'
@@ -601,13 +598,13 @@ object Form1: TForm1
     object TabSheet4: TTabSheet
       Caption = 'HSLRingPicker'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 3
       object HSLRingPicker1: THSLRingPicker
         Left = 50
         Height = 362
         Top = 6
-        Width = 370
+        Width = 369
         Luminance = 240
         RingPickerHintFormat = 'Hue: %h'
         SLPickerHintFormat = 'S: %hslS V: %v'#13'Hex: %hex'
@@ -623,13 +620,13 @@ object Form1: TForm1
     object TabSheet5: TTabSheet
       Caption = 'HSCirclePicker'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 4
       object HSCirclePicker1: THSCirclePicker
         Left = 24
         Height = 362
         Top = 6
-        Width = 405
+        Width = 404
         SelectedColor = clWhite
         HintFormat = 'H: %h S: %s V: %v'#13'Hex: %hex'
         Anchors = [akTop, akLeft, akRight, akBottom]
@@ -639,7 +636,7 @@ object Form1: TForm1
         OnChange = HSVColorPicker1Change
       end
       object LVColorPicker1: TLVColorPicker
-        Left = 437
+        Left = 436
         Height = 375
         Top = 2
         Width = 22
@@ -656,13 +653,13 @@ object Form1: TForm1
     object TabSheet6: TTabSheet
       Caption = 'SLHColorPicker'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 5
       object SLHColorPicker1: TSLHColorPicker
         Left = 8
         Height = 364
         Top = 6
-        Width = 458
+        Width = 457
         SelectedColor = 213
         Value = 213
         Luminance = 100
@@ -679,7 +676,7 @@ object Form1: TForm1
     object TabSheet11: TTabSheet
       Caption = 'Lists && Trees'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 10
       object mbColorList1: TmbColorList
         AnchorSideLeft.Control = Bevel1
@@ -688,7 +685,7 @@ object Form1: TForm1
         AnchorSideRight.Control = TabSheet11
         AnchorSideRight.Side = asrBottom
         AnchorSideBottom.Control = Button5
-        Left = 238
+        Left = 237
         Height = 347
         Top = 0
         Width = 230
@@ -703,7 +700,7 @@ object Form1: TForm1
         Left = 0
         Height = 347
         Top = 0
-        Width = 230
+        Width = 229
         InfoLabelText = 'Color Values:'
         InfoDisplay1 = 'RGB: %r.%g.%b'
         InfoDisplay2 = 'HEX: #%hex'
@@ -716,7 +713,7 @@ object Form1: TForm1
         AnchorSideLeft.Side = asrCenter
         AnchorSideBottom.Control = TabSheet11
         AnchorSideBottom.Side = asrBottom
-        Left = 159
+        Left = 158
         Height = 25
         Top = 347
         Width = 151
@@ -730,7 +727,7 @@ object Form1: TForm1
       object Bevel1: TBevel
         AnchorSideLeft.Control = TabSheet11
         AnchorSideLeft.Side = asrCenter
-        Left = 230
+        Left = 229
         Height = 50
         Top = 72
         Width = 8
@@ -740,7 +737,7 @@ object Form1: TForm1
     object TabSheet7: TTabSheet
       Caption = 'More'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 6
       object Label9: TLabel
         AnchorSideLeft.Control = mbDeskPickerButton1
@@ -751,7 +748,6 @@ object Form1: TForm1
         Width = 113
         BorderSpacing.Left = 12
         Caption = 'HintFormat variables:'
-        ParentColor = False
       end
       object mbDeskPickerButton1: TmbDeskPickerButton
         Left = 8
@@ -785,7 +781,7 @@ object Form1: TForm1
         Left = 34
         Height = 25
         Top = 265
-        Width = 420
+        Width = 419
         SelectedColor = 460777
         SelectionIndicator = siRect
         Anchors = [akLeft, akRight, akBottom]
@@ -799,7 +795,7 @@ object Form1: TForm1
         Left = 34
         Height = 21
         Top = 233
-        Width = 420
+        Width = 419
         ArrowPlacement = spBefore
         NewArrowStyle = True
         SelectionIndicator = siRect
@@ -813,7 +809,7 @@ object Form1: TForm1
         Left = 34
         Height = 61
         Top = 304
-        Width = 420
+        Width = 419
         SelectedColor = 8882175
         Increment = 5
         ArrowPlacement = spBoth
@@ -850,7 +846,7 @@ object Form1: TForm1
         Left = 134
         Height = 190
         Top = 27
-        Width = 320
+        Width = 319
         Anchors = [akTop, akLeft, akRight, akBottom]
         BorderSpacing.Top = 4
         Lines.Strings = (
@@ -897,13 +893,14 @@ object Form1: TForm1
     object TabSheet8: TTabSheet
       Caption = 'Other'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 7
       object HSColorPicker1: THSColorPicker
         Left = 6
         Height = 155
         Top = 6
         Width = 211
+        SelectedColor = 66047
         HintFormat = 'H: %h S: %s'#13'Hex: %hex'
         TabOrder = 0
         OnMouseMove = HSColorPicker1MouseMove
@@ -942,7 +939,7 @@ object Form1: TForm1
     object TabSheet9: TTabSheet
       Caption = 'Even more'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 8
       object Label8: TLabel
         AnchorSideLeft.Control = TabSheet9
@@ -954,7 +951,6 @@ object Form1: TForm1
         BorderSpacing.Left = 4
         BorderSpacing.Top = 4
         Caption = 'New: border styles added.'
-        ParentColor = False
       end
       object CColorPicker1: TCColorPicker
         AnchorSideTop.Control = Label8
@@ -1125,7 +1121,7 @@ object Form1: TForm1
     object TabSheet10: TTabSheet
       Caption = 'Yet even more'
       ClientHeight = 376
-      ClientWidth = 468
+      ClientWidth = 467
       ImageIndex = 9
       object RAxisColorPicker1: TRAxisColorPicker
         AnchorSideLeft.Control = TabSheet10
@@ -1145,7 +1141,7 @@ object Form1: TForm1
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = LblGAxisPicker
         AnchorSideTop.Side = asrBottom
-        Left = 184
+        Left = 183
         Height = 100
         Top = 27
         Width = 100
@@ -1159,7 +1155,7 @@ object Form1: TForm1
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = TabSheet10
         AnchorSideRight.Side = asrBottom
-        Left = 358
+        Left = 357
         Height = 100
         Top = 27
         Width = 100
@@ -1192,7 +1188,7 @@ object Form1: TForm1
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = LblCIEAColorPicker
         AnchorSideTop.Side = asrBottom
-        Left = 184
+        Left = 183
         Height = 100
         Top = 186
         Width = 100
@@ -1210,7 +1206,7 @@ object Form1: TForm1
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = TabSheet10
         AnchorSideRight.Side = asrBottom
-        Left = 358
+        Left = 357
         Height = 100
         Top = 186
         Width = 100
@@ -1228,13 +1224,12 @@ object Form1: TForm1
         AnchorSideLeft.Control = GAxisColorPicker1
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = TabSheet10
-        Left = 189
+        Left = 188
         Height = 15
         Top = 8
-        Width = 90
+        Width = 91
         BorderSpacing.Top = 8
         Caption = 'GAxisColorPicker'
-        ParentColor = False
       end
       object LblRAxisPicker: TLabel
         AnchorSideLeft.Control = TabSheet10
@@ -1242,24 +1237,22 @@ object Form1: TForm1
         Left = 10
         Height = 15
         Top = 8
-        Width = 89
+        Width = 90
         BorderSpacing.Left = 10
         BorderSpacing.Top = 8
         Caption = 'RAxisColorPicker'
-        ParentColor = False
       end
       object LblBAxisPicker: TLabel
         AnchorSideTop.Control = TabSheet10
         AnchorSideRight.Control = BAxisColorPicker1
         AnchorSideRight.Side = asrBottom
-        Left = 369
+        Left = 367
         Height = 15
         Top = 8
-        Width = 89
+        Width = 90
         Anchors = [akTop, akRight]
         BorderSpacing.Top = 8
         Caption = 'BAxisColorPicker'
-        ParentColor = False
       end
       object LblCIELColorPicker: TLabel
         AnchorSideLeft.Control = TabSheet10
@@ -1272,39 +1265,36 @@ object Form1: TForm1
         BorderSpacing.Left = 10
         BorderSpacing.Top = 40
         Caption = 'CIELColorPicker'
-        ParentColor = False
       end
       object LblCIEAColorPicker: TLabel
         AnchorSideLeft.Control = CIEAColorPicker1
         AnchorSideLeft.Side = asrCenter
         AnchorSideTop.Control = GAxisColorPicker1
         AnchorSideTop.Side = asrBottom
-        Left = 191
+        Left = 190
         Height = 15
         Top = 167
         Width = 86
         BorderSpacing.Top = 40
         Caption = 'CIEAColorPicker'
-        ParentColor = False
       end
       object LblCIEBColorPicker: TLabel
         AnchorSideTop.Control = BAxisColorPicker1
         AnchorSideTop.Side = asrBottom
         AnchorSideRight.Control = CIEBColorPicker1
         AnchorSideRight.Side = asrBottom
-        Left = 373
+        Left = 372
         Height = 15
         Top = 167
         Width = 85
         Anchors = [akTop, akRight]
         BorderSpacing.Top = 40
         Caption = 'CIEBColorPicker'
-        ParentColor = False
       end
     end
   end
   object RightPanel: TPanel
-    Left = 488
+    Left = 487
     Height = 404
     Top = 6
     Width = 100
@@ -1326,7 +1316,6 @@ object Form1: TForm1
       Top = 0
       Width = 73
       Caption = 'SelectedColor'
-      ParentColor = False
     end
     object sc: TmbColorPreview
       AnchorSideLeft.Control = RightPanel
@@ -1370,7 +1359,6 @@ object Form1: TForm1
       Width = 96
       BorderSpacing.Top = 4
       Caption = 'ColorUnderCursor'
-      ParentColor = False
     end
     object uc: TmbColorPreview
       AnchorSideLeft.Control = RightPanel
@@ -1426,7 +1414,7 @@ object Form1: TForm1
       Width = 99
       BorderSpacing.Top = 12
       Caption = 'Aditional controls:'#13#13'- Arrow keys'#13'- Ctrl + Arrow keys'#13'- Mouse wheel'
-      ParentColor = False
+      WordWrap = True
     end
     object CbWebSsafe: TCheckBox
       AnchorSideLeft.Control = RightPanel
@@ -1474,12 +1462,12 @@ object Form1: TForm1
   end
   object mbOfficeColorDialog1: TmbOfficeColorDialog
     UseHints = True
-    left = 504
-    top = 144
+    Left = 232
+    Top = 184
   end
   object OpenDialog1: TOpenDialog
     Filter = 'JASC PAL (*.pal)|*.pal|Photoshop (*.act; *.aco)|*.act;*.aco'
-    left = 504
-    top = 40
+    Left = 232
+    Top = 88
   end
 end

components/mbColorLib/examples/fulldemo/main.pas

@@ -175,6 +175,7 @@ implementation
 {$R mxico.res} //MXS icon resource file, for internet shortcut only
 
 uses
+  InterfaceBase,
   mbColorConv;
 //  RGBHSLUtils;
 
@@ -329,6 +330,7 @@ end;
 // only for internet shortcuts
 procedure TForm1.FormCreate(Sender: TObject);
 begin
+  Caption := Format('mbColor Lib v2.2.1 Full Demo (Widgetset: %s)', [GetLCLWidgetTypeName]);
   with TIniFile.Create(ExtractFilePath(Application.ExeName) + '\MXS Website.url') do
   try
     WriteString('InternetShortcut','URL', 'http://mxs.bergsoft.net');