From bb42a3148607cdfa05c337ef32bc5b43672680a9 Mon Sep 17 00:00:00 2001 From: Riley McArdle Date: Tue, 12 Mar 2013 20:18:13 -0500 Subject: [PATCH] Change theme settings file name to Themes.xml and moved it to a Const in App.Info.Settings. --- mRemoteV1/App/App.Info.vb | 1 + mRemoteV1/Forms/frmMain.vb | 2 +- mRemoteV1/Forms/frmOptions.vb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb index 9b1838a5d..1eb576c09 100644 --- a/mRemoteV1/App/App.Info.vb +++ b/mRemoteV1/App/App.Info.vb @@ -21,6 +21,7 @@ Namespace App #End If Public Shared ReadOnly LayoutFileName As String = "pnlLayout.xml" Public Shared ReadOnly ExtAppsFilesName As String = "extApps.xml" + Public Const ThemesFileName As String = "Themes.xml" End Class Public Class Update diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb index 7a05925f5..a465e9e88 100644 --- a/mRemoteV1/Forms/frmMain.vb +++ b/mRemoteV1/Forms/frmMain.vb @@ -50,7 +50,7 @@ Public Class frmMain Try AddHandler Windows.Theme.ThemeChanged, AddressOf ApplyThemes - Dim themes As List(Of Theme) = ThemeSerializer.LoadFromXmlFile(Path.Combine(App.Info.Settings.SettingsPath, "Theme.xml")) + Dim themes As List(Of Theme) = ThemeSerializer.LoadFromXmlFile(Path.Combine(App.Info.Settings.SettingsPath, App.Info.Settings.ThemesFileName)) If themes.Count Then Windows.Theme.FromTheme(themes(0)) Catch ex As Exception Debug.Print(ex.Message) diff --git a/mRemoteV1/Forms/frmOptions.vb b/mRemoteV1/Forms/frmOptions.vb index 52dd8b806..6d2eea2b1 100644 --- a/mRemoteV1/Forms/frmOptions.vb +++ b/mRemoteV1/Forms/frmOptions.vb @@ -1781,7 +1781,7 @@ Public Class frmOptions My.Settings.XULRunnerPath = Me.txtXULrunnerPath.Text - Config.ThemeSerializer.SaveToXmlFile(Windows.Theme, Path.Combine(App.Info.Settings.SettingsPath, "Theme.xml")) + Config.ThemeSerializer.SaveToXmlFile(Windows.Theme, Path.Combine(App.Info.Settings.SettingsPath, App.Info.Settings.ThemesFileName)) If My.Settings.LoadConsFromCustomLocation = False Then App.Runtime.SetMainFormText(App.Info.Connections.DefaultConnectionsPath & "\" & App.Info.Connections.DefaultConnectionsFile)