1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-21 16:55:01 -05:00

More changes

git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@382 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
Wizzup? 2010-01-07 20:25:10 +00:00
parent 96b83db57d
commit ef804714c4
7 changed files with 883 additions and 807 deletions

View File

@ -36,7 +36,7 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="297">
<Units Count="298">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
@ -137,8 +137,8 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/>
<CursorPos X="55" Y="41"/>
<TopLine Value="23"/>
<CursorPos X="78" Y="1459"/>
<TopLine Value="1435"/>
<EditorIndex Value="0"/>
<UsageCount Value="202"/>
<Loaded Value="True"/>
@ -1705,7 +1705,7 @@
<UnitName Value="internets"/>
<CursorPos X="5" Y="14"/>
<TopLine Value="1"/>
<UsageCount Value="196"/>
<UsageCount Value="197"/>
</Unit237>
<Unit238>
<Filename Value="debugimageform.pas"/>
@ -1714,7 +1714,7 @@
<UnitName Value="debugimageform"/>
<CursorPos X="20" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="183"/>
<UsageCount Value="184"/>
</Unit238>
<Unit239>
<Filename Value="debugimage.pas"/>
@ -1724,7 +1724,7 @@
<UnitName Value="debugimage"/>
<CursorPos X="66" Y="17"/>
<TopLine Value="1"/>
<UsageCount Value="182"/>
<UsageCount Value="183"/>
</Unit239>
<Unit240>
<Filename Value="debugimage.lrs"/>
@ -1846,7 +1846,7 @@
<UnitName Value="framefunctionlist"/>
<CursorPos X="117" Y="5"/>
<TopLine Value="1"/>
<UsageCount Value="103"/>
<UsageCount Value="104"/>
</Unit257>
<Unit258>
<Filename Value="../../../usr/local/share/lazarus/lcl/comctrls.pp"/>
@ -1901,7 +1901,7 @@
<UnitName Value="simpleanalyzer"/>
<CursorPos X="52" Y="104"/>
<TopLine Value="193"/>
<UsageCount Value="90"/>
<UsageCount Value="91"/>
</Unit265>
<Unit266>
<Filename Value="../../Units/Misc/mPasLex.pas"/>
@ -1974,9 +1974,9 @@
<Filename Value="../../Units/MMLAddon/updater.pas"/>
<IsPartOfProject Value="True"/>
<UnitName Value="updater"/>
<CursorPos X="10" Y="201"/>
<TopLine Value="190"/>
<UsageCount Value="63"/>
<CursorPos X="112" Y="106"/>
<TopLine Value="68"/>
<UsageCount Value="64"/>
</Unit276>
<Unit277>
<Filename Value="updateform.pas"/>
@ -1984,9 +1984,11 @@
<ComponentName Value="SimbaUpdateForm"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="updateform"/>
<CursorPos X="77" Y="74"/>
<TopLine Value="47"/>
<UsageCount Value="58"/>
<CursorPos X="98" Y="127"/>
<TopLine Value="122"/>
<EditorIndex Value="12"/>
<UsageCount Value="59"/>
<Loaded Value="True"/>
</Unit277>
<Unit278>
<Filename Value="../../../Documents/lazarus/lcl/fileutil.pas"/>
@ -2105,10 +2107,10 @@
<ComponentName Value="SettingsForm"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="simbasettings"/>
<CursorPos X="40" Y="67"/>
<TopLine Value="31"/>
<CursorPos X="44" Y="26"/>
<TopLine Value="8"/>
<EditorIndex Value="9"/>
<UsageCount Value="21"/>
<UsageCount Value="22"/>
<Loaded Value="True"/>
</Unit295>
<Unit296>
@ -2120,6 +2122,13 @@
<UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit296>
<Unit297>
<Filename Value="../../../fpc/packages/unixutil/src/unixutils.pp"/>
<UnitName Value="UnixUtils"/>
<CursorPos X="97" Y="17"/>
<TopLine Value="1"/>
<UsageCount Value="10"/>
</Unit297>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
@ -2127,120 +2136,120 @@
<Caret Line="451" Column="25" TopLine="434"/>
</Position1>
<Position2>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="34" Column="20" TopLine="21"/>
</Position2>
<Position3>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="127" Column="22" TopLine="108"/>
</Position3>
<Position4>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="36" Column="22" TopLine="22"/>
</Position4>
<Position5>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="87" Column="7" TopLine="74"/>
</Position5>
<Position6>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="87" Column="7" TopLine="74"/>
</Position6>
<Position7>
<Filename Value="../../Units/MMLCore/dtmutil.pas"/>
<Caret Line="123" Column="7" TopLine="100"/>
</Position7>
<Position8>
<Filename Value="testunit.pas"/>
<Caret Line="425" Column="68" TopLine="411"/>
</Position8>
<Position9>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="115" Column="76" TopLine="101"/>
</Position9>
<Position10>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="102" Column="18" TopLine="84"/>
</Position10>
<Position11>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="451" Column="25" TopLine="434"/>
</Position11>
<Position12>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="82" Column="47" TopLine="63"/>
</Position12>
<Position13>
</Position2>
<Position3>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="316" Column="1" TopLine="299"/>
</Position13>
<Position14>
</Position3>
<Position4>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="79" Column="51" TopLine="61"/>
</Position14>
<Position15>
</Position4>
<Position5>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="68" Column="52" TopLine="50"/>
</Position15>
<Position16>
</Position5>
<Position6>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="297" Column="49" TopLine="287"/>
</Position16>
<Position17>
</Position6>
<Position7>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="219" Column="24" TopLine="215"/>
</Position17>
<Position18>
</Position7>
<Position8>
<Filename Value="../../Units/MMLCore/window.pas"/>
<Caret Line="52" Column="39" TopLine="33"/>
</Position18>
<Position19>
</Position8>
<Position9>
<Filename Value="../../Units/MMLAddon/mmlpsthread.pas"/>
<Caret Line="310" Column="52" TopLine="291"/>
</Position19>
<Position20>
</Position9>
<Position10>
<Filename Value="colourhistory.pas"/>
<Caret Line="142" Column="3" TopLine="123"/>
</Position20>
<Position21>
</Position10>
<Position11>
<Filename Value="colourhistory.pas"/>
<Caret Line="141" Column="22" TopLine="123"/>
</Position21>
<Position22>
</Position11>
<Position12>
<Filename Value="simbasettings.pas"/>
<Caret Line="20" Column="33" TopLine="1"/>
</Position22>
<Position23>
</Position12>
<Position13>
<Filename Value="simbasettings.pas"/>
<Caret Line="43" Column="8" TopLine="7"/>
</Position23>
<Position24>
</Position13>
<Position14>
<Filename Value="simbasettings.pas"/>
<Caret Line="42" Column="36" TopLine="13"/>
</Position14>
<Position15>
<Filename Value="simbasettings.pas"/>
<Caret Line="3" Column="16" TopLine="1"/>
</Position15>
<Position16>
<Filename Value="simbasettings.pas"/>
<Caret Line="4" Column="27" TopLine="1"/>
</Position16>
<Position17>
<Filename Value="simbasettings.pas"/>
<Caret Line="27" Column="119" TopLine="1"/>
</Position17>
<Position18>
<Filename Value="simbasettings.pas"/>
<Caret Line="3" Column="19" TopLine="1"/>
</Position18>
<Position19>
<Filename Value="simbasettings.pas"/>
<Caret Line="9" Column="18" TopLine="1"/>
</Position19>
<Position20>
<Filename Value="simbasettings.pas"/>
<Caret Line="41" Column="3" TopLine="9"/>
</Position20>
<Position21>
<Filename Value="testunit.pas"/>
<Caret Line="42" Column="14" TopLine="23"/>
</Position21>
<Position22>
<Filename Value="updateform.pas"/>
<Caret Line="21" Column="38" TopLine="1"/>
</Position22>
<Position23>
<Filename Value="updateform.pas"/>
<Caret Line="60" Column="38" TopLine="41"/>
</Position23>
<Position24>
<Filename Value="testunit.pas"/>
<Caret Line="42" Column="14" TopLine="23"/>
</Position24>
<Position25>
<Filename Value="simbasettings.pas"/>
<Caret Line="3" Column="16" TopLine="1"/>
<Caret Line="58" Column="72" TopLine="31"/>
</Position25>
<Position26>
<Filename Value="simbasettings.pas"/>
<Caret Line="4" Column="27" TopLine="1"/>
<Caret Line="65" Column="72" TopLine="31"/>
</Position26>
<Position27>
<Filename Value="simbasettings.pas"/>
<Caret Line="27" Column="119" TopLine="1"/>
<Caret Line="55" Column="52" TopLine="46"/>
</Position27>
<Position28>
<Filename Value="simbasettings.pas"/>
<Caret Line="3" Column="19" TopLine="1"/>
<Caret Line="57" Column="52" TopLine="46"/>
</Position28>
<Position29>
<Filename Value="simbasettings.pas"/>
<Caret Line="9" Column="18" TopLine="1"/>
<Caret Line="69" Column="17" TopLine="46"/>
</Position29>
<Position30>
<Filename Value="simbasettings.pas"/>
<Caret Line="41" Column="3" TopLine="9"/>
<Caret Line="77" Column="5" TopLine="62"/>
</Position30>
</JumpHistory>
</ProjectOptions>
@ -2251,7 +2260,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)/;$(ProjPath)../../Units/MMLAddon/PSInc/"/>
<OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/;$(ProjPath)../../Units/MMLAddon/;$(ProjPath)../../Units/PascalScript/;$(ProjPath)../../Units/Misc/;$(ProjPath)../../Units/MMLAddon/PSInc/;$(ProjPath)../../Units/Linux/;$(ProjPath)../../Units/Synapse/;$(LazarusDir)/components/mouseandkeyinput/"/>
<OtherUnitFiles Value="$(ProjPath)../../Units/MMLCore/;../../../fpc/packages/unixutil/src/;$(ProjPath)../../Units/MMLAddon/;$(ProjPath)../../Units/PascalScript/;$(ProjPath)../../Units/Misc/;$(ProjPath)../../Units/MMLAddon/PSInc/;$(ProjPath)../../Units/Linux/;$(ProjPath)../../Units/Synapse/;$(LazarusDir)/components/mouseandkeyinput/;../../../fpc/packages/libc/src/"/>
</SearchPaths>
<CodeGeneration>
<Optimizations>

