Overhaul 2

tangge233 · Jul 8, 2024 · 0108ec4 · 0108ec4
1 parent a722308
commit 0108ec4
Show file tree

Hide file tree

Showing 10 changed files with 1,352 additions and 279 deletions.
diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb
@@ -317,14 +317,14 @@ Public Class FormMain
         Lang = ReadReg("Lang")
         If String.IsNullOrWhiteSpace(Lang) Then
             Select Case Globalization.CultureInfo.CurrentCulture.Name
+                Case "en-US"
+                    Lang = "en_US"
                 Case "zh-CN"
                     Lang = "zh_CN"
                 Case "zh-HK"
                     Lang = "zh_HK"
                 Case "zh-TW"
-                    Lang = "zh_HK"
-                Case "en-US"
-                    Lang = "en_US"
+                    Lang = "zh_TW"
                 Case Else
                     Lang = "en_US"
             End Select

diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml
@@ -14,8 +14,8 @@
                             <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
                             <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
                         </Grid.ColumnDefinitions>
-                        <local:MyButton x:Name="BtnChina" Grid.Column="0" MinWidth="140" Text="{DynamicResource LangDownloadOptiFineChineseWebsite}" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" />
-                        <local:MyButton x:Name="BtnWeb" Grid.Column="1" MinWidth="140" Text="{DynamicResource LangDownloadOptiFineWebsite}" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
+                        <local:MyButton x:Name="BtnWeb" Grid.Column="0" MinWidth="140" Text="{DynamicResource LangDownloadOptiFineWebsite}" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" />
+                        <local:MyButton x:Name="BtnChina" Grid.Column="1" MinWidth="140" Text="{DynamicResource LangDownloadOptiFineChineseWebsite}" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
                     </Grid>
                 </StackPanel>
             </local:MyCard>

diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml
@@ -142,9 +142,10 @@
                     </Grid.RowDefinitions>
                     <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Text="{DynamicResource LangPageSetupSystemLangLaunchLang}"/>
                     <local:MyComboBox x:Name="ComboBackgroundSuit" Tag="UiBackgroundSuit" HorizontalAlignment="Left" Width="170" Grid.Column="1">
+                        <local:MyComboBoxItem Content="English (US)" Tag="en_US" />
                         <local:MyComboBoxItem Content="简体中文 (中国大陆)" Tag="zh_CN" IsSelected="True" />
                         <local:MyComboBoxItem Content="繁體中文 (香港特別行政區)" Tag="zh_HK"/>
-                        <local:MyComboBoxItem Content="English (US)" Tag="en_US" />
+                        <local:MyComboBoxItem Content="繁體中文 (台灣)" Tag="zh_TW"/>
                     </local:MyComboBox>
                     <local:MyHint Height="25" Text="{DynamicResource LangPageSetupSystemLangWarn}" Grid.Row="2" Grid.ColumnSpan="2"/>
                 </Grid>

diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml.vb
@@ -6,12 +6,14 @@
 
         '读取设置
         Select Case Lang
-            Case "zh_CN"
+            Case "en_US"
                 ComboBackgroundSuit.SelectedIndex = 0
-            Case "zh_HK"
+            Case "zh_CN"
                 ComboBackgroundSuit.SelectedIndex = 1
-            Case "en_US"
+            Case "zh_HK"
                 ComboBackgroundSuit.SelectedIndex = 2
+            Case "zh_TW"
+                ComboBackgroundSuit.SelectedIndex = 3
         End Select
 
         AniControlEnabled += 1

diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml
@@ -70,7 +70,7 @@
                             <TextBlock Grid.Column="4" Grid.Row="2" x:Name="LabLauncherTheme11Click" Background="{StaticResource ColorBrushSemiTransparent}" ToolTipService.Placement="Bottom" />
                             <local:MyRadioBox Grid.Column="5" Grid.Row="2" Text="{DynamicResource LangSetThemeNameCustom}" x:Name="RadioLauncherTheme14" Tag="UiLauncherTheme/14" IsEnabled="False" ToolTipService.Placement="Bottom" ToolTip="{DynamicResource LangSetThemeNameCustomToolTip}" ToolTipService.ShowOnDisabled="True" />
                         </Grid>
-                        <local:MyCheckBox Text="{DynamicResource LangSetThemeShowLogOnStart}" Margin="-1,0,0,1" Height="22" x:Name="CheckLauncherLogo" Tag="UiLauncherLogo" />
+                        <local:MyCheckBox Text="{DynamicResource LangSetThemeShowLogoOnStart}" Margin="-1,0,0,1" Height="22" x:Name="CheckLauncherLogo" Tag="UiLauncherLogo" />
                     </StackPanel>
                     <Border Background="#CCCCCCCC" Margin="-5,22,-5,-5" CornerRadius="4" Name="PanLauncherHide" Visibility="Collapsed">
                         <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">

diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
@@ -554,13 +554,17 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Resources\Language\zh_CN.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Resources\Language\zh_HK.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Resources\Language\zh_CN.xaml">
-      <SubType>Designer</SubType>
+    <Page Include="Resources\Language\zh_TW.xaml">
       <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </Page>
     <Page Include="Pages\PageDownload\PageDownloadForge.xaml">
       <SubType>Designer</SubType>