Skip to content

Commit 9c1e219

Browse files
char-46char-46
committed
#94 将监听模式的默认行为修改为不重写剪贴板。
1 parent f3b37b0 commit 9c1e219

10 files changed

+98
-19
lines changed

‎PasteEx.Setup/PasteEx.Setup.assets.cache

0 Bytes
Binary file not shown.

‎PasteEx/App.config

+3
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@
6161
<setting name="fileNamePatternPure" serializeAs="String">
6262
<value />
6363
</setting>
64+
<setting name="newAutoSaveBehavior" serializeAs="String">
65+
<value>True</value>
66+
</setting>
6467
</PasteEx.Properties.Settings>
6568
</userSettings>
6669
</configuration>

‎PasteEx/Core/ModeController.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ private static void ClipboardMonitor_OnClipboardChange(object sender)
120120
string filePath = PathGenerator.GenerateMonitorAppendFilePath(exts[0]);
121121
CommandLine.Info("[Monitor] Paste pictures into files: " + filePath);
122122

123-
AppendFileToClipboard(filePath);
123+
if (!Properties.Settings.Default.newAutoSaveBehavior) {
124+
AppendFileToClipboard(filePath);
125+
}
124126

125127
monitorModeData.SaveAsync(filePath, exts[0]);
126128
}

‎PasteEx/Forms/FormSetting.Designer.cs

+19-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PasteEx/Forms/FormSetting.cs

+10
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ private void Get()
5151
chkAutoSave.Checked = Properties.Settings.Default.monitorAutoSaveEnabled;
5252
txtAutoSaveFolderPath.Text = Properties.Settings.Default.monitorAutoSavePath;
5353

54+
// Auto Save Behavior
55+
chkNewBehavior.Checked = Properties.Settings.Default.newAutoSaveBehavior;
56+
5457
// Default Startup Monitor Mode
5558
chkDefaultStartupMonitorMode.Checked = Properties.Settings.Default.DefaultStartupMonitorModeEnabled;
5659

@@ -98,6 +101,8 @@ private void Set()
98101
{
99102
Properties.Settings.Default.ApplicationFilterState = AppFilterStateEnum.Exclude.ToString();
100103
}
104+
105+
Properties.Settings.Default.newAutoSaveBehavior = chkNewBehavior.Checked;
101106
}
102107

103108
private void FormSetting_Load(object sender, EventArgs e)
@@ -490,6 +495,11 @@ private void chkAutoSave_CheckedChanged(object sender, EventArgs e)
490495
btnOpenAutoSavePath.Enabled = chkAutoSave.Checked;
491496
}
492497

