From ce69adcd51052f07d5e74f90b59e8402f27e404e Mon Sep 17 00:00:00 2001 From: Kathy Date: Fri, 8 Oct 2010 13:00:24 +0000 Subject: [PATCH] --- .../frmVEPROMS.Designer.cs | 50 +++++++-------- PROMS/VEPROMS User Interface/frmVEPROMS.cs | 18 ++++++ PROMS/Volian.Base.Library/TmpFile.cs | 63 +++++++++++++++++++ 3 files changed, 106 insertions(+), 25 deletions(-) create mode 100644 PROMS/Volian.Base.Library/TmpFile.cs diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs index 1c239d04..6d456e1d 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.Designer.cs @@ -421,9 +421,9 @@ namespace VEPROMS this.btnItemInfo, this.lblItemID, this.lblResolution}); - this.bottomBar.Location = new System.Drawing.Point(5, 636); + this.bottomBar.Location = new System.Drawing.Point(5, 634); this.bottomBar.Name = "bottomBar"; - this.bottomBar.Size = new System.Drawing.Size(1185, 29); + this.bottomBar.Size = new System.Drawing.Size(1185, 25); this.bottomBar.Stretch = true; this.bottomBar.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.bottomBar.TabIndex = 1; @@ -436,7 +436,7 @@ namespace VEPROMS this.cmbFont.FormattingEnabled = true; this.cmbFont.Location = new System.Drawing.Point(1013, 0); this.cmbFont.Name = "cmbFont"; - this.cmbFont.Size = new System.Drawing.Size(172, 28); + this.cmbFont.Size = new System.Drawing.Size(172, 23); this.cmbFont.TabIndex = 0; this.cmbFont.SelectedIndexChanged += new System.EventHandler(this.cmbFont_SelectedIndexChanged); // @@ -523,7 +523,7 @@ namespace VEPROMS this.epAnnotations.Expanded = false; this.epAnnotations.ExpandedBounds = new System.Drawing.Rectangle(4, 544, 1187, 202); this.epAnnotations.ExpandOnTitleClick = true; - this.epAnnotations.Location = new System.Drawing.Point(5, 610); + this.epAnnotations.Location = new System.Drawing.Point(5, 608); this.epAnnotations.Name = "epAnnotations"; this.epAnnotations.Size = new System.Drawing.Size(1185, 26); this.epAnnotations.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -556,7 +556,7 @@ namespace VEPROMS this.ctrlAnnotationDetails.CurrentAnnotation = null; this.ctrlAnnotationDetails.Dock = System.Windows.Forms.DockStyle.Fill; this.ctrlAnnotationDetails.Location = new System.Drawing.Point(0, 26); - this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2); + this.ctrlAnnotationDetails.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.ctrlAnnotationDetails.Name = "ctrlAnnotationDetails"; this.ctrlAnnotationDetails.Size = new System.Drawing.Size(1185, 0); this.ctrlAnnotationDetails.TabIndex = 15; @@ -594,7 +594,7 @@ namespace VEPROMS this.epProcedures.ExpandOnTitleClick = true; this.epProcedures.Location = new System.Drawing.Point(5, 57); this.epProcedures.Name = "epProcedures"; - this.epProcedures.Size = new System.Drawing.Size(30, 553); + this.epProcedures.Size = new System.Drawing.Size(30, 551); this.epProcedures.Style.Alignment = System.Drawing.StringAlignment.Center; this.epProcedures.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.epProcedures.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -640,7 +640,7 @@ namespace VEPROMS this.infoPanel.ExpandOnTitleClick = true; this.infoPanel.Location = new System.Drawing.Point(927, 57); this.infoPanel.Name = "infoPanel"; - this.infoPanel.Size = new System.Drawing.Size(230, 553); + this.infoPanel.Size = new System.Drawing.Size(230, 551); this.infoPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.infoPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.infoPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -674,7 +674,7 @@ namespace VEPROMS this.infoTabs.Name = "infoTabs"; this.infoTabs.SelectedTabFont = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold); this.infoTabs.SelectedTabIndex = 0; - this.infoTabs.Size = new System.Drawing.Size(230, 527); + this.infoTabs.Size = new System.Drawing.Size(230, 525); this.infoTabs.TabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Right; this.infoTabs.TabIndex = 1; this.infoTabs.TabLayoutType = DevComponents.DotNetBar.eTabLayoutType.FixedWithNavigationBox; @@ -692,7 +692,7 @@ namespace VEPROMS this.infotabControlPanelTags.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelTags.Name = "infotabControlPanelTags"; this.infotabControlPanelTags.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 527); + this.infotabControlPanelTags.Size = new System.Drawing.Size(203, 525); this.infotabControlPanelTags.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTags.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTags.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -710,7 +710,7 @@ namespace VEPROMS this.panelEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.panelEx1.Location = new System.Drawing.Point(1, 1); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(201, 525); + this.panelEx1.Size = new System.Drawing.Size(201, 523); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.Color = System.Drawing.Color.Transparent; this.panelEx1.Style.BackColor2.Color = System.Drawing.Color.SlateGray; @@ -724,7 +724,7 @@ namespace VEPROMS this.displayTags.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.displayTags.Dock = System.Windows.Forms.DockStyle.Top; this.displayTags.Location = new System.Drawing.Point(0, 0); - this.displayTags.Margin = new System.Windows.Forms.Padding(2); + this.displayTags.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayTags.MinimumSize = new System.Drawing.Size(100, 630); this.displayTags.MyRTB = null; this.displayTags.Name = "displayTags"; @@ -746,7 +746,7 @@ namespace VEPROMS this.infotabControlPanelTransitions.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelTransitions.Name = "infotabControlPanelTransitions"; this.infotabControlPanelTransitions.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 527); + this.infotabControlPanelTransitions.Size = new System.Drawing.Size(203, 525); this.infotabControlPanelTransitions.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelTransitions.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelTransitions.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -768,7 +768,7 @@ namespace VEPROMS this.displayTransition.MyRTB = null; this.displayTransition.Name = "displayTransition"; this.displayTransition.RangeColor = System.Drawing.Color.LightGray; - this.displayTransition.Size = new System.Drawing.Size(201, 525); + this.displayTransition.Size = new System.Drawing.Size(201, 523); this.displayTransition.TabIndex = 0; // // infotabTransition @@ -786,7 +786,7 @@ namespace VEPROMS this.infotabControlPanelRO.Location = new System.Drawing.Point(0, 0); this.infotabControlPanelRO.Name = "infotabControlPanelRO"; this.infotabControlPanelRO.Padding = new System.Windows.Forms.Padding(1); - this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 527); + this.infotabControlPanelRO.Size = new System.Drawing.Size(203, 525); this.infotabControlPanelRO.Style.BackColor1.Color = System.Drawing.SystemColors.Control; this.infotabControlPanelRO.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; this.infotabControlPanelRO.Style.BorderSide = ((DevComponents.DotNetBar.eBorderSide)(((DevComponents.DotNetBar.eBorderSide.Left | DevComponents.DotNetBar.eBorderSide.Top) @@ -807,7 +807,7 @@ namespace VEPROMS this.displayRO.MyRTB = null; this.displayRO.Name = "displayRO"; this.displayRO.ProgressBar = null; - this.displayRO.Size = new System.Drawing.Size(201, 525); + this.displayRO.Size = new System.Drawing.Size(201, 523); this.displayRO.TabControl = null; this.displayRO.TabIndex = 0; // @@ -862,7 +862,7 @@ namespace VEPROMS this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter1.Location = new System.Drawing.Point(35, 57); this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(3, 553); + this.expandableSplitter1.Size = new System.Drawing.Size(3, 551); this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter1.TabIndex = 5; this.expandableSplitter1.TabStop = false; @@ -894,7 +894,7 @@ namespace VEPROMS this.expandableSplitter2.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; this.expandableSplitter2.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(205)))), ((int)(((byte)(208)))), ((int)(((byte)(213))))); this.expandableSplitter2.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter2.Location = new System.Drawing.Point(38, 607); + this.expandableSplitter2.Location = new System.Drawing.Point(38, 605); this.expandableSplitter2.Name = "expandableSplitter2"; this.expandableSplitter2.Size = new System.Drawing.Size(889, 3); this.expandableSplitter2.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; @@ -930,7 +930,7 @@ namespace VEPROMS this.expandableSplitter3.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter3.Location = new System.Drawing.Point(924, 57); this.expandableSplitter3.Name = "expandableSplitter3"; - this.expandableSplitter3.Size = new System.Drawing.Size(3, 550); + this.expandableSplitter3.Size = new System.Drawing.Size(3, 548); this.expandableSplitter3.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter3.TabIndex = 7; this.expandableSplitter3.TabStop = false; @@ -956,7 +956,7 @@ namespace VEPROMS this.toolsPanel.ExpandOnTitleClick = true; this.toolsPanel.Location = new System.Drawing.Point(1160, 57); this.toolsPanel.Name = "toolsPanel"; - this.toolsPanel.Size = new System.Drawing.Size(30, 553); + this.toolsPanel.Size = new System.Drawing.Size(30, 551); this.toolsPanel.Style.Alignment = System.Drawing.StringAlignment.Center; this.toolsPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.toolsPanel.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -1079,7 +1079,7 @@ namespace VEPROMS // this.displayBookMarks.Dock = System.Windows.Forms.DockStyle.Fill; this.displayBookMarks.Location = new System.Drawing.Point(0, 0); - this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2); + this.displayBookMarks.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); this.displayBookMarks.MyDisplayTabControl = null; this.displayBookMarks.MyRTB = null; this.displayBookMarks.Name = "displayBookMarks"; @@ -1158,7 +1158,7 @@ namespace VEPROMS this.expandableSplitter4.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; this.expandableSplitter4.Location = new System.Drawing.Point(1157, 57); this.expandableSplitter4.Name = "expandableSplitter4"; - this.expandableSplitter4.Size = new System.Drawing.Size(3, 553); + this.expandableSplitter4.Size = new System.Drawing.Size(3, 551); this.expandableSplitter4.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; this.expandableSplitter4.TabIndex = 3; this.expandableSplitter4.TabStop = false; @@ -1179,12 +1179,12 @@ namespace VEPROMS this.tc.Dock = System.Windows.Forms.DockStyle.Fill; this.tc.ForeColor = System.Drawing.SystemColors.ControlText; this.tc.Location = new System.Drawing.Point(38, 57); - this.tc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this.tc.Margin = new System.Windows.Forms.Padding(4); this.tc.MyCopyStep = null; this.tc.Name = "tc"; this.tc.RibbonExpanded = true; this.tc.SelectedDisplayTabItem = null; - this.tc.Size = new System.Drawing.Size(886, 550); + this.tc.Size = new System.Drawing.Size(886, 548); this.tc.TabIndex = 8; this.tc.PanelTabDisplay += new Volian.Controls.Library.StepPanelTabDisplayEvent(this.tc_PanelTabDisplay); this.tc.WordSectionClose += new Volian.Controls.Library.StepPanelWordSectionCloseEvent(this.tc_WordSectionClose); @@ -1196,10 +1196,10 @@ namespace VEPROMS // // frmVEPROMS // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScroll = true; - this.ClientSize = new System.Drawing.Size(1195, 667); + this.ClientSize = new System.Drawing.Size(1195, 661); this.Controls.Add(this.tc); this.Controls.Add(this.expandableSplitter3); this.Controls.Add(this.expandableSplitter2); diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index 53077626..b91fe52b 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -56,9 +56,16 @@ namespace VEPROMS SelectedDVI = null; } else // Step Tab Panel + { SelectedDVI = value.MyStepPanel.MyProcedureItemInfo.MyProcedure.ActiveParent as DocVersionInfo; + // Remove it first, if it wasn't set, this doesn't do anything, but if it was set, you don't want + // multiple events because the print dialog will be displayed for each time the event was added. + _SelectedStepTabPanel.MyStepTabRibbon.PrintRequest -= new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest); + _SelectedStepTabPanel.MyStepTabRibbon.PrintRequest += new StepTabRibbonEvent(MyStepTabRibbon_PrintRequest); + } } } + public DocVersionInfo SelectedDVI { get { return _SelectedDVI; } @@ -89,6 +96,9 @@ namespace VEPROMS #endregion public frmVEPROMS() { + // cleanup from previous run: + Volian.Base.Library.TmpFile.RemoveAllTmps(); + if (VlnSettings.DebugMode) { //use local data (for development/debug mode) @@ -151,6 +161,7 @@ namespace VEPROMS toolsPanel.Expanded = false; displayTags.Visible = false; ribbonControl1.ExpandedChanged += new EventHandler(ribbonControl1_ExpandedChanged); + dlgFindReplace = new FindReplace(); SpellChecker = new VlnSpellCheck(); displaySearch1.PrintRequest += new DisplaySearchEvent(displaySearch1_PrintRequest); @@ -165,6 +176,13 @@ namespace VEPROMS if (SelectedStepTabPanel!=null && SelectedStepTabPanel.MyStepTabRibbon != null) SelectedStepTabPanel.MyStepTabRibbon.SetUpdRoValBtn(SelectedStepTabPanel.MyStepTabRibbon.NewerRoFst()); } + void MyStepTabRibbon_PrintRequest(object sender, StepTabRibbonEventArgs args) + { + ProcedureInfo pi = args.Proc as ProcedureInfo; + if (pi == null) return; + DlgPrintProcedure prnDlg = new DlgPrintProcedure(pi); + prnDlg.Show(); + } void displaySearch1_PrintRequest(object sender, DisplaySearchEventArgs args) { Volian.Print.Library.PDFReport myReport = new Volian.Print.Library.PDFReport(args.ReportTitle, args.MyItemInfoList, @"C:\temp\searchresults.pdf"); diff --git a/PROMS/Volian.Base.Library/TmpFile.cs b/PROMS/Volian.Base.Library/TmpFile.cs new file mode 100644 index 00000000..9ba9dab2 --- /dev/null +++ b/PROMS/Volian.Base.Library/TmpFile.cs @@ -0,0 +1,63 @@ +using System; +using System.Collections.Generic; +using System.Text; +using System.IO; + +namespace Volian.Base.Library +{ + public static class TmpFile + { + public static void RemoveAllTmps() + { + RemoveTmpPDFs(); + RemoveTmpDocs(); + RemoveTmps("*.png"); + } + public static void RemoveTmpPDFs() + { + string tmpFolder = VlnSettings.TemporaryFolder; + DirectoryInfo di = new DirectoryInfo(tmpFolder); + if (!di.Exists) return; + foreach (FileInfo fi in di.GetFiles("*.pdf")) + { + try + { + // only delete pdfs if they are older than an hour - just to be + // safe. During creation of pdf's, separate pdfs are created for + // word sections and imported into the main resulting pdf. + if (fi.LastAccessTime.Ticks > (DateTime.Now.Ticks - TimeSpan.TicksPerHour)) + fi.Delete(); + } + catch (Exception ex) + { + continue; // if an error, go onto next file. + } + } + + } + public static void RemoveTmpDocs() + { + RemoveTmps("*.doc"); + } + + private static void RemoveTmps(string extension) + { + string tmpFolder = VlnSettings.TemporaryFolder; + DirectoryInfo di = new DirectoryInfo(tmpFolder); + if (!di.Exists) return; + foreach (FileInfo fi in di.GetFiles(extension)) + { + try + { + // delete any docs. If it fails, just go on to the next one becase + // it may be open from another process. + fi.Delete(); + } + catch (Exception ex) + { + continue; // if an error, go onto next file. + } + } + } + } +}