Added Status Strip and consolidated logic to update listbox.

This commit is contained in:
Rich 2009-09-16 16:13:52 +00:00
parent a72f4118c5
commit 57d657e9a7
2 changed files with 105 additions and 54 deletions

View File

@ -31,6 +31,8 @@ namespace fmtxml
private Label lblResult;
private TextBox tbResultPath;
private Button btnBrowseResult;
private StatusStrip statusStrip1;
private ToolStripStatusLabel tsslStatus;
/// <summary>
/// Required designer variable.
/// </summary>
@ -49,6 +51,11 @@ namespace fmtxml
// TODO: Add any constructor code after InitializeComponent call
//
}
public string MyStatus
{
get { return tsslStatus.Text; }
set { tsslStatus.Text = value; Application.DoEvents(); }
}
/// <summary>
/// Clean up any resources being used.
@ -89,65 +96,67 @@ namespace fmtxml
this.lblResult = new System.Windows.Forms.Label();
this.tbResultPath = new System.Windows.Forms.TextBox();
this.btnBrowseResult = new System.Windows.Forms.Button();
this.statusStrip1 = new System.Windows.Forms.StatusStrip();
this.tsslStatus = new System.Windows.Forms.ToolStripStatusLabel();
this.statusStrip1.SuspendLayout();
this.SuspendLayout();
//
// btnCvtPagDoc
//
this.btnCvtPagDoc.Location = new System.Drawing.Point(217, 64);
this.btnCvtPagDoc.Location = new System.Drawing.Point(181, 55);
this.btnCvtPagDoc.Name = "btnCvtPagDoc";
this.btnCvtPagDoc.Size = new System.Drawing.Size(201, 50);
this.btnCvtPagDoc.Size = new System.Drawing.Size(167, 44);
this.btnCvtPagDoc.TabIndex = 0;
this.btnCvtPagDoc.Text = "Convert Page and Doc Styles in format directory (Step 2)";
this.btnCvtPagDoc.Click += new System.EventHandler(this.btnCvtPagDoc_Click);
//
// label1
//
this.label1.Location = new System.Drawing.Point(12, 236);
this.label1.Location = new System.Drawing.Point(10, 205);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(201, 19);
this.label1.Size = new System.Drawing.Size(167, 16);
this.label1.TabIndex = 1;
this.label1.Text = "Converted:";
//
// btnExit
//
this.btnExit.Location = new System.Drawing.Point(610, 215);
this.btnExit.Location = new System.Drawing.Point(508, 186);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(77, 27);
this.btnExit.Size = new System.Drawing.Size(64, 24);
this.btnExit.TabIndex = 2;
this.btnExit.Text = "Exit";
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// listBox1
//
this.listBox1.ItemHeight = 16;
this.listBox1.Location = new System.Drawing.Point(10, 258);
this.listBox1.Location = new System.Drawing.Point(8, 224);
this.listBox1.Name = "listBox1";
this.listBox1.Size = new System.Drawing.Size(700, 388);
this.listBox1.Size = new System.Drawing.Size(584, 368);
this.listBox1.TabIndex = 3;
//
// btnCvtGenmac
//
this.btnCvtGenmac.Location = new System.Drawing.Point(10, 172);
this.btnCvtGenmac.Location = new System.Drawing.Point(8, 149);
this.btnCvtGenmac.Name = "btnCvtGenmac";
this.btnCvtGenmac.Size = new System.Drawing.Size(183, 46);
this.btnCvtGenmac.Size = new System.Drawing.Size(153, 40);
this.btnCvtGenmac.TabIndex = 4;
this.btnCvtGenmac.Text = "Convert genmac files to XML (Genmac Step 1)";
this.btnCvtGenmac.Click += new System.EventHandler(this.btnCvtGenmac_Click);
//
// btnCvtXmlToSVG
//
this.btnCvtXmlToSVG.Location = new System.Drawing.Point(199, 170);
this.btnCvtXmlToSVG.Location = new System.Drawing.Point(166, 147);
this.btnCvtXmlToSVG.Name = "btnCvtXmlToSVG";
this.btnCvtXmlToSVG.Size = new System.Drawing.Size(183, 50);
this.btnCvtXmlToSVG.Size = new System.Drawing.Size(152, 44);
this.btnCvtXmlToSVG.TabIndex = 5;
this.btnCvtXmlToSVG.Text = "Convert Genmac_XML to SVG (Genmac Step 2)";
this.btnCvtXmlToSVG.Click += new System.EventHandler(this.btnCvtXmlToSVG_Click);
//
// btnCvtFormat
//
this.btnCvtFormat.Location = new System.Drawing.Point(10, 64);
this.btnCvtFormat.Location = new System.Drawing.Point(8, 55);
this.btnCvtFormat.Name = "btnCvtFormat";
this.btnCvtFormat.Size = new System.Drawing.Size(201, 50);
this.btnCvtFormat.Size = new System.Drawing.Size(168, 44);
this.btnCvtFormat.TabIndex = 8;
this.btnCvtFormat.Text = "Convert Format in format directory (Step 1)";
this.btnCvtFormat.UseVisualStyleBackColor = true;
@ -155,9 +164,9 @@ namespace fmtxml
//
// btnMergeFmtPagDoc
//
this.btnMergeFmtPagDoc.Location = new System.Drawing.Point(424, 64);
this.btnMergeFmtPagDoc.Location = new System.Drawing.Point(353, 55);
this.btnMergeFmtPagDoc.Name = "btnMergeFmtPagDoc";
this.btnMergeFmtPagDoc.Size = new System.Drawing.Size(201, 50);
this.btnMergeFmtPagDoc.Size = new System.Drawing.Size(168, 44);
this.btnMergeFmtPagDoc.TabIndex = 9;
this.btnMergeFmtPagDoc.Text = "Integrate Fmt, Doc & Pag to single xml (Step 3)";
this.btnMergeFmtPagDoc.UseVisualStyleBackColor = true;
@ -166,17 +175,17 @@ namespace fmtxml
// lblPathFmt
//
this.lblPathFmt.AutoSize = true;
this.lblPathFmt.Location = new System.Drawing.Point(7, 42);
this.lblPathFmt.Location = new System.Drawing.Point(6, 36);
this.lblPathFmt.Name = "lblPathFmt";
this.lblPathFmt.Size = new System.Drawing.Size(139, 17);
this.lblPathFmt.Size = new System.Drawing.Size(104, 13);
this.lblPathFmt.TabIndex = 10;
this.lblPathFmt.Text = "Path To Format Files";
//
// btnBrowseFmt
//
this.btnBrowseFmt.Location = new System.Drawing.Point(528, 36);
this.btnBrowseFmt.Location = new System.Drawing.Point(440, 31);
this.btnBrowseFmt.Name = "btnBrowseFmt";
this.btnBrowseFmt.Size = new System.Drawing.Size(152, 23);
this.btnBrowseFmt.Size = new System.Drawing.Size(127, 20);
this.btnBrowseFmt.TabIndex = 11;
this.btnBrowseFmt.Text = "Browse (Format)";
this.btnBrowseFmt.UseVisualStyleBackColor = true;
@ -184,23 +193,23 @@ namespace fmtxml
//
// tbFmtPath
//
this.tbFmtPath.Location = new System.Drawing.Point(155, 37);
this.tbFmtPath.Location = new System.Drawing.Point(129, 32);
this.tbFmtPath.Name = "tbFmtPath";
this.tbFmtPath.Size = new System.Drawing.Size(355, 22);
this.tbFmtPath.Size = new System.Drawing.Size(296, 20);
this.tbFmtPath.TabIndex = 12;
//
// tbGenmacPath
//
this.tbGenmacPath.Location = new System.Drawing.Point(155, 144);
this.tbGenmacPath.Location = new System.Drawing.Point(129, 125);
this.tbGenmacPath.Name = "tbGenmacPath";
this.tbGenmacPath.Size = new System.Drawing.Size(355, 22);
this.tbGenmacPath.Size = new System.Drawing.Size(296, 20);
this.tbGenmacPath.TabIndex = 15;
//
// btnBrowseGenmac
//
this.btnBrowseGenmac.Location = new System.Drawing.Point(528, 143);
this.btnBrowseGenmac.Location = new System.Drawing.Point(440, 124);
this.btnBrowseGenmac.Name = "btnBrowseGenmac";
this.btnBrowseGenmac.Size = new System.Drawing.Size(152, 23);
this.btnBrowseGenmac.Size = new System.Drawing.Size(127, 20);
this.btnBrowseGenmac.TabIndex = 14;
this.btnBrowseGenmac.Text = "Browse (Genmac)";
this.btnBrowseGenmac.UseVisualStyleBackColor = true;
@ -209,42 +218,59 @@ namespace fmtxml
// lblPathGenmac
//
this.lblPathGenmac.AutoSize = true;
this.lblPathGenmac.Location = new System.Drawing.Point(7, 149);
this.lblPathGenmac.Location = new System.Drawing.Point(6, 129);
this.lblPathGenmac.Name = "lblPathGenmac";
this.lblPathGenmac.Size = new System.Drawing.Size(148, 17);
this.lblPathGenmac.Size = new System.Drawing.Size(112, 13);
this.lblPathGenmac.TabIndex = 13;
this.lblPathGenmac.Text = "Path To Genmac Files";
//
// lblResult
//
this.lblResult.AutoSize = true;
this.lblResult.Location = new System.Drawing.Point(16, 10);
this.lblResult.Location = new System.Drawing.Point(13, 9);
this.lblResult.Name = "lblResult";
this.lblResult.Size = new System.Drawing.Size(163, 17);
this.lblResult.Size = new System.Drawing.Size(123, 13);
this.lblResult.TabIndex = 16;
this.lblResult.Text = "Path To Result Directory";
//
// tbResultPath
//
this.tbResultPath.Location = new System.Drawing.Point(185, 8);
this.tbResultPath.Location = new System.Drawing.Point(154, 7);
this.tbResultPath.Name = "tbResultPath";
this.tbResultPath.Size = new System.Drawing.Size(325, 22);
this.tbResultPath.Size = new System.Drawing.Size(271, 20);
this.tbResultPath.TabIndex = 17;
//
// btnBrowseResult
//
this.btnBrowseResult.Location = new System.Drawing.Point(528, 4);
this.btnBrowseResult.Location = new System.Drawing.Point(440, 3);
this.btnBrowseResult.Name = "btnBrowseResult";
this.btnBrowseResult.Size = new System.Drawing.Size(152, 23);
this.btnBrowseResult.Size = new System.Drawing.Size(127, 20);
this.btnBrowseResult.TabIndex = 18;
this.btnBrowseResult.Text = "Browse (Result)";
this.btnBrowseResult.UseVisualStyleBackColor = true;
this.btnBrowseResult.Click += new System.EventHandler(this.btnBrowseResult_Click);
//
// statusStrip1
//
this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.tsslStatus});
this.statusStrip1.Location = new System.Drawing.Point(0, 607);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(712, 22);
this.statusStrip1.TabIndex = 19;
this.statusStrip1.Text = "statusStrip1";
//
// tsslStatus
//
this.tsslStatus.Name = "tsslStatus";
this.tsslStatus.Size = new System.Drawing.Size(39, 17);
this.tsslStatus.Text = "Ready";
//
// Form1
//
this.AutoScaleBaseSize = new System.Drawing.Size(6, 15);
this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
this.ClientSize = new System.Drawing.Size(712, 629);
this.Controls.Add(this.statusStrip1);
this.Controls.Add(this.btnBrowseResult);
this.Controls.Add(this.tbResultPath);
this.Controls.Add(this.lblResult);
@ -264,6 +290,8 @@ namespace fmtxml
this.Controls.Add(this.btnCvtPagDoc);
this.Name = "Form1";
this.Text = "Form1";
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
@ -284,22 +312,35 @@ namespace fmtxml
// get all of the files in the e:\ve-proms\format directory.
DirectoryInfo di = new DirectoryInfo(tbFmtPath.Text); // "C:\\16bit\\ve-proms\\format");
FileInfo[] fis = di.GetFiles("*.pag");
listBox1.Items.Clear();
ClearListBox();
foreach (FileInfo fi in fis)
{
string fn = fi.Name.Substring(0,fi.Name.Length-4);
this.listBox1.Items.Add(fi.Name);
AddFileToListBox(fi);
FmtToXml fx = new FmtToXml(fn, tbFmtPath.Text);
}
fis = di.GetFiles("*.y*");
foreach (FileInfo fi in fis)
{
this.listBox1.Items.Add(fi.Name);
FmtToXml fx = new FmtToXml(fi.Name, tbFmtPath.Text);
AddFileToListBox(fi);
FmtToXml fx = new FmtToXml(fi.Name, tbFmtPath.Text);
}
MessageBox.Show("DONE Converting Page and Document Styles to XML");
}
private void AddFileToListBox(FileInfo fi)
{
this.listBox1.Items.Add(fi.Name);
this.listBox1.SelectedIndex = this.listBox1.Items.Count - 1;
MyStatus = "Processing " + fi.Name;
Application.DoEvents();
}
private void ClearListBox()
{
listBox1.Items.Clear();
}
private void btnExit_Click(object sender, System.EventArgs e)
{
Application.Exit();
@ -315,11 +356,11 @@ namespace fmtxml
DirectoryInfo di = new DirectoryInfo(tbGenmacPath.Text + @"\preproc"); // "C:\\16bit\\promsnt\\genmac\\preproc");
FileInfo[] fis = di.GetFiles("*.i");
listBox1.Items.Clear();
ClearListBox();
foreach (FileInfo fi in fis)
{
// results go to e:\\proms.net\\genmac.xml\\convert
this.listBox1.Items.Add(fi.Name);
AddFileToListBox(fi);
GenToXml gn = new GenToXml(fi.Name, tbGenmacPath.Text, tbResultPath.Text);
}
MessageBox.Show("DONE Converting genmacs to XML - Results are in " + tbResultPath.Text + @"\genmacall\convert");
@ -333,11 +374,11 @@ namespace fmtxml
foreach (FileInfo fi in fissvg)fi.Delete();
DirectoryInfo di = new DirectoryInfo(tbResultPath.Text + @"\genmacall\convert");
FileInfo[] fis = di.GetFiles("*.xml");
listBox1.Items.Clear();
ClearListBox();
foreach (FileInfo fi in fis)
{
// results go to e:\proms.net\genmac.xml
this.listBox1.Items.Add(fi.Name);
AddFileToListBox(fi);
GenXmlToSvg gn = new GenXmlToSvg(fi.Name, tbResultPath.Text);
}
MessageBox.Show("DONE Converting genmacs.xmls to drawing svg - Results are in " + tbResultPath.Text + @"\genmacall");
@ -346,36 +387,42 @@ namespace fmtxml
private void btnCvtFormat_Click(object sender, EventArgs e)
{
DateTime tStart = DateTime.Now;
// first convert base format - for now use genfmt.
MyStatus = "Processing Base";
FmtFileToXml gx = new FmtFileToXml(null,"BASE", tbFmtPath.Text);
// get all of the format files in the e:\ve-proms\format directory.
DirectoryInfo di = new DirectoryInfo(tbFmtPath.Text); // "C:\\16bit\\ve-proms\\format");
//DirectoryInfo di = new DirectoryInfo("E:\\proms.net\\exe\\fmtxml");
// This excludes Background format files *.BFM which use a different structure
FileInfo[] fis = di.GetFiles("*.fmt");
listBox1.Items.Clear();
foreach (FileInfo fi in fis)
ClearListBox();
foreach (FileInfo fi in fis)
{
string fn = fi.Name.Substring(0, fi.Name.Length - 4);
if (fn.ToLower() != "base")
{
this.listBox1.Items.Add(fi.Name);
this.listBox1.Refresh();
AddFileToListBox(fi);
FmtFileToXml fx = new FmtFileToXml(gx, fn, tbFmtPath.Text);
}
}
MyStatus = string.Format("DONE Converting Formats to XML {0:F3} seconds",TimeSpan.FromTicks(DateTime.Now.Ticks - tStart.Ticks).TotalSeconds) ;
MessageBox.Show("DONE Converting Formats to XML");
}
private void btnMergeFmtPagDoc_Click(object sender, EventArgs e)
{
// get all of the generated xml format files in the fmt_xml directory and merge
DateTime tStart = DateTime.Now;
MyStatus = "Merging...";
// get all of the generated xml format files in the fmt_xml directory and merge
// the fmt/doc/pag & subformats into one file.
DirectoryInfo di = new DirectoryInfo("fmt_xml");
//testDirectoryInfo di = new DirectoryInfo("E:\\proms.net\\exe\\fmtxml");
FileInfo[] fis = di.GetFiles("*f.xml");
listBox1.Items.Clear();
foreach (FileInfo fi in fis)
ClearListBox();
foreach (FileInfo fi in fis)
{
// see if all three, format, doc & pag exist - if not, print error,
// if so, process
@ -383,13 +430,14 @@ namespace fmtxml
string pagname = "fmt_xml\\" + fi.Name.Substring(0, fi.Name.Length - 5) + "d.xml";
if (File.Exists(docname) && File.Exists(pagname))
{
this.listBox1.Items.Add(fi.Name);
EntireFormat ef = new EntireFormat("fmt_xml\\" + fi.Name, tbResultPath.Text);
AddFileToListBox(fi);
EntireFormat ef = new EntireFormat("fmt_xml\\" + fi.Name, tbResultPath.Text);
}
else
Console.WriteLine("For {0}, page or document file does not exist.", fi.Name);
}
MessageBox.Show("DONE Converting Formats to XML - Results are in " + tbResultPath.Text + @"\fmtall'");
MyStatus = string.Format("DONE Merging Formats {0:F3} seconds", TimeSpan.FromTicks(DateTime.Now.Ticks - tStart.Ticks).TotalSeconds);
MessageBox.Show("DONE Merging Formats - Results are in " + tbResultPath.Text + @"\fmtall'");
}
private void btnBrowseFmt_Click(object sender, EventArgs e)

View File

@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>