diff --git a/App/Functions/EditorControl.Designer.cs b/App/Functions/EditorControl.Designer.cs
index 4c5517f..5d14a8b 100644
--- a/App/Functions/EditorControl.Designer.cs
+++ b/App/Functions/EditorControl.Designer.cs
@@ -103,7 +103,6 @@
System.Windows.Forms.ToolStripMenuItem _OcrDetectPunctuation;
System.Windows.Forms.ToolStripMenuItem _FullScreen;
System.Windows.Forms.ToolStripMenuItem _PageProperties;
- System.Windows.Forms.ToolStripMenuItem _EditorOptions;
System.Windows.Forms.ToolStripMenuItem _MarkBookmark;
System.Windows.Forms.ToolStripMenuItem _MarkBookmarkRed;
System.Windows.Forms.ToolStripMenuItem _MarkBookmarkYellow;
@@ -123,6 +122,7 @@
System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
+ System.Windows.Forms.ToolStripButton _EditorOptions;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EditorControl));
this._SetCurrentCoordinates = new System.Windows.Forms.ToolStripMenuItem();
this._SelectionMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
@@ -242,7 +242,6 @@
_OcrDetectPunctuation = new System.Windows.Forms.ToolStripMenuItem();
_FullScreen = new System.Windows.Forms.ToolStripMenuItem();
_PageProperties = new System.Windows.Forms.ToolStripMenuItem();
- _EditorOptions = new System.Windows.Forms.ToolStripMenuItem();
_MarkBookmark = new System.Windows.Forms.ToolStripMenuItem();
_MarkBookmarkRed = new System.Windows.Forms.ToolStripMenuItem();
_MarkBookmarkYellow = new System.Windows.Forms.ToolStripMenuItem();
@@ -262,6 +261,7 @@
toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
+ _EditorOptions = new System.Windows.Forms.ToolStripButton();
this._SelectionMenu.SuspendLayout();
this._EditMenu.SuspendLayout();
this._RecentFileMenu.SuspendLayout();
@@ -289,13 +289,6 @@
_AlterPosition.Text = "更改目标页面坐标(&Y)";
_AlterPosition.DropDownItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._MainToolbar_ItemClicked);
//
- // _SetCurrentCoordinates
- //
- this._SetCurrentCoordinates.Image = global::PDFPatcher.Properties.Resources.Pin;
- this._SetCurrentCoordinates.Name = "_SetCurrentCoordinates";
- this._SetCurrentCoordinates.Size = new System.Drawing.Size(184, 22);
- this._SetCurrentCoordinates.Text = "设为当前页坐标(&S)";
- //
// _ChangeCoordinates
//
_ChangeCoordinates.Image = global::PDFPatcher.Properties.Resources.ScrollPosition;
@@ -303,6 +296,13 @@
_ChangeCoordinates.Size = new System.Drawing.Size(184, 22);
_ChangeCoordinates.Text = "更改坐标(&B)...";
//
+ // _SetCurrentCoordinates
+ //
+ this._SetCurrentCoordinates.Image = global::PDFPatcher.Properties.Resources.Pin;
+ this._SetCurrentCoordinates.Name = "_SetCurrentCoordinates";
+ this._SetCurrentCoordinates.Size = new System.Drawing.Size(184, 22);
+ this._SetCurrentCoordinates.Text = "设为当前页坐标(&S)";
+ //
// _ClearPositionX
//
_ClearPositionX.Name = "_ClearPositionX";
@@ -890,13 +890,6 @@
_PageProperties.Size = new System.Drawing.Size(225, 22);
_PageProperties.Text = "查看页面属性(&X)...";
//
- // _EditorOptions
- //
- _EditorOptions.Image = global::PDFPatcher.Properties.Resources.PdfOptions;
- _EditorOptions.Name = "_EditorOptions";
- _EditorOptions.Size = new System.Drawing.Size(208, 22);
- _EditorOptions.Text = "设置文件修改方式(X)...";
- //
// _MarkBookmark
//
_MarkBookmark.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -1035,11 +1028,18 @@
toolStripSeparator4.Name = "toolStripSeparator4";
toolStripSeparator4.Size = new System.Drawing.Size(208, 6);
//
+ // _EditorOptions
+ //
+ _EditorOptions.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+ _EditorOptions.Image = global::PDFPatcher.Properties.Resources.PdfOptions;
+ _EditorOptions.Name = "_EditorOptions";
+ _EditorOptions.Size = new System.Drawing.Size(23, 22);
+ _EditorOptions.Text = "设置文件修改方式(X)...";
+ //
// _ViewerButton
//
this._ViewerButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this._ViewerButton.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
- _EditorOptions,
_MoveMode,
_SelectionMode,
toolStripSeparator11,
@@ -1112,7 +1112,7 @@
_MarkBookmark,
_SelectMarkedBookmarks});
this._EditMenu.Name = "_EditMenu";
- this._EditMenu.Size = new System.Drawing.Size(212, 330);
+ this._EditMenu.Size = new System.Drawing.Size(212, 308);
this._EditMenu.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._MainToolbar_ItemClicked);
//
// _SetOpenStatus
@@ -1195,7 +1195,7 @@
//
this._IncludeDecendantBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this._IncludeDecendantBox.AutoSize = true;
- this._IncludeDecendantBox.Location = new System.Drawing.Point(3, 277);
+ this._IncludeDecendantBox.Location = new System.Drawing.Point(3, 275);
this._IncludeDecendantBox.Name = "_IncludeDecendantBox";
this._IncludeDecendantBox.Size = new System.Drawing.Size(192, 16);
this._IncludeDecendantBox.TabIndex = 1;
@@ -1224,7 +1224,7 @@
this._BookmarkBox.OperationAffectsDescendants = false;
this._BookmarkBox.RevealAfterExpand = false;
this._BookmarkBox.ShowGroups = false;
- this._BookmarkBox.Size = new System.Drawing.Size(260, 268);
+ this._BookmarkBox.Size = new System.Drawing.Size(261, 266);
this._BookmarkBox.TabIndex = 0;
this._BookmarkBox.UseCellFormatEvents = true;
this._BookmarkBox.UseCompatibleStateImageBehavior = false;
@@ -1252,8 +1252,8 @@
//
this._MainPanel.Panel2.Controls.Add(this._PageInfoBox);
this._MainPanel.Panel2.Controls.Add(this._ViewerBox);
- this._MainPanel.Size = new System.Drawing.Size(623, 296);
- this._MainPanel.SplitterDistance = 267;
+ this._MainPanel.Size = new System.Drawing.Size(627, 294);
+ this._MainPanel.SplitterDistance = 268;
this._MainPanel.TabIndex = 1;
//
// _PageInfoBox
@@ -1261,9 +1261,9 @@
this._PageInfoBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this._PageInfoBox.AutoEllipsis = true;
- this._PageInfoBox.Location = new System.Drawing.Point(3, 278);
+ this._PageInfoBox.Location = new System.Drawing.Point(3, 276);
this._PageInfoBox.Name = "_PageInfoBox";
- this._PageInfoBox.Size = new System.Drawing.Size(346, 15);
+ this._PageInfoBox.Size = new System.Drawing.Size(349, 15);
this._PageInfoBox.TabIndex = 1;
this._PageInfoBox.Text = "PDF 页面信息";
//
@@ -1282,7 +1282,7 @@
this._ViewerBox.Name = "_ViewerBox";
this._ViewerBox.OcrLanguage = 2052;
this._ViewerBox.PinPoint = new System.Drawing.Point(0, 0);
- this._ViewerBox.Size = new System.Drawing.Size(346, 268);
+ this._ViewerBox.Size = new System.Drawing.Size(349, 266);
this._ViewerBox.TabIndex = 0;
this._ViewerBox.TintColor = System.Drawing.Color.Transparent;
this._ViewerBox.VirtualMode = true;
@@ -1423,10 +1423,11 @@
_NextPage,
_LastPage,
this._ZoomBox,
- this._ViewerButton});
+ this._ViewerButton,
+ _EditorOptions});
this._ViewerToolbar.Location = new System.Drawing.Point(342, 0);
this._ViewerToolbar.Name = "_ViewerToolbar";
- this._ViewerToolbar.Size = new System.Drawing.Size(262, 25);
+ this._ViewerToolbar.Size = new System.Drawing.Size(285, 25);
this._ViewerToolbar.TabIndex = 4;
this._ViewerToolbar.Text = "toolStrip1";
this._ViewerToolbar.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this._MainToolbar_ItemClicked);
@@ -1465,7 +1466,7 @@
this.Controls.Add(this._BookmarkToolbar);
this.Font = new System.Drawing.Font("SimSun", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "EditorControl";
- this.Size = new System.Drawing.Size(629, 325);
+ this.Size = new System.Drawing.Size(633, 323);
this._SelectionMenu.ResumeLayout(false);
this._EditMenu.ResumeLayout(false);
this._RecentFileMenu.ResumeLayout(false);
diff --git a/App/Functions/EditorControl.resx b/App/Functions/EditorControl.resx
index bf6a952..03ef9e6 100644
--- a/App/Functions/EditorControl.resx
+++ b/App/Functions/EditorControl.resx
@@ -153,15 +153,6 @@
False
-
- False
-
-
- False
-
-
- False
-
False
@@ -246,27 +237,6 @@
False
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
False
@@ -288,24 +258,6 @@
False
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
False
@@ -399,9 +351,6 @@
False
-
- False
-
False
@@ -429,30 +378,6 @@
False
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
False
@@ -474,24 +399,6 @@
False
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
False
@@ -501,6 +408,9 @@
False
+
+ False
+
17, 17
diff --git a/更新历史.txt b/更新历史.txt
index 1da5db5..eb8c15f 100644
--- a/更新历史.txt
+++ b/更新历史.txt
@@ -15,6 +15,7 @@
合并文件功能增加添加文件夹时不导入子文件夹的选项。
增加将 PDF 文件转换为图片 PDF 文档的选项。
允许提取灰度图像掩膜。
+ 增加合并图片时覆盖原图片分辨率的选项。
修改功能：
更新了 JBIG2 解码组件和 MuPDF 组件。
优化了 PDF 补丁丁的主程序代码。
@@ -30,6 +31,7 @@
提高文档结构探查器和文档处理器的容错能力。
合并文档使用上一页的尺寸作为空白页尺寸。
合并文档对话框在添加项后将焦点移动到文本列表框。
+ 将编辑器的修改文档选项菜单项移到阅读器工具栏。
修复问题：
书签编辑器页码、书签级别等数值或文本编辑框太窄。
合并文件功能在添加的目录存在无访问权限文件或子目录时导致程序崩溃。