Skip to content

Commit 0f93f70

Browse files
7Brandyn77Brandyn7
authored
English
1 parent f0bde20 commit 0f93f70

File tree

10 files changed

+1173
-1160
lines changed

10 files changed

+1173
-1160
lines changed

‎Magpie/App.config‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
<?xml version="1.0" encoding="utf-8" ?>
2-
<configuration>
3-
<configSections>
4-
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5-
<section name="Magpie.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6-
</sectionGroup>
7-
</configSections>
8-
<startup>
9-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
10-
</startup>
11-
<userSettings>
12-
<Magpie.Properties.Settings>
13-
<setting name="Hotkey" serializeAs="String">
14-
<value>Alt+F11</value>
15-
</setting>
16-
<setting name="ScaleMode" serializeAs="String">
17-
<value>0</value>
18-
</setting>
19-
<setting name="ShowFPS" serializeAs="String">
20-
<value>False</value>
21-
</setting>
22-
<setting name="InjectMode" serializeAs="String">
23-
<value>0</value>
24-
</setting>
25-
<setting name="CaptureMode" serializeAs="String">
26-
<value>0</value>
27-
</setting>
28-
<setting name="MinimizeAtWindowsStartUp" serializeAs="String">
29-
<value>False</value>
30-
</setting>
31-
<setting name="AutoRestore" serializeAs="String">
32-
<value>False</value>
33-
</setting>
34-
</Magpie.Properties.Settings>
35-
</userSettings>
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<configSections>
4+
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
5+
<section name="Magpie.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
6+
</sectionGroup>
7+
</configSections>
8+
<startup>
9+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
10+
</startup>
11+
<userSettings>
12+
<Magpie.Properties.Settings>
13+
<setting name="Hotkey" serializeAs="String">
14+
<value>Alt+F11</value>
15+
</setting>
16+
<setting name="ScaleMode" serializeAs="String">
17+
<value>0</value>
18+
</setting>
19+
<setting name="ShowFPS" serializeAs="String">
20+
<value>False</value>
21+
</setting>
22+
<setting name="InjectMode" serializeAs="String">
23+
<value>0</value>
24+
</setting>
25+
<setting name="CaptureMode" serializeAs="String">
26+
<value>0</value>
27+
</setting>
28+
<setting name="MinimizeAtWindowsStartUp" serializeAs="String">
29+
<value>False</value>
30+
</setting>
31+
<setting name="AutoRestore" serializeAs="String">
32+
<value>False</value>
33+
</setting>
34+
</Magpie.Properties.Settings>
35+
</userSettings>
3636
</configuration>

‎Magpie/App.xaml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
<Application x:Class="Magpie.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:local="clr-namespace:Magpie"
5-
StartupUri="MainWindow.xaml"
6-
Startup="Application_Startup" Exit="Application_Exit">
7-
<Application.Resources>
8-
<BitmapImage UriSource="Logo.ico" x:Key="Logo"/>
9-
<Style TargetType="Label" x:Key="ContextMenuItemFontIcon">
10-
<Setter Property="Padding" Value="0" />
11-
<Setter Property="Margin" Value="0" />
12-
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
13-
<Setter Property="VerticalAlignment" Value="Center" />
14-
<Setter Property="HorizontalAlignment" Value="Center" />
15-
</Style>
16-
<Style TargetType="ComboBox" x:Key="ComboBox">
17-
<Setter Property="Padding" Value="6,4,5,4" />
18-
</Style>
19-
</Application.Resources>
20-
</Application>
1+
<Application x:Class="Magpie.App"
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:local="clr-namespace:Magpie"
5+
StartupUri="MainWindow.xaml"
6+
Startup="Application_Startup" Exit="Application_Exit">
7+
<Application.Resources>
8+
<BitmapImage UriSource="Logo.ico" x:Key="Logo"/>
9+
<Style TargetType="Label" x:Key="ContextMenuItemFontIcon">
10+
<Setter Property="Padding" Value="0" />
11+
<Setter Property="Margin" Value="0" />
12+
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
13+
<Setter Property="VerticalAlignment" Value="Center" />
14+
<Setter Property="HorizontalAlignment" Value="Center" />
15+
</Style>
16+
<Style TargetType="ComboBox" x:Key="ComboBox">
17+
<Setter Property="Padding" Value="6,4,5,4" />
18+
</Style>
19+
</Application.Resources>
20+
</Application>

‎Magpie/App.xaml.cs‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
using System;
2-
using System.Threading;
3-
using System.Windows;
4-
5-
6-
namespace Magpie {
7-
/// <summary>
8-
/// App.xaml 的交互逻辑
9-
/// </summary>
10-
public partial class App : Application {
11-
public static readonly Version APP_VERSION = new Version("0.6.0.0");
12-
public static readonly string APPLICATION_DIR = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
13-
public static readonly string SCALE_MODELS_JSON_PATH =
14-
AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "ScaleModels.json";
15-
16-
private static readonly Mutex mutex = new Mutex(true, "{4C416227-4A30-4A2F-8F23-8701544DD7D6}");
17-
18-
private void Application_Startup(object sender, StartupEventArgs e) {
19-
// 不允许多个实例同时运行
20-
if (!mutex.WaitOne(TimeSpan.Zero, true)) {
21-
Current.Shutdown();
22-
// 已存在实例时广播 WM_SHOWME，唤醒该实例
23-
_ = NativeMethods.BroadcastMessage(NativeMethods.MAGPIE_WM_SHOWME);
24-
}
25-
}
26-
27-
private void Application_Exit(object sender, ExitEventArgs e) {
28-
mutex.ReleaseMutex();
29-
}
30-
}
31-
}
1+
using System;
2+
using System.Threading;
3+
using System.Windows;
4+
5+
6+
namespace Magpie {
7+
/// <summary>
8+
/// App.xaml 的交互逻辑
9+
/// </summary>
10+
public partial class App : Application {
11+
public static readonly Version APP_VERSION = new Version("0.6.0.0");
12+
public static readonly string APPLICATION_DIR = AppDomain.CurrentDomain.SetupInformation.ApplicationBase;
13+
public static readonly string SCALE_MODELS_JSON_PATH =
14+
AppDomain.CurrentDomain.SetupInformation.ApplicationBase + "ScaleModels.json";
15+
16+
private static readonly Mutex mutex = new Mutex(true, "{4C416227-4A30-4A2F-8F23-8701544DD7D6}");
17+
18+
private void Application_Startup(object sender, StartupEventArgs e) {
19+
// 不允许多个实例同时运行
20+
if (!mutex.WaitOne(TimeSpan.Zero, true)) {
21+
Current.Shutdown();
22+
// 已存在实例时广播 WM_SHOWME，唤醒该实例
23+
_ = NativeMethods.BroadcastMessage(NativeMethods.MAGPIE_WM_SHOWME);
24+
}
25+
}
26+
27+
private void Application_Exit(object sender, ExitEventArgs e) {
28+
mutex.ReleaseMutex();
29+
}
30+
}
31+
}

0 commit comments

Comments
 (0)