Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Component update (whoa I hate delphi reinstallations)

Browse Source 
Added another feature for the Code-Explorer
This commit is contained in:
Christian Hammacher 2006-03-06 19:47:22 +00:00
parent eb7a49f6d4
commit f2b8b82515
21 changed files with 70 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/studio/AMXX_Studio.dof
View File

@ -115,7 +115,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=4
Release=0
Build=16
Build=17
Debug=0
PreRelease=0
Special=0
@ -126,7 +126,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=AMX Mod X Dev Team
FileDescription=
FileVersion=1.4.0.16
FileVersion=1.4.0.17
InternalName=gaben
LegalCopyright=AMX Mod X Dev Team
LegalTrademarks=
@ -134,9 +134,3 @@ OriginalFilename=
ProductName=AMXX-Studio
ProductVersion=1.4.0.0
Comments=
[HistoryLists\hlConditionals]
Count=1
Item0=madExcept
[HistoryLists\hlUnitAliases]
Count=1
Item0=WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;

BIN
editor/studio/AMXX_Studio.exe
View File

Binary file not shown.

BIN
editor/studio/AMXX_Studio.res
View File

Binary file not shown.

5
editor/studio/SciSearchReplace.pas
View File

@ -280,8 +280,11 @@ end;
procedure TSciSearchReplace.ShowSearchReplaceDialog(AReplace: boolean);
var
dlg: TTextSearchDialog;
dlg: TForm;
SelectedText : string;
SearchFromCursor: Boolean;
SearchInSelectionOnly: Boolean;
SearchRegularExpression: Boolean;
begin
if not Assigned(FEditor) then Exit;
if AReplace then

8
editor/studio/UnitCodeExplorerUpdater.pas
View File

@ -152,16 +152,10 @@ var exConstants, exDefined, exIncluded, exMethods, exDefault, exEvents,
eStr: TStringList;
eScrollPosX, eScrollPosY: Integer;
eTempNode: TTreeNode;
eSelected: Integer;
begin
if Application.Terminated then exit;
if (frmMain.trvExplorer.Items.Count = 0) or (eActive <> ActiveDoc.Index) then exit;
if Assigned(frmMain.trvExplorer.Selected) then
eSelected := frmMain.trvExplorer.Selected.AbsoluteIndex
else
eSelected := -1;
frmMain.trvExplorer.Items.BeginUpdate;
try
eScrollPosX := GetScrollPos(frmMain.trvExplorer.Handle, SB_HORZ);
@ -324,8 +318,6 @@ begin
SetScrollPos(frmMain.trvExplorer.Handle, SB_HORZ, eScrollPosX, False);
SetScrollPos(frmMain.trvExplorer.Handle, SB_VERT, eScrollPosY, False);
if eSelected <> -1 then
frmMain.trvExplorer.Items[eSelected].Selected := True;
except
// well, yes.
end;

4
editor/studio/UnitMainTools.pas
View File

@ -641,7 +641,7 @@ begin
if eConfig.ReadString('Editor', 'AutoDisable', '1500') <> '-1' then
frmSettings.txtAUDisable.Text := eConfig.ReadString('Editor', 'AutoDisable', '1500');
if foldFold in frmMain.sciEditor.Folding then begin
case frmMain.sciEditor.FoldMarkerType of
case frmMain.sciEditor.FoldMarkers.MarkerType of
sciMarkArrows: frmSettings.cboCodeFolding.ItemIndex := 0;
sciMarkBox: frmSettings.cboCodeFolding.ItemIndex := 1;
sciMarkCircle: frmSettings.cboCodeFolding.ItemIndex := 2;
@ -1017,6 +1017,8 @@ begin
frmMain.sciEditor.Colors.SelBack := clHighlight;
end;
frmMain.mnuRestoreBackup.Enabled := (FileExists(Document.FileName + '.bak')) and (not Document.Untitled);
frmMain.trvExplorer.Selected := nil;
Screen.Cursor := crDefault;
Plugin_DocChange(Document.Index, Document.FileName, Document.Highlighter, RestoreCaret, False);
end;

2
editor/studio/UnitfrmAllFilesForm.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXListBox,
mbTBXCheckListBox;
mbTBXCheckListBox, SpTBXControls;
type
TfrmAllFilesForm = class(TForm)

BIN
editor/studio/UnitfrmConnGen.dfm
View File

Binary file not shown.

2
editor/studio/UnitfrmConnGen.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, SpTBXEditors, TntStdCtrls, TBXDkPanels,
SpTBXDkPanels;
SpTBXDkPanels, SpTBXControls;
type
TfrmConnGen = class(TForm)

2
editor/studio/UnitfrmGoToLine.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, mbTBXEdit, mbTBXValidateEdit, TBXDkPanels,
SpTBXDkPanels, SpTBXEditors;
SpTBXDkPanels, SpTBXEditors, SpTBXControls;
type
TfrmGoToLine = class(TForm)

