diff --git a/Projects/SAMufasaGUI/colourhistory.lfm b/Projects/SAMufasaGUI/colourhistory.lfm
index 54c1274..9f673e4 100644
--- a/Projects/SAMufasaGUI/colourhistory.lfm
+++ b/Projects/SAMufasaGUI/colourhistory.lfm
@@ -90,4 +90,14 @@ object ColourHistoryForm: TColourHistoryForm
OnClick = OkButtonClick
TabOrder = 5
end
+ object CH_RGB_Label: TLabel
+ Left = 361
+ Height = 18
+ Top = 128
+ Width = 112
+ Anchors = [akTop, akRight]
+ Caption = 'RGBValues'
+ Constraints.MinWidth = 112
+ ParentColor = False
+ end
end
diff --git a/Projects/SAMufasaGUI/colourhistory.lrs b/Projects/SAMufasaGUI/colourhistory.lrs
index b784ddc..7f5a4e9 100644
--- a/Projects/SAMufasaGUI/colourhistory.lrs
+++ b/Projects/SAMufasaGUI/colourhistory.lrs
@@ -26,5 +26,8 @@ LazarusResources.Add('TColourHistoryForm','FORMDATA',[
+'t'#3#152#0#6'Height'#2#24#3'Top'#3#209#0#5'Width'#2'9'#7'Anchors'#11#6'akLe'
+'ft'#7'akRight'#8'akBottom'#0#0#0#7'TButton'#8'OkButton'#4'Left'#3#137#1#6'H'
+'eight'#2#24#3'Top'#3#209#0#5'Width'#2'P'#7'Anchors'#11#7'akRight'#8'akBotto'
- +'m'#0#7'Caption'#6#2'Ok'#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#5#0#0#0
+ +'m'#0#7'Caption'#6#2'Ok'#7'OnClick'#7#13'OkButtonClick'#8'TabOrder'#2#5#0#0#6
+ +'TLabel'#12'CH_RGB_Label'#4'Left'#3'i'#1#6'Height'#2#18#3'Top'#3#128#0#5'Wid'
+ +'th'#2'p'#7'Anchors'#11#5'akTop'#7'akRight'#0#7'Caption'#6#9'RGBValues'#20'C'
+ +'onstraints.MinWidth'#2'p'#11'ParentColor'#8#0#0#0
]);
diff --git a/Projects/SAMufasaGUI/colourhistory.pas b/Projects/SAMufasaGUI/colourhistory.pas
index 7687f46..eaf1077 100644
--- a/Projects/SAMufasaGUI/colourhistory.pas
+++ b/Projects/SAMufasaGUI/colourhistory.pas
@@ -1,198 +1,205 @@
-unit colourhistory;
-
-{$mode objfpc}{$H+}
-
-interface
-
-uses
- Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
- ComCtrls, StdCtrls, ExtCtrls;
-
-type
- TColourPickerObject = class(TObject)
- constructor Create(C: Integer; P: TPoint; N: String);
- destructor Destroy; override;
-
- public
- Colour: Integer;
- Pos: TPoint;
- Name: String;
- end;
-
- { TColourHistoryForm }
-
- TColourHistoryForm = class(TForm)
- OkButton: TButton;
- ColourValue: TEdit;
- CoordValue: TLabel;
- ColourImage: TImage;
- PickNewColourButton: TButton;
- DeleteButton: TButton;
- ColourList: TListView;
- SelectionName: TEdit;
- procedure ChangeName(Sender: TObject);
- procedure ChangeViewData(Sender: TObject; Item: TListItem; Selected: Boolean
- );
- procedure DeleteSelected(Sender: TObject);
- procedure AddColObj(c: TColourPickerObject; autoName: Boolean);
-
- constructor Create(TheOwner: TComponent); override;
- destructor Destroy; override;
- procedure OkButtonClick(Sender: TObject);
- procedure SelectionNameKeyPress(Sender: TObject; var Key: char);
- procedure SetCHShowMenu(Sender: TObject);
- procedure UnSetCHShowMenu(Sender: TObject);
- private
- Colour_Count: Integer;
- { private declarations }
- protected
- procedure AddColObj(c: TColourPickerObject);
- public
- IndexSelected: Integer;
- { public declarations }
- end;
-
-
-
-var
- ColourHistoryForm: TColourHistoryForm;
-
-implementation
-uses
- TestUnit;
-
-constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String);
-begin
- inherited Create;
- Self.Colour := C;
- Self.Pos := P;
- Self.Name:= N;
-end;
-
-destructor TColourPickerObject.Destroy;
-begin
-
- inherited Destroy;
-end;
-
-{ TColourHistoryForm }
-
-procedure TColourHistoryForm.AddColObj(c: TColourPickerObject; autoName: Boolean);
-begin
- if autoName then
- begin
- Inc(Colour_Count);
- c.Name := 'Untitled (' + IntToStr(Colour_Count) + ')';
- end;
- Self.AddColObj(c);
-end;
-
-procedure TColourHistoryForm.AddColObj(c: TColourPickerObject);
-
-var
- it: TListItem;
-begin
- it := ColourList.Items.Add;
- it.Data := c;
- it.Caption:= c.Name;
- ColourList.Selected := it;
-end;
-
-procedure TColourHistoryForm.DeleteSelected(Sender: TObject);
-
-begin
- if (Assigned(ColourList.Selected)) then
- begin
- TColourPickerObject(ColourList.Selected.Data).Free;
- ColourList.Selected.Delete;
- end;
-end;
-
-procedure TColourHistoryForm.ChangeViewData(Sender: TObject; Item: TListItem;
- Selected: Boolean);
-begin
- if not Assigned(Item) then
- exit;
- if not Item.Selected then
- exit;
-
- { This only occurs when we have manually added an item with the Form Editor }
- if not Assigned(Item.Data) then
- exit;
-
- { Change Form Text / Values }
- ColourValue.Caption := IntToStr(TColourPickerObject(Item.Data).Colour);
- CoordValue.Caption := 'Coords: ' + IntToStr(TColourPickerObject(Item.Data).Pos.X) +
- ', ' + IntToStr(TColourPickerObject(Item.Data).Pos.Y);
- SelectionName.Text := TColourPickerObject(Item.Data).Name;
-
- { Draw the Image }
- ColourImage.Canvas.Brush.Color := TColourPickerObject(Item.Data).Colour;
- ColourImage.Canvas.Rectangle(0,0,ColourImage.Width, ColourImage.Height);
-
- if Self.Visible then
- begin
- try
- SelectionName.SetFocus;
- finally
- end;
- end;
-end;
-
-procedure TColourHistoryForm.ChangeName(Sender: TObject);
-begin
- if not Assigned(ColourList.Selected) then
- begin
- WriteLn('We double clicked but have nothing Selected?');
- exit;
- end;
- ColourList.Selected.Caption := SelectionName.Text;
- TColourPickerObject(ColourList.Selected.Data).Name := SelectionName.Text;
-end;
-
-constructor TColourHistoryForm.Create(TheOwner: TComponent);
-begin
- inherited Create(TheOwner);
-
- Colour_Count := 0;
- PickNewColourButton.OnClick:= @Form1.ButtonPickClick;
-end;
-
-destructor TColourHistoryForm.Destroy;
-begin
- PickNewColourButton.OnClick := nil;
- Colour_Count := 0;
-
- inherited Destroy;
-end;
-
-procedure TColourHistoryForm.OkButtonClick(Sender: TObject);
-begin
- Self.close;
-end;
-
-procedure TColourHistoryForm.SelectionNameKeyPress(Sender: TObject;
- var Key: char);
-begin
- if key = #13 then
- begin
- key := #0;
- Self.close;
- end;
-end;
-
-procedure TColourHistoryForm.SetCHShowMenu(Sender: TObject);
-begin
- Form1.MenuItemColourHistory.Checked := True;
-end;
-
-procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject);
-begin
- Form1.MenuItemColourHistory.Checked := False;
-end;
-
-initialization
- {$I colourhistory.lrs}
-
-end.
-
+unit colourhistory;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+ Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
+ ComCtrls, StdCtrls, ExtCtrls;
+
+type
+ TColourPickerObject = class(TObject)
+ constructor Create(C: Integer; P: TPoint; N: String);
+ destructor Destroy; override;
+
+ public
+ Colour: Integer;
+ Pos: TPoint;
+ Name: String;
+ end;
+
+ { TColourHistoryForm }
+
+ TColourHistoryForm = class(TForm)
+ CH_RGB_Label: TLabel;
+ OkButton: TButton;
+ ColourValue: TEdit;
+ CoordValue: TLabel;
+ ColourImage: TImage;
+ PickNewColourButton: TButton;
+ DeleteButton: TButton;
+ ColourList: TListView;
+ SelectionName: TEdit;
+ procedure ChangeName(Sender: TObject);
+ procedure ChangeViewData(Sender: TObject; Item: TListItem; Selected: Boolean
+ );
+ procedure DeleteSelected(Sender: TObject);
+ procedure AddColObj(c: TColourPickerObject; autoName: Boolean);
+
+ constructor Create(TheOwner: TComponent); override;
+ destructor Destroy; override;
+ procedure OkButtonClick(Sender: TObject);
+ procedure SelectionNameKeyPress(Sender: TObject; var Key: char);
+ procedure SetCHShowMenu(Sender: TObject);
+ procedure UnSetCHShowMenu(Sender: TObject);
+ private
+ Colour_Count: Integer;
+ { private declarations }
+ protected
+ procedure AddColObj(c: TColourPickerObject);
+ public
+ IndexSelected: Integer;
+ { public declarations }
+ end;
+
+
+
+var
+ ColourHistoryForm: TColourHistoryForm;
+
+implementation
+uses
+ colour_conv, TestUnit;
+
+constructor TColourPickerObject.Create(C: Integer; P: TPoint; N: String);
+begin
+ inherited Create;
+ Self.Colour := C;
+ Self.Pos := P;
+ Self.Name:= N;
+end;
+
+destructor TColourPickerObject.Destroy;
+begin
+
+ inherited Destroy;
+end;
+
+{ TColourHistoryForm }
+
+procedure TColourHistoryForm.AddColObj(c: TColourPickerObject; autoName: Boolean);
+begin
+ if autoName then
+ begin
+ Inc(Colour_Count);
+ c.Name := 'Untitled (' + IntToStr(Colour_Count) + ')';
+ end;
+ Self.AddColObj(c);
+end;
+
+procedure TColourHistoryForm.AddColObj(c: TColourPickerObject);
+
+var
+ it: TListItem;
+begin
+ it := ColourList.Items.Add;
+ it.Data := c;
+ it.Caption:= c.Name;
+ ColourList.Selected := it;
+end;
+
+procedure TColourHistoryForm.DeleteSelected(Sender: TObject);
+
+begin
+ if (Assigned(ColourList.Selected)) then
+ begin
+ TColourPickerObject(ColourList.Selected.Data).Free;
+ ColourList.Selected.Delete;
+ end;
+end;
+
+procedure TColourHistoryForm.ChangeViewData(Sender: TObject; Item: TListItem;
+ Selected: Boolean);
+var
+ r,g,b:integer;
+begin
+ if not Assigned(Item) then
+ exit;
+ if not Item.Selected then
+ exit;
+
+ { This only occurs when we have manually added an item with the Form Editor }
+ if not Assigned(Item.Data) then
+ exit;
+
+ colour_conv.ColorToRGB(TColourPickerObject(Item.Data).Colour, r, g, b);
+
+ { Change Form Text / Values }
+ ColourValue.Caption := IntToStr(TColourPickerObject(Item.Data).Colour);
+ CoordValue.Caption := 'Coords: ' + IntToStr(TColourPickerObject(Item.Data).Pos.X) +
+ ', ' + IntToStr(TColourPickerObject(Item.Data).Pos.Y);
+ SelectionName.Text := TColourPickerObject(Item.Data).Name;
+
+ CH_RGB_Label.Caption:=Format('RGB:%d,%d%d', [r,g,b]);
+
+ { Draw the Image }
+ ColourImage.Canvas.Brush.Color := TColourPickerObject(Item.Data).Colour;
+ ColourImage.Canvas.Rectangle(0,0,ColourImage.Width, ColourImage.Height);
+
+ if Self.Visible then
+ begin
+ try
+ SelectionName.SetFocus;
+ finally
+ end;
+ end;
+end;
+
+procedure TColourHistoryForm.ChangeName(Sender: TObject);
+begin
+ if not Assigned(ColourList.Selected) then
+ begin
+ WriteLn('We double clicked but have nothing Selected?');
+ exit;
+ end;
+ ColourList.Selected.Caption := SelectionName.Text;
+ TColourPickerObject(ColourList.Selected.Data).Name := SelectionName.Text;
+end;
+
+constructor TColourHistoryForm.Create(TheOwner: TComponent);
+begin
+ inherited Create(TheOwner);
+
+ Colour_Count := 0;
+ PickNewColourButton.OnClick:= @Form1.ButtonPickClick;
+end;
+
+destructor TColourHistoryForm.Destroy;
+begin
+ PickNewColourButton.OnClick := nil;
+ Colour_Count := 0;
+
+ inherited Destroy;
+end;
+
+procedure TColourHistoryForm.OkButtonClick(Sender: TObject);
+begin
+ Self.close;
+end;
+
+procedure TColourHistoryForm.SelectionNameKeyPress(Sender: TObject;
+ var Key: char);
+begin
+ if key = #13 then
+ begin
+ key := #0;
+ Self.close;
+ end;
+end;
+
+procedure TColourHistoryForm.SetCHShowMenu(Sender: TObject);
+begin
+ Form1.MenuItemColourHistory.Checked := True;
+end;
+
+procedure TColourHistoryForm.UnSetCHShowMenu(Sender: TObject);
+begin
+ Form1.MenuItemColourHistory.Checked := False;
+end;
+
+initialization
+ {$I colourhistory.lrs}
+
+end.
+
diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi
index 28732cc..625d39b 100644
--- a/Projects/SAMufasaGUI/project1.lpi
+++ b/Projects/SAMufasaGUI/project1.lpi
@@ -10,7 +10,7 @@
-
+
@@ -167,8 +167,8 @@
-
-
+
+
@@ -730,7 +730,7 @@
-
+
@@ -1513,9 +1513,11 @@
-
-
+
+
+
+
@@ -1799,7 +1801,7 @@
-
+
@@ -1856,13 +1858,11 @@
-
+
-
-
@@ -1872,127 +1872,123 @@
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
-
-
-