Skip to content
This repository was archived by the owner on Sep 11, 2023. It is now read-only.

Commit 242a242

Browse files
committed
translate Test Connection button
1 parent 58e438c commit 242a242

File tree

4 files changed

+8
-12
lines changed

4 files changed

+8
-12
lines changed

UI/MainWindow/MainWindowErrorResultGrid.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ private async void ErrorResultGrid_SelectionChanged(object sender, SelectionChan
7676
GoToErrorLine(editor, row);
7777
}
7878
}
79-
catch (UnauthorizedAccessException ex)
79+
catch (UnauthorizedAccessException)
8080
{
8181
await this.ShowMessageAsync(Translate("Error"), Translate("PermissionAccessError"), settings: MetroDialogOptions);
8282
}

UI/Windows/ConfigWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<PasswordBox x:Name="C_FTPPW" PasswordChanged="C_FTPPW_TextChanged" />
192192
<TextBlock x:Name="FTPDirBlock" IsHitTestVisible="False" />
193193
<TextBox x:Name="C_FTPDir" TextChanged="C_FTPDir_TextChanged" />
194-
<Button x:Name="FTPTestConnectionButton" Content="Test Connection" Click="FTPTestConnectionButton_Click" HorizontalAlignment="Left" Margin="0,15,0,-10"/>
194+
<Button x:Name="FTPTestConnectionButton" Click="FTPTestConnectionButton_Click" HorizontalAlignment="Left" Margin="0,15,0,-10"/>
195195
</StackPanel>
196196
</Grid>
197197
<Grid Grid.Column="1" Margin="5,0,0,0">

UI/Windows/ConfigWindow.xaml.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ private void C_RConCmds_TextChanged(object sender, RoutedEventArgs e)
634634
Program.Configs[ConfigListBox.SelectedIndex].RConCommands = C_RConCmds.Text;
635635
}
636636

637-
private void MetroWindow_Closing(object sender, CancelEventArgs e)
637+
private async void MetroWindow_Closing(object sender, CancelEventArgs e)
638638
{
639639
if (NeedsSMDefInvalidation)
640640
{
@@ -654,7 +654,7 @@ private void MetroWindow_Closing(object sender, CancelEventArgs e)
654654
if (configsList.Any(x => string.IsNullOrEmpty(x)))
655655
{
656656
e.Cancel = true;
657-
this.ShowMessageAsync(Translate("ErrorSavingConfigs"),
657+
await this.ShowMessageAsync(Translate("ErrorSavingConfigs"),
658658
Translate("EmptyConfigNames"), MessageDialogStyle.Affirmative,
659659
Program.MainWindow.MetroDialogOptions);
660660
return;
@@ -664,14 +664,14 @@ private void MetroWindow_Closing(object sender, CancelEventArgs e)
664664
if (configsList.Count != configsList.Distinct().Count())
665665
{
666666
e.Cancel = true;
667-
this.ShowMessageAsync(Translate("ErrorSavingConfigs"),
667+
await this.ShowMessageAsync(Translate("ErrorSavingConfigs"),
668668
Translate("DuplicateConfigNames"), MessageDialogStyle.Affirmative,
669669
Program.MainWindow.MetroDialogOptions);
670670
return;
671671
}
672672

673673
Program.MainWindow.FillConfigMenu();
674-
Program.MainWindow.ChangeConfig(Program.SelectedConfig);
674+
await Program.MainWindow.ChangeConfig(Program.SelectedConfig);
675675
var outString = new StringBuilder();
676676
var settings = new XmlWriterSettings
677677
{
@@ -755,6 +755,8 @@ private void Language_Translate()
755755
RConPWBlock.Text = Translate("RconPw");
756756
RConComBlock.Text = Translate("RconCom");
757757
Rcon_MenuC.Text = Translate("RConCMDLineCom");
758+
FTPTestConnectionButton.Content = Translate("TestConnection");
759+
RCONTestConnectionButton.Content = Translate("TestConnection");
758760
BackupConfigsButton.Content = Translate("BackupConfigs");
759761
LoadConfigsButton.Content = Translate("LoadConfigs");
760762
}

Utils/Constants.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ public static class Constants
1414
public const string ProductHeaderValueName = "spcode-client";
1515
#endregion
1616

17-
#region Java Downloads
18-
public const string JavaDownloadSite64 = "https://api.adoptopenjdk.net/v3/installer/latest/15/ga/windows/x64/jdk/hotspot/normal/adoptopenjdk?project=jdk";
19-
public const string JavaDownloadSite32 = "https://api.adoptopenjdk.net/v3/installer/latest/15/ga/windows/x32/jdk/hotspot/normal/adoptopenjdk?project=jdk";
20-
public const string JavaDownloadFile = @"%userprofile%\Downloads\adoptopenjdk-java-15-spcode.msi";
21-
#endregion
22-
2317
#region Icons
2418
public const string FolderIcon = "icon-folder.png";
2519
public const string IncludeIcon = "icon-include.png";

0 commit comments

Comments
 (0)