2
editor/studio/UnitfrmHTMLPreview.pas
View File

@ -4,7 +4,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, OleCtrls, SHDocVw, ActiveX;
StdCtrls, ExtCtrls, Forms, OleCtrls, SHDocVw_TLB, ActiveX;
type
TfrmHTMLPreview = class(TForm)

3
editor/studio/UnitfrmIRCPaster.pas
View File

@ -4,7 +4,8 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, SpTBXEditors;
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, SpTBXEditors,
SpTBXControls;
type
TfrmIRCPaster = class(TForm)

2
editor/studio/UnitfrmInfo.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, JvExControls,
JvComponent, JvScrollText, ShellAPI, IdHTTP, jpeg, Dialogs;
JvComponent, JvScrollText, ShellAPI, IdHTTP, jpeg, Dialogs, SpTBXControls;
type
TfrmInfo = class(TForm)

3
editor/studio/UnitfrmMOTDGen.pas
View File

@ -4,7 +4,8 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls, ClipBrd,
StdCtrls, ExtCtrls, Forms, mxFlatControls, TBXDkPanels, SpTBXDkPanels;
StdCtrls, ExtCtrls, Forms, mxFlatControls, TBXDkPanels, SpTBXDkPanels,
SpTBXControls;
type
TfrmMOTDGen = class(TForm)

32
editor/studio/UnitfrmMain.dfm
View File

@ -695,12 +695,14 @@ object frmMain: TfrmMain
Height = 501
Align = alClient
ActiveTabIndex = 0
TabAutofitMaxSize = 100
ThemeType = tttTBX
OnActiveTabChange = tsDocumentsActiveTabChange
HiddenItems = <>
object tiDocument1: TSpTBXTabItem
Checked = True
OnSelect = OnTabSelect
CustomWidth = 100
ThemeType = tttTBX
CaptionW = '< 1 Untitled.sma >'
end
@ -809,13 +811,16 @@ object frmMain: TfrmMain
Colors.WhiteSpaceBack = clDefault
Bookmark.BackColor = clGray
Bookmark.ForeColor = clWhite
Bookmark.MarkerType = 0
Bookmark.MarkerType = sciMFullRect
Gutter0.Width = 0
Gutter0.MarginType = gutLineNumber
Gutter0.Sensitive = False
Gutter1.Width = 40
Gutter1.MarginType = gutLineNumber
Gutter1.Sensitive = False
Gutter2.Width = 14
Gutter2.MarginType = gutSymbol
Gutter2.Sensitive = True
WordWrapVisualFlags = []
WordWrapVisualFlagsLocation = []
LayoutCache = sciCacheCaret
@ -827,7 +832,28 @@ object frmMain: TfrmMain
WordChars = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
ControlCharSymbol = #0
Folding = [foldFold, foldCompact, foldComment, foldPreprocessor, foldCommentPython, foldAtElse, foldHTML, foldHTMLPreProcessor]
FoldMarkerType = sciMarkBox
FoldMarkers.MarkerType = sciMarkBox
FoldMarkers.FoldOpen.BackColor = clDefault
FoldMarkers.FoldOpen.ForeColor = clDefault
FoldMarkers.FoldOpen.MarkerType = sciMBoxMinus
FoldMarkers.FoldClosed.BackColor = clDefault
FoldMarkers.FoldClosed.ForeColor = clDefault
FoldMarkers.FoldClosed.MarkerType = sciMBoxPlus
FoldMarkers.FoldSub.BackColor = clDefault
FoldMarkers.FoldSub.ForeColor = clDefault
FoldMarkers.FoldSub.MarkerType = sciMVLine
FoldMarkers.FoldTail.BackColor = clDefault
FoldMarkers.FoldTail.ForeColor = clDefault
FoldMarkers.FoldTail.MarkerType = sciMLCorner
FoldMarkers.FoldEnd.BackColor = clDefault
FoldMarkers.FoldEnd.ForeColor = clDefault
FoldMarkers.FoldEnd.MarkerType = sciMBoxPlusConnected
FoldMarkers.FoldOpenMid.BackColor = clDefault
FoldMarkers.FoldOpenMid.ForeColor = clDefault
FoldMarkers.FoldOpenMid.MarkerType = sciMBoxMinusConnected
FoldMarkers.FoldMidTail.BackColor = clDefault
FoldMarkers.FoldMidTail.ForeColor = clDefault
FoldMarkers.FoldMidTail.MarkerType = sciMTCorner
LanguageManager.LanguageList = <
item
Name = 'null'
@ -6428,6 +6454,8 @@ object frmMain: TfrmMain
ParametersSeparators = ','
ParametersStart = '('
WordCharacters = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
TabSize = 0
UseStyle = False
OnBeforeShow = sciCallTipsBeforeShow
Left = 842
Top = 36