View File

@ -1,21 +1,43 @@
object SettingsForm: TSettingsForm
Left = 747
Height = 438
Top = 283
Width = 333
Left = 600
Height = 559
Top = 138
Width = 342
ActiveControl = SettingsTreeView
Caption = 'Simba Settings'
ClientHeight = 438
ClientWidth = 333
ClientHeight = 559
ClientWidth = 342
OnCreate = FormCreate
OnDestroy = FormDestroy
LCLVersion = '0.9.29'
object SettingsTreeView: TTreeView
Left = 16
Height = 401
Height = 474
Top = 16
Width = 297
Width = 306
Anchors = [akTop, akLeft, akRight, akBottom]
DefaultItemHeight = 19
ReadOnly = True
ScrollBars = ssAutoBoth
TabOrder = 0
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]
end
object SettingsFormButtonOK: TButton
Left = 247
Height = 25
Top = 512
Width = 75
Caption = 'OK'
OnClick = SettingsFormButtonOKClick
TabOrder = 1
end
object SettingsFormButtonCancel: TButton
Left = 16
Height = 25
Top = 512
Width = 75
Caption = 'Cancel'
OnClick = SettingsFormButtonCancelClick
TabOrder = 2
end
end

View File

@ -1,10 +1,19 @@
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TSettingsForm','FORMDATA',[
'TPF0'#13'TSettingsForm'#12'SettingsForm'#4'Left'#3#235#2#6'Height'#3#182#1#3
+'Top'#3#27#1#5'Width'#3'M'#1#7'Caption'#6#14'Simba Settings'#12'ClientHeight'
+#3#182#1#11'ClientWidth'#3'M'#1#8'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7
+#11'FormDestroy'#10'LCLVersion'#6#6'0.9.29'#0#9'TTreeView'#16'SettingsTreeVi'
+'ew'#4'Left'#2#16#6'Height'#3#145#1#3'Top'#2#16#5'Width'#3')'#1#17'DefaultIt'
+'emHeight'#2#19#10'ScrollBars'#7#10'ssAutoBoth'#8'TabOrder'#2#0#0#0#0
'TPF0'#13'TSettingsForm'#12'SettingsForm'#4'Left'#3'X'#2#6'Height'#3'/'#2#3'T'
+'op'#3#138#0#5'Width'#3'V'#1#13'ActiveControl'#7#16'SettingsTreeView'#7'Capt'
+'ion'#6#14'Simba Settings'#12'ClientHeight'#3'/'#2#11'ClientWidth'#3'V'#1#8
+'OnCreate'#7#10'FormCreate'#9'OnDestroy'#7#11'FormDestroy'#10'LCLVersion'#6#6
+'0.9.29'#0#9'TTreeView'#16'SettingsTreeView'#4'Left'#2#16#6'Height'#3#218#1#3
+'Top'#2#16#5'Width'#3'2'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#8'akB'
+'ottom'#0#17'DefaultItemHeight'#2#19#8'ReadOnly'#9#10'ScrollBars'#7#10'ssAut'
+'oBoth'#8'TabOrder'#2#0#7'Options'#11#17'tvoAutoItemHeight'#16'tvoHideSelect'
+'ion'#21'tvoKeepCollapsedNodes'#11'tvoReadOnly'#14'tvoShowButtons'#12'tvoSho'
+'wLines'#11'tvoShowRoot'#11'tvoToolTips'#0#0#0#7'TButton'#20'SettingsFormBut'
+'tonOK'#4'Left'#3#247#0#6'Height'#2#25#3'Top'#3#0#2#5'Width'#2'K'#7'Caption'
+#6#2'OK'#7'OnClick'#7#25'SettingsFormButtonOKClick'#8'TabOrder'#2#1#0#0#7'TB'
+'utton'#24'SettingsFormButtonCancel'#4'Left'#2#16#6'Height'#2#25#3'Top'#3#0#2
+#5'Width'#2'K'#7'Caption'#6#6'Cancel'#7'OnClick'#7#29'SettingsFormButtonCanc'
+'elClick'#8'TabOrder'#2#2#0#0#0
]);

