Skip to content

Commit 7842f85

Browse files
committed
默认关闭划词
1 parent 625d397 commit 7842f85

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

CopyPlusPlus.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,6 @@
264264
<Version>4.5.1</Version>
265265
</PackageReference>
266266
</ItemGroup>
267-
<ItemGroup />
268267
<ItemGroup>
269268
<ProjectReference Include="..\Translate\GoogleTranslateFreeApi-master\GoogleTranslateFreeApi\GoogleTranslateFreeApi.csproj">
270269
<Project>{eb492747-46b1-466a-9d03-b819fe92a147}</Project>

MainWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151

5252
<!--<TextBlock x:Name="TextAbstract1" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="22,5,0,0" FontSize="13" Width="403"><Run Text="1. 划词触发" /></TextBlock>-->
5353
<!--<TextBlock x:Name="TextAbstract2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="22,30,0,0" FontSize="13" Width="403"><Run Text="2. 快捷键触发" /></TextBlock>-->
54-
<mah:ToggleSwitch x:Name="SwitchSelectText" MinWidth="0" ContentDirection="LeftToRight" Content="划词 " FontWeight="Bold" ContentPadding="0,0,-10,0" FontFamily="Microsoft YaHei UI" Margin="35,0,0,0" IsOn="True" />
55-
<mah:ToggleSwitch x:Name="SwitchShortcut" MinWidth="0" ContentDirection="LeftToRight" Content="Control+C+C " FontWeight="Bold" ContentPadding="0,0,-10,0" FontFamily="Microsoft YaHei UI" IsOn="True" Margin="156,0,0,0" />
56-
<Button Content="手动处理" HorizontalAlignment="Left" Margin="344,0,0,0" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" Click="ManualBtn_Click" Height="26" Width="66" Style="{DynamicResource MahApps.Styles.Button.Flat}" Padding="10,3,10,3" FontSize="11" />
54+
<mah:ToggleSwitch x:Name="SwitchSelectText" MinWidth="0" ContentDirection="LeftToRight" Content="划词 " FontWeight="Bold" ContentPadding="0,0,-10,0" FontFamily="Microsoft YaHei UI" Margin="216,0,0,0" IsOn="False" />
55+
<mah:ToggleSwitch x:Name="SwitchShortcut" MinWidth="0" ContentDirection="LeftToRight" Content="Control+C+C " FontWeight="Bold" ContentPadding="0,0,-10,0" FontFamily="Microsoft YaHei UI" IsOn="True" Margin="30,0,0,0" />
56+
<Button Content="手动处理" HorizontalAlignment="Left" Margin="343,0,0,0" VerticalAlignment="Center" FontFamily="Microsoft YaHei UI" Click="ManualBtn_Click" Height="26" Width="66" Style="{DynamicResource MahApps.Styles.Button.Flat}" Padding="10,3,10,3" FontSize="11" />
5757

5858
<!--<TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" Margin="16,46,0,0" FontSize="13" Width="187" Text="祝君创作顺利,走向人生巅峰!" />-->
5959
</Grid>

MainWindow.xaml.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
using Newtonsoft.Json;
2727
using Application = System.Windows.Application;
2828
using Clipboard = System.Windows.Clipboard;
29+
using Cursors = System.Windows.Forms.Cursors;
30+
using DataFormats = System.Windows.DataFormats;
2931
using MessageBox = System.Windows.MessageBox;
3032
using MouseEventArgs = System.Windows.Forms.MouseEventArgs;
3133

@@ -138,10 +140,12 @@ private async void OnMouseDragFinished(object sender, MouseEventArgs e)
138140

139141
if (SwitchSelectText.IsOn == false) return;
140142

141-
var clipboardBefore = Clipboard.GetDataObject();
143+
var clipboardBefore = Clipboard.GetText();
144+
//var clipboardBefore = Clipboard.GetData(DataFormats.Rtf);
142145

143146
Clipboard.Clear();
144-
await Task.Delay(50);
147+
await Task.Delay(20);
148+
145149
SendKeys.SendWait("^c");
146150
await Task.Delay(500);
147151

@@ -165,7 +169,7 @@ private async void OnMouseDragFinished(object sender, MouseEventArgs e)
165169
// ignored
166170
}
167171

168-
if (clipboardBefore != null) Clipboard.SetDataObject(clipboardBefore);
172+
Clipboard.SetDataObject(clipboardBefore, true);
169173
}
170174

171175
public void ProcessText(string text)

Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Properties/Settings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
&lt;string&gt;0&lt;/string&gt;
2626
&lt;string&gt;0&lt;/string&gt;
2727
&lt;string&gt;0&lt;/string&gt;
28-
&lt;string&gt;True&lt;/string&gt;
28+
&lt;string&gt;False&lt;/string&gt;
2929
&lt;string&gt;True&lt;/string&gt;
3030
&lt;/ArrayOfString&gt;</Value>
3131
</Setting>

app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<string>0</string>
3131
<string>0</string>
3232
<string>0</string>
33-
<string>True</string>
33+
<string>False</string>
3434
<string>True</string>
3535
</ArrayOfString>
3636
</value>

0 commit comments

Comments
 (0)