From c674decd3545ce26f0cf66ff49001df07ddd9212 Mon Sep 17 00:00:00 2001 From: WMJ Date: Tue, 26 Aug 2025 20:34:03 +0800 Subject: [PATCH] =?UTF-8?q?=EF=BC=81=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84=E5=B8=83=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App/Functions/MergerControl.Designer.cs | 5 +- App/Functions/OcrControl.Designer.cs | 20 +-- App/Functions/RenameControl.Designer.cs | 202 ++++++++++++------------ 3 files changed, 115 insertions(+), 112 deletions(-) diff --git a/App/Functions/MergerControl.Designer.cs b/App/Functions/MergerControl.Designer.cs index 139cdc6..640ad32 100644 --- a/App/Functions/MergerControl.Designer.cs +++ b/App/Functions/MergerControl.Designer.cs @@ -454,7 +454,6 @@ // // _FolderColumn // - this._FolderColumn.IsEditable = true; this._FolderColumn.Text = "文件夹"; this._FolderColumn.Width = 104; // @@ -568,9 +567,9 @@ // this._ConfigButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this._ConfigButton.Image = global::PDFPatcher.Properties.Resources.PdfOptions; - this._ConfigButton.Location = new System.Drawing.Point(347, 297); + this._ConfigButton.Location = new System.Drawing.Point(335, 297); this._ConfigButton.Name = "_ConfigButton"; - this._ConfigButton.Size = new System.Drawing.Size(86, 23); + this._ConfigButton.Size = new System.Drawing.Size(98, 29); this._ConfigButton.TabIndex = 5; this._ConfigButton.Text = "功能选项"; this._ConfigButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; diff --git a/App/Functions/OcrControl.Designer.cs b/App/Functions/OcrControl.Designer.cs index c81d77c..93c5648 100644 --- a/App/Functions/OcrControl.Designer.cs +++ b/App/Functions/OcrControl.Designer.cs @@ -70,7 +70,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this._PageRangeBox.Location = new System.Drawing.Point(98, 9); this._PageRangeBox.Name = "_PageRangeBox"; - this._PageRangeBox.Size = new System.Drawing.Size(335, 21); + this._PageRangeBox.Size = new System.Drawing.Size(331, 21); this._PageRangeBox.TabIndex = 1; // // tabControl1 @@ -82,7 +82,7 @@ this.tabControl1.Location = new System.Drawing.Point(13, 124); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(447, 194); + this.tabControl1.Size = new System.Drawing.Size(443, 207); this.tabControl1.TabIndex = 4; // // tabPage1 @@ -106,7 +106,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(439, 168); + this.tabPage1.Size = new System.Drawing.Size(435, 181); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "识别选项"; this.tabPage1.UseVisualStyleBackColor = true; @@ -290,7 +290,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this._SourceFileControl.Location = new System.Drawing.Point(9, 3); this._SourceFileControl.Name = "_SourceFileControl"; - this._SourceFileControl.Size = new System.Drawing.Size(454, 24); + this._SourceFileControl.Size = new System.Drawing.Size(450, 24); this._SourceFileControl.TabIndex = 1; // // _BookmarkControl @@ -300,7 +300,7 @@ this._BookmarkControl.LabelText = "识别结果文件："; this._BookmarkControl.Location = new System.Drawing.Point(9, 33); this._BookmarkControl.Name = "_BookmarkControl"; - this._BookmarkControl.Size = new System.Drawing.Size(454, 25); + this._BookmarkControl.Size = new System.Drawing.Size(450, 25); this._BookmarkControl.TabIndex = 2; this._BookmarkControl.UseForBookmarkExport = true; // @@ -310,16 +310,16 @@ | System.Windows.Forms.AnchorStyles.Right))); this._TargetFileControl.Location = new System.Drawing.Point(9, 64); this._TargetFileControl.Name = "_TargetFileControl"; - this._TargetFileControl.Size = new System.Drawing.Size(454, 25); + this._TargetFileControl.Size = new System.Drawing.Size(450, 25); this._TargetFileControl.TabIndex = 16; // // _ExportBookmarkButton // this._ExportBookmarkButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this._ExportBookmarkButton.Image = global::PDFPatcher.Properties.Resources.Ocr; - this._ExportBookmarkButton.Location = new System.Drawing.Point(211, 96); + this._ExportBookmarkButton.Location = new System.Drawing.Point(198, 96); this._ExportBookmarkButton.Name = "_ExportBookmarkButton"; - this._ExportBookmarkButton.Size = new System.Drawing.Size(120, 23); + this._ExportBookmarkButton.Size = new System.Drawing.Size(129, 28); this._ExportBookmarkButton.TabIndex = 3; this._ExportBookmarkButton.Text = "识别图像文本(&S)"; this._ExportBookmarkButton.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -337,7 +337,7 @@ this._ImportOcrResultButton.GlowColor = System.Drawing.Color.White; this._ImportOcrResultButton.Image = global::PDFPatcher.Properties.Resources.Save; this._ImportOcrResultButton.InnerBorderColor = System.Drawing.SystemColors.ControlDarkDark; - this._ImportOcrResultButton.Location = new System.Drawing.Point(337, 95); + this._ImportOcrResultButton.Location = new System.Drawing.Point(333, 95); this._ImportOcrResultButton.Name = "_ImportOcrResultButton"; this._ImportOcrResultButton.OuterBorderColor = System.Drawing.SystemColors.ControlLightLight; this._ImportOcrResultButton.ShowFocusBorder = true; @@ -361,7 +361,7 @@ this.Controls.Add(this._ImportOcrResultButton); this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "OcrControl"; - this.Size = new System.Drawing.Size(475, 333); + this.Size = new System.Drawing.Size(471, 346); this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); this.tabPage1.PerformLayout(); diff --git a/App/Functions/RenameControl.Designer.cs b/App/Functions/RenameControl.Designer.cs index b19d8e4..a292f58 100644 --- a/App/Functions/RenameControl.Designer.cs +++ b/App/Functions/RenameControl.Designer.cs @@ -35,14 +35,14 @@ System.Windows.Forms.ToolStripMenuItem _SelectNone; System.Windows.Forms.ToolStripMenuItem _Copy; System.Windows.Forms.ToolStripMenuItem _RefreshInfo; - this._MainToolbar = new System.Windows.Forms.ToolStrip(); - this._AddFilesButton = new System.Windows.Forms.ToolStripSplitButton(); - this._RecentFileMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this._SortMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this._SortByNaturalNumberItem = new System.Windows.Forms.ToolStripMenuItem(); this._SortByAlphaItem = new System.Windows.Forms.ToolStripMenuItem(); - this._RefreshInfoButton = new System.Windows.Forms.ToolStripSplitButton(); this._RefreshInfoMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this._MainToolbar = new System.Windows.Forms.ToolStrip(); + this._AddFilesButton = new System.Windows.Forms.ToolStripSplitButton(); + this._RecentFileMenu = new System.Windows.Forms.ContextMenuStrip(this.components); + this._RefreshInfoButton = new System.Windows.Forms.ToolStripSplitButton(); this._SelectionMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this._SelectionMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this._ItemList = new BrightIdeasSoftware.ObjectListView(); @@ -72,13 +72,106 @@ _SelectNone = new System.Windows.Forms.ToolStripMenuItem(); _Copy = new System.Windows.Forms.ToolStripMenuItem(); _RefreshInfo = new System.Windows.Forms.ToolStripMenuItem(); - this._MainToolbar.SuspendLayout(); this._SortMenu.SuspendLayout(); + this._MainToolbar.SuspendLayout(); this._SelectionMenu.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this._ItemList)).BeginInit(); this._ItemListMenu.SuspendLayout(); this.SuspendLayout(); // + // toolStripSeparator1 + // + toolStripSeparator1.Name = "toolStripSeparator1"; + toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // _Sort + // + _Sort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + _Sort.DropDown = this._SortMenu; + _Sort.Image = global::PDFPatcher.Properties.Resources.Sort; + _Sort.ImageTransparentColor = System.Drawing.Color.Magenta; + _Sort.Name = "_Sort"; + _Sort.Size = new System.Drawing.Size(29, 22); + _Sort.Text = "排序"; + _Sort.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._SortMenu_ItemClicked); + // + // _SortMenu + // + this._SortMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this._SortByNaturalNumberItem, + this._SortByAlphaItem}); + this._SortMenu.Name = "_SortMenu"; + this._SortMenu.OwnerItem = _Sort; + this._SortMenu.Size = new System.Drawing.Size(217, 48); + this._SortMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._SortMenu_ItemClicked); + // + // _SortByNaturalNumberItem + // + this._SortByNaturalNumberItem.Image = global::PDFPatcher.Properties.Resources.NaturalSort; + this._SortByNaturalNumberItem.Name = "_SortByNaturalNumberItem"; + this._SortByNaturalNumberItem.Size = new System.Drawing.Size(216, 22); + this._SortByNaturalNumberItem.Text = "按数值和字母顺序排序(&M)"; + // + // _SortByAlphaItem + // + this._SortByAlphaItem.Image = global::PDFPatcher.Properties.Resources.AlphabeticSort; + this._SortByAlphaItem.Name = "_SortByAlphaItem"; + this._SortByAlphaItem.Size = new System.Drawing.Size(216, 22); + this._SortByAlphaItem.Text = "按字母顺序排序(&Z)"; + // + // _Delete + // + _Delete.Image = global::PDFPatcher.Properties.Resources.Delete; + _Delete.ImageTransparentColor = System.Drawing.Color.Magenta; + _Delete.Name = "_Delete"; + _Delete.Size = new System.Drawing.Size(76, 22); + _Delete.Text = "删除文件"; + // + // toolStripSeparator2 + // + toolStripSeparator2.Name = "toolStripSeparator2"; + toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // _SelectAll + // + _SelectAll.Image = global::PDFPatcher.Properties.Resources.SelectAll; + _SelectAll.Name = "_SelectAll"; + _SelectAll.Size = new System.Drawing.Size(124, 22); + _SelectAll.Text = "全部选中"; + // + // _InvertSelection + // + _InvertSelection.Name = "_InvertSelection"; + _InvertSelection.Size = new System.Drawing.Size(124, 22); + _InvertSelection.Text = "反转选择"; + // + // _SelectNone + // + _SelectNone.Name = "_SelectNone"; + _SelectNone.Size = new System.Drawing.Size(124, 22); + _SelectNone.Text = "取消选择"; + // + // _Copy + // + _Copy.Image = global::PDFPatcher.Properties.Resources.Copy; + _Copy.Name = "_Copy"; + _Copy.Size = new System.Drawing.Size(148, 22); + _Copy.Text = "复制列表内容"; + // + // _RefreshInfo + // + _RefreshInfo.DropDown = this._RefreshInfoMenu; + _RefreshInfo.Image = global::PDFPatcher.Properties.Resources.Refresh; + _RefreshInfo.Name = "_RefreshInfo"; + _RefreshInfo.Size = new System.Drawing.Size(148, 22); + _RefreshInfo.Text = "刷新文档属性"; + // + // _RefreshInfoMenu + // + this._RefreshInfoMenu.Name = "_RefreshInfoMenu"; + this._RefreshInfoMenu.OwnerItem = _RefreshInfo; + this._RefreshInfoMenu.Size = new System.Drawing.Size(61, 4); + // // _MainToolbar // this._MainToolbar.GripMargin = new System.Windows.Forms.Padding(0); @@ -110,61 +203,10 @@ // _RecentFileMenu // this._RecentFileMenu.Name = "_RecentFileMenu"; + this._RecentFileMenu.OwnerItem = this._AddFilesButton; this._RecentFileMenu.ShowImageMargin = false; this._RecentFileMenu.Size = new System.Drawing.Size(36, 4); // - // toolStripSeparator1 - // - toolStripSeparator1.Name = "toolStripSeparator1"; - toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // _Sort - // - _Sort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - _Sort.DropDown = this._SortMenu; - _Sort.Image = global::PDFPatcher.Properties.Resources.Sort; - _Sort.ImageTransparentColor = System.Drawing.Color.Magenta; - _Sort.Name = "_Sort"; - _Sort.Size = new System.Drawing.Size(29, 22); - _Sort.Text = "排序"; - _Sort.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._SortMenu_ItemClicked); - // - // _SortMenu - // - this._SortMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this._SortByNaturalNumberItem, - this._SortByAlphaItem}); - this._SortMenu.Name = "_SortMenu"; - this._SortMenu.Size = new System.Drawing.Size(217, 48); - this._SortMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._SortMenu_ItemClicked); - // - // _SortByNaturalNumberItem - // - this._SortByNaturalNumberItem.Image = global::PDFPatcher.Properties.Resources.NaturalSort; - this._SortByNaturalNumberItem.Name = "_SortByNaturalNumberItem"; - this._SortByNaturalNumberItem.Size = new System.Drawing.Size(216, 22); - this._SortByNaturalNumberItem.Text = "按数值和字母顺序排序(&M)"; - // - // _SortByAlphaItem - // - this._SortByAlphaItem.Image = global::PDFPatcher.Properties.Resources.AlphabeticSort; - this._SortByAlphaItem.Name = "_SortByAlphaItem"; - this._SortByAlphaItem.Size = new System.Drawing.Size(216, 22); - this._SortByAlphaItem.Text = "按字母顺序排序(&Z)"; - // - // _Delete - // - _Delete.Image = global::PDFPatcher.Properties.Resources.Delete; - _Delete.ImageTransparentColor = System.Drawing.Color.Magenta; - _Delete.Name = "_Delete"; - _Delete.Size = new System.Drawing.Size(76, 22); - _Delete.Text = "删除文件"; - // - // toolStripSeparator2 - // - toolStripSeparator2.Name = "toolStripSeparator2"; - toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // // _RefreshInfoButton // this._RefreshInfoButton.Image = global::PDFPatcher.Properties.Resources.Refresh; @@ -173,45 +215,6 @@ this._RefreshInfoButton.Size = new System.Drawing.Size(112, 22); this._RefreshInfoButton.Text = "刷新文档属性"; // - // _SelectAll - // - _SelectAll.Image = global::PDFPatcher.Properties.Resources.SelectAll; - _SelectAll.Name = "_SelectAll"; - _SelectAll.Size = new System.Drawing.Size(124, 22); - _SelectAll.Text = "全部选中"; - // - // _InvertSelect - // - _InvertSelection.Name = "_InvertSelection"; - _InvertSelection.Size = new System.Drawing.Size(124, 22); - _InvertSelection.Text = "反转选择"; - // - // _SelectNone - // - _SelectNone.Name = "_SelectNone"; - _SelectNone.Size = new System.Drawing.Size(124, 22); - _SelectNone.Text = "取消选择"; - // - // _Copy - // - _Copy.Image = global::PDFPatcher.Properties.Resources.Copy; - _Copy.Name = "_Copy"; - _Copy.Size = new System.Drawing.Size(148, 22); - _Copy.Text = "复制列表内容"; - // - // _RefreshInfo - // - _RefreshInfo.DropDown = this._RefreshInfoMenu; - _RefreshInfo.Image = global::PDFPatcher.Properties.Resources.Refresh; - _RefreshInfo.Name = "_RefreshInfo"; - _RefreshInfo.Size = new System.Drawing.Size(148, 22); - _RefreshInfo.Text = "刷新文档属性"; - // - // _RefreshInfoMenu - // - this._RefreshInfoMenu.Name = "_RefreshInfoMenu"; - this._RefreshInfoMenu.Size = new System.Drawing.Size(61, 4); - // // _SelectionMenu // this._SelectionMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -219,6 +222,7 @@ _InvertSelection, _SelectNone}); this._SelectionMenu.Name = "_SelectionMenu"; + this._SelectionMenu.OwnerItem = this._SelectionMenuItem; this._SelectionMenu.Size = new System.Drawing.Size(125, 70); this._SelectionMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._MainToolbar_ItemClicked); // @@ -371,7 +375,7 @@ this._TestRenameButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this._TestRenameButton.Location = new System.Drawing.Point(312, 297); this._TestRenameButton.Name = "_TestRenameButton"; - this._TestRenameButton.Size = new System.Drawing.Size(119, 23); + this._TestRenameButton.Size = new System.Drawing.Size(119, 29); this._TestRenameButton.TabIndex = 11; this._TestRenameButton.Text = "测试命名模板(&C)"; this._TestRenameButton.UseVisualStyleBackColor = true; @@ -383,7 +387,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this._TargetPdfFile.Label = "重命名模板(&M)："; this._TargetPdfFile.Location = new System.Drawing.Point(13, 265); - this._TargetPdfFile.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); + this._TargetPdfFile.Margin = new System.Windows.Forms.Padding(4); this._TargetPdfFile.Name = "_TargetPdfFile"; this._TargetPdfFile.Size = new System.Drawing.Size(553, 26); this._TargetPdfFile.TabIndex = 7; @@ -423,9 +427,9 @@ this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Name = "RenameControl"; this.Size = new System.Drawing.Size(575, 342); + this._SortMenu.ResumeLayout(false); this._MainToolbar.ResumeLayout(false); this._MainToolbar.PerformLayout(); - this._SortMenu.ResumeLayout(false); this._SelectionMenu.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this._ItemList)).EndInit(); this._ItemListMenu.ResumeLayout(false);