View File

@ -6,7 +6,7 @@ interface
uses
Classes, SysUtils, FileUtil, LResources, Forms, Controls, Graphics, Dialogs,
ComCtrls, settings;
ComCtrls, StdCtrls, settings;
const
SimbaSettingsFile = 'settings.xml';
@ -16,8 +16,12 @@ type
{ TSettingsForm }
TSettingsForm = class(TForm)
SettingsFormButtonCancel: TButton;
SettingsFormButtonOK: TButton;
SettingsTreeView: TTreeView;
Settings: TMMLSettings;
procedure SettingsFormButtonCancelClick(Sender: TObject);
procedure SettingsFormButtonOKClick(Sender: TObject);
procedure FormCreate(Sender: TObject);
procedure FormDestroy(Sender: TObject);
{ private declarations }
@ -48,6 +52,24 @@ begin
Settings.LoadFromXML('settings.xml');
end;
procedure TSettingsForm.SettingsFormButtonOKClick(Sender: TObject);
begin
SettingsForm.Settings.SaveToXML(SimbaSettingsFile);
SettingsForm.ModalResult:=mrOK;
end;
procedure TSettingsForm.SettingsFormButtonCancelClick(Sender: TObject);
begin
if not FileExists(SimbaSettingsFile) then
begin
SettingsForm.SettingsTreeView.Items.Clear;
SettingsForm.Settings.SaveToXML(SimbaSettingsFile);
SettingsForm.SettingsTreeView.Items.Clear;
SettingsForm.Settings.LoadFromXML(SimbaSettingsFile);
end;
SettingsForm.ModalResult:=mrOK;
end;
procedure TSettingsForm.FormDestroy(Sender: TObject);
begin
Settings.Free;

