better names for these classes

This commit is contained in:
codeimp 2008-11-06 08:32:21 +00:00
parent 1dbdfd9c41
commit a266bd82d1
7 changed files with 48 additions and 48 deletions

View file

@ -80,17 +80,17 @@
<Compile Include="Controls\ArgumentBox.Designer.cs"> <Compile Include="Controls\ArgumentBox.Designer.cs">
<DependentUpon>ArgumentBox.cs</DependentUpon> <DependentUpon>ArgumentBox.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\BuilderScriptControl.cs"> <Compile Include="Controls\ScriptEditorControl.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
<Compile Include="Controls\BuilderScriptControl.Designer.cs"> <Compile Include="Controls\ScriptEditorControl.Designer.cs">
<DependentUpon>BuilderScriptControl.cs</DependentUpon> <DependentUpon>ScriptEditorControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Controls\ScriptDocumentTab.cs"> <Compile Include="Controls\ScriptDocumentTab.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="Controls\ScriptEditConstants.cs" /> <Compile Include="Controls\ScintillaConstants.cs" />
<Compile Include="Controls\ScriptEditControl.cs"> <Compile Include="Controls\ScintillaControl.cs">
<SubType>Component</SubType> <SubType>Component</SubType>
</Compile> </Compile>
<Compile Include="Controls\ScriptEditorPanel.cs"> <Compile Include="Controls\ScriptEditorPanel.cs">
@ -655,9 +655,9 @@
<None Include="Resources\ViewTextureFloor.png" /> <None Include="Resources\ViewTextureFloor.png" />
<None Include="Resources\ViewNormal.png" /> <None Include="Resources\ViewNormal.png" />
<None Include="Resources\KnownTextureSet.png" /> <None Include="Resources\KnownTextureSet.png" />
<EmbeddedResource Include="Controls\BuilderScriptControl.resx"> <EmbeddedResource Include="Controls\ScriptEditorControl.resx">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<DependentUpon>BuilderScriptControl.cs</DependentUpon> <DependentUpon>ScriptEditorControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="Resources\Hourglass3D.png" /> <EmbeddedResource Include="Resources\Hourglass3D.png" />
<None Include="Resources\Failed.png" /> <None Include="Resources\Failed.png" />

View file

