moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-10 19:35:10 -05:00
Code Issues Releases Wiki Activity

Added some more functionality to and fixed some bugs in the function list, and made it hidden by default.

Browse Source 
git-svn-id: http://www.villavu.com/repositories/merlijn/mufasa@328 3f818213-9676-44b0-a9b4-5e4c4e03d09d
This commit is contained in:
bullzeye95 2009-12-24 01:20:17 +00:00
parent edfce61a25
commit d281d89d42
4 changed files with 1474 additions and 1429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
Projects/SAMufasaGUI/project1.lpi
View File

@ -10,7 +10,7 @@
<TargetFileExt Value=""/>
<Title Value="Mufasa Stand Alone"/>
<UseXPManifest Value="True"/>
<ActiveEditorIndexAtStart Value="15"/>
<ActiveEditorIndexAtStart Value="6"/>
</General>
<VersionInfo>
<ProjectVersion Value=""/>
@ -36,7 +36,7 @@
<PackageName Value="LCL"/>
</Item2>
</RequiredPackages>
<Units Count="261">
<Units Count="262">
<Unit0>
<Filename Value="project1.lpr"/>
<IsPartOfProject Value="True"/>
@ -139,10 +139,13 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
<UnitName Value="TestUnit"/>
<CursorPos X="4" Y="370"/>
<TopLine Value="360"/>
<CursorPos X="32" Y="959"/>
<TopLine Value="946"/>
<EditorIndex Value="6"/>
<UsageCount Value="202"/>
<Bookmarks Count="1">
<Item0 X="20" Y="973" ID="1"/>
</Bookmarks>
<Loaded Value="True"/>
</Unit13>
<Unit14>
@ -207,7 +210,7 @@
<IsPartOfProject Value="True"/>
<UnitName Value="MufasaTypes"/>
<CursorPos X="32" Y="100"/>
<TopLine Value="147"/>
<TopLine Value="100"/>
<EditorIndex Value="0"/>
<UsageCount Value="201"/>
<Loaded Value="True"/>
@ -250,7 +253,7 @@
<CursorPos X="23" Y="8"/>
<TopLine Value="1"/>
<EditorIndex Value="21"/>
<UsageCount Value="89"/>
<UsageCount Value="91"/>
<Loaded Value="True"/>
</Unit27>
<Unit28>
@ -540,7 +543,7 @@
<CursorPos X="56" Y="46"/>
<TopLine Value="25"/>
<EditorIndex Value="9"/>
<UsageCount Value="41"/>
<UsageCount Value="43"/>
<Loaded Value="True"/>
</Unit69>
<Unit70>
@ -750,7 +753,7 @@
<CursorPos X="33" Y="34"/>
<TopLine Value="30"/>
<EditorIndex Value="20"/>
<UsageCount Value="48"/>
<UsageCount Value="50"/>
<Loaded Value="True"/>
</Unit98>
<Unit99>
@ -886,9 +889,9 @@
<Unit118>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/window.inc"/>
<CursorPos X="50" Y="41"/>
<TopLine Value="18"/>
<TopLine Value="26"/>
<EditorIndex Value="8"/>
<UsageCount Value="10"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit118>
<Unit119>
@ -1366,7 +1369,7 @@
<CursorPos X="55" Y="5"/>
<TopLine Value="1"/>
<EditorIndex Value="11"/>
<UsageCount Value="36"/>
<UsageCount Value="38"/>
<Loaded Value="True"/>
</Unit185>
<Unit186>
@ -1460,7 +1463,7 @@
<CursorPos X="81" Y="189"/>
<TopLine Value="174"/>
<EditorIndex Value="4"/>
<UsageCount Value="153"/>
<UsageCount Value="156"/>
<Loaded Value="True"/>
</Unit198>
<Unit199>
@ -1711,7 +1714,7 @@
<UnitName Value="about"/>
<CursorPos X="44" Y="21"/>
<TopLine Value="4"/>
<UsageCount Value="116"/>
<UsageCount Value="119"/>
</Unit235>
<Unit236>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/file.inc"/>
@ -1725,7 +1728,7 @@
<UnitName Value="internets"/>
<CursorPos X="87" Y="3"/>
<TopLine Value="1"/>
<UsageCount Value="110"/>
<UsageCount Value="113"/>
</Unit237>
<Unit238>
<Filename Value="debugimageform.pas"/>
@ -1734,7 +1737,7 @@
<UnitName Value="debugimageform"/>
<CursorPos X="20" Y="1"/>
<TopLine Value="1"/>
<UsageCount Value="97"/>
<UsageCount Value="100"/>
</Unit238>
<Unit239>
<Filename Value="debugimage.pas"/>
@ -1745,7 +1748,7 @@
<CursorPos X="59" Y="23"/>
<TopLine Value="37"/>
<EditorIndex Value="5"/>
<UsageCount Value="96"/>
<UsageCount Value="99"/>
<Loaded Value="True"/>
</Unit239>
<Unit240>
@ -1820,7 +1823,7 @@
<CursorPos X="57" Y="165"/>
<TopLine Value="145"/>
<EditorIndex Value="13"/>
<UsageCount Value="36"/>
<UsageCount Value="38"/>
<Loaded Value="True"/>
</Unit250>
<Unit251>
@ -1889,128 +1892,87 @@
<TopLine Value="157"/>
<UsageCount Value="7"/>
</Unit260>
<Unit261>
<Filename Value="../../../../../../usr/local/share/lazarus/lcl/controls.pp"/>
<UnitName Value="Controls"/>
<CursorPos X="5" Y="288"/>
<TopLine Value="276"/>
<UsageCount Value="10"/>
</Unit261>
</Units>
<JumpHistory Count="30" HistoryIndex="29">
<JumpHistory Count="18" HistoryIndex="17">
<Position1>
<Filename Value="testunit.pas"/>
<Caret Line="356" Column="10" TopLine="341"/>
<Caret Line="356" Column="40" TopLine="345"/>
</Position1>
<Position2>
<Filename Value="testunit.pas"/>
<Caret Line="360" Column="101" TopLine="349"/>
<Caret Line="405" Column="6" TopLine="404"/>
</Position2>
<Position3>
<Filename Value="testunit.pas"/>
<Caret Line="346" Column="106" TopLine="343"/>
<Caret Line="407" Column="29" TopLine="394"/>
</Position3>
<Position4>
<Filename Value="testunit.pas"/>
<Caret Line="352" Column="64" TopLine="334"/>
<Caret Line="408" Column="21" TopLine="395"/>
</Position4>
<Position5>
<Filename Value="testunit.pas"/>
<Caret Line="344" Column="35" TopLine="340"/>
<Caret Line="410" Column="31" TopLine="395"/>
</Position5>
<Position6>
<Filename Value="testunit.pas"/>
<Caret Line="367" Column="9" TopLine="356"/>
<Caret Line="400" Column="21" TopLine="398"/>
</Position6>
<Position7>
<Filename Value="testunit.pas"/>
<Caret Line="251" Column="76" TopLine="240"/>
<Caret Line="405" Column="89" TopLine="382"/>
</Position7>
<Position8>
<Filename Value="testunit.pas"/>
<Caret Line="349" Column="59" TopLine="340"/>
<Caret Line="406" Column="89" TopLine="383"/>
</Position8>
<Position9>
<Filename Value="testunit.pas"/>
<Caret Line="346" Column="50" TopLine="334"/>
<Caret Line="407" Column="89" TopLine="384"/>
</Position9>
<Position10>
<Filename Value="testunit.pas"/>
<Caret Line="349" Column="53" TopLine="334"/>
<Caret Line="404" Column="83" TopLine="384"/>
</Position10>
<Position11>
<Filename Value="testunit.pas"/>
<Caret Line="352" Column="38" TopLine="340"/>
<Caret Line="1186" Column="51" TopLine="1"/>
</Position11>
<Position12>
<Filename Value="framescript.pas"/>
<Caret Line="107" Column="24" TopLine="95"/>
<Filename Value="testunit.pas"/>
<Caret Line="957" Column="19" TopLine="955"/>
</Position12>
<Position13>
<Filename Value="framescript.pas"/>
<Caret Line="108" Column="38" TopLine="91"/>
<Filename Value="testunit.pas"/>
<Caret Line="955" Column="68" TopLine="950"/>
</Position13>
<Position14>
<Filename Value="../../Units/MMLAddon/PSInc/Wrappers/other.inc"/>
<Caret Line="52" Column="15" TopLine="25"/>
<Filename Value="testunit.pas"/>
<Caret Line="973" Column="103" TopLine="958"/>
</Position14>
<Position15>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="243" Column="65" TopLine="134"/>
<Filename Value="testunit.pas"/>
<Caret Line="955" Column="26" TopLine="952"/>
</Position15>
<Position16>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="47" Column="48" TopLine="27"/>
<Filename Value="testunit.pas"/>
<Caret Line="118" Column="75" TopLine="113"/>
</Position16>
<Position17>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="58" Column="53" TopLine="27"/>
<Filename Value="testunit.pas"/>
<Caret Line="186" Column="26" TopLine="174"/>
</Position17>
<Position18>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="62" Column="13" TopLine="27"/>
<Filename Value="testunit.pas"/>
<Caret Line="265" Column="51" TopLine="253"/>
</Position18>
<Position19>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="45" Column="47" TopLine="27"/>
</Position19>
<Position20>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="80" Column="56" TopLine="63"/>
</Position20>
<Position21>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="94" Column="36" TopLine="63"/>
</Position21>
<Position22>
<Filename Value="../../Units/MMLCore/mufasatypes.pas"/>
<Caret Line="99" Column="17" TopLine="63"/>
</Position22>
<Position23>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="24" Column="85" TopLine="1"/>
</Position23>
<Position24>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="43" Column="19" TopLine="24"/>
</Position24>
<Position25>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="55" Column="68" TopLine="24"/>
</Position25>
<Position26>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="56" Column="66" TopLine="24"/>
</Position26>
<Position27>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="57" Column="42" TopLine="24"/>
</Position27>
<Position28>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="58" Column="38" TopLine="24"/>
</Position28>
<Position29>
<Filename Value="../../Units/MMLCore/bitmaps.pas"/>
<Caret Line="82" Column="50" TopLine="48"/>
</Position29>
<Position30>
<Filename Value="../../Units/MMLAddon/colourpicker.pas"/>
<Caret Line="188" Column="50" TopLine="166"/>
</Position30>
</JumpHistory>
</ProjectOptions>
<CompilerOptions>

