From 461b24cc4f38b29ee5dc9ce857470f36a0c7486b Mon Sep 17 00:00:00 2001 From: tfoman Date: Wed, 22 Jul 2015 10:17:26 +0200 Subject: [PATCH] Registered workfiles can be listed and shown --- CobXmlSupport/CheckWorkItems.Designer.cs | 2 + CobXmlSupport/CheckWorkItems.cs | 50 ++++++++++++++++++++---- CobXmlSupport/GenCobCode.cs | 2 +- CobXmlSupport/ShowCode.Designer.cs | 1 + CobXmlSupport/ShowCode.cs | 9 +++++ 5 files changed, 55 insertions(+), 9 deletions(-) diff --git a/CobXmlSupport/CheckWorkItems.Designer.cs b/CobXmlSupport/CheckWorkItems.Designer.cs index 7383b3e..0714545 100644 --- a/CobXmlSupport/CheckWorkItems.Designer.cs +++ b/CobXmlSupport/CheckWorkItems.Designer.cs @@ -55,11 +55,13 @@ this.chFileName, this.chPath}); this.lvGenFiles.Location = new System.Drawing.Point(209, 13); + this.lvGenFiles.MultiSelect = false; this.lvGenFiles.Name = "lvGenFiles"; this.lvGenFiles.Size = new System.Drawing.Size(568, 355); this.lvGenFiles.TabIndex = 1; this.lvGenFiles.UseCompatibleStateImageBehavior = false; this.lvGenFiles.View = System.Windows.Forms.View.Details; + this.lvGenFiles.SelectedIndexChanged += new System.EventHandler(this.lvGenFiles_SelectedIndexChanged); // // chUsageName // diff --git a/CobXmlSupport/CheckWorkItems.cs b/CobXmlSupport/CheckWorkItems.cs index 3ecb399..2ced074 100644 --- a/CobXmlSupport/CheckWorkItems.cs +++ b/CobXmlSupport/CheckWorkItems.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Drawing; +using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; @@ -34,20 +35,53 @@ namespace CobXmlSupport private void lbWorkFiles_SelectedIndexChanged(object sender, EventArgs e) { string fnameChosen =(string)lbWorkFiles.Items[lbWorkFiles.SelectedIndex]; - GenSetting lSetting; + GenSetting lSetting; FileList.TryGetValue(fnameChosen, out lSetting); - lvGenFiles.Items.Clear(); - foreach(savedFile sf in lSetting.fileList) + if (lSetting.ActualFile == S.ettingActualFile) { - ListViewItem lvi = new ListViewItem( ); - lvi.Text = sf.usageName; - lvi.SubItems.Add(sf.saveDate.ToLocalTime().ToString()); - lvi.SubItems.Add(sf.fNameSaved); - lvi.SubItems.Add(sf.directorySaved); + lSetting.SetSettings(); + } + lvGenFiles.Items.Clear(); + if (lSetting.fileList != null) + { + foreach (savedFile sf in lSetting.fileList) + { + ListViewItem lvi = new ListViewItem(); + lvi.Text = sf.usageName; + lvi.SubItems.Add(sf.saveDate.ToLocalTime().ToString()); + lvi.SubItems.Add(sf.fNameSaved); + lvi.SubItems.Add(sf.directorySaved); + lvGenFiles.Items.Add(lvi); + } + } + else + { + ListViewItem lvi = new ListViewItem(); + lvi.Text = "Inga filer genererade !"; + lvi.SubItems.Add("---"); + lvi.SubItems.Add("---"); + lvi.SubItems.Add("---"); lvGenFiles.Items.Add(lvi); } } + private void lvGenFiles_SelectedIndexChanged(object sender, EventArgs e) + { + ListViewItem fnameChosen = lvGenFiles.SelectedItems[0]; + if (!fnameChosen.Text.StartsWith("Inga")) + { + showGeneratedFile(fnameChosen.Text, fnameChosen.SubItems[3].Text + "\\" + fnameChosen.SubItems[2].Text); + } + else MessageBox.Show(fnameChosen.Text); + } + + private void showGeneratedFile(string usageName,string fname){ + ShowCode FileWin = new ShowCode(); + FileWin.Parent = null; + FileWin.Labeltext = usageName; + FileWin.CodeShower.Text = File.ReadAllText(fname); + FileWin.ShowDialog(); + } } } diff --git a/CobXmlSupport/GenCobCode.cs b/CobXmlSupport/GenCobCode.cs index a24d009..5b7f40f 100644 --- a/CobXmlSupport/GenCobCode.cs +++ b/CobXmlSupport/GenCobCode.cs @@ -1259,7 +1259,7 @@ namespace CobXmlSupport XmlSerializer x = new XmlSerializer(saveColl.GetType()); StreamWriter writer = new StreamWriter(SavePath + "\\FilnamnsDict.xml", false); x.Serialize(writer, saveColl); - MessageBox.Show("Objektet är serialiserat !(" + SavePath + "\\FilnamnsDict.xml)"); + //MessageBox.Show("Objektet är serialiserat !(" + SavePath + "\\FilnamnsDict.xml)"); } catch (Exception ex) { diff --git a/CobXmlSupport/ShowCode.Designer.cs b/CobXmlSupport/ShowCode.Designer.cs index eb55c64..7262b96 100644 --- a/CobXmlSupport/ShowCode.Designer.cs +++ b/CobXmlSupport/ShowCode.Designer.cs @@ -125,6 +125,7 @@ this.Margin = new System.Windows.Forms.Padding(2); this.Name = "ShowCode"; this.Text = "ShowCode"; + this.Load += new System.EventHandler(this.ShowCode_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/CobXmlSupport/ShowCode.cs b/CobXmlSupport/ShowCode.cs index 69acb2b..9fad431 100644 --- a/CobXmlSupport/ShowCode.cs +++ b/CobXmlSupport/ShowCode.cs @@ -338,5 +338,14 @@ namespace CobXmlSupport saveWin.ShowDialog(); } + private void ShowCode_Load(object sender, EventArgs e) + { + if (parentWindow == null) + { + btnSaveAktualText.Enabled = false; + } + else btnSaveAktualText.Enabled = true; + } + } }