From 7518639ebd85427a599320007fc145020065ad97 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 1 Jul 2010 03:37:10 +0200 Subject: [PATCH 1/2] Some minor bugs --- Projects/Simba/framescript.lfm | 5 +--- Projects/Simba/simbaunit.lfm | 47 +++++++++++++++------------------- Projects/Simba/simbaunit.pas | 10 +++++++- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Projects/Simba/framescript.lfm b/Projects/Simba/framescript.lfm index f26a57b..38a50e2 100644 --- a/Projects/Simba/framescript.lfm +++ b/Projects/Simba/framescript.lfm @@ -212,6 +212,7 @@ object ScriptFrame: TScriptFrame item Command = ecRedo ShortCut = 40968 + ShortCut2 = 16473 end item Command = ecLineBreak @@ -245,10 +246,6 @@ object ScriptFrame: TScriptFrame Command = ecCut ShortCut = 16472 end - item - Command = ecDeleteLine - ShortCut = 16473 - end item Command = ecDeleteEOL ShortCut = 24665 diff --git a/Projects/Simba/simbaunit.lfm b/Projects/Simba/simbaunit.lfm index 0a46f59..85fe628 100644 --- a/Projects/Simba/simbaunit.lfm +++ b/Projects/Simba/simbaunit.lfm @@ -3,10 +3,9 @@ object SimbaForm: TSimbaForm Height = 623 Top = 95 Width = 660 - ActiveControl = ScriptPanel AllowDropFiles = True Caption = 'THA FUKING Simba' - ClientHeight = 600 + ClientHeight = 603 ClientWidth = 660 KeyPreview = True Menu = MainMenu @@ -208,8 +207,8 @@ object SimbaForm: TSimbaForm end object StatusBar: TStatusBar Left = 0 - Height = 17 - Top = 583 + Height = 23 + Top = 580 Width = 660 Panels = < item @@ -231,7 +230,7 @@ object SimbaForm: TSimbaForm object PanelMemo: TPanel Left = 0 Height = 154 - Top = 429 + Top = 426 Width = 660 Align = alBottom ClientHeight = 154 @@ -254,19 +253,19 @@ object SimbaForm: TSimbaForm Cursor = crVSplit Left = 0 Height = 5 - Top = 424 + Top = 421 Width = 660 Align = alBottom ResizeAnchor = akBottom end object ScriptPanel: TPanel Left = 0 - Height = 400 + Height = 397 Top = 24 Width = 660 Align = alClient BevelOuter = bvNone - ClientHeight = 400 + ClientHeight = 397 ClientWidth = 660 DockSite = True TabOrder = 4 @@ -274,7 +273,7 @@ object SimbaForm: TSimbaForm OnDockOver = ScriptPanelDockOver object PageControl1: TPageControl Left = 155 - Height = 365 + Height = 362 Top = 0 Width = 505 Align = alClient @@ -293,7 +292,7 @@ object SimbaForm: TSimbaForm object SearchPanel: TPanel Left = 0 Height = 35 - Top = 365 + Top = 362 Width = 660 Align = alBottom BevelOuter = bvSpace @@ -389,7 +388,7 @@ object SimbaForm: TSimbaForm end object LabeledEditSearch: TLabeledEdit Left = 104 - Height = 27 + Height = 21 Top = 6 Width = 174 EditLabel.AnchorSideLeft.Control = LabeledEditSearch @@ -397,10 +396,10 @@ object SimbaForm: TSimbaForm EditLabel.AnchorSideTop.Side = asrCenter EditLabel.AnchorSideRight.Control = LabeledEditSearch EditLabel.AnchorSideBottom.Control = LabeledEditSearch - EditLabel.Left = 67 - EditLabel.Height = 18 - EditLabel.Top = 10 - EditLabel.Width = 34 + EditLabel.Left = 73 + EditLabel.Height = 14 + EditLabel.Top = 9 + EditLabel.Width = 28 EditLabel.Caption = 'Find: ' EditLabel.ParentColor = False LabelPosition = lpLeft @@ -413,9 +412,9 @@ object SimbaForm: TSimbaForm end object CheckBoxMatchCase: TCheckBox Left = 320 - Height = 20 + Height = 17 Top = 7 - Width = 95 + Width = 72 Caption = 'Match case' OnClick = CheckBoxMatchCaseClick TabOrder = 1 @@ -423,38 +422,34 @@ object SimbaForm: TSimbaForm end object SplitterFunctionList: TSplitter Left = 150 - Height = 365 + Height = 362 Top = 0 Width = 5 OnCanResize = SplitterFunctionListCanResize Visible = False end inline frmFunctionList: TFunctionListFrame - Height = 365 + Height = 362 Width = 150 - ClientHeight = 365 + ClientHeight = 362 ClientWidth = 150 OnEndDock = nil TabOrder = 3 inherited FunctionList: TTreeView - Height = 316 - Top = 22 + Height = 323 Width = 150 - DefaultItemHeight = 19 OnChange = FunctionListChange OnEnter = FunctionListEnter OnExit = FunctionListExit end inherited editSearchList: TEdit - Height = 27 - Top = 338 + Top = 341 Width = 150 OnExit = editSearchListExit OnKeyDown = editSearchListKeyDown OnKeyPress = editSearchListKeyPress end inherited FunctionListLabel: TLabel - Height = 18 Width = 146 end end diff --git a/Projects/Simba/simbaunit.pas b/Projects/Simba/simbaunit.pas index 9f6112f..abad04b 100644 --- a/Projects/Simba/simbaunit.pas +++ b/Projects/Simba/simbaunit.pas @@ -46,7 +46,7 @@ uses CastaliaSimplePasPar, v_AutoCompleteForm, PSDump; const - SimbaVersion = 700; + SimbaVersion = 701; type @@ -2890,6 +2890,10 @@ begin Exit; with TOpenDialog.Create(nil) do try + if (CurrScript.ScriptFile <> '') then + InitialDir := ExtractFileDir(CurrScript.ScriptFile) + else + InitialDir := ScriptDir; Options := [ofAllowMultiSelect, ofExtensionDifferent, ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]; Filter:= 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' +LoadSettingDef('Settings/Extensions/FileExtension','sex')+ '|Any files|*.*'; @@ -2985,6 +2989,10 @@ begin Result := false; with TSaveDialog.Create(nil) do try + if (CurrScript.ScriptFile <> '') then + InitialDir := ExtractFileDir(CurrScript.ScriptFile) + else + InitialDir := ScriptDir; filter := 'Simba Files|*.simba;*.simb;*.cogat;*.mufa;*.txt;*.' + LoadSettingDef('Settings/Extensions/FileExtension','sex')+ '|Any files|*.*'; From 099858f7c48964e64fc34c1924dae48c916ac597 Mon Sep 17 00:00:00 2001 From: Raymond Date: Thu, 1 Jul 2010 03:48:00 +0200 Subject: [PATCH 2/2] updated install --- Install/windows/Setup.iss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Install/windows/Setup.iss b/Install/windows/Setup.iss index 610ba17..9f3b42f 100644 --- a/Install/windows/Setup.iss +++ b/Install/windows/Setup.iss @@ -35,6 +35,8 @@ Name: "{app}\Scripts\Tests" [Files] Source: "C:\Remake\Simba.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Remake\Extensions\srl.sex"; DestDir: "{app}\Extensions"; Flags: ignoreversion +Source: "C:\Remake\Extensions\associate.sex"; DestDir: "{app}\Extensions"; Flags: ignoreversion +Source: "C:\Remake\Extensions\dtm_editor.sex"; DestDir: "{app}\Extensions"; Flags: ignoreversion Source: "C:\Remake\Fonts\*"; DestDir: "{app}\Fonts"; Flags: ignoreversion recursesubdirs createallsubdirs Source: "C:\Remake\Tests\PS\*"; DestDir:"{app}\Scripts\Tests"; Flags: ignoreversion ; NOTE: Don't use "Flags: ignoreversion" on any shared system files