50
Projects/SAMufasaGUI/testunit.lfm
View File

@ -1,12 +1,12 @@
object Form1: TForm1
Left = 474
Left = 541
Height = 557
Top = 246
Width = 731
ActiveControl = ScriptPanel
Top = 276
Width = 732
ActiveControl = PageControl1
Caption = 'THA FUKING MUFASA'
ClientHeight = 532
ClientWidth = 731
ClientWidth = 732
KeyPreview = True
Menu = MainMenu1
OnClose = FormClose
@ -20,7 +20,7 @@ object Form1: TForm1
Left = 0
Height = 24
Top = 0
Width = 731
Width = 732
Caption = 'ToolBar1'
Images = Mufasa_Image_List
ParentShowHint = False
@ -168,7 +168,7 @@ object Form1: TForm1
Left = 0
Height = 21
Top = 511
Width = 731
Width = 732
Panels = <
item
Width = 60
@ -186,16 +186,16 @@ object Form1: TForm1
Left = 0
Height = 154
Top = 357
Width = 731
Width = 732
Align = alBottom
ClientHeight = 154
ClientWidth = 731
ClientWidth = 732
TabOrder = 2
object Memo1: TMemo
Left = 1
Height = 152
Top = 1
Width = 729
Width = 730
Align = alClient
ScrollBars = ssAutoBoth
TabOrder = 0
@ -206,7 +206,7 @@ object Form1: TForm1
Left = 0
Height = 5
Top = 352
Width = 731
Width = 732
Align = alBottom
ResizeAnchor = akBottom
end
@ -214,20 +214,20 @@ object Form1: TForm1
Left = 0
Height = 328
Top = 24
Width = 731
Width = 732
Align = alClient
BevelOuter = bvNone
ClientHeight = 328
ClientWidth = 731
ClientWidth = 732
DockSite = True
TabOrder = 4
OnDockDrop = ScriptPanelDockDrop
OnDockOver = ScriptPanelDockOver
object PageControl1: TPageControl
Left = 139
Left = 123
Height = 293
Top = 0
Width = 592
Width = 609
Align = alClient
Images = Mufasa_Image_List
PopupMenu = TabPopup
@ -245,11 +245,11 @@ object Form1: TForm1
Left = 0
Height = 35
Top = 293
Width = 731
Width = 732
Align = alBottom
BevelOuter = bvSpace
ClientHeight = 35
ClientWidth = 731
ClientWidth = 732
TabOrder = 1
Visible = False
object SpeedButtonSearch: TSpeedButton
@ -376,13 +376,15 @@ object Form1: TForm1
Left = 0
Height = 293
Top = 0
Width = 139
Width = 118
Align = alLeft
DefaultItemHeight = 19
ReadOnly = True
ScrollBars = ssAutoBoth
TabOrder = 2
Visible = False
OnMouseDown = FunctionListMouseDown
OnMouseUp = FunctionListMouseUp
Options = [tvoAutoItemHeight, tvoHideSelection, tvoKeepCollapsedNodes, tvoReadOnly, tvoShowButtons, tvoShowLines, tvoShowRoot, tvoToolTips]
Items.Data = {
F9FFFFFF020001000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF020000000000
@ -391,6 +393,14 @@ object Form1: TForm1
FFFF00000000000000000008000000476574436F6C6F72
}
end
object Splitter1: TSplitter
Left = 118
Height = 293
Top = 0
Width = 5
OnCanResize = Splitter1CanResize
Visible = False
end
end
object MainMenu1: TMainMenu
left = 528
@ -1179,6 +1189,10 @@ object Form1: TForm1
Caption = 'View &Debug Image'
OnClick = MenuItemDebugImageClick
end
object MenuItemFunctionList: TMenuItem
Caption = 'View &Function List'
OnClick = MenuItemFunctionListClick
end
end
object MenuHelp: TMenuItem
Caption = '&Help'

