diff --git a/Resources/Icons/NewScript.png b/Resources/Icons/NewScript.png new file mode 100644 index 00000000..9e6fe958 Binary files /dev/null and b/Resources/Icons/NewScript.png differ diff --git a/Resources/Icons/OpenScript.png b/Resources/Icons/OpenScript.png new file mode 100644 index 00000000..210ff23b Binary files /dev/null and b/Resources/Icons/OpenScript.png differ diff --git a/Resources/Icons/SaveAll.png b/Resources/Icons/SaveAll.png new file mode 100644 index 00000000..845a49c2 Binary files /dev/null and b/Resources/Icons/SaveAll.png differ diff --git a/Resources/Icons/SaveScript.png b/Resources/Icons/SaveScript.png new file mode 100644 index 00000000..e5ac50d1 Binary files /dev/null and b/Resources/Icons/SaveScript.png differ diff --git a/Resources/Icons/Script.png b/Resources/Icons/Script.png new file mode 100644 index 00000000..022a785e Binary files /dev/null and b/Resources/Icons/Script.png differ diff --git a/Resources/Icons/Script2.png b/Resources/Icons/Script2.png new file mode 100644 index 00000000..80f929b9 Binary files /dev/null and b/Resources/Icons/Script2.png differ diff --git a/Resources/Icons/ScriptCompile.png b/Resources/Icons/ScriptCompile.png new file mode 100644 index 00000000..8e5d4d6d Binary files /dev/null and b/Resources/Icons/ScriptCompile.png differ diff --git a/Resources/Icons/ScriptPalette.png b/Resources/Icons/ScriptPalette.png new file mode 100644 index 00000000..20f9d693 Binary files /dev/null and b/Resources/Icons/ScriptPalette.png differ diff --git a/Source/Builder.csproj b/Source/Builder.csproj index c1fa9f8a..24e60021 100644 --- a/Source/Builder.csproj +++ b/Source/Builder.csproj @@ -645,6 +645,12 @@ + + + + + + Designer ScriptEditorPanel.cs diff --git a/Source/Controls/ScriptEditorPanel.Designer.cs b/Source/Controls/ScriptEditorPanel.Designer.cs index eccb489c..009d66ac 100644 --- a/Source/Controls/ScriptEditorPanel.Designer.cs +++ b/Source/Controls/ScriptEditorPanel.Designer.cs @@ -30,10 +30,22 @@ namespace CodeImp.DoomBuilder.Controls { this.tabs = new System.Windows.Forms.TabControl(); this.toolbar = new System.Windows.Forms.ToolStrip(); - this.buttonnew = new System.Windows.Forms.ToolStripDropDownButton(); - this.buttonopen = new System.Windows.Forms.ToolStripButton(); this.openfile = new System.Windows.Forms.OpenFileDialog(); this.savefile = new System.Windows.Forms.SaveFileDialog(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.buttonnew = new System.Windows.Forms.ToolStripDropDownButton(); + this.buttonopen = new System.Windows.Forms.ToolStripButton(); + this.buttonsave = new System.Windows.Forms.ToolStripButton(); + this.buttonsaveall = new System.Windows.Forms.ToolStripButton(); + this.buttonscriptconfig = new System.Windows.Forms.ToolStripButton(); + this.buttoncompile = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.buttonundo = new System.Windows.Forms.ToolStripButton(); + this.buttonredo = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.buttoncut = new System.Windows.Forms.ToolStripButton(); + this.buttoncopy = new System.Windows.Forms.ToolStripButton(); + this.buttonpaste = new System.Windows.Forms.ToolStripButton(); this.toolbar.SuspendLayout(); this.SuspendLayout(); // @@ -53,36 +65,27 @@ namespace CodeImp.DoomBuilder.Controls // toolbar // this.toolbar.AllowMerge = false; + this.toolbar.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; this.toolbar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.buttonnew, - this.buttonopen}); + this.buttonopen, + this.buttonsave, + this.buttonsaveall, + this.toolStripSeparator1, + this.buttonundo, + this.buttonredo, + this.toolStripSeparator2, + this.buttoncut, + this.buttoncopy, + this.buttonpaste, + this.toolStripSeparator3, + this.buttonscriptconfig, + this.buttoncompile}); this.toolbar.Location = new System.Drawing.Point(0, 0); this.toolbar.Name = "toolbar"; this.toolbar.Size = new System.Drawing.Size(697, 25); this.toolbar.TabIndex = 1; // - // buttonnew - // - this.buttonnew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonnew.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; - this.buttonnew.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttonnew.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonnew.Name = "buttonnew"; - this.buttonnew.Size = new System.Drawing.Size(29, 22); - this.buttonnew.Text = "New File"; - // - // buttonopen - // - this.buttonopen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.buttonopen.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenMap; - this.buttonopen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; - this.buttonopen.ImageTransparentColor = System.Drawing.Color.Magenta; - this.buttonopen.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2); - this.buttonopen.Name = "buttonopen"; - this.buttonopen.Size = new System.Drawing.Size(23, 22); - this.buttonopen.Text = "Open File"; - this.buttonopen.Click += new System.EventHandler(this.buttonopen_Click); - // // openfile // this.openfile.Title = "Open Script"; @@ -91,6 +94,131 @@ namespace CodeImp.DoomBuilder.Controls // this.savefile.Title = "Save Script As"; // + // toolStripSeparator1 + // + this.toolStripSeparator1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // buttonnew + // + this.buttonnew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonnew.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewScript; + this.buttonnew.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttonnew.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonnew.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2); + this.buttonnew.Name = "buttonnew"; + this.buttonnew.Size = new System.Drawing.Size(29, 22); + this.buttonnew.Text = "New File"; + // + // buttonopen + // + this.buttonopen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonopen.Image = global::CodeImp.DoomBuilder.Properties.Resources.OpenScript; + this.buttonopen.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.buttonopen.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonopen.Margin = new System.Windows.Forms.Padding(3, 1, 0, 2); + this.buttonopen.Name = "buttonopen"; + this.buttonopen.Size = new System.Drawing.Size(23, 22); + this.buttonopen.Text = "Open File"; + this.buttonopen.Click += new System.EventHandler(this.buttonopen_Click); + // + // buttonsave + // + this.buttonsave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsave.Enabled = false; + this.buttonsave.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveScript; + this.buttonsave.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsave.Name = "buttonsave"; + this.buttonsave.Size = new System.Drawing.Size(23, 22); + this.buttonsave.Text = "Save File"; + // + // buttonsaveall + // + this.buttonsaveall.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonsaveall.Enabled = false; + this.buttonsaveall.Image = global::CodeImp.DoomBuilder.Properties.Resources.SaveAll; + this.buttonsaveall.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonsaveall.Name = "buttonsaveall"; + this.buttonsaveall.Size = new System.Drawing.Size(23, 22); + this.buttonsaveall.Text = "Save All Files"; + // + // buttonscriptconfig + // + this.buttonscriptconfig.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonscriptconfig.Enabled = false; + this.buttonscriptconfig.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScriptPalette; + this.buttonscriptconfig.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonscriptconfig.Name = "buttonscriptconfig"; + this.buttonscriptconfig.Size = new System.Drawing.Size(23, 22); + this.buttonscriptconfig.Text = "Change Script Type"; + // + // buttoncompile + // + this.buttoncompile.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncompile.Image = global::CodeImp.DoomBuilder.Properties.Resources.ScriptCompile; + this.buttoncompile.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncompile.Name = "buttoncompile"; + this.buttoncompile.Size = new System.Drawing.Size(23, 22); + this.buttoncompile.Text = "Compile Script"; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // buttonundo + // + this.buttonundo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonundo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Undo; + this.buttonundo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonundo.Name = "buttonundo"; + this.buttonundo.Size = new System.Drawing.Size(23, 22); + this.buttonundo.Text = "Undo"; + // + // buttonredo + // + this.buttonredo.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonredo.Image = global::CodeImp.DoomBuilder.Properties.Resources.Redo; + this.buttonredo.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonredo.Name = "buttonredo"; + this.buttonredo.Size = new System.Drawing.Size(23, 22); + this.buttonredo.Text = "Redo"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); + // + // buttoncut + // + this.buttoncut.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncut.Image = global::CodeImp.DoomBuilder.Properties.Resources.Cut; + this.buttoncut.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncut.Name = "buttoncut"; + this.buttoncut.Size = new System.Drawing.Size(23, 22); + this.buttoncut.Text = "Cut Selection"; + // + // buttoncopy + // + this.buttoncopy.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttoncopy.Image = global::CodeImp.DoomBuilder.Properties.Resources.Copy; + this.buttoncopy.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttoncopy.Name = "buttoncopy"; + this.buttoncopy.Size = new System.Drawing.Size(23, 22); + this.buttoncopy.Text = "Copy Selection"; + // + // buttonpaste + // + this.buttonpaste.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.buttonpaste.Image = global::CodeImp.DoomBuilder.Properties.Resources.Paste; + this.buttonpaste.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonpaste.Name = "buttonpaste"; + this.buttonpaste.Size = new System.Drawing.Size(23, 22); + this.buttonpaste.Text = "Paste"; + // // ScriptEditorPanel // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -114,5 +242,17 @@ namespace CodeImp.DoomBuilder.Controls private System.Windows.Forms.ToolStripDropDownButton buttonnew; private System.Windows.Forms.OpenFileDialog openfile; private System.Windows.Forms.SaveFileDialog savefile; + private System.Windows.Forms.ToolStripButton buttonsave; + private System.Windows.Forms.ToolStripButton buttonsaveall; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripButton buttonscriptconfig; + private System.Windows.Forms.ToolStripButton buttoncompile; + private System.Windows.Forms.ToolStripButton buttonundo; + private System.Windows.Forms.ToolStripButton buttonredo; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripButton buttoncut; + private System.Windows.Forms.ToolStripButton buttoncopy; + private System.Windows.Forms.ToolStripButton buttonpaste; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; } } diff --git a/Source/Properties/Resources.Designer.cs b/Source/Properties/Resources.Designer.cs index a7547bee..2f400375 100644 --- a/Source/Properties/Resources.Designer.cs +++ b/Source/Properties/Resources.Designer.cs @@ -179,6 +179,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap NewScript { + get { + object obj = ResourceManager.GetObject("NewScript", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap OpenMap { get { object obj = ResourceManager.GetObject("OpenMap", resourceCulture); @@ -186,6 +193,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap OpenScript { + get { + object obj = ResourceManager.GetObject("OpenScript", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap Paste { get { object obj = ResourceManager.GetObject("Paste", resourceCulture); @@ -207,6 +221,13 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap SaveAll { + get { + object obj = ResourceManager.GetObject("SaveAll", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap SaveMap { get { object obj = ResourceManager.GetObject("SaveMap", resourceCulture); @@ -214,6 +235,27 @@ namespace CodeImp.DoomBuilder.Properties { } } + internal static System.Drawing.Bitmap SaveScript { + get { + object obj = ResourceManager.GetObject("SaveScript", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap ScriptCompile { + get { + object obj = ResourceManager.GetObject("ScriptCompile", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + internal static System.Drawing.Bitmap ScriptPalette { + get { + object obj = ResourceManager.GetObject("ScriptPalette", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + internal static System.Drawing.Bitmap SlimDX_small { get { object obj = ResourceManager.GetObject("SlimDX_small", resourceCulture); diff --git a/Source/Properties/Resources.resx b/Source/Properties/Resources.resx index 6fd40d73..2530f141 100644 --- a/Source/Properties/Resources.resx +++ b/Source/Properties/Resources.resx @@ -148,8 +148,8 @@ ..\Resources\KnownTextureSet.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\OpenMap.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -205,14 +205,23 @@ ..\Resources\SlimDX_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\WarningOff.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\mergegeometry2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ScriptPalette.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ColorPick.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -220,14 +229,20 @@ ..\Resources\Filter.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Splash3_small.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\SaveScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\OpenScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Paste.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Folder.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Grid4.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Splash3_trans.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\MissingTexture.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -235,7 +250,10 @@ ..\Resources\Warning.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ViewTextureCeiling.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\NewScript.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ScriptCompile.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Source/Resources/NewScript.png b/Source/Resources/NewScript.png new file mode 100644 index 00000000..9e6fe958 Binary files /dev/null and b/Source/Resources/NewScript.png differ diff --git a/Source/Resources/OpenScript.png b/Source/Resources/OpenScript.png new file mode 100644 index 00000000..210ff23b Binary files /dev/null and b/Source/Resources/OpenScript.png differ diff --git a/Source/Resources/SaveAll.png b/Source/Resources/SaveAll.png new file mode 100644 index 00000000..845a49c2 Binary files /dev/null and b/Source/Resources/SaveAll.png differ diff --git a/Source/Resources/SaveScript.png b/Source/Resources/SaveScript.png new file mode 100644 index 00000000..e5ac50d1 Binary files /dev/null and b/Source/Resources/SaveScript.png differ diff --git a/Source/Resources/ScriptCompile.png b/Source/Resources/ScriptCompile.png new file mode 100644 index 00000000..8e5d4d6d Binary files /dev/null and b/Source/Resources/ScriptCompile.png differ diff --git a/Source/Resources/ScriptPalette.png b/Source/Resources/ScriptPalette.png new file mode 100644 index 00000000..20f9d693 Binary files /dev/null and b/Source/Resources/ScriptPalette.png differ diff --git a/Source/Windows/MainForm.Designer.cs b/Source/Windows/MainForm.Designer.cs index 8071f11a..316fe237 100644 --- a/Source/Windows/MainForm.Designer.cs +++ b/Source/Windows/MainForm.Designer.cs @@ -599,6 +599,7 @@ namespace CodeImp.DoomBuilder.Windows this.buttonnewmap.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; this.buttonnewmap.Image = global::CodeImp.DoomBuilder.Properties.Resources.NewMap; this.buttonnewmap.ImageTransparentColor = System.Drawing.Color.Magenta; + this.buttonnewmap.Margin = new System.Windows.Forms.Padding(6, 1, 0, 2); this.buttonnewmap.Name = "buttonnewmap"; this.buttonnewmap.Size = new System.Drawing.Size(23, 22); this.buttonnewmap.Tag = "builder_newmap";