498+
private void chkNewBehavior_CheckedChanged(object sender, EventArgs e)
499+
{
500+
501+
}
502+
493503
private void btnOpenAutoSavePath_Click(object sender, EventArgs e)
494504
{
495505
if (!string.IsNullOrEmpty(txtAutoSaveFolderPath.Text))

‎PasteEx/Forms/FormSetting.resx

+37-7
Original file line numberDiff line numberDiff line change
@@ -1021,11 +1021,41 @@ For example:
10211021
<data name="groupBox7.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
10221022
<value>Top, Left, Right</value>
10231023
</data>
1024+
<data name="chkNewBehavior.AutoSize" type="System.Boolean, mscorlib">
1025+
<value>True</value>
1026+
</data>
1027+
<data name="chkNewBehavior.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
1028+
<value>NoControl</value>
1029+
</data>
1030+
<data name="chkNewBehavior.Location" type="System.Drawing.Point, System.Drawing">
1031+
<value>25, 51</value>
1032+
</data>
1033+
<data name="chkNewBehavior.Size" type="System.Drawing.Size, System.Drawing">
1034+
<value>96, 16</value>
1035+
</data>
1036+
<data name="chkNewBehavior.TabIndex" type="System.Int32, mscorlib">
1037+
<value>8</value>
1038+
</data>
1039+
<data name="chkNewBehavior.Text" xml:space="preserve">
1040+
<value>New Behavior</value>
1041+
</data>
1042+
<data name="&gt;&gt;chkNewBehavior.Name" xml:space="preserve">
1043+
<value>chkNewBehavior</value>
1044+
</data>
1045+
<data name="&gt;&gt;chkNewBehavior.Type" xml:space="preserve">
1046+
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
1047+
</data>
1048+
<data name="&gt;&gt;chkNewBehavior.Parent" xml:space="preserve">
1049+
<value>groupBox7</value>
1050+
</data>
1051+
<data name="&gt;&gt;chkNewBehavior.ZOrder" xml:space="preserve">
1052+
<value>0</value>
1053+
</data>
10241054
<data name="picHelpAutoSave.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
10251055
<value>NoControl</value>
10261056
</data>
10271057
<data name="picHelpAutoSave.Location" type="System.Drawing.Point, System.Drawing">
1028-
<value>25, 55</value>
1058+
<value>150, 52</value>
10291059
</data>
10301060
<data name="picHelpAutoSave.Size" type="System.Drawing.Size, System.Drawing">
10311061
<value>16, 16</value>
@@ -1046,7 +1076,7 @@ For example:
10461076
<value>groupBox7</value>
10471077
</data>
10481078
<data name="&gt;&gt;picHelpAutoSave.ZOrder" xml:space="preserve">
1049-
<value>0</value>
1079+
<value>1</value>
10501080
</data>
10511081
<data name="btnOpenAutoSavePath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
10521082
<value>Top, Right</value>
@@ -1076,7 +1106,7 @@ For example:
10761106
<value>groupBox7</value>
10771107
</data>
10781108
<data name="&gt;&gt;btnOpenAutoSavePath.ZOrder" xml:space="preserve">
1079-
<value>1</value>
1109+
<value>2</value>
10801110
</data>
10811111
<data name="chkAutoSave.AutoSize" type="System.Boolean, mscorlib">
10821112
<value>True</value>
@@ -1106,7 +1136,7 @@ For example:
11061136
<value>groupBox7</value>
11071137
</data>
11081138
<data name="&gt;&gt;chkAutoSave.ZOrder" xml:space="preserve">
1109-
<value>2</value>
1139+
<value>3</value>
11101140
</data>
11111141
<data name="txtAutoSaveFolderPath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
11121142
<value>Top, Left, Right</value>
@@ -1130,7 +1160,7 @@ For example:
11301160
<value>groupBox7</value>
11311161
</data>
11321162
<data name="&gt;&gt;txtAutoSaveFolderPath.ZOrder" xml:space="preserve">
1133-
<value>3</value>
1163+
<value>4</value>
11341164
</data>
11351165
<data name="btnChangeAutoSavePathDialog.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
11361166
<value>Top, Right</value>
@@ -1160,7 +1190,7 @@ For example:
11601190
<value>groupBox7</value>
11611191
</data>
11621192
<data name="&gt;&gt;btnChangeAutoSavePathDialog.ZOrder" xml:space="preserve">
1163-
<value>4</value>
1193+
<value>5</value>
11641194
</data>
11651195
<data name="lblAutoSaveFolderPath.AutoSize" type="System.Boolean, mscorlib">
11661196
<value>True</value>
@@ -1190,7 +1220,7 @@ For example:
11901220
<value>groupBox7</value>
11911221
</data>
11921222
<data name="&gt;&gt;lblAutoSaveFolderPath.ZOrder" xml:space="preserve">
1193-
<value>5</value>
1223+
<value>6</value>
11941224
</data>
11951225
<data name="groupBox7.Location" type="System.Drawing.Point, System.Drawing">
11961226
<value>6, 69</value>

‎PasteEx/Forms/FormSetting.zh-CN.resx

+5-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,8 @@
230230
<value>应用过滤</value>
231231
</data>
232232
<data name="picHelpAutoSave.ToolTip" xml:space="preserve">
233-
<value>自动把复制过的图片保存到该文件夹</value>
233+
<value>自动把复制过的图片保存到该文件夹
234+
勾选新行为后将不会自动把监听模式自动保存的文件复制到剪贴板中</value>
234235
</data>
235236
<data name="btnOpenAutoSavePath.Text" xml:space="preserve">
236237
<value>打开</value>
@@ -280,4 +281,7 @@
280281
<data name="SavePatternBtn.Text" xml:space="preserve">
281282
<value>保存</value>
282283
</data>
284+
<data name="chkNewBehavior.Text" xml:space="preserve">
285+
<value>新行为</value>
286+
</data>
283287
</root>

‎PasteEx/Forms/FormSetting.zh-Hant.resx

+5-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@
236236
<value>包括</value>
237237
</data>
238238
<data name="picHelpAutoSave.ToolTip" xml:space="preserve">
239-
<value>自動把複製過的圖片儲存到該資料夾</value>
239+
<value>自動把複製過的圖片儲存到該資料夾
240+
勾選新行爲後將不會自動把監聽模式自動保存的文件複製到剪貼板中</value>
240241
</data>
241242
<data name="btnOpenAutoSavePath.Text" xml:space="preserve">
242243
<value>開啟</value>
@@ -277,4 +278,7 @@
277278
<data name="$this.Text" xml:space="preserve">
278279
<value>設定</value>
279280
</data>
281+
<data name="chkNewBehavior.Text" xml:space="preserve">
282+
<value>新行爲</value>
283+
</data>
280284
</root>

‎PasteEx/Properties/Settings.Designer.cs

+13-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PasteEx/Properties/Settings.settings

+3
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,8 @@
5353
<Setting Name="fileNamePatternPure" Type="System.String" Scope="User">
5454
<Value Profile="(Default)" />
5555
</Setting>
56+
<Setting Name="newAutoSaveBehavior" Type="System.Boolean" Scope="User">
57+
<Value Profile="(Default)">True</Value>
58+
</Setting>
5659
</Settings>
5760
</SettingsFile>

0 commit comments

Comments
 (0)