From ca79137a3972c7d3b9fc9486d07b92aae7322853 Mon Sep 17 00:00:00 2001 From: Wizzup? Date: Mon, 9 Nov 2009 14:22:29 +0000 Subject: [PATCH] Few changes. SetFocus in colourhistory, and moved a few form items in colourhistory. git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@219 3f818213-9676-44b0-a9b4-5e4c4e03d09d --- Projects/SAMufasaGUI/colourhistory.lfm | 30 +++-- Projects/SAMufasaGUI/colourhistory.lrs | 31 ++--- Projects/SAMufasaGUI/colourhistory.pas | 42 ++++++- Projects/SAMufasaGUI/project1.lpi | 168 +++++++++++++++++++------ Projects/SAMufasaGUI/testunit.lfm | 10 +- Projects/SAMufasaGUI/testunit.lrs | 12 +- Projects/SAMufasaGUI/testunit.pas | 4 +- 7 files changed, 217 insertions(+), 80 deletions(-) diff --git a/Projects/SAMufasaGUI/colourhistory.lfm b/Projects/SAMufasaGUI/colourhistory.lfm index 4b98bb2..f499c9e 100644 --- a/Projects/SAMufasaGUI/colourhistory.lfm +++ b/Projects/SAMufasaGUI/colourhistory.lfm @@ -1,9 +1,9 @@ object ColourHistoryForm: TColourHistoryForm - Left = 486 + Left = 401 Height = 250 - Top = 290 + Top = 344 Width = 489 - ActiveControl = ColourValue + ActiveControl = SelectionName Caption = 'Colour Picker History' ClientHeight = 250 ClientWidth = 489 @@ -12,17 +12,17 @@ object ColourHistoryForm: TColourHistoryForm LCLVersion = '0.9.29' object ColourList: TListView Left = 16 - Height = 208 + Height = 176 Top = 16 - Width = 320 + Width = 328 Columns = <> TabOrder = 0 OnSelectItem = ChangeViewData end object DeleteButton: TButton - Left = 352 + Left = 16 Height = 25 - Top = 199 + Top = 208 Width = 128 Caption = 'Delete' OnClick = DeleteSelected @@ -31,16 +31,16 @@ object ColourHistoryForm: TColourHistoryForm object SelectionName: TEdit Left = 360 Height = 27 - Top = 104 + Top = 16 Width = 112 OnChange = ChangeName TabOrder = 2 Text = 'Name' end object PickNewColourButton: TButton - Left = 352 + Left = 216 Height = 25 - Top = 160 + Top = 208 Width = 128 Caption = 'Pick New Colour' TabOrder = 3 @@ -48,7 +48,7 @@ object ColourHistoryForm: TColourHistoryForm object ColourValue: TEdit Left = 360 Height = 27 - Top = 16 + Top = 56 Width = 112 ReadOnly = True TabOrder = 4 @@ -57,9 +57,15 @@ object ColourHistoryForm: TColourHistoryForm object CoordValue: TLabel Left = 360 Height = 18 - Top = 64 + Top = 96 Width = 74 Caption = 'CoordValue' ParentColor = False end + object ColourImage: TImage + Left = 152 + Height = 24 + Top = 209 + Width = 56 + end end diff --git a/Projects/SAMufasaGUI/colourhistory.lrs b/Projects/SAMufasaGUI/colourhistory.lrs index bae0af7..649f1ca 100644 --- a/Projects/SAMufasaGUI/colourhistory.lrs +++ b/Projects/SAMufasaGUI/colourhistory.lrs @@ -1,21 +1,22 @@ { This is an automatically generated lazarus resource file } LazarusResources.Add('TColourHistoryForm','FORMDATA',[ - 'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#230#1#6'Height' - +#3#250#0#3'Top'#3'"'#1#5'Width'#3#233#1#13'ActiveControl'#7#11'ColourValue'#7 - +'Caption'#6#21'Colour Picker History'#12'ClientHeight'#3#250#0#11'ClientWidt' - +'h'#3#233#1#6'OnHide'#7#15'UnSetCHShowMenu'#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'Width'#3'@'#1#7'Columns'#14#0#8'TabOrder'#2#0#12'OnSe' - +'lectItem'#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'O' - +'nClick'#7#14'DeleteSelected'#8'TabOrder'#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'Ch' + 'TPF0'#18'TColourHistoryForm'#17'ColourHistoryForm'#4'Left'#3#145#1#6'Height' + +#3#250#0#3'Top'#3'X'#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'OnHide'#7#15'UnSetCHShowMenu'#6'OnShow'#7#13'SetCHShowMenu' + +#10'LCLVersion'#6#6'0.9.29'#0#9'TListView'#10'ColourList'#4'Left'#2#16#6'Hei' + +'ght'#3#176#0#3'Top'#2#16#5'Width'#3'H'#1#7'Columns'#14#0#8'TabOrder'#2#0#12 + +'OnSelectItem'#7#14'ChangeViewData'#0#0#7'TButton'#12'DeleteButton'#4'Left'#2 + +#16#6'Height'#2#25#3'Top'#3#208#0#5'Width'#3#128#0#7'Caption'#6#6'Delete'#7 + +'OnClick'#7#14'DeleteSelected'#8'TabOrder'#2#1#0#0#5'TEdit'#13'SelectionName' + +#4'Left'#3'h'#1#6'Height'#2#27#3'Top'#2#16#5'Width'#2'p'#8'OnChange'#7#10'Ch' +'angeName'#8'TabOrder'#2#2#4'Text'#6#4'Name'#0#0#7'TButton'#19'PickNewColour' - +'Button'#4'Left'#3'`'#1#6'Height'#2#25#3'Top'#3#160#0#5'Width'#3#128#0#7'Cap' - +'tion'#6#15'Pick New Colour'#8'TabOrder'#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'TabOr' + +'Button'#4'Left'#3#216#0#6'Height'#2#25#3'Top'#3#208#0#5'Width'#3#128#0#7'Ca' + +'ption'#6#15'Pick New Colour'#8'TabOrder'#2#3#0#0#5'TEdit'#11'ColourValue'#4 + +'Left'#3'h'#1#6'Height'#2#27#3'Top'#2'8'#5'Width'#2'p'#8'ReadOnly'#9#8'TabOr' +'der'#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'P' - +'arentColor'#8#0#0#0 + +#1#6'Height'#2#18#3'Top'#2'`'#5'Width'#2'J'#7'Caption'#6#10'CoordValue'#11'P' + +'arentColor'#8#0#0#6'TImage'#11'ColourImage'#4'Left'#3#152#0#6'Height'#2#24#3 + +'Top'#3#209#0#5'Width'#2'8'#0#0#0 ]); diff --git a/Projects/SAMufasaGUI/colourhistory.pas b/Projects/SAMufasaGUI/colourhistory.pas index a1eb5e7..e84b0de 100644 --- a/Projects/SAMufasaGUI/colourhistory.pas +++ b/Projects/SAMufasaGUI/colourhistory.pas @@ -6,7 +6,7 @@ interface uses Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs, - ComCtrls, StdCtrls; + ComCtrls, StdCtrls, ExtCtrls; type TColourPickerObject = class(TObject) @@ -24,6 +24,7 @@ type TColourHistoryForm = class(TForm) ColourValue: TEdit; CoordValue: TLabel; + ColourImage: TImage; PickNewColourButton: TButton; DeleteButton: TButton; ColourList: TListView; @@ -32,14 +33,17 @@ type procedure ChangeViewData(Sender: TObject; Item: TListItem; Selected: Boolean ); procedure DeleteSelected(Sender: TObject); - procedure AddColObj(c: TColourPickerObject); + procedure AddColObj(c: TColourPickerObject; autoName: Boolean); constructor Create(TheOwner: TComponent); override; destructor Destroy; override; procedure SetCHShowMenu(Sender: TObject); procedure UnSetCHShowMenu(Sender: TObject); private + Colour_Count: Integer; { private declarations } + protected + procedure AddColObj(c: TColourPickerObject); public IndexSelected: Integer; { public declarations } @@ -70,6 +74,16 @@ 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 @@ -82,6 +96,7 @@ begin end; procedure TColourHistoryForm.DeleteSelected(Sender: TObject); + begin if (Assigned(ColourList.Selected)) then begin @@ -97,10 +112,28 @@ begin 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); @@ -118,12 +151,15 @@ 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; diff --git a/Projects/SAMufasaGUI/project1.lpi b/Projects/SAMufasaGUI/project1.lpi index a6743ab..3fb6d0e 100644 --- a/Projects/SAMufasaGUI/project1.lpi +++ b/Projects/SAMufasaGUI/project1.lpi @@ -7,7 +7,7 @@ <UseXPManifest Value="True"/> - <ActiveEditorIndexAtStart Value="0"/> + <ActiveEditorIndexAtStart Value="5"/> </General> <VersionInfo> <ProjectVersion Value=""/> @@ -33,7 +33,7 @@ <PackageName Value="LCL"/> </Item2> </RequiredPackages> - <Units Count="233"> + <Units Count="235"> <Unit0> <Filename Value="project1.lpr"/> <IsPartOfProject Value="True"/> @@ -162,8 +162,8 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <UnitName Value="TestUnit"/> - <CursorPos X="156" Y="888"/> - <TopLine Value="865"/> + <CursorPos X="46" Y="935"/> + <TopLine Value="922"/> <EditorIndex Value="0"/> <UsageCount Value="202"/> <Loaded Value="True"/> @@ -221,7 +221,7 @@ <UnitName Value="Client"/> <CursorPos X="23" Y="42"/> <TopLine Value="21"/> - <EditorIndex Value="1"/> + <EditorIndex Value="2"/> <UsageCount Value="201"/> <Loaded Value="True"/> </Unit25> @@ -275,7 +275,7 @@ <UnitName Value="Input"/> <CursorPos X="47" Y="78"/> <TopLine Value="67"/> - <EditorIndex Value="2"/> + <EditorIndex Value="3"/> <UsageCount Value="79"/> <Loaded Value="True"/> </Unit32> @@ -307,7 +307,7 @@ <UnitName Value="mmlpsthread"/> <CursorPos X="15" Y="96"/> <TopLine Value="71"/> - <EditorIndex Value="5"/> + <EditorIndex Value="6"/> <UsageCount Value="202"/> <Loaded Value="True"/> </Unit36> @@ -376,7 +376,7 @@ <Filename Value="../../Units/MMLAddon/PSInc/pscompile.inc"/> <CursorPos X="88" Y="96"/> <TopLine Value="71"/> - <EditorIndex Value="6"/> + <EditorIndex Value="7"/> <UsageCount Value="94"/> <Loaded Value="True"/> </Unit46> @@ -411,7 +411,7 @@ <Filename Value="../../Units/MMLAddon/PSInc/Wrappers/colour.inc"/> <CursorPos X="1" Y="1"/> <TopLine Value="1"/> - <EditorIndex Value="7"/> + <EditorIndex Value="8"/> <UsageCount Value="38"/> <Loaded Value="True"/> </Unit51> @@ -609,9 +609,11 @@ <Filename Value="../../Units/MMLAddon/plugins.pas"/> <IsPartOfProject Value="True"/> <UnitName Value="plugins"/> - <CursorPos X="86" Y="128"/> - <TopLine Value="128"/> + <CursorPos X="32" Y="80"/> + <TopLine Value="80"/> + <EditorIndex Value="1"/> <UsageCount Value="200"/> + <Loaded Value="True"/> </Unit81> <Unit82> <Filename Value="../../../Compilertje/Units/CogatUnits/compfiles.pas"/> @@ -855,7 +857,7 @@ <UnitName Value="ocr"/> <CursorPos X="19" Y="91"/> <TopLine Value="75"/> - <UsageCount Value="188"/> + <UsageCount Value="189"/> </Unit116> <Unit117> <Filename Value="../../Units/PascalScript/uPSR_extctrls.pas"/> @@ -983,7 +985,7 @@ <UnitName Value="web"/> <CursorPos X="1" Y="1"/> <TopLine Value="1"/> - <UsageCount Value="113"/> + <UsageCount Value="114"/> </Unit136> <Unit137> <Filename Value="../../../lazarus/lcl/lazhelphtml.pas"/> @@ -1180,10 +1182,10 @@ <ComponentName Value="ScriptFrame"/> <ResourceBaseClass Value="Frame"/> <UnitName Value="framescript"/> - <CursorPos X="13" Y="98"/> - <TopLine Value="87"/> - <EditorIndex Value="8"/> - <UsageCount Value="106"/> + <CursorPos X="15" Y="195"/> + <TopLine Value="180"/> + <EditorIndex Value="9"/> + <UsageCount Value="107"/> <Loaded Value="True"/> </Unit161> <Unit162> @@ -1496,10 +1498,10 @@ <ComponentName Value="ColourHistoryForm"/> <ResourceBaseClass Value="Form"/> <UnitName Value="colourhistory"/> - <CursorPos X="39" Y="117"/> - <TopLine Value="113"/> - <EditorIndex Value="4"/> - <UsageCount Value="43"/> + <CursorPos X="30" Y="133"/> + <TopLine Value="108"/> + <EditorIndex Value="5"/> + <UsageCount Value="44"/> <Loaded Value="True"/> </Unit208> <Unit209> @@ -1615,7 +1617,7 @@ <UnitName Value="MMLKeyInput"/> <CursorPos X="83" Y="46"/> <TopLine Value="31"/> - <EditorIndex Value="3"/> + <EditorIndex Value="4"/> <UsageCount Value="20"/> <Loaded Value="True"/> </Unit225> @@ -1668,44 +1670,136 @@ <TopLine Value="481"/> <UsageCount Value="10"/> </Unit232> + <Unit233> + <Filename Value="../../../../Documents/lazarus/lcl/include/listitem.inc"/> + <CursorPos X="1" Y="513"/> + <TopLine Value="498"/> + <UsageCount Value="10"/> + </Unit233> + <Unit234> + <Filename Value="../../../../Documents/fpc/rtl/inc/objpash.inc"/> + <CursorPos X="11" Y="326"/> + <TopLine Value="311"/> + <UsageCount Value="10"/> + </Unit234> </Units> - <JumpHistory Count="9" HistoryIndex="8"> + <JumpHistory Count="29" HistoryIndex="28"> <Position1> <Filename Value="testunit.pas"/> - <Caret Line="837" Column="30" TopLine="831"/> + <Caret Line="365" Column="12" TopLine="358"/> </Position1> <Position2> <Filename Value="testunit.pas"/> - <Caret Line="203" Column="49" TopLine="188"/> + <Caret Line="234" Column="32" TopLine="222"/> </Position2> <Position3> <Filename Value="testunit.pas"/> - <Caret Line="949" Column="10" TopLine="946"/> + <Caret Line="247" Column="30" TopLine="222"/> </Position3> <Position4> - <Filename Value="../../Units/MMLCore/client.pas"/> - <Caret Line="42" Column="23" TopLine="21"/> + <Filename Value="testunit.pas"/> + <Caret Line="628" Column="24" TopLine="613"/> </Position4> <Position5> - <Filename Value="../../Units/MMLCore/input.pas"/> - <Caret Line="39" Column="21" TopLine="27"/> + <Filename Value="testunit.pas"/> + <Caret Line="1325" Column="30" TopLine="1310"/> </Position5> <Position6> - <Filename Value="../../Units/MMLCore/input.pas"/> - <Caret Line="78" Column="47" TopLine="67"/> + <Filename Value="testunit.pas"/> + <Caret Line="1337" Column="30" TopLine="1"/> </Position6> <Position7> - <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/> - <Caret Line="195" Column="24" TopLine="177"/> + <Filename Value="testunit.pas"/> + <Caret Line="638" Column="19" TopLine="623"/> </Position7> <Position8> - <Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/> - <Caret Line="242" Column="18" TopLine="227"/> + <Filename Value="testunit.pas"/> + <Caret Line="64" Column="42" TopLine="46"/> </Position8> <Position9> <Filename Value="testunit.pas"/> - <Caret Line="963" Column="43" TopLine="946"/> + <Caret Line="248" Column="54" TopLine="233"/> </Position9> + <Position10> + <Filename Value="testunit.pas"/> + <Caret Line="458" Column="19" TopLine="443"/> + </Position10> + <Position11> + <Filename Value="testunit.pas"/> + <Caret Line="460" Column="20" TopLine="443"/> + </Position11> + <Position12> + <Filename Value="testunit.pas"/> + <Caret Line="475" Column="19" TopLine="460"/> + </Position12> + <Position13> + <Filename Value="testunit.pas"/> + <Caret Line="486" Column="20" TopLine="460"/> + </Position13> + <Position14> + <Filename Value="testunit.pas"/> + <Caret Line="508" Column="13" TopLine="493"/> + </Position14> + <Position15> + <Filename Value="testunit.pas"/> + <Caret Line="249" Column="9" TopLine="241"/> + </Position15> + <Position16> + <Filename Value="testunit.pas"/> + <Caret Line="266" Column="24" TopLine="241"/> + </Position16> + <Position17> + <Filename Value="testunit.pas"/> + <Caret Line="267" Column="24" TopLine="241"/> + </Position17> + <Position18> + <Filename Value="testunit.pas"/> + <Caret Line="322" Column="21" TopLine="307"/> + </Position18> + <Position19> + <Filename Value="testunit.pas"/> + <Caret Line="461" Column="7" TopLine="446"/> + </Position19> + <Position20> + <Filename Value="testunit.pas"/> + <Caret Line="462" Column="11" TopLine="446"/> + </Position20> + <Position21> + <Filename Value="testunit.pas"/> + <Caret Line="324" Column="45" TopLine="306"/> + </Position21> + <Position22> + <Filename Value="framescript.pas"/> + <Caret Line="64" Column="17" TopLine="49"/> + </Position22> + <Position23> + <Filename Value="framescript.pas"/> + <Caret Line="180" Column="15" TopLine="165"/> + </Position23> + <Position24> + <Filename Value="testunit.pas"/> + <Caret Line="327" Column="12" TopLine="306"/> + </Position24> + <Position25> + <Filename Value="testunit.pas"/> + <Caret Line="330" Column="19" TopLine="309"/> + </Position25> + <Position26> + <Filename Value="testunit.pas"/> + <Caret Line="331" Column="22" TopLine="309"/> + </Position26> + <Position27> + <Filename Value="../../Units/MMLAddon/plugins.pas"/> + <Caret Line="68" Column="23" TopLine="50"/> + </Position27> + <Position28> + <Filename Value="../../Units/MMLAddon/plugins.pas"/> + <Caret Line="206" Column="8" TopLine="183"/> + </Position28> + <Position29> + <Filename Value="../../Units/MMLAddon/plugins.pas"/> + <Caret Line="59" Column="26" TopLine="44"/> + </Position29> </JumpHistory> </ProjectOptions> <CompilerOptions> diff --git a/Projects/SAMufasaGUI/testunit.lfm b/Projects/SAMufasaGUI/testunit.lfm index fed3f53..d2a93ef 100644 --- a/Projects/SAMufasaGUI/testunit.lfm +++ b/Projects/SAMufasaGUI/testunit.lfm @@ -1,7 +1,7 @@ object Form1: TForm1 - Left = 474 + Left = 274 Height = 557 - Top = 246 + Top = 233 Width = 731 ActiveControl = ScriptPanel Caption = 'THA FUKING MUFASA' @@ -261,10 +261,10 @@ object Form1: TForm1 EditLabel.AnchorSideTop.Side = asrCenter EditLabel.AnchorSideRight.Control = LabeledEditSearch EditLabel.AnchorSideBottom.Control = LabeledEditSearch - EditLabel.Left = 65 + EditLabel.Left = 67 EditLabel.Height = 18 EditLabel.Top = 10 - EditLabel.Width = 36 + EditLabel.Width = 34 EditLabel.Caption = 'Find: ' EditLabel.ParentColor = False LabelPosition = lpLeft @@ -365,7 +365,7 @@ object Form1: TForm1 Left = 320 Height = 22 Top = 6 - Width = 98 + Width = 97 Caption = 'Match case' OnClick = CheckBoxMatchCaseClick TabOrder = 1 diff --git a/Projects/SAMufasaGUI/testunit.lrs b/Projects/SAMufasaGUI/testunit.lrs index c53a0c5..5dffa8f 100644 --- a/Projects/SAMufasaGUI/testunit.lrs +++ b/Projects/SAMufasaGUI/testunit.lrs @@ -1,9 +1,9 @@ { This is an automatically generated lazarus resource file } LazarusResources.Add('TForm1','FORMDATA',[ - 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#218#1#6'Height'#3'-'#2#3'Top'#3#246#0#5'W' - +'idth'#3#219#2#13'ActiveControl'#7#11'ScriptPanel'#7'Caption'#6#17'THA FUKIN' - +'G MUFASA'#12'ClientHeight'#3#20#2#11'ClientWidth'#3#219#2#10'KeyPreview'#9#4 + 'TPF0'#6'TForm1'#5'Form1'#4'Left'#3#18#1#6'Height'#3'-'#2#3'Top'#3#233#0#5'Wi' + +'dth'#3#219#2#13'ActiveControl'#7#11'ScriptPanel'#7'Caption'#6#17'THA FUKING' + +' MUFASA'#12'ClientHeight'#3#20#2#11'ClientWidth'#3#219#2#10'KeyPreview'#9#4 +'Menu'#7#9'MainMenu1'#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10'FormCreate' +#9'OnDestroy'#7#11'FormDestroy'#10'OnShortCut'#7#13'FormShortCuts'#8'Positio' +'n'#7#14'poScreenCenter'#10'LCLVersion'#6#6'0.9.29'#7'Visible'#9#0#8'TToolBa' @@ -71,8 +71,8 @@ LazarusResources.Add('TForm1','FORMDATA',[ +'nchorSideLeft.Control'#7#17'LabeledEditSearch'#31'EditLabel.AnchorSideTop.C' +'ontrol'#7#17'LabeledEditSearch'#28'EditLabel.AnchorSideTop.Side'#7#9'asrCen' +'ter!EditLabel.AnchorSideRight.Control'#7#17'LabeledEditSearch"EditLabel.Anc' - +'horSideBottom.Control'#7#17'LabeledEditSearch'#14'EditLabel.Left'#2'A'#16'E' - +'ditLabel.Height'#2#18#13'EditLabel.Top'#2#10#15'EditLabel.Width'#2'$'#17'Ed' + +'horSideBottom.Control'#7#17'LabeledEditSearch'#14'EditLabel.Left'#2'C'#16'E' + +'ditLabel.Height'#2#18#13'EditLabel.Top'#2#10#15'EditLabel.Width'#2'"'#17'Ed' +'itLabel.Caption'#6#6'Find: '#21'EditLabel.ParentColor'#8#13'LabelPosition'#7 +#6'lpLeft'#8'TabOrder'#2#0#8'OnChange'#7#16'EditSearchChange'#7'OnEnter'#7#22 +'LabeledEditSearchEnter'#6'OnExit'#7#21'LabeledEditSearchExit'#9'OnKeyDown'#7 @@ -144,7 +144,7 @@ LazarusResources.Add('TForm1','FORMDATA',[ +#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#9'NumGlyphs'#2#0#7'OnClick'#7#22'SpeedButto' +'nSearchClick'#0#0#9'TCheckBox'#17'CheckBoxMatchCase'#4'Left'#3'@'#1#6'Heigh' - +'t'#2#22#3'Top'#2#6#5'Width'#2'b'#7'Caption'#6#10'Match case'#7'OnClick'#7#22 + +'t'#2#22#3'Top'#2#6#5'Width'#2'a'#7'Caption'#6#10'Match case'#7'OnClick'#7#22 +'CheckBoxMatchCaseClick'#8'TabOrder'#2#1#0#0#0#0#9'TMainMenu'#9'MainMenu1'#4 +'left'#3#16#2#0#9'TMenuItem'#8'MenuFile'#7'Caption'#6#4'File'#13'SubMenuImag' +'es'#7#17'Mufasa_Image_List'#0#9'TMenuItem'#11'MenuItemNew'#6'Action'#7#15'A' diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas index 1e06bc4..939c333 100644 --- a/Projects/SAMufasaGUI/testunit.pas +++ b/Projects/SAMufasaGUI/testunit.pas @@ -1050,9 +1050,9 @@ var cobj: TColourPickerObject; begin Picker.Pick(c, x, y); - cobj := TColourPickerObject.Create(c, Point(x,y), 'Untitled'); + cobj := TColourPickerObject.Create(c, Point(x,y), ''); - ColourHistoryForm.AddColObj(cobj); + ColourHistoryForm.AddColObj(cobj, true); ColourHistoryForm.Show; formWriteln('Picked colour: ' + inttostr(c) + ' at (' + inttostr(x) + ', ' + inttostr(y) + ')'); end;