Skip to content

Commit b30a728

Browse files
TGSANTGSAN
committed
Upgrade to v2.5
UI optimization. UI界面美化。 Added a feature of log output to file. use `-l` or `-log` argument 添加了日志输出到文件功能。 使用 `-l` or `-log` 参数. The UI theme now follows the Windows 10 application theme changes. (Dark or Light.) 现在界面主题会跟随 Windows10 应用主题变化。（暗色或者亮色。） Japanese language localization file updated. 日语本地化语言文件更新。 Fixed some issues about UI animation. (Thanks for Keboo) 修复了UI上的一些动画问题。（感谢 Keboo） Fixed an issue of LTOK not work. 修复了LTOK不能正常工作的问题。 Fixed an issue that could cause a stuck when activated. 修复了激活时可能导致卡住的问题。 Fixed an issue that crashed when running again after a forced stop. 修复了在强制关闭程序后再次运行时会崩溃的问题。 Now it will never leave any redundant registry entries anymore when the problem occurs. 现在它将再也不会在发生问题时留下任何冗余的注册表项。 Code optimization. 优化代码。
1 parent ce21e64 commit b30a728

12 files changed

+411
-128
lines changed

‎CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj

+11-4
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</Reference>
6868
<Reference Include="MaterialDesignThemes.Wpf, Version=2.5.0.1205, Culture=neutral, processorArchitecture=MSIL">
6969
<HintPath>..\packages\MaterialDesignThemes.2.5.0.1205\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
70-
<Private>True</Private>
70+
<Private>False</Private>
7171
</Reference>
7272
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7373
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -78,6 +78,7 @@
7878
<Reference Include="System.Drawing" />
7979
<Reference Include="System.Runtime" />
8080
<Reference Include="System.Runtime.InteropServices.WindowsRuntime" />
81+
<Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
8182
<Reference Include="System.Windows.Forms" />
8283
<Reference Include="System.Xml" />
8384
<Reference Include="Microsoft.CSharp" />
@@ -161,9 +162,15 @@
161162
<Resource Include="CMWTAT.ico" />
162163
</ItemGroup>
163164
<ItemGroup>
164-
<EmbeddedResource Include="Res\MaterialDesignColors.dll" />
165-
<EmbeddedResource Include="Res\MaterialDesignThemes.Wpf.dll" />
166-
<EmbeddedResource Include="Res\Newtonsoft.Json.dll" />
165+
<EmbeddedResource Include="..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll">
166+
<Link>Res\MaterialDesignColors.dll</Link>
167+
</EmbeddedResource>
168+
<EmbeddedResource Include="..\packages\MaterialDesignThemes.2.5.0.1205\lib\net45\MaterialDesignThemes.Wpf.dll">
169+
<Link>Res\MaterialDesignThemes.Wpf.dll</Link>
170+
</EmbeddedResource>
171+
<EmbeddedResource Include="..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll">
172+
<Link>Res\Newtonsoft.Json.dll</Link>
173+
</EmbeddedResource>
167174
</ItemGroup>
168175
<ItemGroup>
169176
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">

‎CMWTAT_DIGITAL/CMWTAT_DIGITAL.csproj.user

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<VerifyUploadedFiles>false</VerifyUploadedFiles>
1616
</PropertyGroup>
1717
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
18-
<StartArguments>
19-
</StartArguments>
18+
<StartArguments>-l -%3f</StartArguments>
2019
</PropertyGroup>
2120
</Project>

‎CMWTAT_DIGITAL/Lang/en.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
22

33
<!--
4-
Version: 2.4.0.0
4+
Version: 2.5.0.0
55
-->
66

77
<!--FontFamily Dictionary-->
@@ -169,7 +169,7 @@
169169
-->
170170

