diff --git a/Projects/SAMufasaGUI/colourhistory.lfm b/Projects/SAMufasaGUI/colourhistory.lfm index e432728..9db6478 100644 --- a/Projects/SAMufasaGUI/colourhistory.lfm +++ b/Projects/SAMufasaGUI/colourhistory.lfm @@ -1,7 +1,7 @@ object ColourHistoryForm: TColourHistoryForm - Left = 498 + Left = 494 Height = 250 - Top = 474 + Top = 299 Width = 489 ActiveControl = SelectionName Caption = 'Colour Picker History' @@ -27,27 +27,11 @@ object ColourHistoryForm: TColourHistoryForm OnClick = DeleteSelected TabOrder = 1 end - object ColourValue: TLabel - Left = 360 - Height = 18 - Top = 40 - Width = 9 - Caption = '0' - ParentColor = False - end - object CoordValue: TLabel - Left = 360 - Height = 18 - Top = 73 - Width = 25 - Caption = '0, 0' - ParentColor = False - end object SelectionName: TEdit Left = 360 Height = 27 Top = 104 - Width = 104 + Width = 112 OnChange = ChangeName TabOrder = 2 Text = 'Name' @@ -60,4 +44,21 @@ object ColourHistoryForm: TColourHistoryForm Caption = 'Pick New Colour' TabOrder = 3 end + object ColourValue: TEdit + Left = 360 + Height = 27 + Top = 16 + Width = 112 + ReadOnly = True + TabOrder = 4 + Text = 'ColourValue' + end + object CoordValue: TLabel + Left = 360 + Height = 18 + Top = 64 + Width = 74 + Caption = 'CoordValue' + ParentColor = False + end end diff --git a/Projects/SAMufasaGUI/colourhistory.lrs b/Projects/SAMufasaGUI/colourhistory.lrs index 905b5c4..3114c17 100644 --- a/Projects/SAMufasaGUI/colourhistory.lrs +++ b/Projects/SAMufasaGUI/colourhistory.lrs @@ -1,20 +1,20 @@ { This is an automatically generated lazarus resource file } LazarusResources.Add('TColourHistoryForm','FORMDATA',[ - 'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#242#1#6'Height' - +#3#250#0#3'Top'#3#218#1#5'Width'#3#233#1#13'ActiveControl'#7#13'SelectionNam' - +'e'#7'Caption'#6#21'Colour Picker History'#12'ClientHeight'#3#250#0#11'Clien' - +'tWidth'#3#233#1#6'OnShow'#7#13'SetCHShowMenu'#10'LCLVersion'#6#6'0.9.29'#0#9 - +'TListView'#10'ColourList'#4'Left'#2#16#6'Height'#3#208#0#3'Top'#2#16#5'Widt' - +'h'#3'@'#1#7'Columns'#14#0#8'TabOrder'#2#0#12'OnSelectItem'#7#14'ChangeViewD' - +'ata'#0#0#7'TButton'#12'DeleteButton'#4'Left'#3'`'#1#6'Height'#2#25#3'Top'#3 - +#199#0#5'Width'#3#128#0#7'Caption'#6#6'Delete'#7'OnClick'#7#14'DeleteSelecte' - +'d'#8'TabOrder'#2#1#0#0#6'TLabel'#11'ColourValue'#4'Left'#3'h'#1#6'Height'#2 - +#18#3'Top'#2'('#5'Width'#2#9#7'Caption'#6#1'0'#11'ParentColor'#8#0#0#6'TLabe' - +'l'#10'CoordValue'#4'Left'#3'h'#1#6'Height'#2#18#3'Top'#2'I'#5'Width'#2#25#7 - +'Caption'#6#4'0, 0'#11'ParentColor'#8#0#0#5'TEdit'#13'SelectionName'#4'Left' - +#3'h'#1#6'Height'#2#27#3'Top'#2'h'#5'Width'#2'h'#8'OnChange'#7#10'ChangeName' - +#8'TabOrder'#2#2#4'Text'#6#4'Name'#0#0#7'TButton'#19'PickNewColourButton'#4 - +'Left'#3'`'#1#6'Height'#2#25#3'Top'#3#160#0#5'Width'#3#128#0#7'Caption'#6#15 - +'Pick New Colour'#8'TabOrder'#2#3#0#0#0 + 'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#238#1#6'Height' + +#3#250#0#3'Top'#3'+'#1#5'Width'#3#233#1#13'ActiveControl'#7#13'SelectionName' + +#7'Caption'#6#21'Colour Picker History'#12'ClientHeight'#3#250#0#11'ClientWi' + +'dth'#3#233#1#6'OnShow'#7#13'SetCHShowMenu'#10'LCLVersion'#6#6'0.9.29'#0#9'T' + +'ListView'#10'ColourList'#4'Left'#2#16#6'Height'#3#208#0#3'Top'#2#16#5'Width' + +#3'@'#1#7'Columns'#14#0#8'TabOrder'#2#0#12'OnSelectItem'#7#14'ChangeViewData' + +#0#0#7'TButton'#12'DeleteButton'#4'Left'#3'`'#1#6'Height'#2#25#3'Top'#3#199#0 + +#5'Width'#3#128#0#7'Caption'#6#6'Delete'#7'OnClick'#7#14'DeleteSelected'#8'T' + +'abOrder'#2#1#0#0#5'TEdit'#13'SelectionName'#4'Left'#3'h'#1#6'Height'#2#27#3 + +'Top'#2'h'#5'Width'#2'p'#8'OnChange'#7#10'ChangeName'#8'TabOrder'#2#2#4'Text' + +#6#4'Name'#0#0#7'TButton'#19'PickNewColourButton'#4'Left'#3'`'#1#6'Height'#2 + +#25#3'Top'#3#160#0#5'Width'#3#128#0#7'Caption'#6#15'Pick New Colour'#8'TabOr' + +'der'#2#3#0#0#5'TEdit'#11'ColourValue'#4'Left'#3'h'#1#6'Height'#2#27#3'Top'#2 + +#16#5'Width'#2'p'#8'ReadOnly'#9#8'TabOrder'#2#4#4'Text'#6#11'ColourValue'#0#0 + +#6'TLabel'#10'CoordValue'#4'Left'#3'h'#1#6'Height'#2#18#3'Top'#2'@'#5'Width' + +#2'J'#7'Caption'#6#10'CoordValue'#11'ParentColor'#8#0#0#0 ]); diff --git a/Projects/SAMufasaGUI/colourhistory.pas b/Projects/SAMufasaGUI/colourhistory.pas index a2d1d31..cc4ed34 100644 --- a/Projects/SAMufasaGUI/colourhistory.pas +++ b/Projects/SAMufasaGUI/colourhistory.pas @@ -22,10 +22,10 @@ type { TColourHistoryForm } TColourHistoryForm = class(TForm) + ColourValue: TEdit; + CoordValue: TLabel; PickNewColourButton: TButton; DeleteButton: TButton; - ColourValue: TLabel; - CoordValue: TLabel; ColourList: TListView; SelectionName: TEdit; procedure ChangeName(Sender: TObject); @@ -96,7 +96,7 @@ begin exit; if not Item.Selected then exit; - ColourValue.Caption := 'Colour: ' + IntToStr(TColourPickerObject(Item.Data).Colour); + 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; diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi index 8e7b387..d8f4ecb 100644 --- a/Projects/SAMufasaGUI/project1.lpi +++ b/Projects/SAMufasaGUI/project1.lpi @@ -726,7 +726,7 @@ - + @@ -1511,8 +1511,8 @@ - - + + @@ -1558,124 +1558,124 @@ - - + + - - + + - + - - + + - + - + - - + + - - + + - - + + - + - - + + - + - - + + - + - + - - + + - + - + - - + + - - + + - - + + - + - + - + - - + + - + - - + + - - + + - + - - + +