2644
Projects/SAMufasaGUI/testunit.lrs
View File

File diff suppressed because it is too large Load Diff

65
Projects/SAMufasaGUI/testunit.pas
View File

@ -89,6 +89,7 @@ type
MenuFile: TMenuItem;
MenuEdit: TMenuItem;
MenuHelp: TMenuItem;
MenuItemFunctionList: TMenuItem;
MenuItemHide: TMenuItem;
MenuItemDebugImage: TMenuItem;
MenuItemAbout: TMenuItem;
@ -132,6 +133,7 @@ type
SearchPanel: TPanel;
ScriptPanel: TPanel;
SpeedButtonSearch: TSpeedButton;
Splitter1: TSplitter;
TabPopup: TPopupMenu;
TB_SaveAll: TToolButton;
DebugTimer: TTimer;
@ -206,6 +208,8 @@ type
procedure ActionUndoExecute(Sender: TObject);
procedure CheckBoxMatchCaseClick(Sender: TObject);
procedure CloseFindPanel;
procedure FunctionListMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure MenuItemColourHistoryClick(Sender: TObject);
procedure dlgReplaceFind(Sender: TObject);
procedure dlgReplaceReplace(Sender: TObject);
@ -227,6 +231,7 @@ type
procedure MenuItemShowClick(Sender: TObject);
procedure MenuItemTabCloseClick(Sender: TObject);
procedure MenuItemTabCloseOthersClick(Sender: TObject);
procedure MenuItemFunctionListClick(Sender: TObject);
procedure OnLinePSScript(Sender: TObject);
procedure ButtonPickClick(Sender: TObject);
procedure ButtonSelectorDown(Sender: TObject; Button: TMouseButton;
@ -253,6 +258,9 @@ type
procedure SpeedButtonSearchClick(Sender: TObject);
procedure FunctionListMouseDown(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
procedure Splitter1CanResize(Sender: TObject; var NewSize: Integer;
var Accept: Boolean);
procedure DockFormOnClose(Sender: TObject; var CloseAction: TCloseAction);
private
PopupTab : integer;
SearchStart : TPoint;
@ -344,13 +352,20 @@ begin
begin
FunctionList.Align := alLeft;
PageControl1.Align := alRight;
Splitter1.ResizeAnchor := akLeft;
Splitter1.Align := alLeft;
Splitter1.Left := FunctionList.Left + FunctionList.Width;
end else begin
FunctionList.Align := alRight;
PageControl1.Align := alLeft;
Splitter1.ResizeAnchor := akRight;
Splitter1.Align := alRight;
Splitter1.Left := FunctionList.Left;
end;
PageControl1.Width := ScriptPanel.Width - (Source.DockRect.Right - Source.DockRect.Left);
FunctionList.Width := ScriptPanel.Width - PageControl1.Width;
PageControl1.Align := alClient;
Splitter1.Show;
end;
procedure TForm1.ScriptPanelDockOver(Sender: TObject; Source: TDragDockObject; //is there a better way to do all of this?
@ -396,6 +411,13 @@ begin
FunctionList.BeginDrag(False, 10);
end;
procedure TForm1.Splitter1CanResize(Sender: TObject; var NewSize: Integer;
var Accept: Boolean);
begin
if(NewSize > ScriptPanel.Width div 2)then
NewSize := ScriptPanel.Width div 2
end;
procedure formWriteln( S : String);
begin
writeln('formWriteln: ' + s);
@ -931,6 +953,27 @@ begin
CurrScript.SynEdit.SetFocus;
end;
procedure TForm1.DockFormOnClose(Sender: TObject; var CloseAction: TCloseAction);
begin
CloseAction := caHide;
MenuItemFunctionList.Checked := False;
end;
procedure TForm1.FunctionListMouseUp(Sender: TObject; Button: TMouseButton;
Shift: TShiftState; X, Y: Integer);
var
F: ^TCustomDockForm;
begin
if(FunctionList.Parent is TCustomDockForm)then
begin
F := @FunctionList.Parent; //can't typecast parent as a TCustomDockForm
F^.Caption := 'Function List';
F^.BorderStyle := bsSizeable;
F^.OnClose := @DockFormOnClose;
Splitter1.Hide;
end;
end;
procedure TForm1.MenuItemColourHistoryClick(Sender: TObject);
begin
MenuItemColourHistory.Checked := not ColourHistoryForm.Visible;
@ -1139,6 +1182,28 @@ begin
CloseTabs(PopupTab);
end;
procedure TForm1.MenuItemFunctionListClick(Sender: TObject);
begin
with MenuItemFunctionList do
begin
Checked := not Checked;
if(Checked)then
begin
if(FunctionList.Parent is TPanel)then
begin
Splitter1.Show;
FunctionList.Show;
end else FunctionList.Parent.Show;
end else begin
if(FunctionList.Parent is TPanel)then
FunctionList.Hide
else
FunctionList.Parent.Hide;
Splitter1.Hide;
end;
end;
end;
procedure TForm1.OnLinePSScript(Sender: TObject);
begin
//Writeln('We just completed a line!!');