171171
<sys:String x:Key="HelpText" xml:space="preserve">
172-
This application now supports the use of console args to startup!&#10;&#10;-a&#9;--auto&#9;&#9;Auto activate.&#10;-h&#9;--hide&#9;&#9;Run with hide mode (Only be worked with -auto).&#10;-e&#9;--expact&#9;&#9;Experimental activation.&#10;-?&#9;--help&#9;&#9;Show this help Dialog.
172+
This application now supports the use of console args to startup!&#10;&#10;-a&#9;--auto&#9;&#9;Auto activate.&#10;-h&#9;--hide&#9;&#9;Run with hide mode (Only be worked with -auto).&#10;-e&#9;--expact&#9;&#9;Experimental activation.&#10;-l&#9;--log&#9;&#9;Output log to file.&#10;-?&#9;--help&#9;&#9;Show this help Dialog.
173173
</sys:String>
174174
<sys:String x:Key="DonateTextConverted" xml:space="preserve">
175175
Congratulation! &#10;&#10;Windows 10 has been successful converted.

‎CMWTAT_DIGITAL/Lang/ja.xaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
22

33
<!--
4-
Version: 2.3.0.1
4+
Version: 2.5.0.0
55
-->
66

77
<!--FontFamily Dictionary-->
@@ -169,7 +169,7 @@
169169
-->
170170

