diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index f0663cb6..65c4e8bc 100755 --- a/editor/studio/AMXX_Studio.dof +++ b/editor/studio/AMXX_Studio.dof @@ -114,8 +114,8 @@ IncludeVerInfo=1 AutoIncBuild=1 MajorVer=1 MinorVer=4 -Release=1 -Build=2 +Release=2 +Build=1 Debug=0 PreRelease=0 Special=0 @@ -126,13 +126,13 @@ CodePage=1252 [Version Info Keys] CompanyName=AMX Mod X Dev Team FileDescription= -FileVersion=1.4.1.2 +FileVersion=1.4.2.1 InternalName=gaben LegalCopyright=AMX Mod X Dev Team LegalTrademarks= OriginalFilename= ProductName=AMXX-Studio -ProductVersion=1.4.1.0 +ProductVersion=1.4.3.0 Comments= [HistoryLists\hlConditionals] Count=1 diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index ca2f3a42..97ee8fcc 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 ce914bfb..1ea8035b 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 b0627008..a84a2c5b 100755 --- a/editor/studio/UnitMainTools.pas +++ b/editor/studio/UnitMainTools.pas @@ -562,6 +562,7 @@ begin if not Plugin_ProjectsChange(CurrProjects, Index, True) then begin Started := False; frmMain.stlIDEs.ItemIndex := CurrProjects; + frmMain.cboCurrentIDE.Text := frmMain.stlIDEs.Strings[CurrProjects]; Started := True; exit; end; @@ -580,6 +581,7 @@ begin Started := False; // dont run this command twice frmMain.stlIDEs.ItemIndex := Index; + cboCurrentIDE.Text := stlIDEs.Strings[Index]; CurrProjects := Index; tbDocs.Tabs.Clear; diff --git a/editor/studio/UnitfrmInfo.dfm b/editor/studio/UnitfrmInfo.dfm index c0c5d66b..d2d789b9 100755 Binary files a/editor/studio/UnitfrmInfo.dfm and b/editor/studio/UnitfrmInfo.dfm differ diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm index e2048e10..90799e38 100755 --- a/editor/studio/UnitfrmMain.dfm +++ b/editor/studio/UnitfrmMain.dfm @@ -4547,7 +4547,7 @@ object frmMain: TfrmMain object TBXSwitcher: TTBXSwitcher Theme = 'OfficeXP' Left = 813 - Top = 5 + Top = 7 end object ilImages: TImageList Left = 722 @@ -6470,6 +6470,7 @@ object frmMain: TfrmMain Top = 36 end object sciPrinter: TSciPrinter + Editor = sciEditor Title = 'DelphiSci' HeaderFont.Charset = DEFAULT_CHARSET HeaderFont.Color = clBlack @@ -6552,6 +6553,7 @@ object frmMain: TfrmMain end object sciSearchReplace: TSciSearchReplace SearchForSelWord = False + Editor = sciEditor Left = 692 Top = 36 end @@ -7777,7 +7779,7 @@ object frmMain: TfrmMain 'XS_AMX' 'XS_AMXX' 'xvar_exists - BLA blubb XD') - IgnoreCase = False + IgnoreCase = True ChooseSingle = False AutoHide = True DropRestOfWord = False @@ -7788,8 +7790,8 @@ object frmMain: TfrmMain OnBeforeShow = sciAutoCompleteBeforeShow MaxWidth = 0 MaxHeight = 5 - Left = 844 - Top = 6 + Left = 842 + Top = 8 end object ppmDocuments: TSpTBXPopupMenu Images = ilImages diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index 5dc4e8a6..e6dd388f 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -2967,7 +2967,8 @@ end; procedure TfrmMain.FormCreate(Sender: TObject); begin stlIDEs.ItemIndex := 0; - + cboCurrentIDE.Text := stlIDEs.Strings[0]; + sciEditor.StreamClass := TSciMyStream; sciEditor.OnCallTipClick := sciEditorCallTipClick; // god why doesn't delphi save this eACList := TmxJsCollection.Create(TACFunction); @@ -2979,6 +2980,7 @@ procedure TfrmMain.stlIDEsClick(Sender: TObject); begin if (stlIDEs.Strings[stlIDEs.ItemIndex] = 'C++') and (not eCPP) then begin stlIDEs.ItemIndex := CurrProjects; + cboCurrentIDE.Text := stlIDEs.Strings[CurrProjects]; MessageBox(Handle, 'C++ IDE is currenty not implemented!', 'Error', MB_ICONERROR); exit; end;