改进语言列表加载

Berrysoft · May 5, 2018 · c203033 · c203033
1 parent 9cc1e4b
commit c203033
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/TsinghuaNet/MainWindow.xaml b/TsinghuaNet/MainWindow.xaml
@@ -37,7 +37,7 @@
         <UniformGrid Grid.Row="0" Rows="1">
             <RadioButton x:Name="Auth4" Foreground="{StaticResource TsinghuaPurple}" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTip="https://auth4.tsinghua.edu.cn">Auth4</RadioButton>
             <RadioButton x:Name="Auth6" Foreground="{StaticResource TsinghuaPurple}" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTip="https://auth6.tsinghua.edu.cn">Auth6</RadioButton>
-            <RadioButton x:Name="Net" Foreground="{StaticResource TsinghuaPurple}" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center" IsChecked="True" ToolTip="https://net.tsinghua.edu.cn">Net</RadioButton>
+            <RadioButton x:Name="Net" Foreground="{StaticResource TsinghuaPurple}" HorizontalAlignment="Center" VerticalAlignment="Center" VerticalContentAlignment="Center" ToolTip="https://net.tsinghua.edu.cn">Net</RadioButton>
         </UniformGrid>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>

diff --git a/TsinghuaNet/MainWindow.xaml.vb b/TsinghuaNet/MainWindow.xaml.vb
@@ -125,18 +125,17 @@ Class MainWindow
         Model.Password = log.Password
         Model.State = log.State
         Model.MoreInformation = log.MoreInf
-        GetFlux()
         Dim currentcul As CultureInfo = Thread.CurrentThread.CurrentUICulture
         Model.FlowDirection = If(currentcul.TextInfo.IsRightToLeft, FlowDirection.RightToLeft, FlowDirection.LeftToRight)
-        Dim langs As New List(Of CultureInfo)(Directory.GetDirectories(Directory.GetCurrentDirectory()).Select(
-                                              Function(fullName)
-                                                  Try
-                                                      Return New CultureInfo((New DirectoryInfo(fullName).Name))
-                                                  Catch ex As CultureNotFoundException
-                                                      Return Nothing
-                                                  End Try
-                                              End Function).Where(Function(cul) cul IsNot Nothing))
-        langs.Add(New CultureInfo(""))
+        Dim langs As New List(Of CultureInfo)()
+        langs.Add(CultureInfo.InvariantCulture)
+        For Each dirname In Directory.EnumerateDirectories(Directory.GetCurrentDirectory())
+            Try
+                langs.Add(New CultureInfo((New DirectoryInfo(dirname)).Name))
+            Catch ex As CultureNotFoundException
+
+            End Try
+        Next
         langs.Sort(New CultureInfoComparer(currentcul))
         For i = 0 To langs.Count - 1
             Model.Languages.Add(langs(i))

diff --git a/TsinghuaNet/Settings.vb b/TsinghuaNet/Settings.vb
@@ -29,7 +29,8 @@ Class Settings
                 End If
             End If
             Dim moreinf As String = logFile.<user>.<more>.Value
-            If StrComp(moreinf, "true", CompareMethod.Text) = 0 Then
+            Dim moreinfResult As Boolean
+            If Boolean.TryParse(moreinf, moreinfResult) AndAlso moreinfResult Then
                 Me.MoreInf = True
             End If
             Dim lang As String = logFile.<user>.<language>.Value