@ -35,7 +35,7 @@ namespace CodeImp.DoomBuilder.Controls
// This is only a wrapper for the Scintilla editor control. Most of this code is // This is only a wrapper for the Scintilla editor control. Most of this code is
// from ScintillaNET project, I only refactored it a bit. See the BuilderScriptControl // from ScintillaNET project, I only refactored it a bit. See the BuilderScriptControl
// for the script editor with Doom Builder features. // for the script editor with Doom Builder features.
internal class ScriptEditControl : Control internal class ScintillaControl : Control
{ {
#region ================== API Declarations #region ================== API Declarations
@ -62,38 +62,38 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Delegates / Events #region ================== Delegates / Events
public delegate void StyleNeededHandler(ScriptEditControl pSender, int position); public delegate void StyleNeededHandler(ScintillaControl pSender, int position);
public delegate void CharAddedHandler(ScriptEditControl pSender, int ch); public delegate void CharAddedHandler(ScintillaControl pSender, int ch);
public delegate void SavePointReachedHandler(ScriptEditControl pSender); public delegate void SavePointReachedHandler(ScintillaControl pSender);
public delegate void SavePointLeftHandler(ScriptEditControl pSender); public delegate void SavePointLeftHandler(ScintillaControl pSender);
public delegate void ModifyAttemptROHandler(ScriptEditControl pSender); public delegate void ModifyAttemptROHandler(ScintillaControl pSender);
public delegate void KeyHandler(ScriptEditControl pSender, int ch, int modifiers); public delegate void KeyHandler(ScintillaControl pSender, int ch, int modifiers);
public delegate void DoubleClickHandler(ScriptEditControl pSender); public delegate void DoubleClickHandler(ScintillaControl pSender);
public delegate void UpdateUIHandler(ScriptEditControl pSender); public delegate void UpdateUIHandler(ScintillaControl pSender);
public delegate void ModifiedHandler(ScriptEditControl pSender, int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev); public delegate void ModifiedHandler(ScintillaControl pSender, int position, int modificationType, string text, int length, int linesAdded, int line, int foldLevelNow, int foldLevelPrev);
public delegate void MacroRecordHandler(ScriptEditControl pSender, int message, IntPtr wParam, IntPtr lParam); public delegate void MacroRecordHandler(ScintillaControl pSender, int message, IntPtr wParam, IntPtr lParam);
public delegate void MarginClickHandler(ScriptEditControl pSender, int modifiers, int position, int margin); public delegate void MarginClickHandler(ScintillaControl pSender, int modifiers, int position, int margin);
public delegate void NeedShownHandler(ScriptEditControl pSender, int position, int length); public delegate void NeedShownHandler(ScintillaControl pSender, int position, int length);
public delegate void PaintedHandler(ScriptEditControl pSender); public delegate void PaintedHandler(ScintillaControl pSender);
public delegate void UserListSelectionHandler(ScriptEditControl pSender, int listType, string text); public delegate void UserListSelectionHandler(ScintillaControl pSender, int listType, string text);
public delegate void URIDroppedHandler(ScriptEditControl pSender, string text); public delegate void URIDroppedHandler(ScintillaControl pSender, string text);
public delegate void DwellStartHandler(ScriptEditControl pSender, int position); public delegate void DwellStartHandler(ScintillaControl pSender, int position);
public delegate void DwellEndHandler(ScriptEditControl pSender, int position); public delegate void DwellEndHandler(ScintillaControl pSender, int position);
public delegate void ZoomHandler(ScriptEditControl pSender); public delegate void ZoomHandler(ScintillaControl pSender);
public delegate void HotSpotClickHandler(ScriptEditControl pSender, int modifiers, int position); public delegate void HotSpotClickHandler(ScintillaControl pSender, int modifiers, int position);
public delegate void HotSpotDoubleClickHandler(ScriptEditControl pSender, int modifiers, int position); public delegate void HotSpotDoubleClickHandler(ScintillaControl pSender, int modifiers, int position);
public delegate void CallTipClickHandler(ScriptEditControl pSender, int position); public delegate void CallTipClickHandler(ScintillaControl pSender, int position);
public delegate void TextInsertedHandler(ScriptEditControl pSender, int position, int length, int linesAdded); public delegate void TextInsertedHandler(ScintillaControl pSender, int position, int length, int linesAdded);
public delegate void TextDeletedHandler(ScriptEditControl pSender, int position, int length, int linesAdded); public delegate void TextDeletedHandler(ScintillaControl pSender, int position, int length, int linesAdded);
public delegate void StyleChangedHandler(ScriptEditControl pSender, int position, int length); public delegate void StyleChangedHandler(ScintillaControl pSender, int position, int length);
public delegate void FoldChangedHandler(ScriptEditControl pSender, int line, int foldLevelNow, int foldLevelPrev); public delegate void FoldChangedHandler(ScintillaControl pSender, int line, int foldLevelNow, int foldLevelPrev);
public delegate void UserPerformedHandler(ScriptEditControl pSender); public delegate void UserPerformedHandler(ScintillaControl pSender);
public delegate void UndoPerformedHandler(ScriptEditControl pSender); public delegate void UndoPerformedHandler(ScintillaControl pSender);
public delegate void RedoPerformedHandler(ScriptEditControl pSender); public delegate void RedoPerformedHandler(ScintillaControl pSender);
public delegate void LastStepInUndoRedoHandler(ScriptEditControl pSender); public delegate void LastStepInUndoRedoHandler(ScintillaControl pSender);
public delegate void MarkerChangedHandler(ScriptEditControl pSender, int line); public delegate void MarkerChangedHandler(ScintillaControl pSender, int line);
public delegate void BeforeInsertHandler(ScriptEditControl pSender, int position, int length); public delegate void BeforeInsertHandler(ScintillaControl pSender, int position, int length);
public delegate void BeforeDeleteHandler(ScriptEditControl pSender, int position, int length); public delegate void BeforeDeleteHandler(ScintillaControl pSender, int position, int length);
public event StyleNeededHandler StyleNeeded; public event StyleNeededHandler StyleNeeded;
public event CharAddedHandler CharAdded; public event CharAddedHandler CharAdded;
@ -2172,7 +2172,7 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Contructor / Disposer #region ================== Contructor / Disposer
// Constructor // Constructor
public ScriptEditControl() public ScintillaControl()
{ {
this.BackColor = SystemColors.Window; this.BackColor = SystemColors.Window;

View file

@ -47,7 +47,7 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Variables #region ================== Variables
protected BuilderScriptControl editor; protected ScriptEditorControl editor;
#endregion #endregion
@ -61,7 +61,7 @@ namespace CodeImp.DoomBuilder.Controls
public ScriptDocumentTab() public ScriptDocumentTab()
{ {
// Make the script control // Make the script control
editor = new BuilderScriptControl(); editor = new ScriptEditorControl();
editor.Location = new Point(EDITOR_BORDER_LEFT, EDITOR_BORDER_TOP); editor.Location = new Point(EDITOR_BORDER_LEFT, EDITOR_BORDER_TOP);
editor.Size = new Size(this.ClientSize.Width - EDITOR_BORDER_LEFT - EDITOR_BORDER_RIGHT, editor.Size = new Size(this.ClientSize.Width - EDITOR_BORDER_LEFT - EDITOR_BORDER_RIGHT,
this.ClientSize.Height - EDITOR_BORDER_TOP - EDITOR_BORDER_BOTTOM); this.ClientSize.Height - EDITOR_BORDER_TOP - EDITOR_BORDER_BOTTOM);

View file

@ -1,6 +1,6 @@
namespace CodeImp.DoomBuilder.Controls namespace CodeImp.DoomBuilder.Controls
{ {
partial class BuilderScriptControl partial class ScriptEditorControl
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@ -29,7 +29,7 @@ namespace CodeImp.DoomBuilder.Controls
private void InitializeComponent() private void InitializeComponent()
{ {
this.functionbar = new System.Windows.Forms.ComboBox(); this.functionbar = new System.Windows.Forms.ComboBox();
this.scriptedit = new CodeImp.DoomBuilder.Controls.ScriptEditControl(); this.scriptedit = new CodeImp.DoomBuilder.Controls.ScintillaControl();
this.scriptpanel = new System.Windows.Forms.Panel(); this.scriptpanel = new System.Windows.Forms.Panel();
this.scriptpanel.SuspendLayout(); this.scriptpanel.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
@ -156,7 +156,7 @@ namespace CodeImp.DoomBuilder.Controls
#endregion #endregion
private ScriptEditControl scriptedit; private ScintillaControl scriptedit;
private System.Windows.Forms.ComboBox functionbar; private System.Windows.Forms.ComboBox functionbar;
private System.Windows.Forms.Panel scriptpanel; private System.Windows.Forms.Panel scriptpanel;
} }

View file

@ -36,7 +36,7 @@ using CodeImp.DoomBuilder.Rendering;
namespace CodeImp.DoomBuilder.Controls namespace CodeImp.DoomBuilder.Controls
{ {
internal partial class BuilderScriptControl : UserControl internal partial class ScriptEditorControl : UserControl
{ {
#region ================== Constants #region ================== Constants
@ -75,7 +75,7 @@ namespace CodeImp.DoomBuilder.Controls
#region ================== Contructor / Disposer #region ================== Contructor / Disposer
// Constructor // Constructor
public BuilderScriptControl() public ScriptEditorControl()
{ {
// Initialize // Initialize
InitializeComponent(); InitializeComponent();