171171
<sys:String x:Key="HelpText" xml:space="preserve">
172-
このアプリは起動時にコンソール引数を使用できるようになりました！&#10;&#10;-a&#9;--auto&#9;&#9;自動認証。&#10;-h&#9;--hide&#9;&#9;非表示モードで実行 (-autoと一緒に使用するだけ可能)。&#10;-e&#9;--expact&#9;&#9;実験性認証。&#10;-?&#9;--help&#9;&#9;この説明ダイアログボックスを表示する。
172+
このアプリは起動時にコンソール引数を使用できるようになりました！&#10;&#10;-a&#9;--auto&#9;&#9;自動認証。&#10;-h&#9;--hide&#9;&#9;非表示モードで実行 (-autoと一緒に使用するだけ可能)。&#10;-e&#9;--expact&#9;&#9;実験性認証。&#10;-l&#9;--log&#9;&#9;ログをファイルに出力。&#10;-?&#9;--help&#9;&#9;この説明ダイアログボックスを表示する。
173173
</sys:String>
174174
<sys:String x:Key="DonateTextConverted" xml:space="preserve">
175175
おめでとう！ &#10;&#10;Windows 10 エディション変換成功。
@@ -205,9 +205,9 @@ Windows10ライセンス認証にはインターネットを通じてキーを
205205
認証失敗。 :( &#10;多分: &#10;1. このエディション/バージョンの Windows はデジタルライセンス認証が適用しない。 &#10;2. マイクロソフトの認証サーバーに接続できません。 &#10;3. その他。 &#10;&#10;暫くお待ちくださいまたはあとでもう一度やり直してください。 &#10;
206206
</sys:String>
207207
<sys:String x:Key="Only_find_ltok" xml:space="preserve">
208-
Only found Long-Term Offline KMS (LTOK) options that can be used with this operating system edition. &#10;This means that it will not be activate automatically after you reinstalled the system. &#10;But don't worry, this is different from the legacy KMS activation method (it can keep activating for 180 days in offline environment). &#10;LTOK (The prefix is Offline-KMS) can keep activating for up to 19 years even it is without networking!
209-
</sys:String>
208+
このシステムエディションに適用されたのは長期オフラインＫＭＳ（ＬＴＯＫ）オプションしか見つかりません。これによってシステムを再インストールした時自動的にライセンス認証しませんが、心配する必要はありません。この方法（ＬＴＯＫ）でライセンス認証後、インターネット接続なしでも最大１９年間稼働を継続できます！
209+
</sys:String>
210210
<sys:String x:Key="DonateTextWillActivated" xml:space="preserve">
211-
Congratulation! &#10;&#10;Windows 10 is ready to activate. &#10;However, it seems that Windows cannot connect to the Microsoft Activation Server.&#10;Your system will be activated automatically the next time the server is connected.
211+
おめでとうございます！ &#10;&#10;Windows 10はライセンス認証の準備が出来ています。&#10;でも、マイクロソフトのライセンス認証サーバーに接続できませんみたいです。&#10;システムは認証サーバーに接続出来る次第に自動的にライセンス認証します。
212212
</sys:String>
213213
</ResourceDictionary>

‎CMWTAT_DIGITAL/Lang/zh.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:sys="clr-namespace:System;assembly=mscorlib">
22

33
<!--
4-
Version: 2.4.0.0
4+
Version: 2.5.0.0
55
-->
66

77
<!--FontFamily Dictionary-->
@@ -169,7 +169,7 @@
169169
-->
170170

171171
<sys:String x:Key="HelpText" xml:space="preserve">
172-
这个应用现已支持通过控制台参数启动！&#10;&#10;-a&#9;--auto&#9;&#9;自动激活。&#10;-h&#9;--hide&#9;&#9;隐藏模式运行 (只能与 -auto 一起使用)。&#10;-e&#9;--expact&#9;&#9;实验性激活。&#10;-?&#9;--help&#9;&#9;显示此说明对话框。
172+
这个应用现已支持通过控制台参数启动！&#10;&#10;-a&#9;--auto&#9;&#9;自动激活。&#10;-h&#9;--hide&#9;&#9;隐藏模式运行 (只能与 -auto 一起使用)。&#10;-e&#9;--expact&#9;实验性激活。&#10;-l&#9;--log&#9;&#9;输出日志到文件。&#10;-?&#9;--help&#9;&#9;显示此说明对话框。
173173
</sys:String>
174174
<sys:String x:Key="DonateTextConverted" xml:space="preserve">
175175
祝贺！ &#10;&#10;Windows 10 已经成功转换。

‎CMWTAT_DIGITAL/MainWindow.xaml

+19-13
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,17 @@
1919
Icon="CMWTAT.ico"
2020
Closing="Window_Closing"
2121
FontFamily="{DynamicResource Font}"
22+
Activated="Window_Activated"
23+
WindowStartupLocation="CenterScreen"
2224
>
2325
<!--FontFamily="{DynamicResource MaterialDesignFont}"-->
2426
<Grid>
2527
<Grid Margin="30,30,30,30" VerticalAlignment="Center">
2628
<StackPanel>
27-
<materialDesign:Card Padding="30" Margin="0,0,0,0">
29+
<materialDesign:Card Padding="30" Margin="0,0,0,0" materialDesign:ShadowAssist.ShadowDepth="Depth3" UniformCornerRadius="8">
2830
<TextBlock FontFamily="{DynamicResource Font}" Style="{DynamicResource MaterialDesignTitleTextBlock}" ><Run Text="{DynamicResource AppName}"/></TextBlock>
2931
</materialDesign:Card>
30-
<materialDesign:Card Padding="30,30" Margin="0,30,0,0">
32+
<materialDesign:Card Padding="30,30" Margin="0,30,0,0" materialDesign:ShadowAssist.ShadowDepth="Depth3" UniformCornerRadius="8">
3133
<StackPanel>
3234
<Grid>
3335
<ComboBox x:Name="SystemEditionText" DisplayMemberPath="DisplayOS" VerticalAlignment="Center" Visibility="Visible"/>
@@ -48,15 +50,19 @@
4850
</StackPanel>
4951
</StackPanel>
5052
</materialDesign:Card>
51-
<Button FontFamily="{DynamicResource Font}" x:Name="actbtn" Content="{DynamicResource Activate_Button}" Margin="0,30,0,0" VerticalAlignment="Top" Click="Activate_Button_Click" Height="65"/>
52-
<Button FontFamily="{DynamicResource Font}" x:Name="installbtn" Content="{DynamicResource Convert_versions}" Margin="0,30,0,0" VerticalAlignment="Top" Click="installbtn_Click" Height="65"/>
53+
<materialDesign:Card Margin="0,30,0,0" VerticalAlignment="Top" materialDesign:ShadowAssist.ShadowDepth="Depth3" Height="65" UniformCornerRadius="8">
54+
<Button FontFamily="{DynamicResource Font}" x:Name="actbtn" Content="{DynamicResource Activate_Button}" materialDesign:ShadowAssist.ShadowDepth="Depth0" Click="Activate_Button_Click" Margin="0" Height="65" />
55+
</materialDesign:Card>
56+
<materialDesign:Card Margin="0,30,0,0" VerticalAlignment="Top" materialDesign:ShadowAssist.ShadowDepth="Depth3" Height="65" UniformCornerRadius="8">
57+
<Button FontFamily="{DynamicResource Font}" x:Name="installbtn" Content="{DynamicResource Convert_versions}" materialDesign:ShadowAssist.ShadowDepth="Depth0" Click="installbtn_Click" Margin="0" Height="65"/>
58+
</materialDesign:Card>
5359
</StackPanel>
5460
</Grid>
5561
<Grid x:Name="DialogHostGrid" Visibility="Hidden">
5662
<materialDesign:DialogHost x:Name="DialogWait" IsOpen="False">
5763
<materialDesign:DialogHost.DialogContent>
5864
<Grid>
59-
<materialDesign:Card>
65+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
6066
<StackPanel>
6167
<StackPanel Margin="32,24,32,24">
6268
<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />
@@ -70,7 +76,7 @@
7076
<materialDesign:DialogHost x:Name="DialogActProg" IsOpen="False">
7177
<materialDesign:DialogHost.DialogContent>
7278
<Grid>
73-
<materialDesign:Card>
79+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
7480
<StackPanel>
7581
<StackPanel Margin="32,24,32,24">
7682
<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />
@@ -84,7 +90,7 @@
8490
<materialDesign:DialogHost x:Name="DialogWithCancel" IsOpen="False">
8591
<materialDesign:DialogHost.DialogContent>
8692
<Grid>
87-
<materialDesign:Card>
93+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
8894
<StackPanel>
8995
<StackPanel Margin="24,24,24,8">
9096
<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />
@@ -104,7 +110,7 @@
104110
<materialDesign:DialogHost x:Name="DialogWithOK" IsOpen="False">
105111
<materialDesign:DialogHost.DialogContent>
106112
<Grid>
107-
<materialDesign:Card>
113+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
108114
<StackPanel>
109115
<StackPanel Margin="16,16,16,8">
110116
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
@@ -125,7 +131,7 @@
125131
<materialDesign:DialogHost x:Name="DialogHelp" IsOpen="False">
126132
<materialDesign:DialogHost.DialogContent>
127133
<Grid>
128-
<materialDesign:Card>
134+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
129135
<StackPanel>
130136
<StackPanel Margin="16,16,16,8">
131137
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
@@ -146,7 +152,7 @@
146152
<materialDesign:DialogHost x:Name="DialogWithExit" IsOpen="False">
147153
<materialDesign:DialogHost.DialogContent>
148154
<Grid>
149-
<materialDesign:Card>
155+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
150156
<StackPanel>
151157
<StackPanel Margin="16,16,16,8">
152158
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
@@ -166,7 +172,7 @@
166172
<materialDesign:DialogHost x:Name="DialogWithOKToCloseDialog" IsOpen="False">
167173
<materialDesign:DialogHost.DialogContent>
168174
<Grid>
169-
<materialDesign:Card>
175+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
170176
<StackPanel>
171177
<StackPanel Margin="16,16,16,8">
172178
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
@@ -186,7 +192,7 @@
186192
<materialDesign:DialogHost x:Name="DialogWithOKToCloseDialogDonate" IsOpen="False">
187193
<materialDesign:DialogHost.DialogContent>
188194
<Grid>
189-
<materialDesign:Card>
195+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
190196
<StackPanel>
191197
<StackPanel Margin="16,16,16,8">
192198
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->
@@ -207,7 +213,7 @@
207213
<materialDesign:DialogHost x:Name="DialogUpdate" IsOpen="False">
208214
<materialDesign:DialogHost.DialogContent>
209215
<Grid>
210-
<materialDesign:Card>
216+
<materialDesign:Card UniformCornerRadius="8" materialDesign:ShadowAssist.ShadowDepth="Depth3">
211217
<StackPanel>
212218
<StackPanel Margin="16,16,16,8">
213219
<!--<ProgressBar Style="{DynamicResource MaterialDesignCircularProgressBar}" HorizontalAlignment="Center" Margin="0,0,0,0" IsIndeterminate="True" Value="0" VerticalAlignment="Top" Width="32" Height="32" />-->

0 commit comments

Comments
 (0)