From 80f2e5fded7ddcae1b6390bc7bbf28a5a670bfbf Mon Sep 17 00:00:00 2001 From: Bitl Date: Tue, 21 Sep 2021 08:11:37 -0700 Subject: [PATCH] add map/client name to desc --- .../Forms/LauncherForm/LauncherFormShared.cs | 6 +++--- .../Forms/LauncherForm/Stylish/LauncherFormStylish.cs | 3 +-- .../Stylish/LauncherFormStylishInterface.xaml.cs | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs index 6d11df3..7d15786 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/LauncherFormShared.cs @@ -916,13 +916,13 @@ namespace NovetusLauncher private void LoadMapDesc() { - if (File.Exists(GlobalPaths.RootPath + @"\\" + Tree.SelectedNode.FullPath.ToString().Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt")) + if (File.Exists(GlobalPaths.RootPath + @"\\" + Tree.SelectedNode.FullPath.Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt")) { - MapDescBox.Text = File.ReadAllText(GlobalPaths.RootPath + @"\\" + Tree.SelectedNode.FullPath.ToString().Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt"); + MapDescBox.Text = File.ReadAllText(GlobalPaths.RootPath + @"\\" + Tree.SelectedNode.FullPath.Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt"); } else { - MapDescBox.Text = Tree.SelectedNode.Text.ToString(); + MapDescBox.Text = Tree.SelectedNode.Text; } } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs index c884395..3166fdf 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylish.cs @@ -154,8 +154,7 @@ namespace NovetusLauncher launcherFormStylishInterface1.clientWarningBox.Text = ""; } - launcherFormStylishInterface1.clientDescBox.Text = GlobalVars.SelectedClientInfo.Description; - //SelectedClientLabel.Text = GlobalVars.UserConfiguration.SelectedClient; + launcherFormStylishInterface1.clientDescBox.Text = GlobalVars.UserConfiguration.SelectedClient + ": " + GlobalVars.SelectedClientInfo.Description; } } } diff --git a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs index ac37d06..ba16dd8 100644 --- a/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs +++ b/Novetus/NovetusLauncher/Forms/LauncherForm/Stylish/LauncherFormStylishInterface.xaml.cs @@ -93,13 +93,13 @@ namespace NovetusLauncher public void LoadMapDesc() { - if (File.Exists(GlobalPaths.RootPath + @"\\" + mapsBox.SelectedNode.FullPath.ToString().Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt")) + if (File.Exists(GlobalPaths.RootPath + @"\\" + mapsBox.SelectedNode.FullPath.Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt")) { - mapsDescBox.Text = File.ReadAllText(GlobalPaths.RootPath + @"\\" + mapsBox.SelectedNode.FullPath.ToString().Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt"); + mapsDescBox.Text = mapsBox.SelectedNode.Text + ": " + File.ReadAllText(GlobalPaths.RootPath + @"\\" + mapsBox.SelectedNode.FullPath.Replace(".rbxl", "").Replace(".rbxlx", "") + "_desc.txt"); } else { - mapsDescBox.Text = mapsBox.SelectedNode.Text.ToString(); + mapsDescBox.Text = mapsBox.SelectedNode.Text; } }