This commit is contained in:
codeimp 2009-01-02 06:46:42 +00:00
parent 7b744e730a
commit ee2bc4c515
2 changed files with 15 additions and 15 deletions

View file

@ -39,8 +39,8 @@ namespace CodeImp.DoomBuilder.Data
#region ================== Variables
// Source
private bool readtextures;
private bool readflats;
private bool roottextures;
private bool rootflats;
#endregion
@ -54,8 +54,8 @@ namespace CodeImp.DoomBuilder.Data
public DirectoryReader(DataLocation dl) : base(dl)
{
// Initialize
this.readtextures = dl.textures;
this.readflats = dl.flats;
this.roottextures = dl.textures;
this.rootflats = dl.flats;
General.WriteLogLine("Opening directory resource '" + location.location + "'");
@ -103,7 +103,7 @@ namespace CodeImp.DoomBuilder.Data
if(issuspended) throw new Exception("Data reader is suspended");
// Should we load the images in this directory as textures?
if(readtextures) return LoadDirectoryImages(); else return null;
if(roottextures) return LoadDirectoryImages(); else return null;
}
#endregion
@ -117,7 +117,7 @@ namespace CodeImp.DoomBuilder.Data
if(issuspended) throw new Exception("Data reader is suspended");
// Should we load the images in this directory as flats?
if(readflats) return LoadDirectoryImages(); else return null;
if(rootflats) return LoadDirectoryImages(); else return null;
}
#endregion

View file

@ -69,7 +69,7 @@ namespace CodeImp.DoomBuilder.Windows
// label2
//
label2.AutoSize = true;
label2.Location = new System.Drawing.Point(15, 75);
label2.Location = new System.Drawing.Point(15, 20);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(104, 14);
label2.TabIndex = 3;
@ -154,28 +154,28 @@ namespace CodeImp.DoomBuilder.Windows
// dir_flats
//
this.dir_flats.AutoSize = true;
this.dir_flats.Location = new System.Drawing.Point(17, 45);
this.dir_flats.Location = new System.Drawing.Point(17, 98);
this.dir_flats.Name = "dir_flats";
this.dir_flats.Size = new System.Drawing.Size(126, 18);
this.dir_flats.Size = new System.Drawing.Size(205, 18);
this.dir_flats.TabIndex = 7;
this.dir_flats.Text = "Load images as flats";
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, 21);
this.dir_textures.Location = new System.Drawing.Point(17, 72);
this.dir_textures.Name = "dir_textures";
this.dir_textures.Size = new System.Drawing.Size(145, 18);
this.dir_textures.Size = new System.Drawing.Size(224, 18);
this.dir_textures.TabIndex = 6;
this.dir_textures.Text = "Load images as textures";
this.dir_textures.Text = "Load images in directory root as textures";
this.dir_textures.UseVisualStyleBackColor = true;
//
// browsedir
//
this.browsedir.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.browsedir.Image = global::CodeImp.DoomBuilder.Properties.Resources.Folder;
this.browsedir.Location = new System.Drawing.Point(316, 91);
this.browsedir.Location = new System.Drawing.Point(316, 36);
this.browsedir.Name = "browsedir";
this.browsedir.Padding = new System.Windows.Forms.Padding(0, 0, 1, 3);
this.browsedir.Size = new System.Drawing.Size(30, 23);
@ -186,7 +186,7 @@ namespace CodeImp.DoomBuilder.Windows
// dirlocation
//
this.dirlocation.BackColor = System.Drawing.SystemColors.Control;
this.dirlocation.Location = new System.Drawing.Point(17, 92);
this.dirlocation.Location = new System.Drawing.Point(17, 37);
this.dirlocation.Name = "dirlocation";
this.dirlocation.ReadOnly = true;
this.dirlocation.Size = new System.Drawing.Size(293, 20);