diff --git a/Source/Core/Windows/ResourceOptionsForm.Designer.cs b/Source/Core/Windows/ResourceOptionsForm.Designer.cs
index b38ba302dcc81c5d81ba5589e834306efb117b1f..d242e294baf1f53775dde845db37c104fc498337 100755
--- a/Source/Core/Windows/ResourceOptionsForm.Designer.cs
+++ b/Source/Core/Windows/ResourceOptionsForm.Designer.cs
@@ -28,372 +28,378 @@ namespace CodeImp.DoomBuilder.Windows
/// </summary>
private void InitializeComponent()
{
- System.Windows.Forms.Label label1;
- System.Windows.Forms.Label label2;
- System.Windows.Forms.Label label3;
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourceOptionsForm));
- this.tabs = new System.Windows.Forms.TabControl();
- this.wadfiletab = new System.Windows.Forms.TabPage();
- this.label6 = new System.Windows.Forms.Label();
- this.strictpatches = new System.Windows.Forms.CheckBox();
- this.browsewad = new System.Windows.Forms.Button();
- this.wadlocation = new System.Windows.Forms.TextBox();
- this.directorytab = new System.Windows.Forms.TabPage();
- this.directorylink = new System.Windows.Forms.LinkLabel();
- this.dir_flats = new System.Windows.Forms.CheckBox();
- this.dir_textures = new System.Windows.Forms.CheckBox();
- this.browsedir = new System.Windows.Forms.Button();
- this.dirlocation = new System.Windows.Forms.TextBox();
- this.pk3filetab = new System.Windows.Forms.TabPage();
- this.pk3link = new System.Windows.Forms.LinkLabel();
- this.browsepk3 = new System.Windows.Forms.Button();
- this.pk3location = new System.Windows.Forms.TextBox();
- this.cancel = new System.Windows.Forms.Button();
- this.apply = new System.Windows.Forms.Button();
- this.wadfiledialog = new System.Windows.Forms.OpenFileDialog();
- this.pk3filedialog = new System.Windows.Forms.OpenFileDialog();
- this.notfortesting = new System.Windows.Forms.CheckBox();
- this.checkingloader = new System.Windows.Forms.Panel();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
- this.label4 = new System.Windows.Forms.Label();
- label1 = new System.Windows.Forms.Label();
- label2 = new System.Windows.Forms.Label();
- label3 = new System.Windows.Forms.Label();
- this.tabs.SuspendLayout();
- this.wadfiletab.SuspendLayout();
- this.directorytab.SuspendLayout();
- this.pk3filetab.SuspendLayout();
- this.checkingloader.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
- this.SuspendLayout();
- //
- // label1
- //
- label1.AutoSize = true;
- label1.Location = new System.Drawing.Point(15, 20);
- label1.Name = "label1";
- label1.Size = new System.Drawing.Size(104, 13);
- label1.TabIndex = 0;
- label1.Text = "WAD File Resource:";
- //
- // label2
- //
- label2.AutoSize = true;
- label2.Location = new System.Drawing.Point(15, 20);
- label2.Name = "label2";
- label2.Size = new System.Drawing.Size(101, 13);
- label2.TabIndex = 3;
- label2.Text = "Directory Resource:";
- //
- // label3
- //
- label3.AutoSize = true;
- label3.Location = new System.Drawing.Point(15, 20);
- label3.Name = "label3";
- label3.Size = new System.Drawing.Size(133, 13);
- label3.TabIndex = 3;
- label3.Text = "PK3 or PK7 File Resource:";
- //
- // tabs
- //
- this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ System.Windows.Forms.Label label1;
+ System.Windows.Forms.Label label2;
+ System.Windows.Forms.Label label3;
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ResourceOptionsForm));
+ this.tabs = new System.Windows.Forms.TabControl();
+ this.wadfiletab = new System.Windows.Forms.TabPage();
+ this.label6 = new System.Windows.Forms.Label();
+ this.strictpatches = new System.Windows.Forms.CheckBox();
+ this.browsewad = new System.Windows.Forms.Button();
+ this.wadlocation = new System.Windows.Forms.TextBox();
+ this.directorytab = new System.Windows.Forms.TabPage();
+ this.directorylink = new System.Windows.Forms.LinkLabel();
+ this.dir_flats = new System.Windows.Forms.CheckBox();
+ this.dir_textures = new System.Windows.Forms.CheckBox();
+ this.browsedir = new System.Windows.Forms.Button();
+ this.dirlocation = new System.Windows.Forms.TextBox();
+ this.pk3filetab = new System.Windows.Forms.TabPage();
+ this.pk3link = new System.Windows.Forms.LinkLabel();
+ this.browsepk3 = new System.Windows.Forms.Button();
+ this.pk3location = new System.Windows.Forms.TextBox();
+ this.cancel = new System.Windows.Forms.Button();
+ this.apply = new System.Windows.Forms.Button();
+ this.wadfiledialog = new System.Windows.Forms.OpenFileDialog();
+ this.pk3filedialog = new System.Windows.Forms.OpenFileDialog();
+ this.notfortesting = new System.Windows.Forms.CheckBox();
+ this.checkingloader = new System.Windows.Forms.Panel();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.label4 = new System.Windows.Forms.Label();
+ label1 = new System.Windows.Forms.Label();
+ label2 = new System.Windows.Forms.Label();
+ label3 = new System.Windows.Forms.Label();
+ this.tabs.SuspendLayout();
+ this.wadfiletab.SuspendLayout();
+ this.directorytab.SuspendLayout();
+ this.pk3filetab.SuspendLayout();
+ this.checkingloader.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ this.SuspendLayout();
+ //
+ // label1
+ //
+ label1.AutoSize = true;
+ label1.Location = new System.Drawing.Point(15, 20);
+ label1.Name = "label1";
+ label1.Size = new System.Drawing.Size(104, 13);
+ label1.TabIndex = 0;
+ label1.Text = "WAD File Resource:";
+ //
+ // label2
+ //
+ label2.AutoSize = true;
+ label2.Location = new System.Drawing.Point(15, 20);
+ label2.Name = "label2";
+ label2.Size = new System.Drawing.Size(101, 13);
+ label2.TabIndex = 3;
+ label2.Text = "Directory Resource:";
+ //
+ // label3
+ //
+ label3.AutoSize = true;
+ label3.Location = new System.Drawing.Point(15, 20);
+ label3.Name = "label3";
+ label3.Size = new System.Drawing.Size(133, 13);
+ label3.TabIndex = 3;
+ label3.Text = "PK3 or PK7 File Resource:";
+ //
+ // tabs
+ //
+ this.tabs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.tabs.Controls.Add(this.wadfiletab);
- this.tabs.Controls.Add(this.directorytab);
- this.tabs.Controls.Add(this.pk3filetab);
- this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
- this.tabs.Location = new System.Drawing.Point(9, 11);
- this.tabs.Name = "tabs";
- this.tabs.Padding = new System.Drawing.Point(16, 3);
- this.tabs.SelectedIndex = 0;
- this.tabs.Size = new System.Drawing.Size(369, 211);
- this.tabs.TabIndex = 0;
- //
- // wadfiletab
- //
- this.wadfiletab.Controls.Add(this.label6);
- this.wadfiletab.Controls.Add(this.strictpatches);
- this.wadfiletab.Controls.Add(this.browsewad);
- this.wadfiletab.Controls.Add(this.wadlocation);
- this.wadfiletab.Controls.Add(label1);
- this.wadfiletab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.wadfiletab.Location = new System.Drawing.Point(4, 22);
- this.wadfiletab.Name = "wadfiletab";
- this.wadfiletab.Padding = new System.Windows.Forms.Padding(3);
- this.wadfiletab.Size = new System.Drawing.Size(361, 185);
- this.wadfiletab.TabIndex = 0;
- this.wadfiletab.Text = "From WAD File";
- this.wadfiletab.UseVisualStyleBackColor = true;
- //
- // label6
- //
- this.label6.Location = new System.Drawing.Point(14, 102);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(329, 58);
- this.label6.TabIndex = 8;
- this.label6.Text = resources.GetString("label6.Text");
- //
- // strictpatches
- //
- this.strictpatches.AutoSize = true;
- this.strictpatches.Location = new System.Drawing.Point(17, 72);
- this.strictpatches.Name = "strictpatches";
- this.strictpatches.Size = new System.Drawing.Size(299, 17);
- this.strictpatches.TabIndex = 2;
- this.strictpatches.Text = "Strictly load patches between P_START and P_END only";
- this.strictpatches.UseVisualStyleBackColor = true;
- //
- // browsewad
- //
- this.browsewad.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
- this.browsewad.Location = new System.Drawing.Point(315, 35);
- this.browsewad.Name = "browsewad";
- this.browsewad.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
- this.browsewad.Size = new System.Drawing.Size(28, 24);
- this.browsewad.TabIndex = 1;
- this.browsewad.Text = " ";
- this.browsewad.UseVisualStyleBackColor = true;
- this.browsewad.Click += new System.EventHandler(this.browsewad_Click);
- //
- // wadlocation
- //
- this.wadlocation.Location = new System.Drawing.Point(17, 37);
- this.wadlocation.Name = "wadlocation";
- this.wadlocation.ReadOnly = true;
- this.wadlocation.Size = new System.Drawing.Size(292, 20);
- this.wadlocation.TabIndex = 0;
- //
- // directorytab
- //
- this.directorytab.Controls.Add(this.directorylink);
- this.directorytab.Controls.Add(this.dir_flats);
- this.directorytab.Controls.Add(this.dir_textures);
- this.directorytab.Controls.Add(this.browsedir);
- this.directorytab.Controls.Add(this.dirlocation);
- this.directorytab.Controls.Add(label2);
- this.directorytab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.directorytab.Location = new System.Drawing.Point(4, 22);
- this.directorytab.Name = "directorytab";
- this.directorytab.Padding = new System.Windows.Forms.Padding(3);
- this.directorytab.Size = new System.Drawing.Size(361, 185);
- this.directorytab.TabIndex = 1;
- this.directorytab.Text = "From Directory";
- this.directorytab.UseVisualStyleBackColor = true;
- //
- // directorylink
- //
- this.directorylink.LinkArea = new System.Windows.Forms.LinkArea(26, 29);
- this.directorylink.LinkColor = System.Drawing.SystemColors.HotTrack;
- this.directorylink.Location = new System.Drawing.Point(14, 127);
- this.directorylink.Name = "directorylink";
- this.directorylink.Size = new System.Drawing.Size(329, 54);
- this.directorylink.TabIndex = 9;
- this.directorylink.TabStop = true;
- this.directorylink.Text = "The directory may use the ZDoom PK3 directory structure, or you can choose to use" +
+ this.tabs.Controls.Add(this.wadfiletab);
+ this.tabs.Controls.Add(this.directorytab);
+ this.tabs.Controls.Add(this.pk3filetab);
+ this.tabs.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+ this.tabs.Location = new System.Drawing.Point(9, 11);
+ this.tabs.Name = "tabs";
+ this.tabs.Padding = new System.Drawing.Point(16, 3);
+ this.tabs.SelectedIndex = 0;
+ this.tabs.Size = new System.Drawing.Size(369, 211);
+ this.tabs.TabIndex = 0;
+ //
+ // wadfiletab
+ //
+ this.wadfiletab.Controls.Add(this.label6);
+ this.wadfiletab.Controls.Add(this.strictpatches);
+ this.wadfiletab.Controls.Add(this.browsewad);
+ this.wadfiletab.Controls.Add(this.wadlocation);
+ this.wadfiletab.Controls.Add(label1);
+ this.wadfiletab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.wadfiletab.Location = new System.Drawing.Point(4, 22);
+ this.wadfiletab.Name = "wadfiletab";
+ this.wadfiletab.Padding = new System.Windows.Forms.Padding(3);
+ this.wadfiletab.Size = new System.Drawing.Size(361, 185);
+ this.wadfiletab.TabIndex = 0;
+ this.wadfiletab.Text = "From WAD File";
+ this.wadfiletab.UseVisualStyleBackColor = true;
+ //
+ // label6
+ //
+ this.label6.Location = new System.Drawing.Point(14, 102);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(329, 58);
+ this.label6.TabIndex = 0;
+ this.label6.Text = resources.GetString("label6.Text");
+ //
+ // strictpatches
+ //
+ this.strictpatches.AutoSize = true;
+ this.strictpatches.Location = new System.Drawing.Point(17, 72);
+ this.strictpatches.Name = "strictpatches";
+ this.strictpatches.Size = new System.Drawing.Size(299, 17);
+ this.strictpatches.TabIndex = 3;
+ this.strictpatches.Text = "Strictly load patches between P_START and P_END only";
+ this.strictpatches.UseVisualStyleBackColor = true;
+ //
+ // browsewad
+ //
+ this.browsewad.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+ this.browsewad.Location = new System.Drawing.Point(315, 35);
+ this.browsewad.Name = "browsewad";
+ this.browsewad.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+ this.browsewad.Size = new System.Drawing.Size(28, 24);
+ this.browsewad.TabIndex = 2;
+ this.browsewad.Text = " ";
+ this.browsewad.UseVisualStyleBackColor = true;
+ this.browsewad.Click += new System.EventHandler(this.browsewad_Click);
+ //
+ // wadlocation
+ //
+ this.wadlocation.Location = new System.Drawing.Point(17, 37);
+ this.wadlocation.Name = "wadlocation";
+ this.wadlocation.ReadOnly = true;
+ this.wadlocation.Size = new System.Drawing.Size(292, 20);
+ this.wadlocation.TabIndex = 1;
+ this.wadlocation.TabStop = false;
+ this.wadlocation.Enter += new System.EventHandler(this.wadlocation_Enter);
+ //
+ // directorytab
+ //
+ this.directorytab.Controls.Add(this.directorylink);
+ this.directorytab.Controls.Add(this.dir_flats);
+ this.directorytab.Controls.Add(this.dir_textures);
+ this.directorytab.Controls.Add(this.browsedir);
+ this.directorytab.Controls.Add(this.dirlocation);
+ this.directorytab.Controls.Add(label2);
+ this.directorytab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.directorytab.Location = new System.Drawing.Point(4, 22);
+ this.directorytab.Name = "directorytab";
+ this.directorytab.Padding = new System.Windows.Forms.Padding(3);
+ this.directorytab.Size = new System.Drawing.Size(361, 185);
+ this.directorytab.TabIndex = 1;
+ this.directorytab.Text = "From Directory";
+ this.directorytab.UseVisualStyleBackColor = true;
+ //
+ // directorylink
+ //
+ this.directorylink.LinkArea = new System.Windows.Forms.LinkArea(26, 29);
+ this.directorylink.LinkColor = System.Drawing.SystemColors.HotTrack;
+ this.directorylink.Location = new System.Drawing.Point(14, 127);
+ this.directorylink.Name = "directorylink";
+ this.directorylink.Size = new System.Drawing.Size(329, 54);
+ this.directorylink.TabIndex = 1;
+ this.directorylink.TabStop = true;
+ this.directorylink.Text = "The directory may use the ZDoom PK3 directory structure, or you can choose to use" +
" the options above to load texture or flat images from the directory root.";
- this.directorylink.UseCompatibleTextRendering = true;
- this.directorylink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
- //
- // dir_flats
- //
- this.dir_flats.AutoSize = true;
- this.dir_flats.Location = new System.Drawing.Point(17, 98);
- this.dir_flats.Name = "dir_flats";
- this.dir_flats.Size = new System.Drawing.Size(197, 17);
- this.dir_flats.TabIndex = 3;
- this.dir_flats.Text = "Load images in directory root as flats";
- this.dir_flats.UseVisualStyleBackColor = true;
- //
- // dir_textures
- //
- this.dir_textures.AutoSize = true;
- this.dir_textures.Location = new System.Drawing.Point(17, 72);
- this.dir_textures.Name = "dir_textures";
- this.dir_textures.Size = new System.Drawing.Size(215, 17);
- this.dir_textures.TabIndex = 2;
- this.dir_textures.Text = "Load images in directory root as textures";
- this.dir_textures.UseVisualStyleBackColor = true;
- //
- // browsedir
- //
- this.browsedir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
- this.browsedir.Location = new System.Drawing.Point(315, 35);
- this.browsedir.Name = "browsedir";
- this.browsedir.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
- this.browsedir.Size = new System.Drawing.Size(28, 24);
- this.browsedir.TabIndex = 1;
- this.browsedir.UseVisualStyleBackColor = true;
- this.browsedir.Click += new System.EventHandler(this.browsedir_Click);
- //
- // dirlocation
- //
- this.dirlocation.BackColor = System.Drawing.SystemColors.Control;
- this.dirlocation.Location = new System.Drawing.Point(17, 37);
- this.dirlocation.Name = "dirlocation";
- this.dirlocation.ReadOnly = true;
- this.dirlocation.Size = new System.Drawing.Size(292, 20);
- this.dirlocation.TabIndex = 0;
- //
- // pk3filetab
- //
- this.pk3filetab.Controls.Add(this.pk3link);
- this.pk3filetab.Controls.Add(this.browsepk3);
- this.pk3filetab.Controls.Add(this.pk3location);
- this.pk3filetab.Controls.Add(label3);
- this.pk3filetab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.pk3filetab.Location = new System.Drawing.Point(4, 22);
- this.pk3filetab.Name = "pk3filetab";
- this.pk3filetab.Size = new System.Drawing.Size(361, 185);
- this.pk3filetab.TabIndex = 2;
- this.pk3filetab.Text = "From PK3/PK7";
- this.pk3filetab.UseVisualStyleBackColor = true;
- //
- // pk3link
- //
- this.pk3link.LinkArea = new System.Windows.Forms.LinkArea(40, 33);
- this.pk3link.LinkColor = System.Drawing.SystemColors.HotTrack;
- this.pk3link.Location = new System.Drawing.Point(15, 72);
- this.pk3link.Name = "pk3link";
- this.pk3link.Size = new System.Drawing.Size(328, 47);
- this.pk3link.TabIndex = 7;
- this.pk3link.TabStop = true;
- this.pk3link.Text = "The archive file is expected to use the ZDoom archive directory structure.";
- this.pk3link.UseCompatibleTextRendering = true;
- this.pk3link.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
- //
- // browsepk3
- //
- this.browsepk3.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
- this.browsepk3.Location = new System.Drawing.Point(315, 35);
- this.browsepk3.Name = "browsepk3";
- this.browsepk3.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
- this.browsepk3.Size = new System.Drawing.Size(28, 24);
- this.browsepk3.TabIndex = 1;
- this.browsepk3.UseVisualStyleBackColor = true;
- this.browsepk3.Click += new System.EventHandler(this.browsepk3_Click);
- //
- // pk3location
- //
- this.pk3location.Location = new System.Drawing.Point(17, 37);
- this.pk3location.Name = "pk3location";
- this.pk3location.ReadOnly = true;
- this.pk3location.Size = new System.Drawing.Size(292, 20);
- this.pk3location.TabIndex = 0;
- //
- // cancel
- //
- this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.cancel.Location = new System.Drawing.Point(262, 304);
- this.cancel.Name = "cancel";
- this.cancel.Size = new System.Drawing.Size(112, 25);
- this.cancel.TabIndex = 2;
- this.cancel.Text = "Cancel";
- this.cancel.UseVisualStyleBackColor = true;
- this.cancel.Click += new System.EventHandler(this.cancel_Click);
- //
- // apply
- //
- this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
- this.apply.Location = new System.Drawing.Point(144, 304);
- this.apply.Name = "apply";
- this.apply.Size = new System.Drawing.Size(112, 25);
- this.apply.TabIndex = 1;
- this.apply.Text = "OK";
- this.apply.UseVisualStyleBackColor = true;
- this.apply.Click += new System.EventHandler(this.apply_Click);
- //
- // wadfiledialog
- //
- this.wadfiledialog.Filter = "Doom WAD Files (*.wad;*.iwad)|*.wad;*.iwad";
- this.wadfiledialog.Title = "Browse WAD File";
- //
- // pk3filedialog
- //
- this.pk3filedialog.Filter = "Doom PK3/PK7 Files (*.pk3;*.pk7;*.ipk3;*.ipk7)|*.pk3;*.pk7;*.ipk3;*.ipk7";
- this.pk3filedialog.Title = "Browse PK3 or PK7 File";
- //
- // notfortesting
- //
- this.notfortesting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
- this.notfortesting.AutoSize = true;
- this.notfortesting.Location = new System.Drawing.Point(12, 233);
- this.notfortesting.Name = "notfortesting";
- this.notfortesting.Size = new System.Drawing.Size(239, 17);
- this.notfortesting.TabIndex = 3;
- this.notfortesting.Text = "Exclude this resource from testing parameters";
- this.notfortesting.UseVisualStyleBackColor = true;
- //
- // checkingloader
- //
- this.checkingloader.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
+ this.directorylink.UseCompatibleTextRendering = true;
+ this.directorylink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
+ //
+ // dir_flats
+ //
+ this.dir_flats.AutoSize = true;
+ this.dir_flats.Location = new System.Drawing.Point(17, 98);
+ this.dir_flats.Name = "dir_flats";
+ this.dir_flats.Size = new System.Drawing.Size(197, 17);
+ this.dir_flats.TabIndex = 4;
+ this.dir_flats.Text = "Load images in directory root as flats";
+ this.dir_flats.UseVisualStyleBackColor = true;
+ //
+ // dir_textures
+ //
+ this.dir_textures.AutoSize = true;
+ this.dir_textures.Location = new System.Drawing.Point(17, 72);
+ this.dir_textures.Name = "dir_textures";
+ this.dir_textures.Size = new System.Drawing.Size(215, 17);
+ this.dir_textures.TabIndex = 3;
+ this.dir_textures.Text = "Load images in directory root as textures";
+ this.dir_textures.UseVisualStyleBackColor = true;
+ //
+ // browsedir
+ //
+ this.browsedir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+ this.browsedir.Location = new System.Drawing.Point(315, 35);
+ this.browsedir.Name = "browsedir";
+ this.browsedir.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+ this.browsedir.Size = new System.Drawing.Size(28, 24);
+ this.browsedir.TabIndex = 2;
+ this.browsedir.UseVisualStyleBackColor = true;
+ this.browsedir.Click += new System.EventHandler(this.browsedir_Click);
+ //
+ // dirlocation
+ //
+ this.dirlocation.BackColor = System.Drawing.SystemColors.Control;
+ this.dirlocation.Location = new System.Drawing.Point(17, 37);
+ this.dirlocation.Name = "dirlocation";
+ this.dirlocation.ReadOnly = true;
+ this.dirlocation.Size = new System.Drawing.Size(292, 20);
+ this.dirlocation.TabIndex = 0;
+ this.dirlocation.TabStop = false;
+ this.dirlocation.Enter += new System.EventHandler(this.dirlocation_Enter);
+ //
+ // pk3filetab
+ //
+ this.pk3filetab.Controls.Add(this.pk3link);
+ this.pk3filetab.Controls.Add(this.browsepk3);
+ this.pk3filetab.Controls.Add(this.pk3location);
+ this.pk3filetab.Controls.Add(label3);
+ this.pk3filetab.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.pk3filetab.Location = new System.Drawing.Point(4, 22);
+ this.pk3filetab.Name = "pk3filetab";
+ this.pk3filetab.Size = new System.Drawing.Size(361, 185);
+ this.pk3filetab.TabIndex = 2;
+ this.pk3filetab.Text = "From PK3/PK7";
+ this.pk3filetab.UseVisualStyleBackColor = true;
+ //
+ // pk3link
+ //
+ this.pk3link.LinkArea = new System.Windows.Forms.LinkArea(40, 33);
+ this.pk3link.LinkColor = System.Drawing.SystemColors.HotTrack;
+ this.pk3link.Location = new System.Drawing.Point(15, 72);
+ this.pk3link.Name = "pk3link";
+ this.pk3link.Size = new System.Drawing.Size(328, 47);
+ this.pk3link.TabIndex = 7;
+ this.pk3link.TabStop = true;
+ this.pk3link.Text = "The archive file is expected to use the ZDoom archive directory structure.";
+ this.pk3link.UseCompatibleTextRendering = true;
+ this.pk3link.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.link_Click);
+ //
+ // browsepk3
+ //
+ this.browsepk3.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
+ this.browsepk3.Location = new System.Drawing.Point(315, 35);
+ this.browsepk3.Name = "browsepk3";
+ this.browsepk3.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
+ this.browsepk3.Size = new System.Drawing.Size(28, 24);
+ this.browsepk3.TabIndex = 1;
+ this.browsepk3.UseVisualStyleBackColor = true;
+ this.browsepk3.Click += new System.EventHandler(this.browsepk3_Click);
+ //
+ // pk3location
+ //
+ this.pk3location.Location = new System.Drawing.Point(17, 37);
+ this.pk3location.Name = "pk3location";
+ this.pk3location.ReadOnly = true;
+ this.pk3location.Size = new System.Drawing.Size(292, 20);
+ this.pk3location.TabIndex = 0;
+ this.pk3location.TabStop = false;
+ this.pk3location.Enter += new System.EventHandler(this.pk3location_Enter);
+ //
+ // cancel
+ //
+ this.cancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.cancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.cancel.Location = new System.Drawing.Point(262, 304);
+ this.cancel.Name = "cancel";
+ this.cancel.Size = new System.Drawing.Size(112, 25);
+ this.cancel.TabIndex = 2;
+ this.cancel.Text = "Cancel";
+ this.cancel.UseVisualStyleBackColor = true;
+ this.cancel.Click += new System.EventHandler(this.cancel_Click);
+ //
+ // apply
+ //
+ this.apply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+ this.apply.Location = new System.Drawing.Point(144, 304);
+ this.apply.Name = "apply";
+ this.apply.Size = new System.Drawing.Size(112, 25);
+ this.apply.TabIndex = 1;
+ this.apply.Text = "OK";
+ this.apply.UseVisualStyleBackColor = true;
+ this.apply.Click += new System.EventHandler(this.apply_Click);
+ //
+ // wadfiledialog
+ //
+ this.wadfiledialog.Filter = "Doom WAD Files (*.wad;*.iwad)|*.wad;*.iwad";
+ this.wadfiledialog.Title = "Browse WAD File";
+ //
+ // pk3filedialog
+ //
+ this.pk3filedialog.Filter = "Doom PK3/PK7 Files (*.pk3;*.pk7;*.ipk3;*.ipk7)|*.pk3;*.pk7;*.ipk3;*.ipk7";
+ this.pk3filedialog.Title = "Browse PK3 or PK7 File";
+ //
+ // notfortesting
+ //
+ this.notfortesting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+ this.notfortesting.AutoSize = true;
+ this.notfortesting.Location = new System.Drawing.Point(12, 233);
+ this.notfortesting.Name = "notfortesting";
+ this.notfortesting.Size = new System.Drawing.Size(239, 17);
+ this.notfortesting.TabIndex = 3;
+ this.notfortesting.Text = "Exclude this resource from testing parameters";
+ this.notfortesting.UseVisualStyleBackColor = true;
+ //
+ // checkingloader
+ //
+ this.checkingloader.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
- this.checkingloader.BackColor = System.Drawing.SystemColors.Info;
- this.checkingloader.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.checkingloader.Controls.Add(this.pictureBox1);
- this.checkingloader.Controls.Add(this.label4);
- this.checkingloader.Cursor = System.Windows.Forms.Cursors.AppStarting;
- this.checkingloader.ForeColor = System.Drawing.SystemColors.InfoText;
- this.checkingloader.Location = new System.Drawing.Point(12, 263);
- this.checkingloader.Name = "checkingloader";
- this.checkingloader.Size = new System.Drawing.Size(362, 32);
- this.checkingloader.TabIndex = 4;
- this.checkingloader.Visible = false;
- //
- // pictureBox1
- //
- this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Loader;
- this.pictureBox1.InitialImage = global::CodeImp.DoomBuilder.Properties.Resources.Loader;
- this.pictureBox1.Location = new System.Drawing.Point(8, 7);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(16, 16);
- this.pictureBox1.TabIndex = 2;
- this.pictureBox1.TabStop = false;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(29, 8);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(176, 13);
- this.label4.TabIndex = 0;
- this.label4.Text = "Please wait, checking the archive...";
- //
- // ResourceOptionsForm
- //
- this.AcceptButton = this.apply;
- this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
- this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
- this.CancelButton = this.cancel;
- this.ClientSize = new System.Drawing.Size(386, 337);
- this.Controls.Add(this.checkingloader);
- this.Controls.Add(this.notfortesting);
- this.Controls.Add(this.cancel);
- this.Controls.Add(this.apply);
- this.Controls.Add(this.tabs);
- this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.MaximizeBox = false;
- this.MinimizeBox = false;
- this.Name = "ResourceOptionsForm";
- this.Opacity = 0D;
- this.ShowIcon = false;
- this.ShowInTaskbar = false;
- this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = "Resource Options";
- this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ResourceOptionsForm_HelpRequested);
- this.tabs.ResumeLayout(false);
- this.wadfiletab.ResumeLayout(false);
- this.wadfiletab.PerformLayout();
- this.directorytab.ResumeLayout(false);
- this.directorytab.PerformLayout();
- this.pk3filetab.ResumeLayout(false);
- this.pk3filetab.PerformLayout();
- this.checkingloader.ResumeLayout(false);
- this.checkingloader.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
- this.ResumeLayout(false);
- this.PerformLayout();
+ this.checkingloader.BackColor = System.Drawing.SystemColors.Info;
+ this.checkingloader.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.checkingloader.Controls.Add(this.pictureBox1);
+ this.checkingloader.Controls.Add(this.label4);
+ this.checkingloader.Cursor = System.Windows.Forms.Cursors.AppStarting;
+ this.checkingloader.ForeColor = System.Drawing.SystemColors.InfoText;
+ this.checkingloader.Location = new System.Drawing.Point(12, 263);
+ this.checkingloader.Name = "checkingloader";
+ this.checkingloader.Size = new System.Drawing.Size(362, 32);
+ this.checkingloader.TabIndex = 4;
+ this.checkingloader.Visible = false;
+ //
+ // pictureBox1
+ //
+ this.pictureBox1.Image = global::CodeImp.DoomBuilder.Properties.Resources.Loader;
+ this.pictureBox1.InitialImage = global::CodeImp.DoomBuilder.Properties.Resources.Loader;
+ this.pictureBox1.Location = new System.Drawing.Point(8, 7);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(16, 16);
+ this.pictureBox1.TabIndex = 2;
+ this.pictureBox1.TabStop = false;
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(29, 8);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(176, 13);
+ this.label4.TabIndex = 0;
+ this.label4.Text = "Please wait, checking the archive...";
+ //
+ // ResourceOptionsForm
+ //
+ this.AcceptButton = this.apply;
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+ this.CancelButton = this.cancel;
+ this.ClientSize = new System.Drawing.Size(386, 337);
+ this.Controls.Add(this.checkingloader);
+ this.Controls.Add(this.notfortesting);
+ this.Controls.Add(this.cancel);
+ this.Controls.Add(this.apply);
+ this.Controls.Add(this.tabs);
+ this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+ this.MaximizeBox = false;
+ this.MinimizeBox = false;
+ this.Name = "ResourceOptionsForm";
+ this.Opacity = 0D;
+ this.ShowIcon = false;
+ this.ShowInTaskbar = false;
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Resource Options";
+ this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.ResourceOptionsForm_HelpRequested);
+ this.tabs.ResumeLayout(false);
+ this.wadfiletab.ResumeLayout(false);
+ this.wadfiletab.PerformLayout();
+ this.directorytab.ResumeLayout(false);
+ this.directorytab.PerformLayout();
+ this.pk3filetab.ResumeLayout(false);
+ this.pk3filetab.PerformLayout();
+ this.checkingloader.ResumeLayout(false);
+ this.checkingloader.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ this.ResumeLayout(false);
+ this.PerformLayout();
}
diff --git a/Source/Core/Windows/ResourceOptionsForm.cs b/Source/Core/Windows/ResourceOptionsForm.cs
index 56917b82fce6bbec44ed081135b3c3ea14891545..117ee3ab68b329a47490a56580219d50c8b1faaf 100755
--- a/Source/Core/Windows/ResourceOptionsForm.cs
+++ b/Source/Core/Windows/ResourceOptionsForm.cs
@@ -502,5 +502,23 @@ namespace CodeImp.DoomBuilder.Windows
General.ShowHelp("w_resourceoptions.html");
hlpevent.Handled = true;
}
- }
+
+ private void wadlocation_Enter(object sender, EventArgs e)
+ {
+ // Stop textbox control from getting focus
+ browsewad.Focus();
+ }
+
+ private void dirlocation_Enter(object sender, EventArgs e)
+ {
+ // Stop textbox control from getting focus
+ browsedir.Focus();
+ }
+
+ private void pk3location_Enter(object sender, EventArgs e)
+ {
+ // Stop textbox control from getting focus
+ browsepk3.Focus();
+ }
+ }
}
\ No newline at end of file
diff --git a/Source/Core/Windows/ResourceOptionsForm.resx b/Source/Core/Windows/ResourceOptionsForm.resx
index 4e7716803ecabe5ba7d07d36adee60014c24d8f7..c26f50626e0f7fffdb3891c086a360e1760c44a3 100755
--- a/Source/Core/Windows/ResourceOptionsForm.resx
+++ b/Source/Core/Windows/ResourceOptionsForm.resx
@@ -141,21 +141,6 @@
<metadata name="wadfiletab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="directorytab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="pk3filetab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="wadfiletab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="strictpatches.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="wadlocation.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<data name="label6.Text" xml:space="preserve">
<value>Use the option above to enforce strictly loading texture patches from between P_START and P_END marker lumps only. This can solve lump name conflicts, but old WAD files do not always adhere to this rule.</value>
</data>
@@ -177,24 +162,12 @@
<metadata name="dirlocation.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="dir_flats.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="dir_textures.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
- <metadata name="dirlocation.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="pk3filetab.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="pk3location.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
- <metadata name="pk3location.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
- <value>True</value>
- </metadata>
<metadata name="wadfiledialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>