View File

@ -1,11 +1,11 @@
object Form1: TForm1
Left = 272
Left = 593
Height = 557
Top = 172
Top = 261
Width = 734
ActiveControl = ScriptPanel
Caption = 'THA FUKING MUFASA'
ClientHeight = 538
ClientHeight = 532
ClientWidth = 734
KeyPreview = True
Menu = MainMenu1
@ -175,8 +175,8 @@ object Form1: TForm1
end
object StatusBar: TStatusBar
Left = 0
Height = 20
Top = 518
Height = 21
Top = 511
Width = 734
Panels = <
item
@ -194,7 +194,7 @@ object Form1: TForm1
object PanelMemo: TPanel
Left = 0
Height = 154
Top = 364
Top = 357
Width = 734
Align = alBottom
ClientHeight = 154
@ -214,19 +214,19 @@ object Form1: TForm1
Cursor = crVSplit
Left = 0
Height = 5
Top = 359
Top = 352
Width = 734
Align = alBottom
ResizeAnchor = akBottom
end
object ScriptPanel: TPanel
Left = 0
Height = 335
Height = 328
Top = 24
Width = 734
Align = alClient
BevelOuter = bvNone
ClientHeight = 335
ClientHeight = 328
ClientWidth = 734
DockSite = True
TabOrder = 4
@ -234,7 +234,7 @@ object Form1: TForm1
OnDockOver = ScriptPanelDockOver
object PageControl1: TPageControl
Left = 155
Height = 300
Height = 293
Top = 0
Width = 579
Align = alClient
@ -253,7 +253,7 @@ object Form1: TForm1
object SearchPanel: TPanel
Left = 0
Height = 35
Top = 300
Top = 293
Width = 734
Align = alBottom
BevelOuter = bvSpace
@ -349,7 +349,7 @@ object Form1: TForm1
end
object LabeledEditSearch: TLabeledEdit
Left = 104
Height = 21
Height = 27
Top = 6
Width = 174
EditLabel.AnchorSideLeft.Control = LabeledEditSearch
@ -357,10 +357,10 @@ object Form1: TForm1
EditLabel.AnchorSideTop.Side = asrCenter
EditLabel.AnchorSideRight.Control = LabeledEditSearch
EditLabel.AnchorSideBottom.Control = LabeledEditSearch
EditLabel.Left = 73
EditLabel.Height = 14
EditLabel.Top = 9
EditLabel.Width = 28
EditLabel.Left = 65
EditLabel.Height = 18
EditLabel.Top = 10
EditLabel.Width = 36
EditLabel.Caption = 'Find: '
EditLabel.ParentColor = False
LabelPosition = lpLeft
@ -373,9 +373,9 @@ object Form1: TForm1
end
object CheckBoxMatchCase: TCheckBox
Left = 320
Height = 17
Height = 22
Top = 7
Width = 74
Width = 97
Caption = 'Match case'
OnClick = CheckBoxMatchCaseClick
TabOrder = 1
@ -383,37 +383,39 @@ object Form1: TForm1
end
object SplitterFunctionList: TSplitter
Left = 150
Height = 300
Height = 293
Top = 0
Width = 5
OnCanResize = SplitterFunctionListCanResize
Visible = False
end
inline frmFunctionList: TFunctionListFrame
Height = 300
Height = 293
Width = 150
ClientHeight = 300
ClientHeight = 293
ClientWidth = 150
OnEndDock = nil
TabOrder = 3
DesignLeft = 401
DesignTop = 219
inherited FunctionList: TTreeView
Height = 261
Height = 244
Top = 22
Width = 150
DefaultItemHeight = 19
OnChange = FunctionListChange
OnDeletion = nil
OnEnter = FunctionListEnter
OnExit = FunctionListExit
end
inherited editSearchList: TEdit
Top = 279
Height = 27
Top = 266
Width = 150
OnExit = editSearchListExit
OnKeyDown = editSearchListKeyDown
OnKeyPress = editSearchListKeyPress
end
inherited FunctionListLabel: TLabel
Height = 18
Width = 146
end
end
@ -1209,6 +1211,10 @@ object Form1: TForm1
Caption = 'View &Function List'
OnClick = MenuItemFunctionListClick
end
object MenuViewSettings: TMenuItem
Caption = 'View Settings'
OnClick = MenuViewSettingsClick
end
end
object MenuExtra: TMenuItem
Caption = 'Extra'

File diff suppressed because it is too large Load Diff

View File

@ -93,6 +93,7 @@ type
MenuEdit: TMenuItem;
MenuHelp: TMenuItem;
MenuExtra: TMenuItem;
MenuViewSettings: TMenuItem;
MenuItemExportHTML: TMenuItem;
MenuItemDivider9: TMenuItem;
UpdateTimer: TTimer;
@ -248,6 +249,7 @@ type
procedure MenuItemTabCloseClick(Sender: TObject);
procedure MenuItemTabCloseOthersClick(Sender: TObject);
procedure MenuItemFunctionListClick(Sender: TObject);
procedure MenuViewSettingsClick(Sender: TObject);
procedure OnLinePSScript(Sender: TObject);
procedure ButtonPickClick(Sender: TObject);
procedure ButtonSelectorDown(Sender: TObject; Button: TMouseButton;
@ -1430,6 +1432,11 @@ begin
FunctionListShown(not MenuItemFunctionList.Checked);
end;
procedure TForm1.MenuViewSettingsClick(Sender: TObject);
begin
SettingsForm.ShowModal;
end;
procedure TForm1.OnLinePSScript(Sender: TObject);
begin
//Writeln('We just completed a line!!');