diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3404d86..00d4aff 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3404d86..00d4aff 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8cb7182..17b4d29 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3404d86..00d4aff 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8cb7182..17b4d29 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - 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 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3404d86..00d4aff 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8cb7182..17b4d29 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index 24ce2d6..a2641b9 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -87,70 +87,6 @@ False bin\x86\Debug\DevComponents.Instrumentation.dll - - False - bin\x86\Debug\DevExpress.Charts.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Data.v14.1.dll - - - False - bin\x86\Debug\DevExpress.Office.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Pdf.v14.1.Drawing.dll - - - False - bin\x86\Debug\DevExpress.Printing.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.RichEdit.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Spreadsheet.v14.1.Core.dll - - - False - bin\x86\Debug\DevExpress.Utils.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraBars.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraCharts.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraEditors.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraGrid.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraPdfViewer.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraRichEdit.v14.1.dll - - - False - bin\x86\Debug\DevExpress.XtraSpreadsheet.v14.1.dll - False bin\x86\Debug\GSBalloonExDotNet.dll diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 0df83b4..73feb80 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FormDocumentManager.Designer.cs b/FormDocumentManager.Designer.cs index 127f95a..1ce6ee2 100644 --- a/FormDocumentManager.Designer.cs +++ b/FormDocumentManager.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDocumentManager)); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.btn_add = new DevComponents.DotNetBar.ButtonX(); this.btn_query = new DevComponents.DotNetBar.ButtonX(); @@ -52,19 +51,11 @@ this.labelX4 = new DevComponents.DotNetBar.LabelX(); this.labelX2 = new DevComponents.DotNetBar.LabelX(); this.labelX1 = new DevComponents.DotNetBar.LabelX(); - this.sideBar1 = new DevComponents.DotNetBar.SideBar(); - this.waitpicBox = new System.Windows.Forms.PictureBox(); this.winGridViewPager1 = new WHC.Pager.WinControl.WinGridViewPager(); - this.expandableSplitter1 = new DevComponents.DotNetBar.ExpandableSplitter(); this.progressBar1 = new System.Windows.Forms.ProgressBar(); - this.wordDocumentControl = new DevExpress.XtraRichEdit.RichEditControl(); - this.excelDocumentControl = new DevExpress.XtraSpreadsheet.SpreadsheetControl(); - this.pdfDocumentControl = new DevExpress.XtraPdfViewer.PdfViewer(); - this.pictureDocumentControl = new System.Windows.Forms.PictureBox(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); this.panelEx1.SuspendLayout(); - this.sideBar1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).BeginInit(); + this.tableLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // // panelEx1 @@ -86,7 +77,7 @@ this.panelEx1.Dock = System.Windows.Forms.DockStyle.Top; this.panelEx1.Location = new System.Drawing.Point(0, 0); this.panelEx1.Name = "panelEx1"; - this.panelEx1.Size = new System.Drawing.Size(873, 68); + this.panelEx1.Size = new System.Drawing.Size(901, 68); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; @@ -227,7 +218,7 @@ this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX3.Location = new System.Drawing.Point(287, 7); this.labelX3.Name = "labelX3"; - this.labelX3.Size = new System.Drawing.Size(50, 16); + this.labelX3.Size = new System.Drawing.Size(56, 18); this.labelX3.TabIndex = 0; this.labelX3.Text = "文档类型"; // @@ -241,7 +232,7 @@ this.labelX5.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX5.Location = new System.Drawing.Point(250, 39); this.labelX5.Name = "labelX5"; - this.labelX5.Size = new System.Drawing.Size(8, 14); + this.labelX5.Size = new System.Drawing.Size(13, 16); this.labelX5.TabIndex = 0; this.labelX5.Text = "-"; // @@ -255,7 +246,7 @@ this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX4.Location = new System.Drawing.Point(8, 39); this.labelX4.Name = "labelX4"; - this.labelX4.Size = new System.Drawing.Size(50, 16); + this.labelX4.Size = new System.Drawing.Size(56, 18); this.labelX4.TabIndex = 0; this.labelX4.Text = "上传日期"; // @@ -269,7 +260,7 @@ this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX2.Location = new System.Drawing.Point(597, 7); this.labelX2.Name = "labelX2"; - this.labelX2.Size = new System.Drawing.Size(38, 16); + this.labelX2.Size = new System.Drawing.Size(44, 18); this.labelX2.TabIndex = 0; this.labelX2.Text = "上传人"; // @@ -283,147 +274,53 @@ this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.labelX1.Location = new System.Drawing.Point(15, 9); this.labelX1.Name = "labelX1"; - this.labelX1.Size = new System.Drawing.Size(26, 16); + this.labelX1.Size = new System.Drawing.Size(31, 18); this.labelX1.TabIndex = 0; this.labelX1.Text = "标题"; // - // sideBar1 - // - this.sideBar1.AccessibleRole = System.Windows.Forms.AccessibleRole.ToolBar; - this.sideBar1.BorderStyle = DevComponents.DotNetBar.eBorderType.None; - this.sideBar1.Controls.Add(this.waitpicBox); - this.sideBar1.Controls.Add(this.winGridViewPager1); - this.sideBar1.Dock = System.Windows.Forms.DockStyle.Top; - this.sideBar1.ExpandedPanel = null; - this.sideBar1.Location = new System.Drawing.Point(0, 68); - this.sideBar1.Name = "sideBar1"; - this.sideBar1.Size = new System.Drawing.Size(873, 249); - this.sideBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.sideBar1.TabIndex = 16; - this.sideBar1.Text = "sideBar1"; - // - // waitpicBox - // - this.waitpicBox.BackColor = System.Drawing.Color.DarkGray; - this.waitpicBox.Image = ((System.Drawing.Image)(resources.GetObject("waitpicBox.Image"))); - this.waitpicBox.Location = new System.Drawing.Point(352, 33); - this.waitpicBox.Name = "waitpicBox"; - this.waitpicBox.Size = new System.Drawing.Size(126, 116); - this.waitpicBox.TabIndex = 2; - this.waitpicBox.TabStop = false; - // // winGridViewPager1 // this.winGridViewPager1.AppendedMenu = null; this.winGridViewPager1.DataSource = null; this.winGridViewPager1.DisplayColumns = ""; this.winGridViewPager1.Dock = System.Windows.Forms.DockStyle.Fill; - this.winGridViewPager1.Location = new System.Drawing.Point(0, 0); + this.winGridViewPager1.Location = new System.Drawing.Point(3, 3); this.winGridViewPager1.MinimumSize = new System.Drawing.Size(540, 0); this.winGridViewPager1.Name = "winGridViewPager1"; this.winGridViewPager1.PrintTitle = ""; - this.winGridViewPager1.Size = new System.Drawing.Size(873, 249); + this.winGridViewPager1.Size = new System.Drawing.Size(895, 364); this.winGridViewPager1.TabIndex = 3; // - // expandableSplitter1 - // - this.expandableSplitter1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.BackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.BackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; - this.expandableSplitter1.Dock = System.Windows.Forms.DockStyle.Top; - this.expandableSplitter1.ExpandableControl = this.sideBar1; - this.expandableSplitter1.ExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.ExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.ExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.ExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.GripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.GripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.GripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.HotBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(246)))), ((int)(((byte)(200)))), ((int)(((byte)(103))))); - this.expandableSplitter1.HotBackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(254)))), ((int)(((byte)(226)))), ((int)(((byte)(135))))); - this.expandableSplitter1.HotBackColor2SchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground2; - this.expandableSplitter1.HotBackColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemPressedBackground; - this.expandableSplitter1.HotExpandFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotExpandFillColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotExpandLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(31)))), ((int)(((byte)(57)))), ((int)(((byte)(120))))); - this.expandableSplitter1.HotExpandLineColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.ItemText; - this.expandableSplitter1.HotGripDarkColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(157)))), ((int)(((byte)(189))))); - this.expandableSplitter1.HotGripDarkColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.expandableSplitter1.HotGripLightColor = System.Drawing.Color.FromArgb(((int)(((byte)(220)))), ((int)(((byte)(232)))), ((int)(((byte)(246))))); - this.expandableSplitter1.HotGripLightColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground; - this.expandableSplitter1.Location = new System.Drawing.Point(0, 317); - this.expandableSplitter1.Name = "expandableSplitter1"; - this.expandableSplitter1.Size = new System.Drawing.Size(873, 8); - this.expandableSplitter1.Style = DevComponents.DotNetBar.eSplitterStyle.Office2007; - this.expandableSplitter1.TabIndex = 25; - this.expandableSplitter1.TabStop = false; - // // progressBar1 // - this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.progressBar1.Location = new System.Drawing.Point(0, 601); + this.progressBar1.Dock = System.Windows.Forms.DockStyle.Fill; + this.progressBar1.Location = new System.Drawing.Point(3, 373); this.progressBar1.Name = "progressBar1"; - this.progressBar1.Size = new System.Drawing.Size(873, 23); + this.progressBar1.Size = new System.Drawing.Size(895, 16); this.progressBar1.TabIndex = 37; this.progressBar1.Visible = false; // - // wordDocumentControl + // tableLayoutPanel1 // - this.wordDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.wordDocumentControl.EnableToolTips = true; - this.wordDocumentControl.Location = new System.Drawing.Point(0, 325); - this.wordDocumentControl.Name = "wordDocumentControl"; - this.wordDocumentControl.Options.CopyPaste.MaintainDocumentSectionSettings = false; - this.wordDocumentControl.Options.Fields.UseCurrentCultureDateTimeFormat = false; - this.wordDocumentControl.Options.MailMerge.KeepLastParagraph = false; - this.wordDocumentControl.Size = new System.Drawing.Size(873, 276); - this.wordDocumentControl.TabIndex = 38; - this.wordDocumentControl.Visible = false; - // - // excelDocumentControl - // - this.excelDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.excelDocumentControl.Location = new System.Drawing.Point(0, 325); - this.excelDocumentControl.Name = "excelDocumentControl"; - this.excelDocumentControl.Size = new System.Drawing.Size(873, 276); - this.excelDocumentControl.TabIndex = 39; - this.excelDocumentControl.Text = "spreadsheetControl1"; - this.excelDocumentControl.Visible = false; - // - // pdfDocumentControl - // - this.pdfDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pdfDocumentControl.HandTool = false; - this.pdfDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pdfDocumentControl.Name = "pdfDocumentControl"; - this.pdfDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pdfDocumentControl.TabIndex = 40; - this.pdfDocumentControl.Visible = false; - // - // pictureDocumentControl - // - this.pictureDocumentControl.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureDocumentControl.Location = new System.Drawing.Point(0, 325); - this.pictureDocumentControl.Name = "pictureDocumentControl"; - this.pictureDocumentControl.Size = new System.Drawing.Size(873, 276); - this.pictureDocumentControl.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureDocumentControl.TabIndex = 41; - this.pictureDocumentControl.TabStop = false; - this.pictureDocumentControl.Visible = false; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); + this.tableLayoutPanel1.Controls.Add(this.winGridViewPager1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.progressBar1, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 68); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 94.39776F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 5.602241F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(901, 392); + this.tableLayoutPanel1.TabIndex = 38; // // FormDocumentManager // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(873, 624); - this.Controls.Add(this.pictureDocumentControl); - this.Controls.Add(this.pdfDocumentControl); - this.Controls.Add(this.excelDocumentControl); - this.Controls.Add(this.wordDocumentControl); - this.Controls.Add(this.progressBar1); - this.Controls.Add(this.expandableSplitter1); - this.Controls.Add(this.sideBar1); + this.ClientSize = new System.Drawing.Size(901, 460); + this.Controls.Add(this.tableLayoutPanel1); this.Controls.Add(this.panelEx1); this.DoubleBuffered = true; this.Name = "FormDocumentManager"; @@ -433,9 +330,7 @@ this.Load += new System.EventHandler(this.FormDocumentManager_Load); this.panelEx1.ResumeLayout(false); this.panelEx1.PerformLayout(); - this.sideBar1.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.waitpicBox)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pictureDocumentControl)).EndInit(); + this.tableLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); } @@ -443,7 +338,6 @@ #endregion private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.SideBar sideBar1; private System.Windows.Forms.DateTimePicker dateTime_begin; private DevComponents.DotNetBar.Controls.ComboBoxEx combo_writer; private DevComponents.DotNetBar.Controls.TextBoxX txt_title; @@ -452,7 +346,6 @@ private DevComponents.DotNetBar.LabelX labelX4; private DevComponents.DotNetBar.LabelX labelX2; private DevComponents.DotNetBar.LabelX labelX1; - private DevComponents.DotNetBar.ExpandableSplitter expandableSplitter1; private System.Windows.Forms.DateTimePicker dateTime_end; private DevComponents.DotNetBar.ButtonX btn_add; private DevComponents.DotNetBar.ButtonX btn_query; @@ -468,12 +361,8 @@ private DevComponents.Editors.ComboItem comboItem9; private DevComponents.Editors.ComboItem comboItem10; private System.Windows.Forms.ProgressBar progressBar1; - private DevExpress.XtraRichEdit.RichEditControl wordDocumentControl; - private DevExpress.XtraSpreadsheet.SpreadsheetControl excelDocumentControl; - private DevExpress.XtraPdfViewer.PdfViewer pdfDocumentControl; - private System.Windows.Forms.PictureBox pictureDocumentControl; - private System.Windows.Forms.PictureBox waitpicBox; private WHC.Pager.WinControl.WinGridViewPager winGridViewPager1; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; } } \ No newline at end of file diff --git a/FormDocumentManager.cs b/FormDocumentManager.cs index 8bd9d37..e3ff73f 100644 --- a/FormDocumentManager.cs +++ b/FormDocumentManager.cs @@ -37,7 +37,8 @@ winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged); this.winGridViewPager1.OnAddNew += new EventHandler(winGridViewPager1_OnEditSelected); //预览 - this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + //this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnAddNew);//下载 + this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//下载 this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//删除 this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport); @@ -51,7 +52,7 @@ if (frm == null) { frm = new FormDocumentManager(); - frm.waitpicBox.Show(); + //frm.waitpicBox.Show(); frm.Show(); } @@ -89,8 +90,9 @@ winGridViewPager1.dataGridView1.ContextMenuStrip.Items[5].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[6].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[7].Visible = false; + winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[1].Text = "下载"; - winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; + //winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "预览"; winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "删除"; //右键菜单宽度 @@ -135,14 +137,14 @@ /// /// /// - private void winGridViewPager1_OnAddNew(object sender, EventArgs e) - { - progressBar1.Visible = true; - progressBar1.Value = 0; - Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); - preViewJob.IsBackground = true; - preViewJob.Start(e); - } + //private void winGridViewPager1_OnAddNew(object sender, EventArgs e) + //{ + // progressBar1.Visible = true; + // progressBar1.Value = 0; + // Thread preViewJob = new Thread(new ParameterizedThreadStart(doPreView)); + // preViewJob.IsBackground = true; + // preViewJob.Start(e); + //} /// /// 下载 /// @@ -433,11 +435,11 @@ MessageBox.Show("数据库访问异常", "错误"); } - this.Invoke((EventHandler)delegate - { - this.waitpicBox.Hide(); + //this.Invoke((EventHandler)delegate + //{ + // this.waitpicBox.Hide(); - }); + //}); } private void FormDocumentManager_FormClosing(object sender, FormClosingEventArgs e) @@ -458,113 +460,113 @@ LoadData(1); } - private void doPreView(Object e) - { //处理预览操作 - System.GC.Collect(); - if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) - { - DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; - try - { - string filename = row.Cells["文档名称"].Value.ToString(); - this.Invoke((EventHandler)delegate - { - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); - pictureDocumentControl.Visible = false; - }); - lock (lockHelp) - { - string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; - string file = System.Environment.CurrentDirectory + "\\download\\" + filename; + //private void doPreView(Object e) + //{ //处理预览操作 + // System.GC.Collect(); + // if (winGridViewPager1 != null && winGridViewPager1.dataGridView1 != null && winGridViewPager1.dataGridView1.SelectedRows.Count > 0) + // { + // DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0]; + // try + // { + // string filename = row.Cells["文档名称"].Value.ToString(); + // this.Invoke((EventHandler)delegate + // { + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + "tmp.pdf"); + // pictureDocumentControl.Visible = false; + // }); + // lock (lockHelp) + // { + // string url = ConfigurationManager.AppSettings["downurl"] + "/" + filename; + // string file = System.Environment.CurrentDirectory + "\\download\\" + filename; - System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); - System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); - long totalBytes = myrp.ContentLength; - if (Myrq != null) { Myrq.Abort(); Myrq = null; }; - if (myrp != null) { myrp.Close(); myrp = null; }; + // System.Net.HttpWebRequest Myrq = (System.Net.HttpWebRequest)System.Net.HttpWebRequest.Create(url); + // System.Net.HttpWebResponse myrp = (System.Net.HttpWebResponse)Myrq.GetResponse(); + // long totalBytes = myrp.ContentLength; + // if (Myrq != null) { Myrq.Abort(); Myrq = null; }; + // if (myrp != null) { myrp.Close(); myrp = null; }; - if (totalBytes > 50 * 1024 * 1024) - { - MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); - return; - } + // if (totalBytes > 50 * 1024 * 1024) + // { + // MessageBox.Show("文件大小超过50M,请下载后打开！", "提示"); + // return; + // } - int result = DownloadFile(url, file, progressBar1); - if (result == 1) - { //正在下载，不响应 - return; - } - else if (result == 2 || result == 3) - { //下载出现了异常,在下载时候已经出现提示框，不再展示 - MessageBox.Show(filename + "预览操作失败", "通知"); - return; - } + // int result = DownloadFile(url, file, progressBar1); + // if (result == 1) + // { //正在下载，不响应 + // return; + // } + // else if (result == 2 || result == 3) + // { //下载出现了异常,在下载时候已经出现提示框，不再展示 + // MessageBox.Show(filename + "预览操作失败", "通知"); + // return; + // } - this.Invoke((EventHandler)delegate - { - //progressBar1.Visible = false; - switch (Path.GetExtension(filename)) - { - case ".doc": - case ".docx": - wordDocumentControl.Visible = true; - excelDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // this.Invoke((EventHandler)delegate + // { + // //progressBar1.Visible = false; + // switch (Path.GetExtension(filename)) + // { + // case ".doc": + // case ".docx": + // wordDocumentControl.Visible = true; + // excelDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".xls": - case ".xlsx": - excelDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - pdfDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; - excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".pdf": - pdfDocumentControl.Visible = true; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = false; + // wordDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".xls": + // case ".xlsx": + // excelDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // pdfDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; + // excelDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".pdf": + // pdfDocumentControl.Visible = true; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = false; - pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); - break; - case ".jpg": - case ".png": - case ".gif": - case ".bmp": - pdfDocumentControl.Visible = false; - wordDocumentControl.Visible = false; - excelDocumentControl.Visible = false; - pictureDocumentControl.Visible = true; - pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; - break; - default: - MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); - break; - } + // pdfDocumentControl.LoadDocument(System.Environment.CurrentDirectory + "\\download\\" + filename); + // break; + // case ".jpg": + // case ".png": + // case ".gif": + // case ".bmp": + // pdfDocumentControl.Visible = false; + // wordDocumentControl.Visible = false; + // excelDocumentControl.Visible = false; + // pictureDocumentControl.Visible = true; + // pictureDocumentControl.ImageLocation = System.Environment.CurrentDirectory + "\\download\\" + filename; + // break; + // default: + // MessageBox.Show("不支持该格式文件预览, 仅支持|.doc|.docx|.xls|.xlsx|.pdf|.jpg|.png|.gif|.bmp格式的预览", "结果", MessageBoxButtons.OK, MessageBoxIcon.Information); + // break; + // } - }); + // }); - } + // } - } - catch (Exception ex) - { - MessageBox.Show("预览失败！", "提示"); - } - } - else - { - MessageBox.Show("请选中需要预览的文件！", "提示"); - } + // } + // catch (Exception ex) + // { + // MessageBox.Show("预览失败！", "提示"); + // } + // } + // else + // { + // MessageBox.Show("请选中需要预览的文件！", "提示"); + // } - } + //} private void doDownload(Object e) { //下载操作 diff --git a/FormDocumentManager.resx b/FormDocumentManager.resx index 7b3068c..1af7de1 100644 --- a/FormDocumentManager.resx +++ b/FormDocumentManager.resx @@ -117,77 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Blue - - - - - R0lGODlhgACAAKIAAP///93d3bu7u5mZmQAA/wAAAAAAAAAAACH/C05FVFNDQVBFMi4wAwEAAAAh+QQF - BQAEACwCAAIAfAB8AAAD/0i63P4wygYqmDjrzbtflvWNZGliYXiubKuloivPLlzReD7al+7/Eh5wSFQI - i8hHYBkwHUmD6CD5YTJLz49USuVYraRsZ7vtar7XnQ1Kjpoz6LRHvGlz35O4nEPP2O94EnpNc2sef1OB - GIOFMId/inB6jSmPdpGScR19EoiYmZobnBCIiZ95k6KGGp6ni4wvqxilrqBfqo6skLW2YBmjDa28r6Eo - sp27w8Rov8ekycqoqUHODrTRvXsQwArC2NLF29UM19/LtxO5yJd4Au4CK7DUNxPebG4e7+8n8iv2WmQ6 - 6BtoYpo/dvfacBjIkITBE9DGlMvAsOIIZjIUAixliv9ixYZVtLUos5GjwI8gzc3iCGghypQqrbFsme8l - wZgLZtIcYfNmTJ34WPTUZw5oRxdD9w0z6iOpO15MgTh1BTTJUKos39jE+o/KS64IFVmsFfYT0aU7capd - y7at27dw48qdS7eu3bt480I02vUbX2F/JxYNDImw4GiGE/P9qbhxVpWOI/eFKtlNZbWXuzlmG1mv58+g - Q4seTbq06dOoU6vGQZJy0FNlMcV+czhQ7SQmYd8eMhPs5BxVdfcGEtV3buDBXQ+fURxx8oM6MT9P+Fh6 - dOrH2zavc13u9JXVJb520Vp8dvC76wXMuN5Sepm/1WtkEZHDefnzR9Qvsd9+/wi8+en3X0ntYVcSdAE+ - UN4zs7ln24CaLagghIxBaGF8kFGoIYV+Ybghh841GIyI5ICIFoklJsigihmimJOLEbLYIYwxSgigiZ+8 - l2KB+Ml4oo/w8dijjcrouCORKwIpnJIjMnkkksalNeR4fuBIm5UEYImhIlsGCeWNNJphpJdSTlkml1jW - eOY6TnaRpppUctcmFW9mGSaZceYopH9zkjnjUe59iR5pdapWaGqHopboaYua1qije67GJ6CuJAAAIfkE - BQUABAAsCgACAFcAMAAAA/9Iutz+ML5Ag7w46z0r5WAoSp43nihXVmnrdusrv+s332dt4Tyo9yOBUJD6 - oQBIQGs4RBlHySSKyczVTtHoidocPUNZaZAr9F5FYbGI3PWdQWn1mi36buLKFJvojsHjLnshdhl4L4Iq - bxqGh4gahBJ4eY1kiX6LgDN7fBmQEJI4jhieD4yhdJ2KkZk8oiSqEaatqBekDLKztBG2CqBACq4wJRi4 - PZu1sA2+v8C6EJexrBAD1AOBzsLE0g/V1UvYR9sN3eR6lTLi4+TlY1wz6Qzr8u1t6FkY8vNzZTxaGfn6 - mAkEGFDgL4LrDDJDyE4hEIbdHB6ESE1iD4oVLfLAqPETIsOODwmCDJlv5MSGJklaS6khAQAh+QQFBQAE - ACwfAAIAVwAwAAAD/0i63P5LSAGrvTjrNuf+YKh1nWieIumhbFupkivPBEzR+GnnfLj3ooFwwPqdAshA - azhEGUXJJIrJ1MGOUamJ2jQ9QVltkCv0XqFh5IncBX01afGYnDqD40u2z76JK/N0bnxweC5sRB9vF34z - h4gjg4uMjXobihWTlJUZlw9+fzSHlpGYhTminKSepqebF50NmTyor6qxrLO0L7YLn0ALuhCwCrJAjrUq - krjGrsIkGMW/BMEPJcphLgDaABjUKNEh29vdgTLLIOLpF80s5xrp8ORVONgi8PcZ8zlRJvf40tL8/QPY - Q+BAgjgMxkPIQ6E6hgkdjoNIQ+JEijMsasNY0RQix4gKP+YIKXKkwJIFF6JMudFEAgAh+QQFBQAEACw8 - AAIAQgBCAAAD/kg0PPowykmrna3dzXvNmSeOFqiRaGoyaTuujitv8Gx/661HtSv8gt2jlwIChYtc0Xjc - EUnMpu4pikpv1I71astytkGh9wJGJk3QrXlcKa+VWjeSPZHP4Rtw+I2OW81DeBZ2fCB+UYCBfWRqiQp0 - CnqOj4J1jZOQkpOUIYx/m4oxg5cuAaYBO4Qop6c6pKusrDevIrG2rkwptrupXB67vKAbwMHCFcTFxhLI - t8oUzLHOE9Cy0hHUrdbX2KjaENzey9Dh08jkz8Tnx83q66bt8PHy8/T19vf4+fr6AP3+/wADAjQmsKDB - f6AOKjS4aaHDgZMeSgTQcKLDhBYPEswoA1BBAgAh+QQFBQAEACxOAAoAMABXAAAD7Ei6vPOjyUkrhdDq - fXHm4OZ9YSmNpKmiqVqykbuysgvX5o2HcLxzup8oKLQQix0UcqhcVo5ORi+aHFEn02sDeuWqBGCBkbYL - h5/NmnldxajX7LbPBK+PH7K6narfO/t+SIBwfINmUYaHf4lghYyOhlqJWgqDlAuAlwyBmpVnnaChoqOk - paanqKmqKgGtrq+wsbA1srW2ry63urasu764Jr/CAb3Du7nGt7TJsqvOz9DR0tPU1TIA2ACl2dyi3N/a - neDf4uPklObj6OngWuzt7u/d8fLY9PXr9eFX+vv8+PnYlUsXiqC3c6PmUUgAACH5BAUFAAQALE4AHwAw - AFcAAAPpSLrc/m7IAau9bU7MO9GgJ0ZgOI5leoqpumKt+1axPJO1dtO5vuM9yi8TlAyBvSMxqES2mo8c - FFKb8kzWqzDL7Xq/4LB4TC6bz1yBes1uu9uzt3zOXtHv8xN+Dx/x/wJ6gHt2g3Rxhm9oi4yNjo+QkZKT - CgGWAWaXmmOanZhgnp2goaJdpKGmp55cqqusrZuvsJays6mzn1m4uRAAvgAvuBW/v8GwvcTFxqfIycA3 - zA/OytCl0tPPO7HD2GLYvt7dYd/ZX99j5+Pi6tPh6+bvXuTuzujxXens9fr7YPn+7egRI9PPHrgpCQAA - IfkEBQUABAAsPAA8AEIAQgAAA/lIutz+UI1Jq7026h2x/xUncmD5jehjrlnqSmz8vrE8u7V5z/m5/8Cg - cEgsGo/IpHLJbDqf0Kh0ShBYBdTXdZsdbb/Yrgb8FUfIYLMDTVYz2G13FV6Wz+lX+x0fdvPzdn9WeoJG - AYcBN39EiIiKeEONjTt0kZKHQGyWl4mZdREAoQAcnJhBXBqioqSlT6qqG6WmTK+rsa1NtaGsuEu6o7yX - ubojsrTEIsa+yMm9SL8osp3PzM2cStDRykfZ2tfUtS/bRd3ewtzV5pLo4eLjQuUp70Hx8t9E9eqO5Oku - 5/ztdkxi90qPg3x2EMpR6IahGocPCxp8AGtigwQAIfkEBQUABAAsHwBOAFcAMAAAA/9Iutz+MMo36pg4 - 682J/V0ojs1nXmSqSqe5vrDXunEdzq2ta3i+/5DeCUh0CGnF5BGULC4tTeUTFQVONYAs4CfoCkZPjFar - 83rBx8l4XDObSUL1Ott2d1U4yZwcs5/xSBB7dBMBhgEYfncrTBGDW4WHhomKUY+QEZKSE4qLRY8YmoeU - fkmXoaKInJ2fgxmpqqulQKCvqRqsP7WooriVO7u8mhu5NacasMTFMMHCm8qzzM2RvdDRK9PUwxzLKdna - z9y/Kt8SyR3dIuXmtyHpHMcd5+jvWK4i8/TXHff47SLjQvQLkU+fG29rUhQ06IkEG4X/Rryp4mwUxSgL - L/7IqFETB8eONT6ChCFy5ItqJomES6kgAQAh+QQFBQAEACwKAE4AVwAwAAAD/0i63A4QuEmrvTi3yLX/ - 4MeNUmieITmibEuppCu3sDrfYG3jPKbHveDktxIaF8TOcZmMLI9NyBPanFKJp4A2IBx4B5lkdqvtfb8+ - HYpMxp3Pl1qLvXW/vWkli16/3dFxTi58ZRcChwIYf3hWBIRchoiHiotWj5AVkpIXi4xLjxiaiJR/T5eh - oomcnZ+EGamqq6VGoK+pGqxCtaiiuJVBu7yaHrk4pxqwxMUzwcKbyrPMzZG90NGDrh/JH8t72dq3IN1j - fCHb3L/e5ebh4ukmxyDn6O8g08jt7tf26ybz+m/W9GNXzUQ9fm1Q/APoSWAhhfkMAmpEbRhFKwsvCsmo - sRIHx444PoKcIXKkjIImjTzjkQAAIfkEBQUABAAsAgA8AEIAQgAAA/VIBNz+8KlJq72Yxs1d/uDVjVxo - gmQqnaylvkArT7A63/V47/m2/8CgcEgsGo/IpHLJbDqf0Kh0Sj0FroGqDMvVmrjgrDcTBo8v5fCZki6v - CW33Oq4+0832O/at3+f7fICBdzsChgJGeoWHhkV0P4yMRG1BkYeOeECWl5hXQ5uNIAOjA1KgiKKko1Cn - qBmqqk+nIbCkTq20taVNs7m1vKAnurtLvb6wTMbHsUq4wrrFwSzDzcrLtknW16tI2tvERt6pv0fi48jh - 5h/U6Zs77EXSN/BE8jP09ZFA+PmhP/xvJgAMSGBgQINvEK5ReIZhQ3QEMTBLAAAh+QQFBQAEACwCAB8A - MABXAAAD50i6DA4syklre87qTbHn4OaNYSmNqKmiqVqyrcvBsazRpH3jmC7yD98OCBF2iEXjBKmsAJsW - HDQKmw571l8my+16v+CweEwum8+hgHrNbrvbtrd8znbR73MVfg838f8BeoB7doN0cYZvaIuMjY6PkJGS - k2gClgJml5pjmp2YYJ6dX6GeXaShWaeoVqqlU62ir7CXqbOWrLafsrNctjIDwAMWvC7BwRWtNsbGFKc+ - y8fNsTrQ0dK3QtXAYtrCYd3eYN3c49/a5NVj5eLn5u3s6e7x8NDo9fbL+Mzy9/T5+tvUzdN3Zp+GBAAh - +QQJBQAEACwCAAIAfAB8AAAD/0i63P4wykmrvTjrzbv/YCiOZGmeaKqubOu+cCzPdArcQK2TOL7/nl4P - SMwIfcUk5YhUOh3M5nNKiOaoWCuWqt1Ou16l9RpOgsvEMdocXbOZ7nQ7DjzTaeq7zq6P5fszfIASAYUB - IYKDDoaGIImKC4ySH3OQEJKYHZWWi5iZG0ecEZ6eHEOio6SfqCaqpaytrpOwJLKztCO2jLi1uoW8Ir6/ - wCHCxMG2x7muysukzb230M6H09bX2Nna29zd3t/g4cAC5OXm5+jn3Ons7eba7vHt2fL16tj2+QL0+vXw - /e7WAUwnrqDBgwgTKlzIsKHDh2gGSBwAccHEixAvaqTYcFCjRoYeNyoM6REhyZIHT4o0qPIjy5YTTcKU - mHImx5cwE85cmJPnSYckK66sSAAj0aNIkypdyrSp06dQo0qdSrWq1atYs2rdyrWr169gwxZJAAA7 - - \ No newline at end of file diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 1e1e9d0..02da4c5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -82,6 +82,7 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); + this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -610,7 +611,6 @@ this.buttonItem84 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem75 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem76 = new DevComponents.DotNetBar.ButtonItem(); - this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -810,7 +810,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; this.toolStripDropDownButton1.Click += new System.EventHandler(this.toolStripDropDownButton1_Click); @@ -1047,6 +1047,16 @@ this.layerSensorTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerMarkerTree_AfterCheck); this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -4111,9 +4121,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel7); - this.ribbonControl1.Controls.Add(this.ribbonPanel3); this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Controls.Add(this.ribbonPanel15); this.ribbonControl1.Controls.Add(this.ribbonPanel8); @@ -4184,6 +4194,7 @@ this.ribbonPanel1.StyleMouseOver.Class = ""; this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; // // ribbonBar21 // @@ -4377,10 +4388,10 @@ this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar3); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -4397,7 +4408,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar3 // @@ -4421,7 +4431,7 @@ this.buttonItem9}); this.ribbonBar3.Location = new System.Drawing.Point(3, 0); this.ribbonBar3.Name = "ribbonBar3"; - this.ribbonBar3.Size = new System.Drawing.Size(296, 92); + this.ribbonBar3.Size = new System.Drawing.Size(296, 59); this.ribbonBar3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar3.TabIndex = 0; // @@ -6004,7 +6014,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_01_hover; this.ribbonTabItem1.Image = global::Cyberpipe.Properties.Resources._24x24icon_01; this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -6033,6 +6042,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_10_hover1; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_101; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -6386,16 +6396,6 @@ this.buttonItem76.SubItemsExpandWidth = 14; this.buttonItem76.Text = "坐标标注"; // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; diff --git a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll deleted file mode 100644 index a889796..0000000 --- a/bin/x86/Debug/DevExpress.Charts.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Data.v14.1.dll b/bin/x86/Debug/DevExpress.Data.v14.1.dll deleted file mode 100644 index 06f2801..0000000 --- a/bin/x86/Debug/DevExpress.Data.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll deleted file mode 100644 index 23fa234..0000000 --- a/bin/x86/Debug/DevExpress.Office.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll deleted file mode 100644 index a8f2b00..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll b/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll deleted file mode 100644 index eeed88e..0000000 --- a/bin/x86/Debug/DevExpress.Pdf.v14.1.Drawing.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll deleted file mode 100644 index ede5744..0000000 --- a/bin/x86/Debug/DevExpress.Printing.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll b/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll deleted file mode 100644 index 5d772bb..0000000 --- a/bin/x86/Debug/DevExpress.RichEdit.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll b/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll deleted file mode 100644 index b86f69e..0000000 --- a/bin/x86/Debug/DevExpress.Spreadsheet.v14.1.Core.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.Utils.v14.1.dll b/bin/x86/Debug/DevExpress.Utils.v14.1.dll deleted file mode 100644 index ebd0783..0000000 --- a/bin/x86/Debug/DevExpress.Utils.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll b/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll deleted file mode 100644 index e1760d4..0000000 --- a/bin/x86/Debug/DevExpress.XtraBars.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll b/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll deleted file mode 100644 index b971123..0000000 --- a/bin/x86/Debug/DevExpress.XtraCharts.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll b/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll deleted file mode 100644 index 721f445..0000000 --- a/bin/x86/Debug/DevExpress.XtraEditors.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll b/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll deleted file mode 100644 index 25117ad..0000000 --- a/bin/x86/Debug/DevExpress.XtraGrid.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll b/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll deleted file mode 100644 index 4caba9b..0000000 --- a/bin/x86/Debug/DevExpress.XtraPdfViewer.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll b/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll deleted file mode 100644 index 53d22ee..0000000 --- a/bin/x86/Debug/DevExpress.XtraRichEdit.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll b/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll deleted file mode 100644 index 4992252..0000000 --- a/bin/x86/Debug/DevExpress.XtraSpreadsheet.v14.1.dll +++ /dev/null Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.exe b/bin/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/bin/x86/Debug/EMSCyberpipe.exe +++ b/bin/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/bin/x86/Debug/EMSCyberpipe.pdb b/bin/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/bin/x86/Debug/EMSCyberpipe.pdb +++ b/bin/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources index bf13af8..6c05a97 100644 --- a/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources +++ b/obj/x86/Debug/Cyberpipe.FormDocumentManager.resources Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache index 3404d86..00d4aff 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 8cb7182..17b4d29 100644 --- a/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.exe b/obj/x86/Debug/EMSCyberpipe.exe index b750500..ffc67ec 100644 --- a/obj/x86/Debug/EMSCyberpipe.exe +++ b/obj/x86/Debug/EMSCyberpipe.exe Binary files differ diff --git a/obj/x86/Debug/EMSCyberpipe.pdb b/obj/x86/Debug/EMSCyberpipe.pdb index 1610d91..51f0819 100644 --- a/obj/x86/Debug/EMSCyberpipe.pdb +++ b/obj/x86/Debug/EMSCyberpipe.pdb Binary files differ diff --git a/obj/x86/Debug/GenerateResource.read.1.tlog b/obj/x86/Debug/GenerateResource.read.1.tlog index e91278d..b680038 100644 --- a/obj/x86/Debug/GenerateResource.read.1.tlog +++ b/obj/x86/Debug/GenerateResource.read.1.tlog Binary files differ