diff --git a/source/Docking/DockContent.cs b/source/Docking/DockContent.cs
index 20b8702..29f8c1f 100644
--- a/source/Docking/DockContent.cs
+++ b/source/Docking/DockContent.cs
@@ -185,7 +185,7 @@ namespace LSLEditor.Docking
[LocalizedCategory("Category_Docking")]
[LocalizedDescription("DockContent_TabPageContextMenu_Description")]
[DefaultValue(null)]
- public ContextMenu TabPageContextMenu
+ public ContextMenuStrip TabPageContextMenu
{
get { return DockHandler.TabPageContextMenu; }
set { DockHandler.TabPageContextMenu = value; }
diff --git a/source/Docking/DockContent.resx b/source/Docking/DockContent.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/source/Docking/DockContent.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/source/Docking/DockContentHandler.cs b/source/Docking/DockContentHandler.cs
index 5e79579..aded7a5 100644
--- a/source/Docking/DockContentHandler.cs
+++ b/source/Docking/DockContentHandler.cs
@@ -608,8 +608,8 @@ namespace LSLEditor.Docking
return DockHelper.IsDockStateValid(dockState, DockAreas);
}
- private ContextMenu m_tabPageContextMenu = null;
- public ContextMenu TabPageContextMenu
+ private ContextMenuStrip m_tabPageContextMenu = null;
+ public ContextMenuStrip TabPageContextMenu
{
get { return m_tabPageContextMenu; }
set { m_tabPageContextMenu = value; }
diff --git a/source/Docking/DockPane.SplitterControl.resx b/source/Docking/DockPane.SplitterControl.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/source/Docking/DockPane.SplitterControl.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/source/Docking/DockPane.cs b/source/Docking/DockPane.cs
index ecb70dd..ea033ed 100644
--- a/source/Docking/DockPane.cs
+++ b/source/Docking/DockPane.cs
@@ -261,7 +261,7 @@ namespace LSLEditor.Docking
return;
}
- ContextMenu contextMenu = menu as ContextMenu;
+ ContextMenuStrip contextMenu = menu as ContextMenuStrip;
if (contextMenu != null)
contextMenu.Show(this, position);
}
diff --git a/source/Docking/DockPane.resx b/source/Docking/DockPane.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/source/Docking/DockPane.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/source/Docking/DockPanel.AutoHideWindow.cs b/source/Docking/DockPanel.AutoHideWindow.cs
index 99b950e..a019454 100644
--- a/source/Docking/DockPanel.AutoHideWindow.cs
+++ b/source/Docking/DockPanel.AutoHideWindow.cs
@@ -2,6 +2,7 @@ using System;
using System.Windows.Forms;
using System.Drawing;
using System.Runtime.InteropServices;
+using Timer = System.Windows.Forms.Timer;
namespace LSLEditor.Docking
{
diff --git a/source/Form1.cs b/source/Form1.cs
index acba0e4..3c75ad4 100644
--- a/source/Form1.cs
+++ b/source/Form1.cs
@@ -37,61 +37,61 @@ namespace LSLEditor
private System.Windows.Forms.SaveFileDialog saveFileDialog1;
private System.Windows.Forms.Panel panel1;
private System.ComponentModel.IContainer components = null;
- private Compiler compiler;
+ private System.CodeDom.Compiler.CodeCompiler compiler;
private bool FullDebug;
private System.Windows.Forms.TabControl tabControl1;
- private System.Windows.Forms.ContextMenu contextMenu1;
+ private System.Windows.Forms.ContextMenuStrip contextMenu1;
- private System.Windows.Forms.MainMenu mainMenu1;
- private System.Windows.Forms.MenuItem menuItem1;
- private System.Windows.Forms.MenuItem menuItem2;
- private System.Windows.Forms.MenuItem menuItem3;
- private System.Windows.Forms.MenuItem menuItem4;
- private System.Windows.Forms.MenuItem menuItem5;
- private System.Windows.Forms.MenuItem menuItem6;
- private System.Windows.Forms.MenuItem menuItem7;
- private System.Windows.Forms.MenuItem menuItem8;
- private System.Windows.Forms.MenuItem menuItem9;
- private System.Windows.Forms.MenuItem menuItem10;
- private System.Windows.Forms.MenuItem menuItem11;
- private System.Windows.Forms.MenuItem menuItem12;
- private System.Windows.Forms.MenuItem menuItem13;
- private System.Windows.Forms.MenuItem menuItem14;
- private System.Windows.Forms.MenuItem menuItem15;
- private System.Windows.Forms.MenuItem menuItem16;
- private System.Windows.Forms.MenuItem menuItem17;
- private System.Windows.Forms.MenuItem menuItem18;
- private System.Windows.Forms.MenuItem menuItem19;
- private System.Windows.Forms.MenuItem menuItem20;
- private System.Windows.Forms.MenuItem menuItem21;
- private System.Windows.Forms.MenuItem menuItem22;
- private System.Windows.Forms.MenuItem menuItem23;
- private System.Windows.Forms.MenuItem menuItem24;
- private System.Windows.Forms.MenuItem menuItem25;
- private System.Windows.Forms.MenuItem menuItem26;
- private System.Windows.Forms.MenuItem menuItem27;
- private System.Windows.Forms.MenuItem menuItem28;
- private System.Windows.Forms.MenuItem menuItem29;
- private System.Windows.Forms.MenuItem menuItem30;
- private System.Windows.Forms.MenuItem menuItem31;
- private System.Windows.Forms.MenuItem menuItem32;
+ private System.Windows.Forms.MenuStrip mainMenu1;
+ private System.Windows.Forms.ToolStripMenuItem menuItem1;
+ private System.Windows.Forms.ToolStripMenuItem menuItem2;
+ private System.Windows.Forms.ToolStripMenuItem menuItem3;
+ private System.Windows.Forms.ToolStripMenuItem menuItem4;
+ private System.Windows.Forms.ToolStripMenuItem menuItem5;
+ private System.Windows.Forms.ToolStripMenuItem menuItem6;
+ private System.Windows.Forms.ToolStripMenuItem menuItem7;
+ private System.Windows.Forms.ToolStripMenuItem menuItem8;
+ private System.Windows.Forms.ToolStripMenuItem menuItem9;
+ private System.Windows.Forms.ToolStripMenuItem menuItem10;
+ private System.Windows.Forms.ToolStripMenuItem menuItem11;
+ private System.Windows.Forms.ToolStripMenuItem menuItem12;
+ private System.Windows.Forms.ToolStripMenuItem menuItem13;
+ private System.Windows.Forms.ToolStripMenuItem menuItem14;
+ private System.Windows.Forms.ToolStripMenuItem menuItem15;
+ private System.Windows.Forms.ToolStripMenuItem menuItem16;
+ private System.Windows.Forms.ToolStripMenuItem menuItem17;
+ private System.Windows.Forms.ToolStripMenuItem menuItem18;
+ private System.Windows.Forms.ToolStripMenuItem menuItem19;
+ private System.Windows.Forms.ToolStripMenuItem menuItem20;
+ private System.Windows.Forms.ToolStripMenuItem menuItem21;
+ private System.Windows.Forms.ToolStripMenuItem menuItem22;
+ private System.Windows.Forms.ToolStripMenuItem menuItem23;
+ private System.Windows.Forms.ToolStripMenuItem menuItem24;
+ private System.Windows.Forms.ToolStripMenuItem menuItem25;
+ private System.Windows.Forms.ToolStripMenuItem menuItem26;
+ private System.Windows.Forms.ToolStripMenuItem menuItem27;
+ private System.Windows.Forms.ToolStripMenuItem menuItem28;
+ private System.Windows.Forms.ToolStripMenuItem menuItem29;
+ private System.Windows.Forms.ToolStripMenuItem menuItem30;
+ private System.Windows.Forms.ToolStripMenuItem menuItem31;
+ private System.Windows.Forms.ToolStripMenuItem menuItem32;
private System.Windows.Forms.PageSetupDialog pageSetupDialog1;
private System.Windows.Forms.PrintDialog printDialog1;
- private System.Windows.Forms.MenuItem menuItem34;
- private System.Windows.Forms.MenuItem menuItem35;
- private System.Windows.Forms.MenuItem menuItem36;
+ private System.Windows.Forms.ToolStripMenuItem menuItem34;
+ private System.Windows.Forms.ToolStripMenuItem menuItem35;
+ private System.Windows.Forms.ToolStripMenuItem menuItem36;
private TabPage tabPage1;
private NumberedTextBox.NumberedTextBoxUC numberedTextBoxUC1;
- private MenuItem menuItem37;
- private MenuItem menuItem38;
- private MenuItem menuItem39;
- private MenuItem menuItem41;
- private MenuItem menuItem40;
- private MenuItem menuItem42;
- private MenuItem menuItemUploadScript;
+ private ToolStripMenuItem menuItem37;
+ private ToolStripMenuItem menuItem38;
+ private ToolStripMenuItem menuItem39;
+ private ToolStripMenuItem menuItem41;
+ private ToolStripMenuItem menuItem40;
+ private ToolStripMenuItem menuItem42;
+ private ToolStripMenuItem menuItemUploadScript;
private StatusStrip statusStrip1;
private ToolStripStatusLabel toolStripStatusLabel1;
- private System.Windows.Forms.MenuItem menuItem33;
+ private System.Windows.Forms.ToolStripMenuItem menuItem33;
public Form1(string[] args)
{
@@ -687,7 +687,7 @@ namespace LSLEditor
private void StartCompiler()
{
- compiler = new Compiler(this.FullDebug, "ConfLSL.xml", this.numberedTextBoxUC1.TextBox.Text);
+ compiler = new System.CodeDom.Compiler.CodeCompiler(this.FullDebug, "ConfLSL.xml", this.numberedTextBoxUC1.TextBox.Text);
if (compiler.CompilerErrors != null)
{
MessageBox.Show(compiler.CompilerErrors, "compiler errors");
diff --git a/source/Properties/Settings.Designer.cs b/source/Properties/Settings.Designer.cs
index e03f273..0244a28 100644
--- a/source/Properties/Settings.Designer.cs
+++ b/source/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-namespace lsleditor.Properties {
+namespace LSLEditor.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
diff --git a/source/lsleditor.csproj b/source/lsleditor.csproj
index ba66931..48bc43f 100644
--- a/source/lsleditor.csproj
+++ b/source/lsleditor.csproj
@@ -10,11 +10,7 @@
-
-
-
-
-
+
diff --git a/source/packages.config b/source/packages.config
deleted file mode 100644
index 0aa888f..0000000
--- a/source/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file