Skip to content

#94 将监听模式的默认行为修改为不重写剪贴板。 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
char-46 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#94 将监听模式的默认行为修改为不重写剪贴板。 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified PasteEx.Setup/PasteEx.Setup.assets.cache
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions PasteEx/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@
<setting name="fileNamePatternPure" serializeAs="String">
<value />
</setting>
<setting name="newAutoSaveBehavior" serializeAs="String">
<value>True</value>
</setting>
</PasteEx.Properties.Settings>
</userSettings>
</configuration>
4 changes: 3 additions & 1 deletion PasteEx/Core/ModeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,9 @@ private static void ClipboardMonitor_OnClipboardChange(object sender)
string filePath = PathGenerator.GenerateMonitorAppendFilePath(exts[0]);
CommandLine.Info("[Monitor] Paste pictures into files: " + filePath);

AppendFileToClipboard(filePath);
if (!Properties.Settings.Default.newAutoSaveBehavior) {
AppendFileToClipboard(filePath);
}

monitorModeData.SaveAsync(filePath, exts[0]);
}
Expand Down
27 changes: 19 additions & 8 deletions PasteEx/Forms/FormSetting.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions PasteEx/Forms/FormSetting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ private void Get()
chkAutoSave.Checked = Properties.Settings.Default.monitorAutoSaveEnabled;
txtAutoSaveFolderPath.Text = Properties.Settings.Default.monitorAutoSavePath;

// Auto Save Behavior
chkNewBehavior.Checked = Properties.Settings.Default.newAutoSaveBehavior;

// Default Startup Monitor Mode
chkDefaultStartupMonitorMode.Checked = Properties.Settings.Default.DefaultStartupMonitorModeEnabled;

Expand Down Expand Up @@ -98,6 +101,8 @@ private void Set()
{
Properties.Settings.Default.ApplicationFilterState = AppFilterStateEnum.Exclude.ToString();
}

Properties.Settings.Default.newAutoSaveBehavior = chkNewBehavior.Checked;
}

private void FormSetting_Load(object sender, EventArgs e)
Expand Down Expand Up @@ -490,6 +495,11 @@ private void chkAutoSave_CheckedChanged(object sender, EventArgs e)
btnOpenAutoSavePath.Enabled = chkAutoSave.Checked;
}

private void chkNewBehavior_CheckedChanged(object sender, EventArgs e)
{

}

private void btnOpenAutoSavePath_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(txtAutoSaveFolderPath.Text))
Expand Down
44 changes: 37 additions & 7 deletions PasteEx/Forms/FormSetting.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,11 +1021,41 @@ For example:
<data name="groupBox7.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
</data>
<data name="chkNewBehavior.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="chkNewBehavior.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="chkNewBehavior.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 51</value>
</data>
<data name="chkNewBehavior.Size" type="System.Drawing.Size, System.Drawing">
<value>96, 16</value>
</data>
<data name="chkNewBehavior.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
<data name="chkNewBehavior.Text" xml:space="preserve">
<value>New Behavior</value>
</data>
<data name="&gt;&gt;chkNewBehavior.Name" xml:space="preserve">
<value>chkNewBehavior</value>
</data>
<data name="&gt;&gt;chkNewBehavior.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chkNewBehavior.Parent" xml:space="preserve">
<value>groupBox7</value>
</data>
<data name="&gt;&gt;chkNewBehavior.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="picHelpAutoSave.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="picHelpAutoSave.Location" type="System.Drawing.Point, System.Drawing">
<value>25, 55</value>
<value>150, 52</value>
</data>
<data name="picHelpAutoSave.Size" type="System.Drawing.Size, System.Drawing">
<value>16, 16</value>
Expand All @@ -1046,7 +1076,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;picHelpAutoSave.ZOrder" xml:space="preserve">
<value>0</value>
<value>1</value>
</data>
<data name="btnOpenAutoSavePath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
Expand Down Expand Up @@ -1076,7 +1106,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;btnOpenAutoSavePath.ZOrder" xml:space="preserve">
<value>1</value>
<value>2</value>
</data>
<data name="chkAutoSave.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand Down Expand Up @@ -1106,7 +1136,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;chkAutoSave.ZOrder" xml:space="preserve">
<value>2</value>
<value>3</value>
</data>
<data name="txtAutoSaveFolderPath.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Left, Right</value>
Expand All @@ -1130,7 +1160,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;txtAutoSaveFolderPath.ZOrder" xml:space="preserve">
<value>3</value>
<value>4</value>
</data>
<data name="btnChangeAutoSavePathDialog.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Right</value>
Expand Down Expand Up @@ -1160,7 +1190,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;btnChangeAutoSavePathDialog.ZOrder" xml:space="preserve">
<value>4</value>
<value>5</value>
</data>
<data name="lblAutoSaveFolderPath.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
Expand Down Expand Up @@ -1190,7 +1220,7 @@ For example:
<value>groupBox7</value>
</data>
<data name="&gt;&gt;lblAutoSaveFolderPath.ZOrder" xml:space="preserve">
<value>5</value>
<value>6</value>
</data>
<data name="groupBox7.Location" type="System.Drawing.Point, System.Drawing">
<value>6, 69</value>
Expand Down
6 changes: 5 additions & 1 deletion PasteEx/Forms/FormSetting.zh-CN.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@
<value>应用过滤</value>
</data>
<data name="picHelpAutoSave.ToolTip" xml:space="preserve">
<value>自动把复制过的图片保存到该文件夹</value>
<value>自动把复制过的图片保存到该文件夹
勾选新行为后将不会自动把监听模式自动保存的文件复制到剪贴板中</value>
</data>
<data name="btnOpenAutoSavePath.Text" xml:space="preserve">
<value>打开</value>
Expand Down Expand Up @@ -280,4 +281,7 @@
<data name="SavePatternBtn.Text" xml:space="preserve">
<value>保存</value>
</data>
<data name="chkNewBehavior.Text" xml:space="preserve">
<value>新行为</value>
</data>
</root>
6 changes: 5 additions & 1 deletion PasteEx/Forms/FormSetting.zh-Hant.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,8 @@
<value>包括</value>
</data>
<data name="picHelpAutoSave.ToolTip" xml:space="preserve">
<value>自動把複製過的圖片儲存到該資料夾</value>
<value>自動把複製過的圖片儲存到該資料夾
勾選新行爲後將不會自動把監聽模式自動保存的文件複製到剪貼板中</value>
</data>
<data name="btnOpenAutoSavePath.Text" xml:space="preserve">
<value>開啟</value>
Expand Down Expand Up @@ -277,4 +278,7 @@
<data name="$this.Text" xml:space="preserve">
<value>設定</value>
</data>
<data name="chkNewBehavior.Text" xml:space="preserve">
<value>新行爲</value>
</data>
</root>
14 changes: 13 additions & 1 deletion PasteEx/Properties/Settings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions PasteEx/Properties/Settings.settings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,8 @@
<Setting Name="fileNamePatternPure" Type="System.String" Scope="User">
<Value Profile="(Default)" />
</Setting>
<Setting Name="newAutoSaveBehavior" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
</Settings>
</SettingsFile>