22
editor/studio/UnitfrmMain.pas
View File

@ -20,7 +20,7 @@ uses
ShellAPI, IdFTPCommon, IdAntiFreezeBase, IdAntiFreeze, JvComponent,
JvInspector, JvExControls, JvPluginManager, JvgLanguageLoader,
JvWndProcHook, CommCtrl, JvPageList, JvPageListTreeView,
SciSearchReplaceBase;
SciSearchReplaceBase, SpTBXControls;
type
TfrmMain = class(TForm)
@ -536,10 +536,10 @@ begin
sciEditor.WordWrap := sciNoWrap;
case frmSettings.cboCodeFolding.ItemIndex of
0: sciEditor.FoldMarkerType := sciMarkArrows;
1: sciEditor.FoldMarkerType := sciMarkBox;
2: sciEditor.FoldMarkerType := sciMarkCircle;
3: sciEditor.FoldMarkerType := sciMarkPlusMinus;
0: sciEditor.FoldMarkers.MarkerType := sciMarkArrows;
1: sciEditor.FoldMarkers.MarkerType := sciMarkBox;
2: sciEditor.FoldMarkers.MarkerType := sciMarkCircle;
3: sciEditor.FoldMarkers.MarkerType := sciMarkPlusMinus;
end;
if frmSettings.cboCodeFolding.ItemIndex = 4 then
sciEditor.Folding := sciEditor.Folding - [foldFold]
@ -1651,9 +1651,17 @@ begin
end;
procedure TfrmMain.trvExplorerDblClick(Sender: TObject);
var eFile, eTemp: String;
begin
if Assigned(trvExplorer.Selected) then begin
if (trvExplorer.Selected.ImageIndex <> 42) and (trvExplorer.Selected.ImageIndex <> 43) then begin
if (Assigned(trvExplorer.Selected.Parent)) and (trvExplorer.Selected.Parent.Text = 'Included') then begin
eFile := UpdateIncPath(trvExplorer.Selected.Text);
eTemp := odOpen.FileName;
odOpen.FileName := eFile;
mnuOpenClick(nil);
odOpen.FileName := eTemp;
end
else if (trvExplorer.Selected.ImageIndex <> 42) and (trvExplorer.Selected.ImageIndex <> 43) then begin
sciEditor.GotoLineEnsureVisible(Integer(trvExplorer.Selected.Data));
sciEditor.SetFocus;
UpdateCI(frmMain.sciEditor.GetCurrentLineNumber);
@ -2440,8 +2448,10 @@ begin
SCM_RELOADINI: ReloadIni;
SCM_SELECTLANGUAGE: SelectLanguage(eData);
SCM_LOADFILE: begin
eTemp := odOpen.FileName;
odOpen.FileName := eData;
mnuOpenClick(nil);
odOpen.FileName := eTemp;
end;
SCM_CURRPROJECTS: Msg.Result := tsMain.ActiveTabIndex;
SCM_COMPILE: mnuDoCompile.Click;

3
editor/studio/UnitfrmMenuGenerator.pas
View File

@ -7,7 +7,8 @@ uses
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, JvExControls,
JvComponent, JvPageList, TFlatRadioButtonUnit, TFlatMemoUnit,
TFlatEditUnit, TB2Dock, TB2Toolbar, TBX, SpTBXItem, ImgList, TB2Item,
Dialogs, TFlatComboBoxUnit, ComCtrls, ClipBrd, TFlatCheckBoxUnit;
Dialogs, TFlatComboBoxUnit, ComCtrls, ClipBrd, TFlatCheckBoxUnit,
SpTBXControls;
type
TfrmMenuGenerator = class(TForm)

2
editor/studio/UnitfrmParamEdit.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXMemo,
SpTBXEditors;
SpTBXEditors, SpTBXControls;
type
TfrmParamEdit = class(TForm)

2
editor/studio/UnitfrmPluginsIniEditor.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TBXDkPanels, SpTBXDkPanels, mbTBXMemo, Dialogs,
IdFTPCommon;
IdFTPCommon, SpTBXControls;
type
TfrmPluginsIniEditor = class(TForm)

2
editor/studio/UnitfrmReplace.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TntStdCtrls, SpTBXEditors, SpTBXDkPanels,
TBXDkPanels;
TBXDkPanels, SpTBXControls;
type
TfrmReplace = class(TForm)

2
editor/studio/UnitfrmSearch.pas
View File

@ -5,7 +5,7 @@ interface
uses
SysUtils, Windows, Messages, Classes, Graphics, Controls,
StdCtrls, ExtCtrls, Forms, TntStdCtrls, SpTBXEditors, SpTBXDkPanels,
TBXDkPanels, Dialogs;
TBXDkPanels, Dialogs, SpTBXControls;
type
TfrmSearch = class(TForm)