diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index f45cfd7f..105256a3 100755 --- a/editor/studio/AMXX_Studio.dof +++ b/editor/studio/AMXX_Studio.dof @@ -115,7 +115,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=1 Release=0 -Build=1 +Build=4 Debug=0 PreRelease=0 Special=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName=AMX Mod X Dev Team FileDescription= -FileVersion=1.1.0.1 +FileVersion=1.1.0.4 InternalName= LegalCopyright= LegalTrademarks= diff --git a/editor/studio/AMXX_Studio.dpr b/editor/studio/AMXX_Studio.dpr index 163bc920..9234d6c7 100755 --- a/editor/studio/AMXX_Studio.dpr +++ b/editor/studio/AMXX_Studio.dpr @@ -55,7 +55,7 @@ begin for i := 1 to ParamCount do SendStudioMsg(SCM_LOADFILE, ParamStr(i), 0); end; - exit; + //exit; end; Application.Initialize; Application.Title := 'AMXX-Studio'; diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index bd88293f..5525301a 100755 Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res index 80f516da..800d9171 100755 Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ diff --git a/editor/studio/UnitMainTools.pas b/editor/studio/UnitMainTools.pas index e145d5f9..8398d792 100755 --- a/editor/studio/UnitMainTools.pas +++ b/editor/studio/UnitMainTools.pas @@ -530,14 +530,14 @@ begin tsDocuments.Items.Add(TabItem); end; - Plugin_ProjectsChange(OldIndex, Index, False); - if JumpToLastDoc then begin Started := False; tsDocuments.Items[Collection.ActiveDocument.Index].Checked := True; Collection.Activate(Collection.ActiveDocument.Index, True); Started := True; end; + + Plugin_ProjectsChange(OldIndex, Index, False); end; end; @@ -910,25 +910,7 @@ begin Started := True; end; - if Document.Code.Count > 75 then begin - ShowProgress; - frmMain.pbLoading.Max := Document.Code.Count; - for i := 0 to Document.Code.Count -1 do begin - if Cancel then begin - Cancel := False; - exit; - end; - - frmMain.sciEditor.Lines.Add(Document.Code.Strings[i]); - frmMain.pbLoading.Position := i; - SetProgressStatus('Adding Code To Editor...'); - Application.ProcessMessages; - end; - HideProgress; - frmMain.sciEditor.EmptyUndoBuffer; - end - else - frmMain.sciEditor.Lines.Text := Document.Code.Text; + frmMain.sciEditor.SetText(Document.Code.GetText); SetRTFText(frmMain.rtfNotes, Document.NotesText); frmMain.sciEditor.ReadOnly := Document.ReadOnly; @@ -996,7 +978,7 @@ begin if (Self = PawnProjects) and (frmMain.tsMain.ActiveTabIndex <> 0) then exit; if (Self = CPPProjects) and (frmMain.tsMain.ActiveTabIndex <> 1) then exit; if (Self = OtherProjects) and (frmMain.tsMain.ActiveTabIndex <> 2) then exit; - + TabItem := TSpTBXTabItem.Create(frmMain.tsDocuments); TabItem.Caption := Title; TabItem.OnSelect := frmMain.OnTabSelect; diff --git a/editor/studio/UnitfrmInfo.dfm b/editor/studio/UnitfrmInfo.dfm index b8e85b8e..ffb73974 100755 Binary files a/editor/studio/UnitfrmInfo.dfm and b/editor/studio/UnitfrmInfo.dfm differ diff --git a/editor/studio/UnitfrmInfo.pas b/editor/studio/UnitfrmInfo.pas index 48fbb9d2..068134bf 100755 --- a/editor/studio/UnitfrmInfo.pas +++ b/editor/studio/UnitfrmInfo.pas @@ -14,16 +14,16 @@ type lblInfo1: TLabel; imgAMXXLarge: TImage; cmdClose: TSpTBXButton; - pnlGallery: TPanel; - Label1: TLabel; - imgGabeN: TImage; - imgBurger: TImage; - Label2: TLabel; - Label3: TLabel; + lblCHelp: TLabel; + lblScintilla1: TLabel; + lblScintilla2: TLabel; + pnlImages: TPanel; + imgDoom4: TImage; + imgHampster: TImage; imgYams: TImage; - procedure imgGabeNDblClick(Sender: TObject); - procedure imgBurgerDblClick(Sender: TObject); - procedure imgYamsDblClick(Sender: TObject); + procedure imgHampsterClick(Sender: TObject); + procedure imgDoom4Click(Sender: TObject); + procedure imgYamsClick(Sender: TObject); end; var @@ -33,24 +33,25 @@ implementation {$R *.DFM} -procedure TfrmInfo.imgGabeNDblClick(Sender: TObject); +procedure TfrmInfo.imgHampsterClick(Sender: TObject); begin - ShellExecute(Handle, 'open', PChar('http://sniperbeamer.de/gallery/gaben.php'), nil, nil, SW_SHOW); + MessageBox(Handle, 'Hampster!', 'Your computer! wtf', MB_ICONERROR); + MessageBox(Handle, 'ZOMG YES it''s a hampster!', 'zomg', MB_ICONINFORMATION); + MessageBox(Handle, 'hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster hampster!', 'ham ham hampster', MB_ICONWARNING); end; -procedure TfrmInfo.imgBurgerDblClick(Sender: TObject); +procedure TfrmInfo.imgDoom4Click(Sender: TObject); begin - MessageBeep(MB_ICONQUESTION); - if MessageBox(Handle, 'Do you want a BIG TASTY BURGER?', 'all-in-one-messagebox', MB_ICONQUESTION + MB_YESNO) = mrYes then begin - ShellExecute(Handle, 'open', 'http://www.amxmodx.org/forums/viewtopic.php?t=14658&karma_up=8284', nil, nil, SW_SHOW); - Sleep(5000); - MessageBox(Handle, 'zomg you won''t get one. GabeN (tm) has already eaten each burger on THIS F**KIN'' BURGERLESS WORLD >_< :( Sorry.', 'all-in-one-messagebox', MB_ICONERROR); - end; + MessageBox(Handle, 'gaben', 'doom', MB_ICONWARNING); + MessageBox(Handle, 'gaben gaben gaben gaben gaben gaben!', 'doom', MB_ICONERROR); + MessageBox(Handle, 'gab gab gab gab gab GABEN GABEN GABEN GAAGAGAGABEN! gabenygabgab gaben da gaben0r gabbagaben >_<', 'doom', MB_ICONINFORMATION); end; -procedure TfrmInfo.imgYamsDblClick(Sender: TObject); +procedure TfrmInfo.imgYamsClick(Sender: TObject); begin - MessageBox(Handle, 'myam(s) myam(s), myam(s)...', 'all-in-one-messagebox', MB_ICONINFORMATION); + MessageBox(Handle, 'mmm.. yams', 'personal farmer', MB_ICONINFORMATION); + MessageBox(Handle, 'yam yam yam.. oh a yam! yaaaam yaaaam yayayammm yaaamamamamam and some yaaams', 'gran farmer', MB_ICONERROR); + MessageBox(Handle, 'yams? deadly yams? >:(', 'not a farmer', MB_ICONQUESTION); end; end. diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm index 4044f2e8..ddd7fcc3 100755 --- a/editor/studio/UnitfrmMain.dfm +++ b/editor/studio/UnitfrmMain.dfm @@ -7738,9 +7738,4 @@ object frmMain: TfrmMain Left = 632 Top = 6 end - object JvWindowHook: TJvWindowHook - Left = 632 - Top = 36 - IsForm = True - end end diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index fcd56b18..1cd1f519 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -270,7 +270,6 @@ type sepView3: TSpTBXSeparatorItem; mnuShowCodeExplorer: TSpTBXItem; mnuShowCodeInspector: TSpTBXItem; - JvWindowHook: TJvWindowHook; procedure FormConstrainedResize(Sender: TObject; var MinWidth, MinHeight, MaxWidth, MaxHeight: Integer); procedure mnuExitClick(Sender: TObject); diff --git a/editor/studio/UnitfrmSplashscreen.pas b/editor/studio/UnitfrmSplashscreen.pas index f4bf4495..5bda9d89 100755 --- a/editor/studio/UnitfrmSplashscreen.pas +++ b/editor/studio/UnitfrmSplashscreen.pas @@ -153,7 +153,7 @@ begin OtherProjects.Close(0); ActivateProjects(0, False); // Started := True is already set here - PAWNProjects.Activate(PAWNProjects.Count -1, False, False); + PAWNProjects.Activate(PAWNProjects.Count -1, False, False); UpdateCI; LoadPlugins; end;