color dialog: The PageControl and Tabsheets now have meaningful names.

1 files changed, 26 insertions, 29 deletions

diff --git a/src/gui/colordialog.inc b/src/gui/colordialog.inc
index d34d58ca..19163aa3 100644
--- a/src/gui/colordialog.inc
+++ b/src/gui/colordialog.inc
@@ -25,9 +25,9 @@ type
   TfpgColorSelectDialog = class(TfpgBaseDialog)
   private
     {@VFD_HEAD_BEGIN: ColorSelectDialog}
-    PageControl1: TfpgPageControl;
-    TabSheet1: TfpgTabSheet;
-    TabSheet2: TfpgTabSheet;
+    pcColorSelect: TfpgPageControl;
+    tsColorWheel: TfpgTabSheet;
+    tsColorNames: TfpgTabSheet;
     ComboBox1: TfpgComboBox;
     ColorListBox1: TfpgColorListBox;
     Label1: TfpgLabel;
@@ -135,15 +135,15 @@ begin
   {%region 'Auto-generated GUI code' -fold}
   {@VFD_BODY_BEGIN: ColorSelectDialog}
   Name := 'ColorSelectDialog';
-  SetPosition(316, 186, 328, 375);
+  SetPosition(340, 164, 328, 375);
   WindowTitle := 'Color Select Dialog';
   Hint := '';
   WindowPosition := wpOneThirdDown;
 
-  PageControl1 := TfpgPageControl.Create(self);
-  with PageControl1 do
+  pcColorSelect := TfpgPageControl.Create(self);
+  with pcColorSelect do
   begin
-    Name := 'PageControl1';
+    Name := 'pcColorSelect';
     SetPosition(4, 4, 320, 332);
     Anchors := [anLeft,anRight,anTop,anBottom];
     ActivePageIndex := 0;
@@ -151,23 +151,23 @@ begin
     TabOrder := 1;
   end;
 
-  TabSheet1 := TfpgTabSheet.Create(PageControl1);
-  with TabSheet1 do
+  tsColorWheel := TfpgTabSheet.Create(pcColorSelect);
+  with tsColorWheel do
   begin
-    Name := 'TabSheet1';
+    Name := 'tsColorWheel';
     SetPosition(3, 24, 314, 305);
     Text := 'Color Wheel';
   end;
 
-  TabSheet2 := TfpgTabSheet.Create(PageControl1);
-  with TabSheet2 do
+  tsColorNames := TfpgTabSheet.Create(pcColorSelect);
+  with tsColorNames do
   begin
-    Name := 'TabSheet2';
+    Name := 'tsColorNames';
     SetPosition(3, 24, 314, 305);
     Text := 'Predefined';
   end;
 
-  ComboBox1 := TfpgComboBox.Create(TabSheet2);
+  ComboBox1 := TfpgComboBox.Create(tsColorNames);
   with ComboBox1 do
   begin
     Name := 'ComboBox1';
@@ -178,21 +178,18 @@ begin
     TabOrder := 1;
   end;
 
-  ColorListBox1 := TfpgColorListBox.Create(TabSheet2);
+  ColorListBox1 := TfpgColorListBox.Create(tsColorNames);
   with ColorListBox1 do
   begin
     Name := 'ColorListBox1';
     SetPosition(8, 72, 299, 224);
     Anchors := [anLeft,anRight,anTop,anBottom];
-    ColorPalette := cpStandardColors;
     FontDesc := '#List';
     Hint := '';
-    HotTrack := False;
-    PopupFrame := False;
     TabOrder := 2;
   end;
 
-  Label1 := TfpgLabel.Create(TabSheet2);
+  Label1 := TfpgLabel.Create(tsColorNames);
   with Label1 do
   begin
     Name := 'Label1';
@@ -202,7 +199,7 @@ begin
     Text := 'Select a color palette';
   end;
 
-  Label2 := TfpgLabel.Create(TabSheet2);
+  Label2 := TfpgLabel.Create(tsColorNames);
   with Label2 do
   begin
     Name := 'Label2';
@@ -212,14 +209,14 @@ begin
     Text := 'Available colors:';
   end;
 
-  ColorWheel := TfpgColorWheel.Create(TabSheet1);
+  ColorWheel := TfpgColorWheel.Create(tsColorWheel);
   with ColorWheel do
   begin
     Name := 'ColorWheel';
     SetPosition(8, 8, 204, 204);
   end;
 
-  ValueBar := TfpgValueBar.Create(TabSheet1);
+  ValueBar := TfpgValueBar.Create(tsColorWheel);
   with ValueBar do
   begin
     Name := 'ValueBar';
@@ -227,7 +224,7 @@ begin
     OnChange := @ColorChanged;
   end;
 
-  edR := TfpgSpinEdit.Create(TabSheet1);
+  edR := TfpgSpinEdit.Create(tsColorWheel);
   with edR do
   begin
     Name := 'edR';
@@ -237,7 +234,7 @@ begin
     OnChange := @RGBChanged;
   end;
 
-  edG := TfpgSpinEdit.Create(TabSheet1);
+  edG := TfpgSpinEdit.Create(tsColorWheel);
   with edG do
   begin
     Name := 'edG';
@@ -247,7 +244,7 @@ begin
     OnChange := @RGBChanged;
   end;
 
-  edB := TfpgSpinEdit.Create(TabSheet1);
+  edB := TfpgSpinEdit.Create(tsColorWheel);
   with edB do
   begin
     Name := 'edB';
@@ -257,7 +254,7 @@ begin
     OnChange := @RGBChanged;
   end;
 
-  Label3 := TfpgLabel.Create(TabSheet1);
+  Label3 := TfpgLabel.Create(tsColorWheel);
   with Label3 do
   begin
     Name := 'Label3';
@@ -268,7 +265,7 @@ begin
     Text := 'Red';
   end;
 
-  Label4 := TfpgLabel.Create(TabSheet1);
+  Label4 := TfpgLabel.Create(tsColorWheel);
   with Label4 do
   begin
     Name := 'Label4';
@@ -279,7 +276,7 @@ begin
     Text := 'Green';
   end;
 
-  Label5 := TfpgLabel.Create(TabSheet1);
+  Label5 := TfpgLabel.Create(tsColorWheel);
   with Label5 do
   begin
     Name := 'Label5';
@@ -290,7 +287,7 @@ begin
     Text := 'Blue';
   end;
 
-  pnlColorPreview := TfpgBevel.Create(TabSheet1);
+  pnlColorPreview := TfpgBevel.Create(tsColorWheel);
   with pnlColorPreview do
   begin
     Name := 'pnlColorPreview';