diff --git a/ExternalConnectors/ExternalConnectors.csproj b/ExternalConnectors/ExternalConnectors.csproj index 7d1a8dfe..7a82710d 100644 --- a/ExternalConnectors/ExternalConnectors.csproj +++ b/ExternalConnectors/ExternalConnectors.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/mRemoteNG/App/Info/SettingsFileInfo.cs b/mRemoteNG/App/Info/SettingsFileInfo.cs index e6007b9f..f06045d3 100644 --- a/mRemoteNG/App/Info/SettingsFileInfo.cs +++ b/mRemoteNG/App/Info/SettingsFileInfo.cs @@ -8,13 +8,9 @@ namespace mRemoteNG.App.Info { public static class SettingsFileInfo { - private static readonly string ExePath = - Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location); + private static readonly string ExePath = Path.GetDirectoryName(Assembly.GetAssembly(typeof(ConnectionInfo))?.Location); - public static string SettingsPath => - Runtime.IsPortableEdition - ? ExePath - : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName; + public static string SettingsPath => Runtime.IsPortableEdition ? ExePath : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\" + Application.ProductName; public static string LayoutFileName { get; } = "pnlLayout.xml"; public static string ExtAppsFilesName { get; } = "extApps.xml"; diff --git a/mRemoteNG/App/Info/UpdateChannelInfo.cs b/mRemoteNG/App/Info/UpdateChannelInfo.cs index de1f014c..60b5cfbb 100644 --- a/mRemoteNG/App/Info/UpdateChannelInfo.cs +++ b/mRemoteNG/App/Info/UpdateChannelInfo.cs @@ -22,7 +22,7 @@ namespace mRemoteNG.App.Info public static Uri GetUpdateChannelInfo() { - var channel = IsValidChannel(Settings.Default.UpdateChannel) ? Settings.Default.UpdateChannel : STABLE; + var channel = IsValidChannel(Properties.OptionsUpdatesPage.Default.UpdateChannel) ? Properties.OptionsUpdatesPage.Default.UpdateChannel : STABLE; return GetUpdateTxtUri(channel); } @@ -65,7 +65,7 @@ namespace mRemoteNG.App.Info private static Uri GetUpdateTxtUri(string channel) { - return new Uri(new Uri(Settings.Default.UpdateAddress), + return new Uri(new Uri(Properties.OptionsUpdatesPage.Default.UpdateAddress), new Uri(GetChannelFileName(channel), UriKind.Relative)); } diff --git a/mRemoteNG/App/Initialization/CredsAndConsSetup.cs b/mRemoteNG/App/Initialization/CredsAndConsSetup.cs index 935e3eea..b33ac71f 100644 --- a/mRemoteNG/App/Initialization/CredsAndConsSetup.cs +++ b/mRemoteNG/App/Initialization/CredsAndConsSetup.cs @@ -10,10 +10,8 @@ namespace mRemoteNG.App.Initialization { new SaveConnectionsOnEdit(Runtime.ConnectionsService); - if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && - !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName())) - Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService - .GetStartupConnectionFileName()); + if (Properties.App.Default.FirstStart && !Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation && !File.Exists(Runtime.ConnectionsService.GetStartupConnectionFileName())) + Runtime.ConnectionsService.NewConnectionsFile(Runtime.ConnectionsService.GetStartupConnectionFileName()); Runtime.LoadConnections(); } diff --git a/mRemoteNG/App/Logger.cs b/mRemoteNG/App/Logger.cs index 7981cff6..52c31d32 100644 --- a/mRemoteNG/App/Logger.cs +++ b/mRemoteNG/App/Logger.cs @@ -27,10 +27,10 @@ namespace mRemoteNG.App private void Initialize() { XmlConfigurator.Configure(LogManager.CreateRepository("mRemoteNG")); - if (string.IsNullOrEmpty(Settings.Default.LogFilePath)) - Settings.Default.LogFilePath = BuildLogFilePath(); + if (string.IsNullOrEmpty(Properties.OptionsNotificationsPage.Default.LogFilePath)) + Properties.OptionsNotificationsPage.Default.LogFilePath = BuildLogFilePath(); - SetLogPath(Settings.Default.LogToApplicationDirectory ? DefaultLogPath : Settings.Default.LogFilePath); + SetLogPath(Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory ? DefaultLogPath : Properties.OptionsNotificationsPage.Default.LogFilePath); } public void SetLogPath(string path) diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs index d30edebe..93a92d22 100644 --- a/mRemoteNG/App/ProgramRoot.cs +++ b/mRemoteNG/App/ProgramRoot.cs @@ -17,7 +17,7 @@ namespace mRemoteNG.App [STAThread] public static void Main(string[] args) { - if (Settings.Default.SingleInstance) + if (Properties.OptionsStartupExitPage.Default.SingleInstance) StartApplicationAsSingleInstance(); else StartApplication(); diff --git a/mRemoteNG/App/Runtime.cs b/mRemoteNG/App/Runtime.cs index 2347d074..8177b780 100644 --- a/mRemoteNG/App/Runtime.cs +++ b/mRemoteNG/App/Runtime.cs @@ -91,17 +91,17 @@ namespace mRemoteNG.App return; connectionFileName = loadDialog.FileName; - Settings.Default.UseSQLServer = false; - Settings.Default.Save(); + Properties.OptionsDBsPage.Default.UseSQLServer = false; + Properties.OptionsDBsPage.Default.Save(); } - else if (!Settings.Default.UseSQLServer) + else if (!Properties.OptionsDBsPage.Default.UseSQLServer) { connectionFileName = ConnectionsService.GetStartupConnectionFileName(); } - ConnectionsService.LoadConnections(Settings.Default.UseSQLServer, false, connectionFileName); + ConnectionsService.LoadConnections(Properties.OptionsDBsPage.Default.UseSQLServer, false, connectionFileName); - if (Settings.Default.UseSQLServer) + if (Properties.OptionsDBsPage.Default.UseSQLServer) { ConnectionsService.LastSqlUpdate = DateTime.Now; } @@ -117,24 +117,18 @@ namespace mRemoteNG.App { FrmSplashScreen.getInstance().Close(); - if (Settings.Default.UseSQLServer) + if (Properties.OptionsDBsPage.Default.UseSQLServer) { MessageCollector.AddExceptionMessage(Language.LoadFromSqlFailed, ex); - var commandButtons = string.Join("|", Language._TryAgain, - Language.CommandOpenConnectionFile, - string.Format(Language.CommandExitProgram, - Application.ProductName)); - CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed, - Language.LoadFromSqlFailedContent, - MiscTools.GetExceptionMessageRecursive(ex), "", "", - commandButtons, false, ESysIcons.Error, ESysIcons.Error); + var commandButtons = string.Join("|", Language._TryAgain, Language.CommandOpenConnectionFile, string.Format(Language.CommandExitProgram, Application.ProductName)); + CTaskDialog.ShowCommandBox(Application.ProductName, Language.LoadFromSqlFailed, Language.LoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, ESysIcons.Error, ESysIcons.Error); switch (CTaskDialog.CommandButtonResult) { case 0: LoadConnections(withDialog); return; case 1: - Settings.Default.UseSQLServer = false; + Properties.OptionsDBsPage.Default.UseSQLServer = false; LoadConnections(true); return; default: @@ -163,14 +157,7 @@ namespace mRemoteNG.App { try { - CTaskDialog.ShowTaskDialogBox( - GeneralAppInfo.ProductName, - Language.ConnectionFileNotFound, - "", "", "", "", "", - string.Join(" | ", commandButtons), - ETaskDialogButtons.None, - ESysIcons.Question, - ESysIcons.Question); + CTaskDialog.ShowTaskDialogBox(GeneralAppInfo.ProductName, Language.ConnectionFileNotFound, "", "", "", "", "", string.Join(" | ", commandButtons), ETaskDialogButtons.None, ESysIcons.Question, ESysIcons.Question); switch (CTaskDialog.CommandButtonResult) { @@ -195,11 +182,7 @@ namespace mRemoteNG.App } catch (Exception exc) { - MessageCollector.AddExceptionMessage( - string - .Format(Language.ConnectionsFileCouldNotBeLoadedNew, - connectionFileName), exc, - MessageClass.InformationMsg); + MessageCollector.AddExceptionMessage(string.Format(Language.ConnectionsFileCouldNotBeLoadedNew, connectionFileName), exc, MessageClass.InformationMsg); } } @@ -215,12 +198,7 @@ namespace mRemoteNG.App } else { - MessageBox.Show(FrmMain.Default, - string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine, - Application.ProductName, - ConnectionsService.GetStartupConnectionFileName(), - MiscTools.GetExceptionMessageRecursive(ex)), - @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error); + MessageBox.Show(FrmMain.Default, string.Format(Language.ErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, ConnectionsService.GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)), @"Could not load startup file.", MessageBoxButtons.OK, MessageBoxIcon.Error); Application.Exit(); } } diff --git a/mRemoteNG/App/Shutdown.cs b/mRemoteNG/App/Shutdown.cs index 2067cbdb..322e94cb 100644 --- a/mRemoteNG/App/Shutdown.cs +++ b/mRemoteNG/App/Shutdown.cs @@ -66,14 +66,14 @@ namespace mRemoteNG.App DateTime currentDate = DateTime.Now; //OBSOLETE: Settings.Default.SaveConsOnExit is obsolete and should be removed in a future release - if (Settings.Default.SaveConsOnExit || (Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnExit)) + if (Properties.OptionsStartupExitPage.Default.SaveConnectionsOnExit || (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnExit)) { Runtime.ConnectionsService.SaveConnections(); return; } lastUpdate = Runtime.ConnectionsService.UsingDatabase ? Runtime.ConnectionsService.LastSqlUpdate : Runtime.ConnectionsService.LastFileUpdate; - switch (Settings.Default.SaveConnectionsFrequency) + switch (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency) { case (int)ConnectionsBackupFrequencyEnum.Daily: updateDate = lastUpdate.AddDays(1); diff --git a/mRemoteNG/App/Startup.cs b/mRemoteNG/App/Startup.cs index e7a13bce..7fb7a5eb 100644 --- a/mRemoteNG/App/Startup.cs +++ b/mRemoteNG/App/Startup.cs @@ -59,10 +59,9 @@ namespace mRemoteNG.App public void CreateConnectionsProvider(MessageCollector messageCollector) { messageCollector.AddMessage(MessageClass.DebugMsg, "Determining if we need a database syncronizer"); - if (!Settings.Default.UseSQLServer) return; + if (!Properties.OptionsDBsPage.Default.UseSQLServer) return; messageCollector.AddMessage(MessageClass.DebugMsg, "Creating database syncronizer"); - Runtime.ConnectionsService.RemoteConnectionsSyncronizer = - new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker()); + Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker()); Runtime.ConnectionsService.RemoteConnectionsSyncronizer.Enable(); } @@ -78,12 +77,8 @@ namespace mRemoteNG.App } var nextUpdateCheck = - Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add( - TimeSpan - .FromDays(Convert.ToDouble(Settings - .Default - .CheckForUpdatesFrequencyDays)))); - if (!Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck) + Convert.ToDateTime(Properties.OptionsUpdatesPage.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays)))); + if (!Properties.OptionsUpdatesPage.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck) { return; } diff --git a/mRemoteNG/App/SupportedCultures.cs b/mRemoteNG/App/SupportedCultures.cs index b3e2511c..e4827fcc 100644 --- a/mRemoteNG/App/SupportedCultures.cs +++ b/mRemoteNG/App/SupportedCultures.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Diagnostics; using System.Globalization; @@ -22,7 +22,7 @@ namespace mRemoteNG.App private SupportedCultures() { - foreach (var CultureName in Settings.Default.SupportedUICultures.Split(',')) + foreach (var CultureName in Properties.AppUI.Default.SupportedUICultures.Split(',')) { try { diff --git a/mRemoteNG/App/Update/AppUpdater.cs b/mRemoteNG/App/Update/AppUpdater.cs index 4bfc6b06..855cdc66 100644 --- a/mRemoteNG/App/Update/AppUpdater.cs +++ b/mRemoteNG/App/Update/AppUpdater.cs @@ -58,23 +58,18 @@ namespace mRemoteNG.App.Update private void SetDefaultProxySettings() { - var shouldWeUseProxy = Settings.Default.UpdateUseProxy; - var proxyAddress = Settings.Default.UpdateProxyAddress; - var port = Settings.Default.UpdateProxyPort; - var useAuthentication = Settings.Default.UpdateProxyUseAuthentication; - var username = Settings.Default.UpdateProxyAuthUser; + var shouldWeUseProxy = Properties.OptionsUpdatesPage.Default.UpdateUseProxy; + var proxyAddress = Properties.OptionsUpdatesPage.Default.UpdateProxyAddress; + var port = Properties.OptionsUpdatesPage.Default.UpdateProxyPort; + var useAuthentication = Properties.OptionsUpdatesPage.Default.UpdateProxyUseAuthentication; + var username = Properties.OptionsUpdatesPage.Default.UpdateProxyAuthUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - var password = cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey); + var password = cryptographyProvider.Decrypt(Properties.OptionsUpdatesPage.Default.UpdateProxyAuthPass, Runtime.EncryptionKey); SetProxySettings(shouldWeUseProxy, proxyAddress, port, useAuthentication, username, password); } - public void SetProxySettings(bool useProxy, - string address, - int port, - bool useAuthentication, - string username, - string password) + public void SetProxySettings(bool useProxy, string address, int port, bool useAuthentication, string username, string password) { if (useProxy && !string.IsNullOrEmpty(address)) { @@ -229,11 +224,11 @@ namespace mRemoteNG.App.Update _getUpdateInfoCancelToken = new CancellationTokenSource(); var updateInfo = await _httpClient.GetStringAsync(UpdateChannelInfo.GetUpdateChannelInfo(), _getUpdateInfoCancelToken.Token); CurrentUpdateInfo = UpdateInfo.FromString(updateInfo); - Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesLastCheck = DateTime.UtcNow; - if (!Settings.Default.UpdatePending) + if (!Properties.OptionsUpdatesPage.Default.UpdatePending) { - Settings.Default.UpdatePending = IsUpdateAvailable(); + Properties.OptionsUpdatesPage.Default.UpdatePending = IsUpdateAvailable(); } } finally diff --git a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs index 168d42c9..8badd155 100644 --- a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs +++ b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs @@ -20,8 +20,7 @@ namespace mRemoteNG.Config.Connections connectionsService.ConnectionsLoaded += ConnectionsServiceOnConnectionsLoaded; } - private void ConnectionsServiceOnConnectionsLoaded(object sender, - ConnectionsLoadedEventArgs connectionsLoadedEventArgs) + private void ConnectionsServiceOnConnectionsLoaded(object sender, ConnectionsLoadedEventArgs connectionsLoadedEventArgs) { connectionsLoadedEventArgs.NewConnectionTreeModel.CollectionChanged += ConnectionTreeModelOnCollectionChanged; @@ -34,15 +33,12 @@ namespace mRemoteNG.Config.Connections } } - private void ConnectionTreeModelOnPropertyChanged(object sender, - PropertyChangedEventArgs propertyChangedEventArgs) + private void ConnectionTreeModelOnPropertyChanged(object sender, PropertyChangedEventArgs propertyChangedEventArgs) { SaveConnectionOnEdit(propertyChangedEventArgs.PropertyName); } - private void ConnectionTreeModelOnCollectionChanged(object sender, - NotifyCollectionChangedEventArgs - notifyCollectionChangedEventArgs) + private void ConnectionTreeModelOnCollectionChanged(object sender, NotifyCollectionChangedEventArgs notifyCollectionChangedEventArgs) { SaveConnectionOnEdit(); } @@ -50,7 +46,7 @@ namespace mRemoteNG.Config.Connections private void SaveConnectionOnEdit(string propertyName = "") { //OBSOLETE: mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit is obsolete and should be removed in a future release - if (mRemoteNG.Properties.Settings.Default.SaveConnectionsAfterEveryEdit || (mRemoteNG.Properties.Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnEdit)) + if (Properties.OptionsBackupPage.Default.SaveConnectionsAfterEveryEdit || (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.OnEdit)) { if (FrmMain.Default.IsClosing) return; diff --git a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs index 4be3dce9..ea8ca5df 100644 --- a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs @@ -18,6 +18,7 @@ using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.Resources.Language; +using mRemoteNG.Properties; namespace mRemoteNG.Config.Connections { @@ -27,10 +28,7 @@ namespace mRemoteNG.Config.Connections private readonly ISerializer, string> _localPropertiesSerializer; private readonly IDataProvider _dataProvider; - public SqlConnectionsSaver(SaveFilter saveFilter, - ISerializer, string> - localPropertieSerializer, - IDataProvider localPropertiesDataProvider) + public SqlConnectionsSaver(SaveFilter saveFilter, ISerializer, string> localPropertieSerializer, IDataProvider localPropertiesDataProvider) { if (saveFilter == null) throw new ArgumentNullException(nameof(saveFilter)); @@ -47,15 +45,13 @@ namespace mRemoteNG.Config.Connections if (PropertyIsLocalOnly(propertyNameTrigger)) { - Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, - $"Property {propertyNameTrigger} is local only. Not saving to database."); + Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Property {propertyNameTrigger} is local only. Not saving to database."); return; } if (SqlUserIsReadOnly()) { - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, - "Trying to save connection tree but the SQL read only checkbox is checked, aborting!"); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Trying to save connection tree but the SQL read only checkbox is checked, aborting!"); return; } @@ -68,8 +64,7 @@ namespace mRemoteNG.Config.Connections if (!databaseVersionVerifier.VerifyDatabaseVersion(metaData.ConfVersion)) { - Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, - Language.ErrorConnectionListSaveFailed); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.ErrorConnectionListSaveFailed); return; } @@ -178,7 +173,7 @@ namespace mRemoteNG.Config.Connections private bool SqlUserIsReadOnly() { - return Properties.Settings.Default.SQLReadOnly; + return Properties.OptionsDBsPage.Default.SQLReadOnly; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs b/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs index 00365807..6391d6e0 100644 --- a/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs @@ -7,6 +7,7 @@ using mRemoteNG.Security; using mRemoteNG.Security.Factories; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; +using mRemoteNG.Properties; namespace mRemoteNG.Config.Connections { @@ -37,7 +38,7 @@ namespace mRemoteNG.Config.Connections cryptographyProvider, connectionTreeModel, _saveFilter, - Properties.Settings.Default.EncryptCompleteConnectionsFile); + Properties.OptionsSecurityPage.Default.EncryptCompleteConnectionsFile); var rootNode = connectionTreeModel.RootNodes.OfType().First(); var xml = xmlConnectionsSerializer.Serialize(rootNode); diff --git a/mRemoteNG/Config/DataProviders/FileBackupCreator.cs b/mRemoteNG/Config/DataProviders/FileBackupCreator.cs index 57c9fbef..fd531422 100644 --- a/mRemoteNG/Config/DataProviders/FileBackupCreator.cs +++ b/mRemoteNG/Config/DataProviders/FileBackupCreator.cs @@ -16,7 +16,7 @@ namespace mRemoteNG.Config.DataProviders return; var backupFileName = - string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now); + string.Format(Properties.OptionsBackupPage.Default.BackupFileNameFormat, fileName, DateTime.Now); File.Copy(fileName, backupFileName); } catch (Exception ex) @@ -39,7 +39,7 @@ namespace mRemoteNG.Config.DataProviders private bool FeatureIsTurnedOff() { - return Properties.Settings.Default.BackupFileKeepCount == 0; + return Properties.OptionsBackupPage.Default.BackupFileKeepCount == 0; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/DataProviders/FileBackupPruner.cs b/mRemoteNG/Config/DataProviders/FileBackupPruner.cs index eeec7873..7955455d 100644 --- a/mRemoteNG/Config/DataProviders/FileBackupPruner.cs +++ b/mRemoteNG/Config/DataProviders/FileBackupPruner.cs @@ -13,7 +13,7 @@ namespace mRemoteNG.Config.DataProviders if (string.IsNullOrEmpty(fileName) || string.IsNullOrEmpty(directoryName)) return; - var searchPattern = string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, "*"); + var searchPattern = string.Format(Properties.OptionsBackupPage.Default.BackupFileNameFormat, fileName, "*"); var files = Directory.GetFiles(directoryName, searchPattern); if (files.Length <= maxBackupsToKeep) diff --git a/mRemoteNG/Config/DataProviders/SqlDataProvider.cs b/mRemoteNG/Config/DataProviders/SqlDataProvider.cs index 2bb27d99..96f0b43b 100644 --- a/mRemoteNG/Config/DataProviders/SqlDataProvider.cs +++ b/mRemoteNG/Config/DataProviders/SqlDataProvider.cs @@ -2,6 +2,7 @@ using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Messages; using mRemoteNG.App; +using mRemoteNG.Properties; using MySql.Data.MySqlClient; using System.Data.SqlClient; @@ -108,7 +109,7 @@ namespace mRemoteNG.Config.DataProviders private bool DbUserIsReadOnly() { - return Properties.Settings.Default.SQLReadOnly; + return Properties.OptionsDBsPage.Default.SQLReadOnly; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs b/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs index 9b6e7cfa..ee20e559 100644 --- a/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs +++ b/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs @@ -1,4 +1,5 @@ using mRemoteNG.App; +using mRemoteNG.Properties; using mRemoteNG.Security.SymmetricEncryption; namespace mRemoteNG.Config.DatabaseConnectors @@ -7,12 +8,12 @@ namespace mRemoteNG.Config.DatabaseConnectors { public static IDatabaseConnector DatabaseConnectorFromSettings() { - var sqlType = Properties.Settings.Default.SQLServerType; - var sqlHost = Properties.Settings.Default.SQLHost; - var sqlCatalog = Properties.Settings.Default.SQLDatabaseName; - var sqlUsername = Properties.Settings.Default.SQLUser; + var sqlType = Properties.OptionsDBsPage.Default.SQLServerType; + var sqlHost = Properties.OptionsDBsPage.Default.SQLHost; + var sqlCatalog = Properties.OptionsDBsPage.Default.SQLDatabaseName; + var sqlUsername = Properties.OptionsDBsPage.Default.SQLUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey); + var sqlPassword = cryptographyProvider.Decrypt(Properties.OptionsDBsPage.Default.SQLPass, Runtime.EncryptionKey); return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword); } diff --git a/mRemoteNG/Config/Settings/SettingsLoader.cs b/mRemoteNG/Config/Settings/SettingsLoader.cs index 180e9948..44773b7b 100644 --- a/mRemoteNG/Config/Settings/SettingsLoader.cs +++ b/mRemoteNG/Config/Settings/SettingsLoader.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Drawing; using System.Windows.Forms; using WeifenLuo.WinFormsUI.Docking; @@ -74,7 +74,7 @@ namespace mRemoteNG.Config.Settings LoadExternalAppsFromXml(); SetAlwaysShowPanelTabs(); - if (Properties.Settings.Default.ResetToolbars) + if (Properties.App.Default.ResetToolbars) SetToolbarsDefault(); else LoadToolbarsFromSettings(); @@ -87,40 +87,37 @@ namespace mRemoteNG.Config.Settings private static void SetAlwaysShowPanelTabs() { - if (Properties.Settings.Default.AlwaysShowPanelTabs) + if (Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelTabs) FrmMain.Default.pnlDock.DocumentStyle = DocumentStyle.DockingWindow; } private void SetSupportedCulture() { - if (Properties.Settings.Default.OverrideUICulture == "" || - !SupportedCultures.IsNameSupported(Properties.Settings.Default.OverrideUICulture)) return; + if (Properties.Settings.Default.OverrideUICulture == "" || !SupportedCultures.IsNameSupported(Properties.Settings.Default.OverrideUICulture)) return; Thread.CurrentThread.CurrentUICulture = new CultureInfo(Properties.Settings.Default.OverrideUICulture); - _messageCollector.AddMessage(MessageClass.InformationMsg, - $"Override Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}", - true); + _messageCollector.AddMessage(MessageClass.InformationMsg, $"Override Culture: {Thread.CurrentThread.CurrentUICulture.Name}/{Thread.CurrentThread.CurrentUICulture.NativeName}", true); } private void SetApplicationWindowPositionAndSize() { MainForm.WindowState = FormWindowState.Normal; - if (Properties.Settings.Default.MainFormState == FormWindowState.Normal) + if (Properties.App.Default.MainFormState == FormWindowState.Normal) { - if (!Properties.Settings.Default.MainFormLocation.IsEmpty) - MainForm.Location = Properties.Settings.Default.MainFormLocation; - if (!Properties.Settings.Default.MainFormSize.IsEmpty) - MainForm.Size = Properties.Settings.Default.MainFormSize; + if (!Properties.App.Default.MainFormLocation.IsEmpty) + MainForm.Location = Properties.App.Default.MainFormLocation; + if (!Properties.App.Default.MainFormSize.IsEmpty) + MainForm.Size = Properties.App.Default.MainFormSize; } else { - if (!Properties.Settings.Default.MainFormRestoreLocation.IsEmpty) - MainForm.Location = Properties.Settings.Default.MainFormRestoreLocation; - if (!Properties.Settings.Default.MainFormRestoreSize.IsEmpty) - MainForm.Size = Properties.Settings.Default.MainFormRestoreSize; + if (!Properties.App.Default.MainFormRestoreLocation.IsEmpty) + MainForm.Location = Properties.App.Default.MainFormRestoreLocation; + if (!Properties.App.Default.MainFormRestoreSize.IsEmpty) + MainForm.Size = Properties.App.Default.MainFormRestoreSize; } - if (Properties.Settings.Default.MainFormState == FormWindowState.Maximized) + if (Properties.App.Default.MainFormState == FormWindowState.Maximized) { MainForm.WindowState = FormWindowState.Maximized; } @@ -145,33 +142,31 @@ namespace mRemoteNG.Config.Settings private void SetAutoSave() { - if (Properties.Settings.Default.AutoSaveEveryMinutes <= 0) return; - MainForm.tmrAutoSave.Interval = Properties.Settings.Default.AutoSaveEveryMinutes * 60000; + if (Properties.OptionsConnectionsPage.Default.AutoSaveEveryMinutes <= 0) return; + MainForm.tmrAutoSave.Interval = Properties.OptionsConnectionsPage.Default.AutoSaveEveryMinutes * 60000; MainForm.tmrAutoSave.Enabled = true; } private void SetKioskMode() { - if (!Properties.Settings.Default.MainFormKiosk) return; + if (!Properties.App.Default.MainFormKiosk) return; MainForm.Fullscreen.Value = true; } private static void SetShowSystemTrayIcon() { - if (Properties.Settings.Default.ShowSystemTrayIcon) + if (Properties.OptionsAppearancePage.Default.ShowSystemTrayIcon) Runtime.NotificationAreaIcon = new NotificationAreaIcon(); } private static void SetPuttyPath() { - PuttyBase.PuttyPath = Properties.Settings.Default.UseCustomPuttyPath - ? Properties.Settings.Default.CustomPuttyPath - : GeneralAppInfo.PuttyPath; + PuttyBase.PuttyPath = Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath ? Properties.OptionsAdvancedPage.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath; } private void EnsureSettingsAreSavedInNewestVersion() { - if (Properties.Settings.Default.DoUpgrade) + if (Properties.App.Default.DoUpgrade) UpgradeSettingsVersion(); } @@ -187,12 +182,12 @@ namespace mRemoteNG.Config.Settings _messageCollector.AddExceptionMessage("Settings.Upgrade() failed", ex); } - Properties.Settings.Default.DoUpgrade = false; + Properties.App.Default.DoUpgrade = false; // Clear pending update flag // This is used for automatic updates, not for settings migration, but it // needs to be cleared here because we know that we just updated. - Properties.Settings.Default.UpdatePending = false; + Properties.OptionsUpdatesPage.Default.UpdatePending = false; } private void SetToolbarsDefault() diff --git a/mRemoteNG/Config/Settings/SettingsSaver.cs b/mRemoteNG/Config/Settings/SettingsSaver.cs index 7c35e5b8..26937498 100644 --- a/mRemoteNG/Config/Settings/SettingsSaver.cs +++ b/mRemoteNG/Config/Settings/SettingsSaver.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; @@ -11,10 +11,7 @@ namespace mRemoteNG.Config.Settings { public static class SettingsSaver { - public static void SaveSettings(Control quickConnectToolStrip, - ExternalToolsToolStrip externalToolsToolStrip, - MultiSshToolStrip multiSshToolStrip, - FrmMain frmMain) + public static void SaveSettings(Control quickConnectToolStrip, ExternalToolsToolStrip externalToolsToolStrip, MultiSshToolStrip multiSshToolStrip, FrmMain frmMain) { try { @@ -25,25 +22,25 @@ namespace mRemoteNG.Config.Settings frmMain.WindowState = FormWindowState.Maximized; } - Properties.Settings.Default.MainFormLocation = frmMain.Location; - Properties.Settings.Default.MainFormSize = frmMain.Size; + Properties.App.Default.MainFormLocation = frmMain.Location; + Properties.App.Default.MainFormSize = frmMain.Size; if (frmMain.WindowState != FormWindowState.Normal) { - Properties.Settings.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location; - Properties.Settings.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size; + Properties.App.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location; + Properties.App.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size; } - Properties.Settings.Default.MainFormState = frmMain.WindowState; + Properties.App.Default.MainFormState = frmMain.WindowState; if (frmMain.Fullscreen != null) { - Properties.Settings.Default.MainFormKiosk = frmMain.Fullscreen.Value; + Properties.App.Default.MainFormKiosk = frmMain.Fullscreen.Value; } - Properties.Settings.Default.FirstStart = false; - Properties.Settings.Default.ResetPanels = false; - Properties.Settings.Default.ResetToolbars = false; + Properties.App.Default.FirstStart = false; + Properties.App.Default.ResetPanels = false; + Properties.App.Default.ResetToolbars = false; Properties.Settings.Default.NoReconnect = false; SaveExternalAppsToolbarLocation(externalToolsToolStrip); diff --git a/mRemoteNG/Connection/ConnectionInitiator.cs b/mRemoteNG/Connection/ConnectionInitiator.cs index da0b8145..39e38cfd 100644 --- a/mRemoteNG/Connection/ConnectionInitiator.cs +++ b/mRemoteNG/Connection/ConnectionInitiator.cs @@ -299,9 +299,7 @@ namespace mRemoteNG.Connection private static string SetConnectionPanel(ConnectionInfo connectionInfo, ConnectionInfo.Force force) { - if (connectionInfo.Panel != "" && - !force.HasFlag(ConnectionInfo.Force.OverridePanel) && - !Settings.Default.AlwaysShowPanelSelectionDlg) + if (connectionInfo.Panel != "" && !force.HasFlag(ConnectionInfo.Force.OverridePanel) && !Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelSelectionDlg) return connectionInfo.Panel; var frmPnl = new FrmChoosePanel(); diff --git a/mRemoteNG/Connection/ConnectionsService.cs b/mRemoteNG/Connection/ConnectionsService.cs index 95a19429..d2c9b286 100644 --- a/mRemoteNG/Connection/ConnectionsService.cs +++ b/mRemoteNG/Connection/ConnectionsService.cs @@ -94,7 +94,7 @@ namespace mRemoteNG.Connection var newConnectionInfo = new ConnectionInfo(); newConnectionInfo.CopyFrom(DefaultConnectionInfo.Instance); - newConnectionInfo.Name = Settings.Default.IdentifyQuickConnectTabs + newConnectionInfo.Name = Properties.OptionsTabsPanelsPage.Default.IdentifyQuickConnectTabs ? string.Format(Language.Quick, uriBuilder.Host) : uriBuilder.Host; @@ -149,8 +149,7 @@ namespace mRemoteNG.Connection if (newConnectionTreeModel == null) { - DialogFactory.ShowLoadConnectionsFailedDialog(connectionFileName, "Decrypting connection file failed", - IsConnectionsFileLoaded); + DialogFactory.ShowLoadConnectionsFailedDialog(connectionFileName, "Decrypting connection file failed", IsConnectionsFileLoaded); return; } @@ -166,10 +165,8 @@ namespace mRemoteNG.Connection ConnectionTreeModel = newConnectionTreeModel; UpdateCustomConsPathSetting(connectionFileName); - RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, - useDatabase, connectionFileName); - Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, - $"Connections loaded using {connectionLoader.GetType().Name}"); + RaiseConnectionsLoadedEvent(oldConnectionTreeModel, newConnectionTreeModel, oldIsUsingDatabaseValue, useDatabase, connectionFileName); + Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, $"Connections loaded using {connectionLoader.GetType().Name}"); } /// @@ -321,9 +318,7 @@ namespace mRemoteNG.Connection public string GetStartupConnectionFileName() { - return Settings.Default.LoadConsFromCustomLocation == false - ? GetDefaultStartupConnectionFileName() - : Settings.Default.CustomConsPath; + return Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation == false ? GetDefaultStartupConnectionFileName() : Properties.OptionsBackupPage.Default.BackupFilePath; } public string GetDefaultStartupConnectionFileName() @@ -337,21 +332,18 @@ namespace mRemoteNG.Connection { if (filename == GetDefaultStartupConnectionFileName()) { - Settings.Default.LoadConsFromCustomLocation = false; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = false; } else { - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = filename; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.BackupFilePath = filename; } } private string GetDefaultStartupConnectionFileNameNormalEdition() { - var appDataPath = Path.Combine( - Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), - Application.ProductName, - ConnectionsFileInfo.DefaultConnectionsFile); + var appDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), Application.ProductName, ConnectionsFileInfo.DefaultConnectionsFile); return File.Exists(appDataPath) ? appDataPath : GetDefaultStartupConnectionFileNamePortableEdition(); } diff --git a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs index 42c72d0c..ebe7f89d 100644 --- a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs +++ b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs @@ -80,11 +80,11 @@ namespace mRemoteNG.Connection.Protocol _process.Exited += ProcessExited; _process.Start(); - _process.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000); + _process.WaitForInputIdle(Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000); var startTicks = Environment.TickCount; while (_handle.ToInt32() == 0 & - Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000) + Environment.TickCount < startTicks + Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000) { _process.Refresh(); if (_process.MainWindowTitle != "Default IME") diff --git a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs index 8f20464a..5d3aa624 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs @@ -23,7 +23,7 @@ namespace mRemoteNG.Connection.Protocol { case ProtocolType.RDP: var rdp = _rdpProtocolFactory.Build(connectionInfo.RdpVersion); - rdp.LoadBalanceInfoUseUtf8 = Settings.Default.RdpLoadBalanceInfoUseUtf8; + rdp.LoadBalanceInfoUseUtf8 = Properties.OptionsAdvancedPage.Default.RdpLoadBalanceInfoUseUtf8; return rdp; case ProtocolType.VNC: return new ProtocolVNC(); diff --git a/mRemoteNG/Connection/Protocol/PuttyBase.cs b/mRemoteNG/Connection/Protocol/PuttyBase.cs index e2577d64..508182cf 100644 --- a/mRemoteNG/Connection/Protocol/PuttyBase.cs +++ b/mRemoteNG/Connection/Protocol/PuttyBase.cs @@ -101,19 +101,19 @@ namespace mRemoteNG.Connection.Protocol if (string.IsNullOrEmpty(username)) { - switch (Settings.Default.EmptyCredentials) + switch (Properties.OptionsCredentialsPage.Default.EmptyCredentials) { case "windows": username = Environment.UserName; break; - case "custom" when !string.IsNullOrEmpty(Settings.Default.DefaultUsername): - username = Settings.Default.DefaultUsername; + case "custom" when !string.IsNullOrEmpty(Properties.OptionsCredentialsPage.Default.DefaultUsername): + username = Properties.OptionsCredentialsPage.Default.DefaultUsername; break; case "custom": try { ExternalConnectors.TSS.SecretServerInterface.FetchSecretFromServer( - "SSAPI:" + Settings.Default.UserViaAPDefault, out username, out password, + "SSAPI:" + Properties.OptionsCredentialsPage.Default.UserViaAPDefault, out username, out password, out domain); } catch (Exception ex) @@ -127,11 +127,10 @@ namespace mRemoteNG.Connection.Protocol if (string.IsNullOrEmpty(password)) { - if (Settings.Default.EmptyCredentials == "custom") + if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "custom") { var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - password = cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, - Runtime.EncryptionKey); + password = cryptographyProvider.Decrypt(Properties.OptionsCredentialsPage.Default.DefaultPassword, Runtime.EncryptionKey); } } @@ -171,16 +170,15 @@ namespace mRemoteNG.Connection.Protocol PuttyProcess.Exited += ProcessExited; PuttyProcess.Start(); - PuttyProcess.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000); + PuttyProcess.WaitForInputIdle(Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000); var startTicks = Environment.TickCount; while (PuttyHandle.ToInt32() == 0 & - Environment.TickCount < startTicks + Settings.Default.MaxPuttyWaitTime * 1000) + Environment.TickCount < startTicks + Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000) { if (_isPuttyNg) { - PuttyHandle = NativeMethods.FindWindowEx( - InterfaceControl.Handle, new IntPtr(0), null, null); + PuttyHandle = NativeMethods.FindWindowEx(InterfaceControl.Handle, new IntPtr(0), null, null); } else { @@ -200,14 +198,9 @@ namespace mRemoteNG.Connection.Protocol } Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.PuttyStuff, true); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, - string.Format(Language.PuttyHandle, PuttyHandle), true); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, - string.Format(Language.PuttyTitle, PuttyProcess.MainWindowTitle), - true); - Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, - string.Format(Language.PanelHandle, - InterfaceControl.Parent.Handle), true); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PuttyHandle, PuttyHandle), true); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PuttyTitle, PuttyProcess.MainWindowTitle), true); + Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PanelHandle, InterfaceControl.Parent.Handle), true); if (!string.IsNullOrEmpty(InterfaceControl.Info?.OpeningCommand)) { @@ -222,9 +215,7 @@ namespace mRemoteNG.Connection.Protocol } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, - Language.ConnectionFailed + Environment.NewLine + - ex.Message); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.ConnectionFailed + Environment.NewLine + ex.Message); return false; } } @@ -237,9 +228,7 @@ namespace mRemoteNG.Connection.Protocol } catch (Exception ex) { - Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, - Language.PuttyFocusFailed + Environment.NewLine + ex.Message, - true); + Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.PuttyFocusFailed + Environment.NewLine + ex.Message, true); } } diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index 138732b4..766f0289 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -481,18 +481,18 @@ namespace mRemoteNG.Connection.Protocol.RDP if (string.IsNullOrEmpty(userName)) { - switch (Settings.Default.EmptyCredentials) + switch (Properties.OptionsCredentialsPage.Default.EmptyCredentials) { case "windows": _rdpClient.UserName = Environment.UserName; break; - case "custom" when !string.IsNullOrEmpty(Settings.Default.DefaultUsername): - _rdpClient.UserName = Settings.Default.DefaultUsername; + case "custom" when !string.IsNullOrEmpty(Properties.OptionsCredentialsPage.Default.DefaultUsername): + _rdpClient.UserName = Properties.OptionsCredentialsPage.Default.DefaultUsername; break; case "custom": try { - ExternalConnectors.TSS.SecretServerInterface.FetchSecretFromServer("SSAPI:" + Settings.Default.UserViaAPDefault, out userName, out password, out domain); + ExternalConnectors.TSS.SecretServerInterface.FetchSecretFromServer("SSAPI:" + Properties.OptionsCredentialsPage.Default.UserViaAPDefault, out userName, out password, out domain); _rdpClient.UserName = userName; } catch (Exception ex) @@ -510,13 +510,12 @@ namespace mRemoteNG.Connection.Protocol.RDP if (string.IsNullOrEmpty(password)) { - if (Settings.Default.EmptyCredentials == "custom") + if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "custom") { - if (Settings.Default.DefaultPassword != "") + if (Properties.OptionsCredentialsPage.Default.DefaultPassword != "") { var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - _rdpClient.AdvancedSettings2.ClearTextPassword = - cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey); + _rdpClient.AdvancedSettings2.ClearTextPassword = cryptographyProvider.Decrypt(Properties.OptionsCredentialsPage.Default.DefaultPassword, Runtime.EncryptionKey); } } } @@ -527,10 +526,10 @@ namespace mRemoteNG.Connection.Protocol.RDP if (string.IsNullOrEmpty(domain)) { - _rdpClient.Domain = Settings.Default.EmptyCredentials switch + _rdpClient.Domain = Properties.OptionsCredentialsPage.Default.EmptyCredentials switch { "windows" => Environment.UserDomainName, - "custom" => Settings.Default.DefaultDomain, + "custom" => Properties.OptionsCredentialsPage.Default.DefaultDomain, _ => _rdpClient.Domain }; } @@ -740,7 +739,7 @@ namespace mRemoteNG.Connection.Protocol.RDP Event_Disconnected(this, reason, discReason); } - if (Settings.Default.ReconnectOnDisconnect) + if (Properties.OptionsAdvancedPage.Default.ReconnectOnDisconnect) { ReconnectGroup = new ReconnectGroup(); ReconnectGroup.CloseClicked += Event_ReconnectGroupCloseClicked; diff --git a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs index 915568ec..af07f6b3 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get => Settings.Default.TextLogMessageWriterWriteDebugMsgs; - set => Settings.Default.TextLogMessageWriterWriteDebugMsgs = value; + get => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteDebugMsgs; + set => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get => Settings.Default.TextLogMessageWriterWriteInfoMsgs; - set => Settings.Default.TextLogMessageWriterWriteInfoMsgs = value; + get => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteInfoMsgs; + set => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get => Settings.Default.TextLogMessageWriterWriteWarningMsgs; - set => Settings.Default.TextLogMessageWriterWriteWarningMsgs = value; + get => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteWarningMsgs; + set => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get => Settings.Default.TextLogMessageWriterWriteErrorMsgs; - set => Settings.Default.TextLogMessageWriterWriteErrorMsgs = value; + get => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteErrorMsgs; + set => Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs index 21c22bc1..8d2ec8e2 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get => Settings.Default.NotificationPanelWriterWriteDebugMsgs; - set => Settings.Default.NotificationPanelWriterWriteDebugMsgs = value; + get => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteDebugMsgs; + set => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get => Settings.Default.NotificationPanelWriterWriteInfoMsgs; - set => Settings.Default.NotificationPanelWriterWriteInfoMsgs = value; + get => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteInfoMsgs; + set => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get => Settings.Default.NotificationPanelWriterWriteWarningMsgs; - set => Settings.Default.NotificationPanelWriterWriteWarningMsgs = value; + get => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteWarningMsgs; + set => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get => Settings.Default.NotificationPanelWriterWriteErrorMsgs; - set => Settings.Default.NotificationPanelWriterWriteErrorMsgs = value; + get => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteErrorMsgs; + set => Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs index debbbee6..26e7ebff 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs @@ -12,20 +12,20 @@ namespace mRemoteNG.Messages.MessageFilteringOptions public bool AllowInfoMessages { - get => Settings.Default.SwitchToMCOnInformation; - set => Settings.Default.SwitchToMCOnInformation = value; + get => Properties.OptionsNotificationsPage.Default.SwitchToMCOnInformation; + set => Properties.OptionsNotificationsPage.Default.SwitchToMCOnInformation = value; } public bool AllowWarningMessages { - get => Settings.Default.SwitchToMCOnWarning; - set => Settings.Default.SwitchToMCOnWarning = value; + get => Properties.OptionsNotificationsPage.Default.SwitchToMCOnWarning; + set => Properties.OptionsNotificationsPage.Default.SwitchToMCOnWarning = value; } public bool AllowErrorMessages { - get => Settings.Default.SwitchToMCOnError; - set => Settings.Default.SwitchToMCOnError = value; + get => Properties.OptionsNotificationsPage.Default.SwitchToMCOnError; + set => Properties.OptionsNotificationsPage.Default.SwitchToMCOnError = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs index 55786a68..13ce89e1 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs @@ -6,26 +6,26 @@ namespace mRemoteNG.Messages.MessageFilteringOptions { public bool AllowDebugMessages { - get => Settings.Default.PopupMessageWriterWriteDebugMsgs; - set => Settings.Default.PopupMessageWriterWriteDebugMsgs = value; + get => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteDebugMsgs; + set => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteDebugMsgs = value; } public bool AllowInfoMessages { - get => Settings.Default.PopupMessageWriterWriteInfoMsgs; - set => Settings.Default.PopupMessageWriterWriteInfoMsgs = value; + get => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteInfoMsgs; + set => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteInfoMsgs = value; } public bool AllowWarningMessages { - get => Settings.Default.PopupMessageWriterWriteWarningMsgs; - set => Settings.Default.PopupMessageWriterWriteWarningMsgs = value; + get => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteWarningMsgs; + set => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteWarningMsgs = value; } public bool AllowErrorMessages { - get => Settings.Default.PopupMessageWriterWriteErrorMsgs; - set => Settings.Default.PopupMessageWriterWriteErrorMsgs = value; + get => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteErrorMsgs; + set => Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteErrorMsgs = value; } } } \ No newline at end of file diff --git a/mRemoteNG/Properties/App.Designer.cs b/mRemoteNG/Properties/App.Designer.cs new file mode 100644 index 00000000..ee3ac449 --- /dev/null +++ b/mRemoteNG/Properties/App.Designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class App : global::System.Configuration.ApplicationSettingsBase { + + private static App defaultInstance = ((App)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new App()))); + + public static App Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point MainFormLocation { + get { + return ((global::System.Drawing.Point)(this["MainFormLocation"])); + } + set { + this["MainFormLocation"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Size MainFormSize { + get { + return ((global::System.Drawing.Size)(this["MainFormSize"])); + } + set { + this["MainFormSize"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("Normal")] + public global::System.Windows.Forms.FormWindowState MainFormState { + get { + return ((global::System.Windows.Forms.FormWindowState)(this["MainFormState"])); + } + set { + this["MainFormState"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Size MainFormRestoreSize { + get { + return ((global::System.Drawing.Size)(this["MainFormRestoreSize"])); + } + set { + this["MainFormRestoreSize"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] + public global::System.Drawing.Point MainFormRestoreLocation { + get { + return ((global::System.Drawing.Point)(this["MainFormRestoreLocation"])); + } + set { + this["MainFormRestoreLocation"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MainFormKiosk { + get { + return ((bool)(this["MainFormKiosk"])); + } + set { + this["MainFormKiosk"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1")] + public string StartOnScreen { + get { + return ((string)(this["StartOnScreen"])); + } + set { + this["StartOnScreen"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool FirstStart { + get { + return ((bool)(this["FirstStart"])); + } + set { + this["FirstStart"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ResetPanels { + get { + return ((bool)(this["ResetPanels"])); + } + set { + this["ResetPanels"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ResetToolbars { + get { + return ((bool)(this["ResetToolbars"])); + } + set { + this["ResetToolbars"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool NoReconnect { + get { + return ((bool)(this["NoReconnect"])); + } + set { + this["NoReconnect"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool DoUpgrade { + get { + return ((bool)(this["DoUpgrade"])); + } + set { + this["DoUpgrade"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/App.settings b/mRemoteNG/Properties/App.settings new file mode 100644 index 00000000..c97c38e7 --- /dev/null +++ b/mRemoteNG/Properties/App.settings @@ -0,0 +1,42 @@ + + + + + + 0, 0 + + + 0, 0 + + + Normal + + + 0, 0 + + + 0, 0 + + + False + + + 1 + + + True + + + False + + + False + + + False + + + True + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/AppUI.Designer.cs b/mRemoteNG/Properties/AppUI.Designer.cs new file mode 100644 index 00000000..2a1f90a9 --- /dev/null +++ b/mRemoteNG/Properties/AppUI.Designer.cs @@ -0,0 +1,36 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class AppUI : global::System.Configuration.ApplicationSettingsBase { + + private static AppUI defaultInstance = ((AppUI)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new AppUI()))); + + public static AppUI Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk," + + "tr-TR,zh-CN,zh-TW")] + public string SupportedUICultures { + get { + return ((string)(this["SupportedUICultures"])); + } + } + } +} diff --git a/mRemoteNG/Properties/AppUI.settings b/mRemoteNG/Properties/AppUI.settings new file mode 100644 index 00000000..4380a30b --- /dev/null +++ b/mRemoteNG/Properties/AppUI.settings @@ -0,0 +1,9 @@ + + + + + + cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs b/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs new file mode 100644 index 00000000..6b264bf0 --- /dev/null +++ b/mRemoteNG/Properties/OptionsAdvancedPage.Designer.cs @@ -0,0 +1,98 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsAdvancedPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsAdvancedPage defaultInstance = ((OptionsAdvancedPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsAdvancedPage()))); + + public static OptionsAdvancedPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ReconnectOnDisconnect { + get { + return ((bool)(this["ReconnectOnDisconnect"])); + } + set { + this["ReconnectOnDisconnect"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string CustomPuttyPath { + get { + return ((string)(this["CustomPuttyPath"])); + } + set { + this["CustomPuttyPath"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UseCustomPuttyPath { + get { + return ((bool)(this["UseCustomPuttyPath"])); + } + set { + this["UseCustomPuttyPath"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("2")] + public int MaxPuttyWaitTime { + get { + return ((int)(this["MaxPuttyWaitTime"])); + } + set { + this["MaxPuttyWaitTime"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("5500")] + public int UVNCSCPort { + get { + return ((int)(this["UVNCSCPort"])); + } + set { + this["UVNCSCPort"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool RdpLoadBalanceInfoUseUtf8 { + get { + return ((bool)(this["RdpLoadBalanceInfoUseUtf8"])); + } + set { + this["RdpLoadBalanceInfoUseUtf8"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsAdvancedPage.settings b/mRemoteNG/Properties/OptionsAdvancedPage.settings new file mode 100644 index 00000000..3bcb8b84 --- /dev/null +++ b/mRemoteNG/Properties/OptionsAdvancedPage.settings @@ -0,0 +1,24 @@ + + + + + + False + + + + + + False + + + 2 + + + 5500 + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs b/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs new file mode 100644 index 00000000..9c318157 --- /dev/null +++ b/mRemoteNG/Properties/OptionsAppearancePage.Designer.cs @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsAppearancePage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsAppearancePage defaultInstance = ((OptionsAppearancePage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsAppearancePage()))); + + public static OptionsAppearancePage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool ShowSystemTrayIcon { + get { + return ((bool)(this["ShowSystemTrayIcon"])); + } + set { + this["ShowSystemTrayIcon"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool MinimizeToTray { + get { + return ((bool)(this["MinimizeToTray"])); + } + set { + this["MinimizeToTray"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool CloseToTray { + get { + return ((bool)(this["CloseToTray"])); + } + set { + this["CloseToTray"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ShowDescriptionTooltipsInTree { + get { + return ((bool)(this["ShowDescriptionTooltipsInTree"])); + } + set { + this["ShowDescriptionTooltipsInTree"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ShowCompleteConsPathInTitle { + get { + return ((bool)(this["ShowCompleteConsPathInTitle"])); + } + set { + this["ShowCompleteConsPathInTitle"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsAppearancePage.settings b/mRemoteNG/Properties/OptionsAppearancePage.settings new file mode 100644 index 00000000..3987a1f2 --- /dev/null +++ b/mRemoteNG/Properties/OptionsAppearancePage.settings @@ -0,0 +1,21 @@ + + + + + + True + + + False + + + False + + + False + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsBackupPage.Designer.cs b/mRemoteNG/Properties/OptionsBackupPage.Designer.cs new file mode 100644 index 00000000..6b1e6c23 --- /dev/null +++ b/mRemoteNG/Properties/OptionsBackupPage.Designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsBackupPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsBackupPage defaultInstance = ((OptionsBackupPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsBackupPage()))); + + public static OptionsBackupPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10")] + public int BackupFileKeepCount { + get { + return ((int)(this["BackupFileKeepCount"])); + } + set { + this["BackupFileKeepCount"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("{0}.{1:yyyyMMdd-HHmmssffff}.backup")] + public string BackupFileNameFormat { + get { + return ((string)(this["BackupFileNameFormat"])); + } + set { + this["BackupFileNameFormat"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string BackupFilePath { + get { + return ((string)(this["BackupFilePath"])); + } + set { + this["BackupFilePath"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool SaveConsOnExit { + get { + return ((bool)(this["SaveConsOnExit"])); + } + set { + this["SaveConsOnExit"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int SaveConnectionsFrequency { + get { + return ((int)(this["SaveConnectionsFrequency"])); + } + set { + this["SaveConnectionsFrequency"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string CustomConsPath { + get { + return ((string)(this["CustomConsPath"])); + } + set { + this["CustomConsPath"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool SaveConnectionsAfterEveryEdit { + get { + return ((bool)(this["SaveConnectionsAfterEveryEdit"])); + } + set { + this["SaveConnectionsAfterEveryEdit"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("50")] + public int AutoSaveEveryMinutes { + get { + return ((int)(this["AutoSaveEveryMinutes"])); + } + set { + this["AutoSaveEveryMinutes"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool LoadConsFromCustomLocation { + get { + return ((bool)(this["LoadConsFromCustomLocation"])); + } + set { + this["LoadConsFromCustomLocation"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsBackupPage.settings b/mRemoteNG/Properties/OptionsBackupPage.settings new file mode 100644 index 00000000..c70359f6 --- /dev/null +++ b/mRemoteNG/Properties/OptionsBackupPage.settings @@ -0,0 +1,33 @@ + + + + + + 10 + + + {0}.{1:yyyyMMdd-HHmmssffff}.backup + + + + + + True + + + 0 + + + + + + True + + + 50 + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs b/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs new file mode 100644 index 00000000..6da69250 --- /dev/null +++ b/mRemoteNG/Properties/OptionsConnectionsPage.Designer.cs @@ -0,0 +1,38 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsConnectionsPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsConnectionsPage defaultInstance = ((OptionsConnectionsPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsConnectionsPage()))); + + public static OptionsConnectionsPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("0")] + public int AutoSaveEveryMinutes { + get { + return ((int)(this["AutoSaveEveryMinutes"])); + } + set { + this["AutoSaveEveryMinutes"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsConnectionsPage.settings b/mRemoteNG/Properties/OptionsConnectionsPage.settings new file mode 100644 index 00000000..e32909c3 --- /dev/null +++ b/mRemoteNG/Properties/OptionsConnectionsPage.settings @@ -0,0 +1,9 @@ + + + + + + 0 + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs new file mode 100644 index 00000000..945e9c3c --- /dev/null +++ b/mRemoteNG/Properties/OptionsCredentialsPage.Designer.cs @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsCredentialsPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsCredentialsPage defaultInstance = ((OptionsCredentialsPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsCredentialsPage()))); + + public static OptionsCredentialsPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string DefaultUsername { + get { + return ((string)(this["DefaultUsername"])); + } + set { + this["DefaultUsername"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string DefaultPassword { + get { + return ((string)(this["DefaultPassword"])); + } + set { + this["DefaultPassword"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string DefaultDomain { + get { + return ((string)(this["DefaultDomain"])); + } + set { + this["DefaultDomain"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string UserViaAPDefault { + get { + return ((string)(this["UserViaAPDefault"])); + } + set { + this["UserViaAPDefault"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("noinfo")] + public string EmptyCredentials { + get { + return ((string)(this["EmptyCredentials"])); + } + set { + this["EmptyCredentials"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsCredentialsPage.settings b/mRemoteNG/Properties/OptionsCredentialsPage.settings new file mode 100644 index 00000000..557bd792 --- /dev/null +++ b/mRemoteNG/Properties/OptionsCredentialsPage.settings @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + noinfo + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsDBsPage.Designer.cs b/mRemoteNG/Properties/OptionsDBsPage.Designer.cs new file mode 100644 index 00000000..b64361a0 --- /dev/null +++ b/mRemoteNG/Properties/OptionsDBsPage.Designer.cs @@ -0,0 +1,110 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsDBsPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsDBsPage defaultInstance = ((OptionsDBsPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsDBsPage()))); + + public static OptionsDBsPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UseSQLServer { + get { + return ((bool)(this["UseSQLServer"])); + } + set { + this["UseSQLServer"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("mssql")] + public string SQLServerType { + get { + return ((string)(this["SQLServerType"])); + } + set { + this["SQLServerType"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string SQLHost { + get { + return ((string)(this["SQLHost"])); + } + set { + this["SQLHost"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SQLReadOnly { + get { + return ((bool)(this["SQLReadOnly"])); + } + set { + this["SQLReadOnly"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string SQLDatabaseName { + get { + return ((string)(this["SQLDatabaseName"])); + } + set { + this["SQLDatabaseName"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string SQLUser { + get { + return ((string)(this["SQLUser"])); + } + set { + this["SQLUser"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string SQLPass { + get { + return ((string)(this["SQLPass"])); + } + set { + this["SQLPass"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsDBsPage.settings b/mRemoteNG/Properties/OptionsDBsPage.settings new file mode 100644 index 00000000..aed15235 --- /dev/null +++ b/mRemoteNG/Properties/OptionsDBsPage.settings @@ -0,0 +1,27 @@ + + + + + + False + + + mssql + + + + + + False + + + + + + + + + + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs b/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs new file mode 100644 index 00000000..1c6a98c0 --- /dev/null +++ b/mRemoteNG/Properties/OptionsNotificationsPage.Designer.cs @@ -0,0 +1,230 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsNotificationsPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsNotificationsPage defaultInstance = ((OptionsNotificationsPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsNotificationsPage()))); + + public static OptionsNotificationsPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool NotificationPanelWriterWriteDebugMsgs { + get { + return ((bool)(this["NotificationPanelWriterWriteDebugMsgs"])); + } + set { + this["NotificationPanelWriterWriteDebugMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool NotificationPanelWriterWriteInfoMsgs { + get { + return ((bool)(this["NotificationPanelWriterWriteInfoMsgs"])); + } + set { + this["NotificationPanelWriterWriteInfoMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool NotificationPanelWriterWriteWarningMsgs { + get { + return ((bool)(this["NotificationPanelWriterWriteWarningMsgs"])); + } + set { + this["NotificationPanelWriterWriteWarningMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool NotificationPanelWriterWriteErrorMsgs { + get { + return ((bool)(this["NotificationPanelWriterWriteErrorMsgs"])); + } + set { + this["NotificationPanelWriterWriteErrorMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool SwitchToMCOnInformation { + get { + return ((bool)(this["SwitchToMCOnInformation"])); + } + set { + this["SwitchToMCOnInformation"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool SwitchToMCOnWarning { + get { + return ((bool)(this["SwitchToMCOnWarning"])); + } + set { + this["SwitchToMCOnWarning"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool SwitchToMCOnError { + get { + return ((bool)(this["SwitchToMCOnError"])); + } + set { + this["SwitchToMCOnError"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool PopupMessageWriterWriteDebugMsgs { + get { + return ((bool)(this["PopupMessageWriterWriteDebugMsgs"])); + } + set { + this["PopupMessageWriterWriteDebugMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool PopupMessageWriterWriteInfoMsgs { + get { + return ((bool)(this["PopupMessageWriterWriteInfoMsgs"])); + } + set { + this["PopupMessageWriterWriteInfoMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool PopupMessageWriterWriteWarningMsgs { + get { + return ((bool)(this["PopupMessageWriterWriteWarningMsgs"])); + } + set { + this["PopupMessageWriterWriteWarningMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool PopupMessageWriterWriteErrorMsgs { + get { + return ((bool)(this["PopupMessageWriterWriteErrorMsgs"])); + } + set { + this["PopupMessageWriterWriteErrorMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool LogToApplicationDirectory { + get { + return ((bool)(this["LogToApplicationDirectory"])); + } + set { + this["LogToApplicationDirectory"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string LogFilePath { + get { + return ((string)(this["LogFilePath"])); + } + set { + this["LogFilePath"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool TextLogMessageWriterWriteDebugMsgs { + get { + return ((bool)(this["TextLogMessageWriterWriteDebugMsgs"])); + } + set { + this["TextLogMessageWriterWriteDebugMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool TextLogMessageWriterWriteErrorMsgs { + get { + return ((bool)(this["TextLogMessageWriterWriteErrorMsgs"])); + } + set { + this["TextLogMessageWriterWriteErrorMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool TextLogMessageWriterWriteInfoMsgs { + get { + return ((bool)(this["TextLogMessageWriterWriteInfoMsgs"])); + } + set { + this["TextLogMessageWriterWriteInfoMsgs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool TextLogMessageWriterWriteWarningMsgs { + get { + return ((bool)(this["TextLogMessageWriterWriteWarningMsgs"])); + } + set { + this["TextLogMessageWriterWriteWarningMsgs"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsNotificationsPage.settings b/mRemoteNG/Properties/OptionsNotificationsPage.settings new file mode 100644 index 00000000..681c19ba --- /dev/null +++ b/mRemoteNG/Properties/OptionsNotificationsPage.settings @@ -0,0 +1,57 @@ + + + + + + False + + + False + + + False + + + True + + + True + + + True + + + True + + + False + + + False + + + False + + + False + + + True + + + + + + False + + + True + + + True + + + True + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs b/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs new file mode 100644 index 00000000..4ed36d85 --- /dev/null +++ b/mRemoteNG/Properties/OptionsSecurityPage.Designer.cs @@ -0,0 +1,74 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsSecurityPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsSecurityPage defaultInstance = ((OptionsSecurityPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsSecurityPage()))); + + public static OptionsSecurityPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool EncryptCompleteConnectionsFile { + get { + return ((bool)(this["EncryptCompleteConnectionsFile"])); + } + set { + this["EncryptCompleteConnectionsFile"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("AES")] + public global::mRemoteNG.Security.BlockCipherEngines EncryptionEngine { + get { + return ((global::mRemoteNG.Security.BlockCipherEngines)(this["EncryptionEngine"])); + } + set { + this["EncryptionEngine"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("GCM")] + public global::mRemoteNG.Security.BlockCipherModes EncryptionBlockCipherMode { + get { + return ((global::mRemoteNG.Security.BlockCipherModes)(this["EncryptionBlockCipherMode"])); + } + set { + this["EncryptionBlockCipherMode"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("10000")] + public int EncryptionKeyDerivationIterations { + get { + return ((int)(this["EncryptionKeyDerivationIterations"])); + } + set { + this["EncryptionKeyDerivationIterations"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsSecurityPage.settings b/mRemoteNG/Properties/OptionsSecurityPage.settings new file mode 100644 index 00000000..fb5cc3e3 --- /dev/null +++ b/mRemoteNG/Properties/OptionsSecurityPage.settings @@ -0,0 +1,18 @@ + + + + + + False + + + AES + + + GCM + + + 10000 + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs b/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs new file mode 100644 index 00000000..25ed8f63 --- /dev/null +++ b/mRemoteNG/Properties/OptionsStartupExitPage.Designer.cs @@ -0,0 +1,86 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsStartupExitPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsStartupExitPage defaultInstance = ((OptionsStartupExitPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsStartupExitPage()))); + + public static OptionsStartupExitPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool StartFullScreen { + get { + return ((bool)(this["StartFullScreen"])); + } + set { + this["StartFullScreen"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool StartMinimized { + get { + return ((bool)(this["StartMinimized"])); + } + set { + this["StartMinimized"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SaveConnectionsOnExit { + get { + return ((bool)(this["SaveConnectionsOnExit"])); + } + set { + this["SaveConnectionsOnExit"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool SingleInstance { + get { + return ((bool)(this["SingleInstance"])); + } + set { + this["SingleInstance"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool OpenConsFromLastSession { + get { + return ((bool)(this["OpenConsFromLastSession"])); + } + set { + this["OpenConsFromLastSession"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsStartupExitPage.settings b/mRemoteNG/Properties/OptionsStartupExitPage.settings new file mode 100644 index 00000000..4b93d330 --- /dev/null +++ b/mRemoteNG/Properties/OptionsStartupExitPage.settings @@ -0,0 +1,21 @@ + + + + + + False + + + False + + + False + + + False + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs b/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs new file mode 100644 index 00000000..9f5e99b6 --- /dev/null +++ b/mRemoteNG/Properties/OptionsTabsPanelsPage.Designer.cs @@ -0,0 +1,146 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsTabsPanelsPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsTabsPanelsPage defaultInstance = ((OptionsTabsPanelsPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsTabsPanelsPage()))); + + public static OptionsTabsPanelsPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("General")] + public string StartUpPanelName { + get { + return ((string)(this["StartUpPanelName"])); + } + set { + this["StartUpPanelName"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool AlwaysShowPanelTabs { + get { + return ((bool)(this["AlwaysShowPanelTabs"])); + } + set { + this["AlwaysShowPanelTabs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool CreateEmptyPanelOnStartUp { + get { + return ((bool)(this["CreateEmptyPanelOnStartUp"])); + } + set { + this["CreateEmptyPanelOnStartUp"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool AlwaysShowConnectionTabs { + get { + return ((bool)(this["AlwaysShowConnectionTabs"])); + } + set { + this["AlwaysShowConnectionTabs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool OpenTabsRightOfSelected { + get { + return ((bool)(this["OpenTabsRightOfSelected"])); + } + set { + this["OpenTabsRightOfSelected"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ShowLogonInfoOnTabs { + get { + return ((bool)(this["ShowLogonInfoOnTabs"])); + } + set { + this["ShowLogonInfoOnTabs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ShowProtocolOnTabs { + get { + return ((bool)(this["ShowProtocolOnTabs"])); + } + set { + this["ShowProtocolOnTabs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool IdentifyQuickConnectTabs { + get { + return ((bool)(this["IdentifyQuickConnectTabs"])); + } + set { + this["IdentifyQuickConnectTabs"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool DoubleClickOnTabClosesIt { + get { + return ((bool)(this["DoubleClickOnTabClosesIt"])); + } + set { + this["DoubleClickOnTabClosesIt"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool AlwaysShowPanelSelectionDlg { + get { + return ((bool)(this["AlwaysShowPanelSelectionDlg"])); + } + set { + this["AlwaysShowPanelSelectionDlg"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsTabsPanelsPage.settings b/mRemoteNG/Properties/OptionsTabsPanelsPage.settings new file mode 100644 index 00000000..186f6c1c --- /dev/null +++ b/mRemoteNG/Properties/OptionsTabsPanelsPage.settings @@ -0,0 +1,36 @@ + + + + + + General + + + False + + + False + + + True + + + True + + + False + + + False + + + False + + + True + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsThemePage.Designer.cs b/mRemoteNG/Properties/OptionsThemePage.Designer.cs new file mode 100644 index 00000000..9c26dfd5 --- /dev/null +++ b/mRemoteNG/Properties/OptionsThemePage.Designer.cs @@ -0,0 +1,50 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsThemePage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsThemePage defaultInstance = ((OptionsThemePage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsThemePage()))); + + public static OptionsThemePage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool ThemingActive { + get { + return ((bool)(this["ThemingActive"])); + } + set { + this["ThemingActive"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string ThemeName { + get { + return ((string)(this["ThemeName"])); + } + set { + this["ThemeName"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsThemePage.settings b/mRemoteNG/Properties/OptionsThemePage.settings new file mode 100644 index 00000000..b8862c4f --- /dev/null +++ b/mRemoteNG/Properties/OptionsThemePage.settings @@ -0,0 +1,12 @@ + + + + + + False + + + + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs b/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs new file mode 100644 index 00000000..90344d54 --- /dev/null +++ b/mRemoteNG/Properties/OptionsUpdatesPage.Designer.cs @@ -0,0 +1,188 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace mRemoteNG.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + internal sealed partial class OptionsUpdatesPage : global::System.Configuration.ApplicationSettingsBase { + + private static OptionsUpdatesPage defaultInstance = ((OptionsUpdatesPage)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new OptionsUpdatesPage()))); + + public static OptionsUpdatesPage Default { + get { + return defaultInstance; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UpdatePending { + get { + return ((bool)(this["UpdatePending"])); + } + set { + this["UpdatePending"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("release")] + public string UpdateChannel { + get { + return ((string)(this["UpdateChannel"])); + } + set { + this["UpdateChannel"] = value; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("https://mremoteng.org/")] + public string UpdateAddress { + get { + return ((string)(this["UpdateAddress"])); + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string UpdateProxyAddress { + get { + return ((string)(this["UpdateProxyAddress"])); + } + set { + this["UpdateProxyAddress"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string UpdateProxyAuthPass { + get { + return ((string)(this["UpdateProxyAuthPass"])); + } + set { + this["UpdateProxyAuthPass"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("")] + public string UpdateProxyAuthUser { + get { + return ((string)(this["UpdateProxyAuthUser"])); + } + set { + this["UpdateProxyAuthUser"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("80")] + public int UpdateProxyPort { + get { + return ((int)(this["UpdateProxyPort"])); + } + set { + this["UpdateProxyPort"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UpdateProxyUseAuthentication { + get { + return ((bool)(this["UpdateProxyUseAuthentication"])); + } + set { + this["UpdateProxyUseAuthentication"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool UpdateUseProxy { + get { + return ((bool)(this["UpdateUseProxy"])); + } + set { + this["UpdateUseProxy"] = value; + } + } + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("dev")] + public string CurrentUpdateChannelType { + get { + return ((string)(this["CurrentUpdateChannelType"])); + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("True")] + public bool CheckForUpdatesOnStartup { + get { + return ((bool)(this["CheckForUpdatesOnStartup"])); + } + set { + this["CheckForUpdatesOnStartup"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("1980-01-01")] + public global::System.DateTime CheckForUpdatesLastCheck { + get { + return ((global::System.DateTime)(this["CheckForUpdatesLastCheck"])); + } + set { + this["CheckForUpdatesLastCheck"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("14")] + public int CheckForUpdatesFrequencyDays { + get { + return ((int)(this["CheckForUpdatesFrequencyDays"])); + } + set { + this["CheckForUpdatesFrequencyDays"] = value; + } + } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool CheckForUpdatesAsked { + get { + return ((bool)(this["CheckForUpdatesAsked"])); + } + set { + this["CheckForUpdatesAsked"] = value; + } + } + } +} diff --git a/mRemoteNG/Properties/OptionsUpdatesPage.settings b/mRemoteNG/Properties/OptionsUpdatesPage.settings new file mode 100644 index 00000000..10b7658e --- /dev/null +++ b/mRemoteNG/Properties/OptionsUpdatesPage.settings @@ -0,0 +1,48 @@ + + + + + + False + + + release + + + https://mremoteng.org/ + + + + + + + + + + + + 80 + + + False + + + False + + + dev + + + True + + + 1980-01-01 + + + 14 + + + False + + + \ No newline at end of file diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index f439c9e4..d96fdf40 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace mRemoteNG.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -23,210 +23,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] - public global::System.Drawing.Point MainFormLocation { - get { - return ((global::System.Drawing.Point)(this["MainFormLocation"])); - } - set { - this["MainFormLocation"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] - public global::System.Drawing.Size MainFormSize { - get { - return ((global::System.Drawing.Size)(this["MainFormSize"])); - } - set { - this["MainFormSize"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("Normal")] - public global::System.Windows.Forms.FormWindowState MainFormState { - get { - return ((global::System.Windows.Forms.FormWindowState)(this["MainFormState"])); - } - set { - this["MainFormState"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool MainFormKiosk { - get { - return ((bool)(this["MainFormKiosk"])); - } - set { - this["MainFormKiosk"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool DoUpgrade { - get { - return ((bool)(this["DoUpgrade"])); - } - set { - this["DoUpgrade"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string CustomPuttyPath { - get { - return ((string)(this["CustomPuttyPath"])); - } - set { - this["CustomPuttyPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SwitchToMCOnInformation { - get { - return ((bool)(this["SwitchToMCOnInformation"])); - } - set { - this["SwitchToMCOnInformation"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SwitchToMCOnWarning { - get { - return ((bool)(this["SwitchToMCOnWarning"])); - } - set { - this["SwitchToMCOnWarning"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SwitchToMCOnError { - get { - return ((bool)(this["SwitchToMCOnError"])); - } - set { - this["SwitchToMCOnError"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool LoadConsFromCustomLocation { - get { - return ((bool)(this["LoadConsFromCustomLocation"])); - } - set { - this["LoadConsFromCustomLocation"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string CustomConsPath { - get { - return ((string)(this["CustomConsPath"])); - } - set { - this["CustomConsPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SaveConsOnExit { - get { - return ((bool)(this["SaveConsOnExit"])); - } - set { - this["SaveConsOnExit"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool CheckForUpdatesOnStartup { - get { - return ((bool)(this["CheckForUpdatesOnStartup"])); - } - set { - this["CheckForUpdatesOnStartup"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ShowDescriptionTooltipsInTree { - get { - return ((bool)(this["ShowDescriptionTooltipsInTree"])); - } - set { - this["ShowDescriptionTooltipsInTree"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ShowSystemTrayIcon { - get { - return ((bool)(this["ShowSystemTrayIcon"])); - } - set { - this["ShowSystemTrayIcon"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool OpenTabsRightOfSelected { - get { - return ((bool)(this["OpenTabsRightOfSelected"])); - } - set { - this["OpenTabsRightOfSelected"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ShowLogonInfoOnTabs { - get { - return ((bool)(this["ShowLogonInfoOnTabs"])); - } - set { - this["ShowLogonInfoOnTabs"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -239,174 +35,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("noinfo")] - public string EmptyCredentials { - get { - return ((string)(this["EmptyCredentials"])); - } - set { - this["EmptyCredentials"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string DefaultUsername { - get { - return ((string)(this["DefaultUsername"])); - } - set { - this["DefaultUsername"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string DefaultPassword { - get { - return ((string)(this["DefaultPassword"])); - } - set { - this["DefaultPassword"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string DefaultDomain { - get { - return ((string)(this["DefaultDomain"])); - } - set { - this["DefaultDomain"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool UseCustomPuttyPath { - get { - return ((bool)(this["UseCustomPuttyPath"])); - } - set { - this["UseCustomPuttyPath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool FirstStart { - get { - return ((bool)(this["FirstStart"])); - } - set { - this["FirstStart"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ShowProtocolOnTabs { - get { - return ((bool)(this["ShowProtocolOnTabs"])); - } - set { - this["ShowProtocolOnTabs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ResetPanels { - get { - return ((bool)(this["ResetPanels"])); - } - set { - this["ResetPanels"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool UpdateUseProxy { - get { - return ((bool)(this["UpdateUseProxy"])); - } - set { - this["UpdateUseProxy"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string UpdateProxyAddress { - get { - return ((string)(this["UpdateProxyAddress"])); - } - set { - this["UpdateProxyAddress"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("80")] - public int UpdateProxyPort { - get { - return ((int)(this["UpdateProxyPort"])); - } - set { - this["UpdateProxyPort"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool UpdateProxyUseAuthentication { - get { - return ((bool)(this["UpdateProxyUseAuthentication"])); - } - set { - this["UpdateProxyUseAuthentication"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string UpdateProxyAuthUser { - get { - return ((string)(this["UpdateProxyAuthUser"])); - } - set { - this["UpdateProxyAuthUser"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string UpdateProxyAuthPass { - get { - return ((string)(this["UpdateProxyAuthPass"])); - } - set { - this["UpdateProxyAuthPass"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -623,42 +251,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("2")] - public int MaxPuttyWaitTime { - get { - return ((int)(this["MaxPuttyWaitTime"])); - } - set { - this["MaxPuttyWaitTime"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool SingleInstance { - get { - return ((bool)(this["SingleInstance"])); - } - set { - this["SingleInstance"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool OpenConsFromLastSession { - get { - return ((bool)(this["OpenConsFromLastSession"])); - } - set { - this["OpenConsFromLastSession"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -671,18 +263,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int AutoSaveEveryMinutes { - get { - return ((int)(this["AutoSaveEveryMinutes"])); - } - set { - this["AutoSaveEveryMinutes"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -767,66 +347,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ResetToolbars { - get { - return ((bool)(this["ResetToolbars"])); - } - set { - this["ResetToolbars"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool UseSQLServer { - get { - return ((bool)(this["UseSQLServer"])); - } - set { - this["UseSQLServer"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string SQLHost { - get { - return ((string)(this["SQLHost"])); - } - set { - this["SQLHost"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string SQLUser { - get { - return ((string)(this["SQLUser"])); - } - set { - this["SQLUser"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string SQLPass { - get { - return ((string)(this["SQLPass"])); - } - set { - this["SQLPass"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -1163,42 +683,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool DoubleClickOnTabClosesIt { - get { - return ((bool)(this["DoubleClickOnTabClosesIt"])); - } - set { - this["DoubleClickOnTabClosesIt"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ReconnectOnDisconnect { - get { - return ((bool)(this["ReconnectOnDisconnect"])); - } - set { - this["ReconnectOnDisconnect"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool AlwaysShowPanelSelectionDlg { - get { - return ((bool)(this["AlwaysShowPanelSelectionDlg"])); - } - set { - this["AlwaysShowPanelSelectionDlg"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("AuthVNC")] @@ -1463,18 +947,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool MinimizeToTray { - get { - return ((bool)(this["MinimizeToTray"])); - } - set { - this["MinimizeToTray"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -1511,18 +983,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("5500")] - public int UVNCSCPort { - get { - return ((int)(this["UVNCSCPort"])); - } - set { - this["UVNCSCPort"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -1571,18 +1031,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool EncryptCompleteConnectionsFile { - get { - return ((bool)(this["EncryptCompleteConnectionsFile"])); - } - set { - this["EncryptCompleteConnectionsFile"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -1631,54 +1079,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool CheckForUpdatesAsked { - get { - return ((bool)(this["CheckForUpdatesAsked"])); - } - set { - this["CheckForUpdatesAsked"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("14")] - public int CheckForUpdatesFrequencyDays { - get { - return ((int)(this["CheckForUpdatesFrequencyDays"])); - } - set { - this["CheckForUpdatesFrequencyDays"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("1980-01-01")] - public global::System.DateTime CheckForUpdatesLastCheck { - get { - return ((global::System.DateTime)(this["CheckForUpdatesLastCheck"])); - } - set { - this["CheckForUpdatesLastCheck"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool UpdatePending { - get { - return ((bool)(this["UpdatePending"])); - } - set { - this["UpdatePending"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Never")] @@ -1967,66 +1367,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Drawing.Size MainFormRestoreSize { - get { - return ((global::System.Drawing.Size)(this["MainFormRestoreSize"])); - } - set { - this["MainFormRestoreSize"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - public global::System.Drawing.Point MainFormRestoreLocation { - get { - return ((global::System.Drawing.Point)(this["MainFormRestoreLocation"])); - } - set { - this["MainFormRestoreLocation"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("mRemoteNG")] - public string SQLDatabaseName { - get { - return ((string)(this["SQLDatabaseName"])); - } - set { - this["SQLDatabaseName"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("10")] - [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)] - public int BackupFileKeepCount { - get { - return ((int)(this["BackupFileKeepCount"])); - } - set { - this["BackupFileKeepCount"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("{0}.{1:yyyyMMdd-HHmmssffff}.backup")] - [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)] - public string BackupFileNameFormat { - get { - return ((string)(this["BackupFileNameFormat"])); - } - set { - this["BackupFileNameFormat"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2063,56 +1403,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)] - public bool AlwaysShowPanelTabs { - get { - return ((bool)(this["AlwaysShowPanelTabs"])); - } - set { - this["AlwaysShowPanelTabs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - [global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)] - public bool IdentifyQuickConnectTabs { - get { - return ((bool)(this["IdentifyQuickConnectTabs"])); - } - set { - this["IdentifyQuickConnectTabs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("release")] - public string UpdateChannel { - get { - return ((string)(this["UpdateChannel"])); - } - set { - this["UpdateChannel"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string ThemeName { - get { - return ((string)(this["ThemeName"])); - } - set { - this["ThemeName"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -2161,15 +1451,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://mremoteng.org/")] - public string UpdateAddress { - get { - return ((string)(this["UpdateAddress"])); - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -2257,18 +1538,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool ShowCompleteConsPathInTitle { - get { - return ((bool)(this["ShowCompleteConsPathInTitle"])); - } - set { - this["ShowCompleteConsPathInTitle"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("20")] @@ -2281,42 +1550,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("AES")] - public global::mRemoteNG.Security.BlockCipherEngines EncryptionEngine { - get { - return ((global::mRemoteNG.Security.BlockCipherEngines)(this["EncryptionEngine"])); - } - set { - this["EncryptionEngine"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("GCM")] - public global::mRemoteNG.Security.BlockCipherModes EncryptionBlockCipherMode { - get { - return ((global::mRemoteNG.Security.BlockCipherModes)(this["EncryptionBlockCipherMode"])); - } - set { - this["EncryptionBlockCipherMode"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("10000")] - public int EncryptionKeyDerivationIterations { - get { - return ((int)(this["EncryptionKeyDerivationIterations"])); - } - set { - this["EncryptionKeyDerivationIterations"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Dynamic")] @@ -2413,174 +1646,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string LogFilePath { - get { - return ((string)(this["LogFilePath"])); - } - set { - this["LogFilePath"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool TextLogMessageWriterWriteDebugMsgs { - get { - return ((bool)(this["TextLogMessageWriterWriteDebugMsgs"])); - } - set { - this["TextLogMessageWriterWriteDebugMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool TextLogMessageWriterWriteInfoMsgs { - get { - return ((bool)(this["TextLogMessageWriterWriteInfoMsgs"])); - } - set { - this["TextLogMessageWriterWriteInfoMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool TextLogMessageWriterWriteWarningMsgs { - get { - return ((bool)(this["TextLogMessageWriterWriteWarningMsgs"])); - } - set { - this["TextLogMessageWriterWriteWarningMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool TextLogMessageWriterWriteErrorMsgs { - get { - return ((bool)(this["TextLogMessageWriterWriteErrorMsgs"])); - } - set { - this["TextLogMessageWriterWriteErrorMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool NotificationPanelWriterWriteDebugMsgs { - get { - return ((bool)(this["NotificationPanelWriterWriteDebugMsgs"])); - } - set { - this["NotificationPanelWriterWriteDebugMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool NotificationPanelWriterWriteInfoMsgs { - get { - return ((bool)(this["NotificationPanelWriterWriteInfoMsgs"])); - } - set { - this["NotificationPanelWriterWriteInfoMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool NotificationPanelWriterWriteWarningMsgs { - get { - return ((bool)(this["NotificationPanelWriterWriteWarningMsgs"])); - } - set { - this["NotificationPanelWriterWriteWarningMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool NotificationPanelWriterWriteErrorMsgs { - get { - return ((bool)(this["NotificationPanelWriterWriteErrorMsgs"])); - } - set { - this["NotificationPanelWriterWriteErrorMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool PopupMessageWriterWriteDebugMsgs { - get { - return ((bool)(this["PopupMessageWriterWriteDebugMsgs"])); - } - set { - this["PopupMessageWriterWriteDebugMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool PopupMessageWriterWriteInfoMsgs { - get { - return ((bool)(this["PopupMessageWriterWriteInfoMsgs"])); - } - set { - this["PopupMessageWriterWriteInfoMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool PopupMessageWriterWriteWarningMsgs { - get { - return ((bool)(this["PopupMessageWriterWriteWarningMsgs"])); - } - set { - this["PopupMessageWriterWriteWarningMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool PopupMessageWriterWriteErrorMsgs { - get { - return ((bool)(this["PopupMessageWriterWriteErrorMsgs"])); - } - set { - this["PopupMessageWriterWriteErrorMsgs"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool LogToApplicationDirectory { - get { - return ((bool)(this["LogToApplicationDirectory"])); - } - set { - this["LogToApplicationDirectory"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("True")] @@ -2593,28 +1658,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.ApplicationScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk," + - "tr-TR,zh-CN,zh-TW")] - public string SupportedUICultures { - get { - return ((string)(this["SupportedUICultures"])); - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool ThemingActive { - get { - return ((bool)(this["ThemingActive"])); - } - set { - this["ThemingActive"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -2663,18 +1706,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool SaveConnectionsAfterEveryEdit { - get { - return ((bool)(this["SaveConnectionsAfterEveryEdit"])); - } - set { - this["SaveConnectionsAfterEveryEdit"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2687,18 +1718,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool SQLReadOnly { - get { - return ((bool)(this["SQLReadOnly"])); - } - set { - this["SQLReadOnly"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2711,18 +1730,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool RdpLoadBalanceInfoUseUtf8 { - get { - return ((bool)(this["RdpLoadBalanceInfoUseUtf8"])); - } - set { - this["RdpLoadBalanceInfoUseUtf8"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("0, 0")] @@ -2759,30 +1766,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool CreateEmptyPanelOnStartUp { - get { - return ((bool)(this["CreateEmptyPanelOnStartUp"])); - } - set { - this["CreateEmptyPanelOnStartUp"] = value; - } - } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("General")] - public string StartUpPanelName { - get { - return ((string)(this["StartUpPanelName"])); - } - set { - this["StartUpPanelName"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2807,18 +1790,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("True")] - public bool AlwaysShowConnectionTabs { - get { - return ((bool)(this["AlwaysShowConnectionTabs"])); - } - set { - this["AlwaysShowConnectionTabs"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2855,18 +1826,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("mssql")] - public string SQLServerType { - get { - return ((string)(this["SQLServerType"])); - } - set { - this["SQLServerType"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -2915,18 +1874,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("0")] - public int SaveConnectionsFrequency { - get { - return ((int)(this["SaveConnectionsFrequency"])); - } - set { - this["SaveConnectionsFrequency"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("Highest")] @@ -2999,18 +1946,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool StartMinimized { - get { - return ((bool)(this["StartMinimized"])); - } - set { - this["StartMinimized"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -3035,18 +1970,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool CloseToTray { - get { - return ((bool)(this["CloseToTray"])); - } - set { - this["CloseToTray"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -3155,18 +2078,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("False")] - public bool StartFullScreen { - get { - return ((bool)(this["StartFullScreen"])); - } - set { - this["StartFullScreen"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("False")] @@ -3239,18 +2150,6 @@ namespace mRemoteNG.Properties { } } - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("dev")] - public string CurrentUpdateChannelType { - get { - return ((string)(this["CurrentUpdateChannelType"])); - } - set { - this["CurrentUpdateChannelType"] = value; - } - } - [global::System.Configuration.UserScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("")] @@ -3274,17 +2173,5 @@ namespace mRemoteNG.Properties { this["ConDefaultRDPStartProgramWorkDir"] = value; } } - - [global::System.Configuration.UserScopedSettingAttribute()] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("")] - public string UserViaAPDefault { - get { - return ((string)(this["UserViaAPDefault"])); - } - set { - this["UserViaAPDefault"] = value; - } - } } } diff --git a/mRemoteNG/Properties/Settings.settings b/mRemoteNG/Properties/Settings.settings index 4cf0a13c..2a3ad719 100644 --- a/mRemoteNG/Properties/Settings.settings +++ b/mRemoteNG/Properties/Settings.settings @@ -2,102 +2,9 @@ - - 0, 0 - - - 0, 0 - - - Normal - - - False - - - True - - - - - - True - - - True - - - True - - - False - - - - - - True - - - True - - - False - - - False - - - True - - - False - False - - noinfo - - - - - - - - - - - - False - - - True - - - False - - - False - - - False - - - - - - 80 - - - False - - - - - - - @@ -152,21 +59,9 @@ False - - 2 - - - False - - - False - False - - 0 - False @@ -188,21 +83,6 @@ Top - - False - - - False - - - - - - - - - - False @@ -287,15 +167,6 @@ False - - True - - - False - - - False - AuthVNC @@ -362,9 +233,6 @@ False - - False - False @@ -374,9 +242,6 @@ False - - 5500 - @@ -389,9 +254,6 @@ False - - False - @@ -404,18 +266,6 @@ False - - False - - - 14 - - - 1980-01-01 - - - False - Never @@ -488,21 +338,6 @@ 4 - - - - - - - - mRemoteNG - - - 10 - - - {0}.{1:yyyyMMdd-HHmmssffff}.backup - False @@ -512,18 +347,6 @@ False - - False - - - False - - - release - - - - True @@ -536,9 +359,6 @@ True - - https://mremoteng.org/ - @@ -560,21 +380,9 @@ 9/8, 34/8 - - False - 20 - - AES - - - GCM - - - 10000 - Dynamic @@ -599,57 +407,9 @@ 00000000-0000-0000-0000-000000000000 - - - - - False - - - True - - - True - - - True - - - False - - - False - - - True - - - True - - - False - - - False - - - False - - - False - - - True - True - - cs-CZ,de,el,en,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW - - - True - @@ -662,21 +422,12 @@ General - - True - False - - False - False - - False - 0, 0 @@ -686,21 +437,12 @@ False - - False - - - General - False True - - True - False @@ -710,9 +452,6 @@ False - - mssql - False @@ -725,9 +464,6 @@ False - - 0 - Highest @@ -746,18 +482,12 @@ - - False - False False - - False - False @@ -785,9 +515,6 @@ False - - False - False @@ -806,17 +533,11 @@ - - dev - - - - \ No newline at end of file diff --git a/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs b/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs index 1f63d132..a291e878 100644 --- a/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs +++ b/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs @@ -7,9 +7,8 @@ namespace mRemoteNG.Security.Factories public ICryptographyProvider Build() { var provider = - new CryptoProviderFactory(Settings.Default.EncryptionEngine, Settings.Default.EncryptionBlockCipherMode) - .Build(); - provider.KeyDerivationIterations = Settings.Default.EncryptionKeyDerivationIterations; + new CryptoProviderFactory(Properties.OptionsSecurityPage.Default.EncryptionEngine, Properties.OptionsSecurityPage.Default.EncryptionBlockCipherMode).Build(); + provider.KeyDerivationIterations = Properties.OptionsSecurityPage.Default.EncryptionKeyDerivationIterations; return provider; } } diff --git a/mRemoteNG/Themes/ThemeManager.cs b/mRemoteNG/Themes/ThemeManager.cs index 4edbdaaa..1aa10aaf 100644 --- a/mRemoteNG/Themes/ThemeManager.cs +++ b/mRemoteNG/Themes/ThemeManager.cs @@ -39,18 +39,18 @@ namespace mRemoteNG.Themes private void SetActive() { - if (themes[Settings.Default.ThemeName] != null) - ActiveTheme = (ThemeInfo)themes[Settings.Default.ThemeName]; + if (themes[Properties.OptionsThemePage.Default.ThemeName] != null) + ActiveTheme = (ThemeInfo)themes[Properties.OptionsThemePage.Default.ThemeName]; else { ActiveTheme = DefaultTheme; - if (string.IsNullOrEmpty(Settings.Default.ThemeName)) return; + if (string.IsNullOrEmpty(Properties.OptionsThemePage.Default.ThemeName)) return; //too early for logging to be enabled... Debug.WriteLine("Detected invalid Theme in settings file. Resetting to default."); // if we got here, then there's an invalid theme name in use, so just empty it out... - Settings.Default.ThemeName = ""; - Settings.Default.Save(); + Properties.OptionsThemePage.Default.ThemeName = ""; + Properties.OptionsThemePage.Default.Save(); } } @@ -168,45 +168,27 @@ namespace mRemoteNG.Themes //Load the embedded themes, extended palettes are taken from the vs2015 themes, trying to match the color theme // 2012 - var vs2012Light = new ThemeInfo("vs2012Light", new VS2012LightTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2012, - ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); + var vs2012Light = new ThemeInfo("vs2012Light", new VS2012LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); themes.Add(vs2012Light.Name, vs2012Light); - var vs2012Dark = new ThemeInfo("vs2012Dark", new VS2012DarkTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2012, - ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); + var vs2012Dark = new ThemeInfo("vs2012Dark", new VS2012DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); themes.Add(vs2012Dark.Name, vs2012Dark); - var vs2012Blue = new ThemeInfo("vs2012Blue", new VS2012BlueTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2012, - ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); + var vs2012Blue = new ThemeInfo("vs2012Blue", new VS2012BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2012, ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); themes.Add(vs2012Blue.Name, vs2012Blue); // 2013 - var vs2013Light = new ThemeInfo("vs2013Light", new VS2013LightTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2013, - ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); + var vs2013Light = new ThemeInfo("vs2013Light", new VS2013LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); themes.Add(vs2013Light.Name, vs2013Light); - var vs2013Dark = new ThemeInfo("vs2013Dark", new VS2013DarkTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2013, - ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); + var vs2013Dark = new ThemeInfo("vs2013Dark", new VS2013DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); themes.Add(vs2013Dark.Name, vs2013Dark); - var vs2013Blue = new ThemeInfo("vs2013Blue", new VS2013BlueTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2013, - ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); + var vs2013Blue = new ThemeInfo("vs2013Blue", new VS2013BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2013, ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); themes.Add(vs2013Blue.Name, vs2013Blue); // 2015 - var vs2015Light = new ThemeInfo("vs2015Light", new VS2015LightTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2015, - ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); + var vs2015Light = new ThemeInfo("vs2015Light", new VS2015LightTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015, ((ThemeInfo)themes["vs2015lightNG"]).ExtendedPalette); themes.Add(vs2015Light.Name, vs2015Light); - var vs2015Dark = new ThemeInfo("vs2015Dark", new VS2015DarkTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2015, - ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); + var vs2015Dark = new ThemeInfo("vs2015Dark", new VS2015DarkTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015, ((ThemeInfo)themes["vs2015darkNG"]).ExtendedPalette); themes.Add(vs2015Dark.Name, vs2015Dark); - var vs2015Blue = new ThemeInfo("vs2015Blue", new VS2015BlueTheme(), "", - VisualStudioToolStripExtender.VsVersion.Vs2015, - ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); + var vs2015Blue = new ThemeInfo("vs2015Blue", new VS2015BlueTheme(), "", VisualStudioToolStripExtender.VsVersion.Vs2015, ((ThemeInfo)themes["vs2015blueNG"]).ExtendedPalette); themes.Add(vs2015Blue.Name, vs2015Blue); } } @@ -303,7 +285,7 @@ namespace mRemoteNG.Themes { if (themes.Count == 0) return; _themeActive = value; - Settings.Default.ThemingActive = value; + Properties.OptionsThemePage.Default.ThemingActive = value; NotifyThemeChanged(this, new PropertyChangedEventArgs("")); } } @@ -324,20 +306,20 @@ namespace mRemoteNG.Themes // Default accordingly... if (value == null) { - var changed = !Settings.Default.ThemeName.Equals(DefaultTheme.Name); + var changed = !Properties.OptionsThemePage.Default.ThemeName.Equals(DefaultTheme.Name); - Settings.Default.ThemeName = DefaultTheme.Name; + Properties.OptionsThemePage.Default.ThemeName = DefaultTheme.Name; _activeTheme = DefaultTheme; if (changed) NotifyThemeChanged(this, new PropertyChangedEventArgs("theme")); - Settings.Default.Save(); + Properties.OptionsThemePage.Default.Save(); return; } _activeTheme = value; - Settings.Default.ThemeName = value.Name; + Properties.OptionsThemePage.Default.ThemeName = value.Name; NotifyThemeChanged(this, new PropertyChangedEventArgs("theme")); } } diff --git a/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs b/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs index f2cfc1e5..33b43f25 100644 --- a/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs +++ b/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs @@ -48,28 +48,28 @@ namespace mRemoteNG.Tools.Cmdline { if (args["resetpos"] == null && args["rp"] == null && args["reset"] == null) return; _messageCollector.AddMessage(MessageClass.DebugMsg, "Cmdline arg: Resetting window positions."); - Settings.Default.MainFormKiosk = false; + Properties.App.Default.MainFormKiosk = false; var newWidth = 900; var newHeight = 600; var newX = Screen.PrimaryScreen.WorkingArea.Width / 2 - newWidth / 2; var newY = Screen.PrimaryScreen.WorkingArea.Height / 2 - newHeight / 2; - Settings.Default.MainFormLocation = new Point(newX, newY); - Settings.Default.MainFormSize = new Size(newWidth, newHeight); - Settings.Default.MainFormState = FormWindowState.Normal; + Properties.App.Default.MainFormLocation = new Point(newX, newY); + Properties.App.Default.MainFormSize = new Size(newWidth, newHeight); + Properties.App.Default.MainFormState = FormWindowState.Normal; } private void ParseResetPanelsArg(CmdArgumentsInterpreter args) { if (args["resetpanels"] == null && args["rpnl"] == null && args["reset"] == null) return; _messageCollector.AddMessage(MessageClass.DebugMsg, "Cmdline arg: Resetting panels"); - Settings.Default.ResetPanels = true; + Properties.App.Default.ResetPanels = true; } private void ParseResetToolbarArg(CmdArgumentsInterpreter args) { if (args["resettoolbar"] == null && args["rtbr"] == null && args["reset"] == null) return; _messageCollector.AddMessage(MessageClass.DebugMsg, "Cmdline arg: Resetting toolbar position"); - Settings.Default.ResetToolbars = true; + Properties.App.Default.ResetToolbars = true; } private void ParseNoReconnectArg(CmdArgumentsInterpreter args) @@ -77,7 +77,7 @@ namespace mRemoteNG.Tools.Cmdline if (args["noreconnect"] == null && args["norc"] == null) return; _messageCollector.AddMessage(MessageClass.DebugMsg, "Cmdline arg: Disabling reconnection to previously connected hosts"); - Settings.Default.NoReconnect = true; + Properties.App.Default.NoReconnect = true; } private void ParseCustomConnectionPathArg(CmdArgumentsInterpreter args) @@ -94,20 +94,19 @@ namespace mRemoteNG.Tools.Cmdline { if (File.Exists(Path.Combine(GeneralAppInfo.HomePath, args[consParam]))) { - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = Path.Combine(GeneralAppInfo.HomePath, args[consParam]); + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.BackupFilePath = Path.Combine(GeneralAppInfo.HomePath, args[consParam]); return; } if (!File.Exists(Path.Combine(ConnectionsFileInfo.DefaultConnectionsPath, args[consParam]))) return; - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = - Path.Combine(ConnectionsFileInfo.DefaultConnectionsPath, args[consParam]); + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.BackupFilePath = Path.Combine(ConnectionsFileInfo.DefaultConnectionsPath, args[consParam]); } else { - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = args[consParam]; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.BackupFilePath = args[consParam]; } } } diff --git a/mRemoteNG/Tools/ExternalToolArgumentParser.cs b/mRemoteNG/Tools/ExternalToolArgumentParser.cs index 88f83a45..9710f930 100644 --- a/mRemoteNG/Tools/ExternalToolArgumentParser.cs +++ b/mRemoteNG/Tools/ExternalToolArgumentParser.cs @@ -178,25 +178,23 @@ namespace mRemoteNG.Tools case "username": replacement = _connectionInfo.Username; if (string.IsNullOrEmpty(replacement)) - if (Settings.Default.EmptyCredentials == "windows") + if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "windows") replacement = Environment.UserName; - else if (Settings.Default.EmptyCredentials == "custom") - replacement = Settings.Default.DefaultUsername; + else if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "custom") + replacement = Properties.OptionsCredentialsPage.Default.DefaultUsername; break; case "password": replacement = _connectionInfo.Password; - if (string.IsNullOrEmpty(replacement) && Settings.Default.EmptyCredentials == "custom") - replacement = new LegacyRijndaelCryptographyProvider() - .Decrypt(Convert.ToString(Settings.Default.DefaultPassword), - Runtime.EncryptionKey); + if (string.IsNullOrEmpty(replacement) && Properties.OptionsCredentialsPage.Default.EmptyCredentials == "custom") + replacement = new LegacyRijndaelCryptographyProvider().Decrypt(Convert.ToString(Properties.OptionsCredentialsPage.Default.DefaultPassword), Runtime.EncryptionKey); break; case "domain": replacement = _connectionInfo.Domain; if (string.IsNullOrEmpty(replacement)) - if (Settings.Default.EmptyCredentials == "windows") + if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "windows") replacement = Environment.UserDomainName; - else if (Settings.Default.EmptyCredentials == "custom") - replacement = Settings.Default.DefaultDomain; + else if (Properties.OptionsCredentialsPage.Default.EmptyCredentials == "custom") + replacement = Properties.OptionsCredentialsPage.Default.DefaultDomain; break; case "description": replacement = _connectionInfo.Description; diff --git a/mRemoteNG/Tools/MiscTools.cs b/mRemoteNG/Tools/MiscTools.cs index 2e0f508a..98047926 100644 --- a/mRemoteNG/Tools/MiscTools.cs +++ b/mRemoteNG/Tools/MiscTools.cs @@ -64,7 +64,7 @@ namespace mRemoteNG.Tools public static string DBDate(DateTime Dt) { - switch (Settings.Default.SQLServerType) + switch (Properties.OptionsDBsPage.Default.SQLServerType) { case "mysql": return Dt.ToString("yyyy/MM/dd HH:mm:ss"); @@ -76,7 +76,7 @@ namespace mRemoteNG.Tools public static Type DBTimeStampType() { - switch (Settings.Default.SQLServerType) + switch (Properties.OptionsDBsPage.Default.SQLServerType) { case "mysql": return typeof(MySqlDateTime); @@ -88,7 +88,7 @@ namespace mRemoteNG.Tools public static object DBTimeStampNow() { - switch (Settings.Default.SQLServerType) + switch (Properties.OptionsDBsPage.Default.SQLServerType) { case "mysql": return new MySqlDateTime(DateTime.Now); diff --git a/mRemoteNG/Tools/NotificationAreaIcon.cs b/mRemoteNG/Tools/NotificationAreaIcon.cs index 13e67989..283cc2c7 100644 --- a/mRemoteNG/Tools/NotificationAreaIcon.cs +++ b/mRemoteNG/Tools/NotificationAreaIcon.cs @@ -111,7 +111,7 @@ namespace mRemoteNG.Tools FrmMain.Show(); FrmMain.WindowState = FrmMain.PreviousWindowState; - if (Settings.Default.ShowSystemTrayIcon) return; + if (Properties.OptionsAppearancePage.Default.ShowSystemTrayIcon) return; Runtime.NotificationAreaIcon.Dispose(); Runtime.NotificationAreaIcon = null; } diff --git a/mRemoteNG/Tools/ProcessController.cs b/mRemoteNG/Tools/ProcessController.cs index 57915b4b..a57c8f68 100644 --- a/mRemoteNG/Tools/ProcessController.cs +++ b/mRemoteNG/Tools/ProcessController.cs @@ -110,12 +110,12 @@ namespace mRemoteNG.Tools if (Process == null || Process.HasExited) return IntPtr.Zero; - Process.WaitForInputIdle(Settings.Default.MaxPuttyWaitTime * 1000); + Process.WaitForInputIdle(Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000); Handle = IntPtr.Zero; var startTicks = Environment.TickCount; while (Handle == IntPtr.Zero && - Environment.TickCount < startTicks + (Settings.Default.MaxPuttyWaitTime * 1000)) + Environment.TickCount < startTicks + (Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime * 1000)) { Process.Refresh(); Handle = Process.MainWindowHandle; @@ -152,8 +152,7 @@ namespace mRemoteNG.Tools } else { - NativeMethods.SendMessage(control, NativeMethods.WM_GETTEXT, new IntPtr(stringBuilder.Capacity), - stringBuilder); + NativeMethods.SendMessage(control, NativeMethods.WM_GETTEXT, new IntPtr(stringBuilder.Capacity), stringBuilder); if (stringBuilder.ToString() != text) continue; controlHandle = control; break; diff --git a/mRemoteNG/Tools/PuttyProcessController.cs b/mRemoteNG/Tools/PuttyProcessController.cs index 43e1be15..869741eb 100644 --- a/mRemoteNG/Tools/PuttyProcessController.cs +++ b/mRemoteNG/Tools/PuttyProcessController.cs @@ -1,4 +1,4 @@ -using mRemoteNG.Properties; +using mRemoteNG.Properties; using mRemoteNG.Tools.Cmdline; namespace mRemoteNG.Tools @@ -7,9 +7,7 @@ namespace mRemoteNG.Tools { public bool Start(CommandLineArguments arguments = null) { - var filename = Settings.Default.UseCustomPuttyPath - ? Settings.Default.CustomPuttyPath - : App.Info.GeneralAppInfo.PuttyPath; + var filename = Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath ? Properties.OptionsAdvancedPage.Default.CustomPuttyPath : App.Info.GeneralAppInfo.PuttyPath; return Start(filename, arguments); } } diff --git a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs index 3bf8322b..52e1287d 100644 --- a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs +++ b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs @@ -311,10 +311,7 @@ namespace mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid if (rootInfo.Password) { - var passwordName = Settings.Default.UseSQLServer - ? Language.SQLServer.TrimEnd(':') - : Path.GetFileName(Runtime.ConnectionsService.GetStartupConnectionFileName()); - + var passwordName = Properties.OptionsDBsPage.Default.UseSQLServer ? Language.SQLServer.TrimEnd(':') : Path.GetFileName(Runtime.ConnectionsService.GetStartupConnectionFileName()); var password = MiscTools.PasswordDialog(passwordName); // operation cancelled, dont set a password diff --git a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs index 95a90044..3a679910 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs @@ -487,7 +487,7 @@ namespace mRemoteNG.UI.Controls.ConnectionTree { try { - if (!Settings.Default.ShowDescriptionTooltipsInTree) + if (!Properties.OptionsAppearancePage.Default.ShowDescriptionTooltipsInTree) { // setting text to null prevents the tooltip from being shown e.Text = null; @@ -538,9 +538,7 @@ namespace mRemoteNG.UI.Controls.ConnectionTree } catch (Exception ex) { - Runtime.MessageCollector.AddExceptionStackTrace( - "tvConnections_AfterLabelEdit (UI.Window.ConnectionTreeWindow) failed", - ex); + Runtime.MessageCollector.AddExceptionStackTrace("tvConnections_AfterLabelEdit (UI.Window.ConnectionTreeWindow) failed", ex); } } diff --git a/mRemoteNG/UI/Forms/FrmAbout.cs b/mRemoteNG/UI/Forms/FrmAbout.cs index 59820ba3..6e02b9a2 100644 --- a/mRemoteNG/UI/Forms/FrmAbout.cs +++ b/mRemoteNG/UI/Forms/FrmAbout.cs @@ -55,19 +55,19 @@ namespace mRemoteNG.UI.Forms private void llLicense_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Settings.Default.CurrentUpdateChannelType + "/COPYING.txt"); + OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Properties.OptionsUpdatesPage.Default.CurrentUpdateChannelType + "/COPYING.txt"); Close(); } private void llChangelog_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Settings.Default.CurrentUpdateChannelType + "/CHANGELOG.md"); + OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Properties.OptionsUpdatesPage.Default.CurrentUpdateChannelType + "/CHANGELOG.md"); Close(); } private void llCredits_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Settings.Default.CurrentUpdateChannelType + "/CREDITS.md"); + OpenUrl("https://raw.githubusercontent.com/mRemoteNG/mRemoteNG/v" + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, Assembly.GetExecutingAssembly().GetName().Version.ToString().Length - 2) + "-" + Properties.OptionsUpdatesPage.Default.CurrentUpdateChannelType + "/CREDITS.md"); Close(); } diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs index e6ec5b61..52174348 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs @@ -48,45 +48,43 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - chkAutomaticReconnect.Checked = Settings.Default.ReconnectOnDisconnect; - chkLoadBalanceInfoUseUtf8.Checked = Settings.Default.RdpLoadBalanceInfoUseUtf8; - numPuttyWaitTime.Value = Settings.Default.MaxPuttyWaitTime; + chkAutomaticReconnect.Checked = Properties.OptionsAdvancedPage.Default.ReconnectOnDisconnect; + chkLoadBalanceInfoUseUtf8.Checked = Properties.OptionsAdvancedPage.Default.RdpLoadBalanceInfoUseUtf8; + numPuttyWaitTime.Value = Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime; - chkUseCustomPuttyPath.Checked = Settings.Default.UseCustomPuttyPath; - txtCustomPuttyPath.Text = Settings.Default.CustomPuttyPath; + chkUseCustomPuttyPath.Checked = Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath; + txtCustomPuttyPath.Text = Properties.OptionsAdvancedPage.Default.CustomPuttyPath; SetPuttyLaunchButtonEnabled(); - numUVNCSCPort.Value = Settings.Default.UVNCSCPort; + numUVNCSCPort.Value = Properties.OptionsAdvancedPage.Default.UVNCSCPort; } public override void SaveSettings() { - Settings.Default.ReconnectOnDisconnect = chkAutomaticReconnect.Checked; - Settings.Default.RdpLoadBalanceInfoUseUtf8 = chkLoadBalanceInfoUseUtf8.Checked; + Properties.OptionsAdvancedPage.Default.ReconnectOnDisconnect = chkAutomaticReconnect.Checked; + Properties.OptionsAdvancedPage.Default.RdpLoadBalanceInfoUseUtf8 = chkLoadBalanceInfoUseUtf8.Checked; var puttyPathChanged = false; - if (Settings.Default.CustomPuttyPath != txtCustomPuttyPath.Text) + if (Properties.OptionsAdvancedPage.Default.CustomPuttyPath != txtCustomPuttyPath.Text) { puttyPathChanged = true; - Settings.Default.CustomPuttyPath = txtCustomPuttyPath.Text; + Properties.OptionsAdvancedPage.Default.CustomPuttyPath = txtCustomPuttyPath.Text; } - if (Settings.Default.UseCustomPuttyPath != chkUseCustomPuttyPath.Checked) + if (Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath != chkUseCustomPuttyPath.Checked) { puttyPathChanged = true; - Settings.Default.UseCustomPuttyPath = chkUseCustomPuttyPath.Checked; + Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath = chkUseCustomPuttyPath.Checked; } if (puttyPathChanged) { - PuttyBase.PuttyPath = Settings.Default.UseCustomPuttyPath - ? Settings.Default.CustomPuttyPath - : GeneralAppInfo.PuttyPath; + PuttyBase.PuttyPath = Properties.OptionsAdvancedPage.Default.UseCustomPuttyPath ? Properties.OptionsAdvancedPage.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath; PuttySessionsManager.Instance.AddSessions(); } - Settings.Default.MaxPuttyWaitTime = (int)numPuttyWaitTime.Value; - Settings.Default.UVNCSCPort = (int)numUVNCSCPort.Value; + Properties.OptionsAdvancedPage.Default.MaxPuttyWaitTime = (int)numPuttyWaitTime.Value; + Properties.OptionsAdvancedPage.Default.UVNCSCPort = (int)numUVNCSCPort.Value; } #endregion diff --git a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs index 6663a038..b1b9f162 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs @@ -57,11 +57,11 @@ namespace mRemoteNG.UI.Forms.OptionsPages cboLanguage.SelectedIndex = 0; } - chkShowDescriptionTooltipsInTree.Checked = Settings.Default.ShowDescriptionTooltipsInTree; - chkShowFullConnectionsFilePathInTitle.Checked = Settings.Default.ShowCompleteConsPathInTitle; - chkShowSystemTrayIcon.Checked = Settings.Default.ShowSystemTrayIcon; - chkMinimizeToSystemTray.Checked = Settings.Default.MinimizeToTray; - chkCloseToSystemTray.Checked = Settings.Default.CloseToTray; + chkShowDescriptionTooltipsInTree.Checked = Properties.OptionsAppearancePage.Default.ShowDescriptionTooltipsInTree; + chkShowFullConnectionsFilePathInTitle.Checked = Properties.OptionsAppearancePage.Default.ShowCompleteConsPathInTitle; + chkShowSystemTrayIcon.Checked = Properties.OptionsAppearancePage.Default.ShowSystemTrayIcon; + chkMinimizeToSystemTray.Checked = Properties.OptionsAppearancePage.Default.MinimizeToTray; + chkCloseToSystemTray.Checked = Properties.OptionsAppearancePage.Default.CloseToTray; } public override void SaveSettings() @@ -69,20 +69,19 @@ namespace mRemoteNG.UI.Forms.OptionsPages if (cboLanguage.SelectedIndex > 0 && SupportedCultures.IsNativeNameSupported(Convert.ToString(cboLanguage.SelectedItem))) { - Settings.Default.OverrideUICulture = - SupportedCultures.get_CultureName(Convert.ToString(cboLanguage.SelectedItem)); + Settings.Default.OverrideUICulture = SupportedCultures.get_CultureName(Convert.ToString(cboLanguage.SelectedItem)); } else { Settings.Default.OverrideUICulture = string.Empty; } - Settings.Default.ShowDescriptionTooltipsInTree = chkShowDescriptionTooltipsInTree.Checked; - Settings.Default.ShowCompleteConsPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked; + Properties.OptionsAppearancePage.Default.ShowDescriptionTooltipsInTree = chkShowDescriptionTooltipsInTree.Checked; + Properties.OptionsAppearancePage.Default.ShowCompleteConsPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked; FrmMain.Default.ShowFullPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked; - Settings.Default.ShowSystemTrayIcon = chkShowSystemTrayIcon.Checked; - if (Settings.Default.ShowSystemTrayIcon) + Properties.OptionsAppearancePage.Default.ShowSystemTrayIcon = chkShowSystemTrayIcon.Checked; + if (Properties.OptionsAppearancePage.Default.ShowSystemTrayIcon) { if (Runtime.NotificationAreaIcon == null) { @@ -98,8 +97,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages } } - Settings.Default.MinimizeToTray = chkMinimizeToSystemTray.Checked; - Settings.Default.CloseToTray = chkCloseToSystemTray.Checked; + Properties.OptionsAppearancePage.Default.MinimizeToTray = chkMinimizeToSystemTray.Checked; + Properties.OptionsAppearancePage.Default.CloseToTray = chkCloseToSystemTray.Checked; } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs index daa6ed9d..750063d0 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/BackupPage.cs @@ -70,36 +70,36 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - numMaxBackups.Value = Convert.ToDecimal(Settings.Default.BackupFileKeepCount); + numMaxBackups.Value = Convert.ToDecimal(Properties.OptionsBackupPage.Default.BackupFileKeepCount); - if (Settings.Default.SaveConnectionsFrequency == (int) ConnectionsBackupFrequencyEnum.Unassigned) + if (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int) ConnectionsBackupFrequencyEnum.Unassigned) { - if (Settings.Default.SaveConnectionsAfterEveryEdit) + if (Properties.OptionsBackupPage.Default.SaveConnectionsAfterEveryEdit) { - Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnEdit; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnEdit; } - else if (Settings.Default.SaveConsOnExit) + else if (Properties.OptionsBackupPage.Default.SaveConsOnExit) { - Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnExit; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.OnExit; } else { - Settings.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.Never; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int) ConnectionsBackupFrequencyEnum.Never; } } - cmbConnectionBackupFrequency.SelectedValue = Settings.Default.SaveConnectionsFrequency; - textBoxConnectionBackupPath.Text = Settings.Default.CustomConsPath; + cmbConnectionBackupFrequency.SelectedValue = Properties.OptionsBackupPage.Default.SaveConnectionsFrequency; + textBoxConnectionBackupPath.Text = Properties.OptionsBackupPage.Default.CustomConsPath; } public override void SaveSettings() { - Settings.Default.BackupFileKeepCount = (int) numMaxBackups.Value; + Properties.OptionsBackupPage.Default.BackupFileKeepCount = (int) numMaxBackups.Value; - if (Settings.Default.AutoSaveEveryMinutes > 0) + if (Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes > 0) { - _frmMain.tmrAutoSave.Interval = Settings.Default.AutoSaveEveryMinutes * 60000; + _frmMain.tmrAutoSave.Interval = Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes * 60000; _frmMain.tmrAutoSave.Enabled = true; } else @@ -107,12 +107,12 @@ namespace mRemoteNG.UI.Forms.OptionsPages _frmMain.tmrAutoSave.Enabled = false; } - Settings.Default.SaveConnectionsFrequency = (int) cmbConnectionBackupFrequency.SelectedValue; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int) cmbConnectionBackupFrequency.SelectedValue; if (textBoxConnectionBackupPath.Text.Trim().Length <= 0) { - Settings.Default.LoadConsFromCustomLocation = false; - Settings.Default.CustomConsPath = String.Empty; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = false; + Properties.OptionsBackupPage.Default.CustomConsPath = String.Empty; } else { @@ -123,18 +123,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages if (newFileName == Runtime.ConnectionsService.GetDefaultStartupConnectionFileName()) { - Settings.Default.LoadConsFromCustomLocation = false; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = false; } else { - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = newFileName; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.CustomConsPath = newFileName; } } //Obsolete. Set to false - Settings.Default.SaveConnectionsAfterEveryEdit = false; - Settings.Default.SaveConsOnExit = false; + Properties.OptionsBackupPage.Default.SaveConnectionsAfterEveryEdit = false; + Properties.OptionsBackupPage.Default.SaveConsOnExit = false; } private void ButtonBrowsePath_Click(object sender, EventArgs e) diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs index 6649cbcb..15234124 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs @@ -69,44 +69,44 @@ namespace mRemoteNG.UI.Forms.OptionsPages numRdpReconnectionCount.Value = Convert.ToDecimal(Settings.Default.RdpReconnectionCount); numRDPConTimeout.Value = Convert.ToDecimal(Settings.Default.ConRDPOverallConnectionTimeout); - numAutoSave.Value = Convert.ToDecimal(Settings.Default.AutoSaveEveryMinutes); + numAutoSave.Value = Convert.ToDecimal(Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes); //comboBoxConnectionWarning.SelectedValue = Settings.Default.ConfirmCloseConnection; - if (Settings.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.Unassigned) + if (Properties.OptionsBackupPage.Default.SaveConnectionsFrequency == (int)ConnectionsBackupFrequencyEnum.Unassigned) { - if (Settings.Default.SaveConnectionsAfterEveryEdit) + if (Properties.OptionsBackupPage.Default.SaveConnectionsAfterEveryEdit) { - Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnEdit; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnEdit; } - else if (Settings.Default.SaveConsOnExit) + else if (Properties.OptionsBackupPage.Default.SaveConsOnExit) { - Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnExit; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.OnExit; } else { - Settings.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.Never; + Properties.OptionsBackupPage.Default.SaveConnectionsFrequency = (int)ConnectionsBackupFrequencyEnum.Never; } } } public override void SaveSettings() { - Settings.Default.SingleClickOnConnectionOpensIt = chkSingleClickOnConnectionOpensIt.Checked; - Settings.Default.SingleClickSwitchesToOpenConnection = chkSingleClickOnOpenedConnectionSwitchesToIt.Checked; - Settings.Default.TrackActiveConnectionInConnectionTree = chkConnectionTreeTrackActiveConnection.Checked; - Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked; + Properties.Settings.Default.SingleClickOnConnectionOpensIt = chkSingleClickOnConnectionOpensIt.Checked; + Properties.Settings.Default.SingleClickSwitchesToOpenConnection = chkSingleClickOnOpenedConnectionSwitchesToIt.Checked; + Properties.Settings.Default.TrackActiveConnectionInConnectionTree = chkConnectionTreeTrackActiveConnection.Checked; + Properties.Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked; - Settings.Default.UseFilterSearch = chkUseFilterSearch.Checked; - Settings.Default.PlaceSearchBarAboveConnectionTree = chkPlaceSearchBarAboveConnectionTree.Checked; - Settings.Default.DoNotTrimUsername = chkDoNotTrimUsername.Checked; + Properties.Settings.Default.UseFilterSearch = chkUseFilterSearch.Checked; + Properties.Settings.Default.PlaceSearchBarAboveConnectionTree = chkPlaceSearchBarAboveConnectionTree.Checked; + Properties.Settings.Default.DoNotTrimUsername = chkDoNotTrimUsername.Checked; - Settings.Default.RdpReconnectionCount = (int)numRdpReconnectionCount.Value; - Settings.Default.ConRDPOverallConnectionTimeout = (int)numRDPConTimeout.Value; - Settings.Default.AutoSaveEveryMinutes = (int)numAutoSave.Value; - if (Settings.Default.AutoSaveEveryMinutes > 0) + Properties.Settings.Default.RdpReconnectionCount = (int)numRdpReconnectionCount.Value; + Properties.Settings.Default.ConRDPOverallConnectionTimeout = (int)numRDPConTimeout.Value; + Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes = (int)numAutoSave.Value; + if (Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes > 0) { - _frmMain.tmrAutoSave.Interval = Settings.Default.AutoSaveEveryMinutes * 60000; + _frmMain.tmrAutoSave.Interval = Properties.OptionsBackupPage.Default.AutoSaveEveryMinutes * 60000; _frmMain.tmrAutoSave.Enabled = true; } else diff --git a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs index 242efec2..2d5fcf30 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs @@ -36,7 +36,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { // ReSharper disable once SwitchStatementMissingSomeCases - switch (Settings.Default.EmptyCredentials) + switch (Properties.OptionsCredentialsPage.Default.EmptyCredentials) { case "noinfo": radCredentialsNoInfo.Checked = true; @@ -49,35 +49,35 @@ namespace mRemoteNG.UI.Forms.OptionsPages break; } - txtCredentialsUsername.Text = Settings.Default.DefaultUsername; + txtCredentialsUsername.Text = Properties.OptionsCredentialsPage.Default.DefaultUsername; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); txtCredentialsPassword.Text = - cryptographyProvider.Decrypt(Settings.Default.DefaultPassword, Runtime.EncryptionKey); - txtCredentialsDomain.Text = Settings.Default.DefaultDomain; - txtCredentialsUserViaAPI.Text = Settings.Default.UserViaAPDefault; + cryptographyProvider.Decrypt(Properties.OptionsCredentialsPage.Default.DefaultPassword, Runtime.EncryptionKey); + txtCredentialsDomain.Text = Properties.OptionsCredentialsPage.Default.DefaultDomain; + txtCredentialsUserViaAPI.Text = Properties.OptionsCredentialsPage.Default.UserViaAPDefault; } public override void SaveSettings() { if (radCredentialsNoInfo.Checked) { - Settings.Default.EmptyCredentials = "noinfo"; + Properties.OptionsCredentialsPage.Default.EmptyCredentials = "noinfo"; } else if (radCredentialsWindows.Checked) { - Settings.Default.EmptyCredentials = "windows"; + Properties.OptionsCredentialsPage.Default.EmptyCredentials = "windows"; } else if (radCredentialsCustom.Checked) { - Settings.Default.EmptyCredentials = "custom"; + Properties.OptionsCredentialsPage.Default.EmptyCredentials = "custom"; } - Settings.Default.DefaultUsername = txtCredentialsUsername.Text; + Properties.OptionsCredentialsPage.Default.DefaultUsername = txtCredentialsUsername.Text; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - Settings.Default.DefaultPassword = + Properties.OptionsCredentialsPage.Default.DefaultPassword = cryptographyProvider.Encrypt(txtCredentialsPassword.Text, Runtime.EncryptionKey); - Settings.Default.DefaultDomain = txtCredentialsDomain.Text; - Settings.Default.UserViaAPDefault = txtCredentialsUserViaAPI.Text; + Properties.OptionsCredentialsPage.Default.DefaultDomain = txtCredentialsDomain.Text; + Properties.OptionsCredentialsPage.Default.UserViaAPDefault = txtCredentialsUserViaAPI.Text; } private void radCredentialsCustom_CheckedChanged(object sender, EventArgs e) diff --git a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs index c3bcdb6b..6b6737b1 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs @@ -76,61 +76,61 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void LoadNotificationPanelSettings() { - chkShowDebugInMC.Checked = Settings.Default.NotificationPanelWriterWriteDebugMsgs; - chkShowInfoInMC.Checked = Settings.Default.NotificationPanelWriterWriteInfoMsgs; - chkShowWarningInMC.Checked = Settings.Default.NotificationPanelWriterWriteWarningMsgs; - chkShowErrorInMC.Checked = Settings.Default.NotificationPanelWriterWriteErrorMsgs; - chkSwitchToMCInformation.Checked = Settings.Default.SwitchToMCOnInformation; - chkSwitchToMCWarnings.Checked = Settings.Default.SwitchToMCOnWarning; - chkSwitchToMCErrors.Checked = Settings.Default.SwitchToMCOnError; + chkShowDebugInMC.Checked = Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteDebugMsgs; + chkShowInfoInMC.Checked = Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteInfoMsgs; + chkShowWarningInMC.Checked = Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteWarningMsgs; + chkShowErrorInMC.Checked = Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteErrorMsgs; + chkSwitchToMCInformation.Checked = Properties.OptionsNotificationsPage.Default.SwitchToMCOnInformation; + chkSwitchToMCWarnings.Checked = Properties.OptionsNotificationsPage.Default.SwitchToMCOnWarning; + chkSwitchToMCErrors.Checked = Properties.OptionsNotificationsPage.Default.SwitchToMCOnError; } private void LoadLoggingSettings() { - chkLogToCurrentDir.Checked = Settings.Default.LogToApplicationDirectory; - textBoxLogPath.Text = Settings.Default.LogFilePath; - chkLogDebugMsgs.Checked = Settings.Default.TextLogMessageWriterWriteDebugMsgs; - chkLogInfoMsgs.Checked = Settings.Default.TextLogMessageWriterWriteInfoMsgs; - chkLogWarningMsgs.Checked = Settings.Default.TextLogMessageWriterWriteWarningMsgs; - chkLogErrorMsgs.Checked = Settings.Default.TextLogMessageWriterWriteErrorMsgs; + chkLogToCurrentDir.Checked = Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory; + textBoxLogPath.Text = Properties.OptionsNotificationsPage.Default.LogFilePath; + chkLogDebugMsgs.Checked = Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteDebugMsgs; + chkLogInfoMsgs.Checked = Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteInfoMsgs; + chkLogWarningMsgs.Checked = Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteWarningMsgs; + chkLogErrorMsgs.Checked = Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteErrorMsgs; } private void LoadPopupSettings() { - chkPopupDebug.Checked = Settings.Default.PopupMessageWriterWriteDebugMsgs; - chkPopupInfo.Checked = Settings.Default.PopupMessageWriterWriteInfoMsgs; - chkPopupWarning.Checked = Settings.Default.PopupMessageWriterWriteWarningMsgs; - chkPopupError.Checked = Settings.Default.PopupMessageWriterWriteErrorMsgs; + chkPopupDebug.Checked = Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteDebugMsgs; + chkPopupInfo.Checked = Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteInfoMsgs; + chkPopupWarning.Checked = Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteWarningMsgs; + chkPopupError.Checked = Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteErrorMsgs; } private void SaveNotificationPanelSettings() { - Settings.Default.NotificationPanelWriterWriteDebugMsgs = chkShowDebugInMC.Checked; - Settings.Default.NotificationPanelWriterWriteInfoMsgs = chkShowInfoInMC.Checked; - Settings.Default.NotificationPanelWriterWriteWarningMsgs = chkShowWarningInMC.Checked; - Settings.Default.NotificationPanelWriterWriteErrorMsgs = chkShowErrorInMC.Checked; - Settings.Default.SwitchToMCOnInformation = chkSwitchToMCInformation.Checked; - Settings.Default.SwitchToMCOnWarning = chkSwitchToMCWarnings.Checked; - Settings.Default.SwitchToMCOnError = chkSwitchToMCErrors.Checked; + Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteDebugMsgs = chkShowDebugInMC.Checked; + Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteInfoMsgs = chkShowInfoInMC.Checked; + Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteWarningMsgs = chkShowWarningInMC.Checked; + Properties.OptionsNotificationsPage.Default.NotificationPanelWriterWriteErrorMsgs = chkShowErrorInMC.Checked; + Properties.OptionsNotificationsPage.Default.SwitchToMCOnInformation = chkSwitchToMCInformation.Checked; + Properties.OptionsNotificationsPage.Default.SwitchToMCOnWarning = chkSwitchToMCWarnings.Checked; + Properties.OptionsNotificationsPage.Default.SwitchToMCOnError = chkSwitchToMCErrors.Checked; } private void SaveLoggingSettings() { - Settings.Default.LogToApplicationDirectory = chkLogToCurrentDir.Checked; - Settings.Default.LogFilePath = textBoxLogPath.Text; - Logger.Instance.SetLogPath(Settings.Default.LogFilePath); - Settings.Default.TextLogMessageWriterWriteDebugMsgs = chkLogDebugMsgs.Checked; - Settings.Default.TextLogMessageWriterWriteInfoMsgs = chkLogInfoMsgs.Checked; - Settings.Default.TextLogMessageWriterWriteWarningMsgs = chkLogWarningMsgs.Checked; - Settings.Default.TextLogMessageWriterWriteErrorMsgs = chkLogErrorMsgs.Checked; + Properties.OptionsNotificationsPage.Default.LogToApplicationDirectory = chkLogToCurrentDir.Checked; + Properties.OptionsNotificationsPage.Default.LogFilePath = textBoxLogPath.Text; + Logger.Instance.SetLogPath(Properties.OptionsNotificationsPage.Default.LogFilePath); + Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteDebugMsgs = chkLogDebugMsgs.Checked; + Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteInfoMsgs = chkLogInfoMsgs.Checked; + Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteWarningMsgs = chkLogWarningMsgs.Checked; + Properties.OptionsNotificationsPage.Default.TextLogMessageWriterWriteErrorMsgs = chkLogErrorMsgs.Checked; } private void SavePopupSettings() { - Settings.Default.PopupMessageWriterWriteDebugMsgs = chkPopupDebug.Checked; - Settings.Default.PopupMessageWriterWriteInfoMsgs = chkPopupInfo.Checked; - Settings.Default.PopupMessageWriterWriteWarningMsgs = chkPopupWarning.Checked; - Settings.Default.PopupMessageWriterWriteErrorMsgs = chkPopupError.Checked; + Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteDebugMsgs = chkPopupDebug.Checked; + Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteInfoMsgs = chkPopupInfo.Checked; + Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteWarningMsgs = chkPopupWarning.Checked; + Properties.OptionsNotificationsPage.Default.PopupMessageWriterWriteErrorMsgs = chkPopupError.Checked; } private void buttonSelectLogPath_Click(object sender, System.EventArgs e) diff --git a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs index f11cc2b8..d1aca220 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs @@ -43,19 +43,19 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - chkEncryptCompleteFile.Checked = Settings.Default.EncryptCompleteConnectionsFile; - comboBoxEncryptionEngine.Text = Enum.GetName(typeof(BlockCipherEngines), Settings.Default.EncryptionEngine); + chkEncryptCompleteFile.Checked = Properties.OptionsSecurityPage.Default.EncryptCompleteConnectionsFile; + comboBoxEncryptionEngine.Text = Enum.GetName(typeof(BlockCipherEngines), Properties.OptionsSecurityPage.Default.EncryptionEngine); comboBoxBlockCipher.Text = - Enum.GetName(typeof(BlockCipherModes), Settings.Default.EncryptionBlockCipherMode); - numberBoxKdfIterations.Value = Settings.Default.EncryptionKeyDerivationIterations; + Enum.GetName(typeof(BlockCipherModes), Properties.OptionsSecurityPage.Default.EncryptionBlockCipherMode); + numberBoxKdfIterations.Value = Properties.OptionsSecurityPage.Default.EncryptionKeyDerivationIterations; } public override void SaveSettings() { - Settings.Default.EncryptCompleteConnectionsFile = chkEncryptCompleteFile.Checked; - Settings.Default.EncryptionEngine = (BlockCipherEngines)comboBoxEncryptionEngine.SelectedItem; - Settings.Default.EncryptionBlockCipherMode = (BlockCipherModes)comboBoxBlockCipher.SelectedItem; - Settings.Default.EncryptionKeyDerivationIterations = (int)numberBoxKdfIterations.Value; + Properties.OptionsSecurityPage.Default.EncryptCompleteConnectionsFile = chkEncryptCompleteFile.Checked; + Properties.OptionsSecurityPage.Default.EncryptionEngine = (BlockCipherEngines)comboBoxEncryptionEngine.SelectedItem; + Properties.OptionsSecurityPage.Default.EncryptionBlockCipherMode = (BlockCipherModes)comboBoxBlockCipher.SelectedItem; + Properties.OptionsSecurityPage.Default.EncryptionKeyDerivationIterations = (int)numberBoxKdfIterations.Value; } public override void RevertSettings() diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs index b5118bf7..4ee42ab4 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs @@ -44,42 +44,41 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - chkUseSQLServer.Checked = Settings.Default.UseSQLServer; - txtSQLType.Text = Settings.Default.SQLServerType; - txtSQLServer.Text = Settings.Default.SQLHost; - txtSQLDatabaseName.Text = Settings.Default.SQLDatabaseName; - txtSQLUsername.Text = Settings.Default.SQLUser; + chkUseSQLServer.Checked = Properties.OptionsDBsPage.Default.UseSQLServer; + txtSQLType.Text = Properties.OptionsDBsPage.Default.SQLServerType; + txtSQLServer.Text = Properties.OptionsDBsPage.Default.SQLHost; + txtSQLDatabaseName.Text = Properties.OptionsDBsPage.Default.SQLDatabaseName; + txtSQLUsername.Text = Properties.OptionsDBsPage.Default.SQLUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - txtSQLPassword.Text = cryptographyProvider.Decrypt(Settings.Default.SQLPass, Runtime.EncryptionKey); - chkSQLReadOnly.Checked = Settings.Default.SQLReadOnly; + txtSQLPassword.Text = cryptographyProvider.Decrypt(Properties.OptionsDBsPage.Default.SQLPass, Runtime.EncryptionKey); + chkSQLReadOnly.Checked = Properties.OptionsDBsPage.Default.SQLReadOnly; lblTestConnectionResults.Text = ""; } public override void SaveSettings() { base.SaveSettings(); - var sqlServerWasPreviouslyEnabled = Settings.Default.UseSQLServer; + var sqlServerWasPreviouslyEnabled = Properties.OptionsDBsPage.Default.UseSQLServer; - Settings.Default.UseSQLServer = chkUseSQLServer.Checked; - Settings.Default.SQLServerType = txtSQLType.Text; - Settings.Default.SQLHost = txtSQLServer.Text; - Settings.Default.SQLDatabaseName = txtSQLDatabaseName.Text; - Settings.Default.SQLUser = txtSQLUsername.Text; + Properties.OptionsDBsPage.Default.UseSQLServer = chkUseSQLServer.Checked; + Properties.OptionsDBsPage.Default.SQLServerType = txtSQLType.Text; + Properties.OptionsDBsPage.Default.SQLHost = txtSQLServer.Text; + Properties.OptionsDBsPage.Default.SQLDatabaseName = txtSQLDatabaseName.Text; + Properties.OptionsDBsPage.Default.SQLUser = txtSQLUsername.Text; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - Settings.Default.SQLPass = cryptographyProvider.Encrypt(txtSQLPassword.Text, Runtime.EncryptionKey); - Settings.Default.SQLReadOnly = chkSQLReadOnly.Checked; + Properties.OptionsDBsPage.Default.SQLPass = cryptographyProvider.Encrypt(txtSQLPassword.Text, Runtime.EncryptionKey); + Properties.OptionsDBsPage.Default.SQLReadOnly = chkSQLReadOnly.Checked; - if (Settings.Default.UseSQLServer) + if (Properties.OptionsDBsPage.Default.UseSQLServer) ReinitializeSqlUpdater(); - else if (!Settings.Default.UseSQLServer && sqlServerWasPreviouslyEnabled) + else if (!Properties.OptionsDBsPage.Default.UseSQLServer && sqlServerWasPreviouslyEnabled) DisableSql(); } private static void ReinitializeSqlUpdater() { Runtime.ConnectionsService.RemoteConnectionsSyncronizer?.Dispose(); - Runtime.ConnectionsService.RemoteConnectionsSyncronizer = - new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker()); + Runtime.ConnectionsService.RemoteConnectionsSyncronizer = new RemoteConnectionsSyncronizer(new SqlConnectionsUpdateChecker()); Runtime.ConnectionsService.LoadConnections(true, false, ""); } @@ -163,16 +162,12 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void UpdateConnectionImage(bool connectionSuccess) { - imgConnectionStatus.Image = connectionSuccess - ? Properties.Resources.Test_16x - : Properties.Resources.LogError_16x; + imgConnectionStatus.Image = connectionSuccess ? Properties.Resources.Test_16x : Properties.Resources.LogError_16x; } private string BuildTestFailedMessage(string specificMessage) { - return Language.ConnectionOpenFailed + - Environment.NewLine + - specificMessage; + return Language.ConnectionOpenFailed + Environment.NewLine + specificMessage; } } } \ No newline at end of file diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs index 836dbcb8..ba231f10 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs @@ -32,18 +32,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.SaveSettings(); - Settings.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked; - Settings.Default.SingleInstance = chkSingleInstance.Checked; - Settings.Default.StartMinimized = chkStartMinimized.Checked; - Settings.Default.StartFullScreen = chkStartFullScreen.Checked; + Properties.OptionsStartupExitPage.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked; + Properties.OptionsStartupExitPage.Default.SingleInstance = chkSingleInstance.Checked; + Properties.OptionsStartupExitPage.Default.StartMinimized = chkStartMinimized.Checked; + Properties.OptionsStartupExitPage.Default.StartFullScreen = chkStartFullScreen.Checked; } private void StartupExitPage_Load(object sender, EventArgs e) { - chkReconnectOnStart.Checked = Settings.Default.OpenConsFromLastSession; - chkSingleInstance.Checked = Settings.Default.SingleInstance; - chkStartMinimized.Checked = Settings.Default.StartMinimized; - chkStartFullScreen.Checked = Settings.Default.StartFullScreen; + chkReconnectOnStart.Checked = Properties.OptionsStartupExitPage.Default.OpenConsFromLastSession; + chkSingleInstance.Checked = Properties.OptionsStartupExitPage.Default.SingleInstance; + chkStartMinimized.Checked = Properties.OptionsStartupExitPage.Default.StartMinimized; + chkStartFullScreen.Checked = Properties.OptionsStartupExitPage.Default.StartFullScreen; ; } diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs index c8999794..da5be493 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs @@ -36,16 +36,16 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - chkAlwaysShowPanelTabs.Checked = Settings.Default.AlwaysShowPanelTabs; - chkAlwaysShowConnectionTabs.Checked = Settings.Default.AlwaysShowConnectionTabs; - chkOpenNewTabRightOfSelected.Checked = Settings.Default.OpenTabsRightOfSelected; - chkShowLogonInfoOnTabs.Checked = Settings.Default.ShowLogonInfoOnTabs; - chkShowProtocolOnTabs.Checked = Settings.Default.ShowProtocolOnTabs; - chkIdentifyQuickConnectTabs.Checked = Settings.Default.IdentifyQuickConnectTabs; - chkDoubleClickClosesTab.Checked = Settings.Default.DoubleClickOnTabClosesIt; - chkAlwaysShowPanelSelectionDlg.Checked = Settings.Default.AlwaysShowPanelSelectionDlg; - chkCreateEmptyPanelOnStart.Checked = Settings.Default.CreateEmptyPanelOnStartUp; - txtBoxPanelName.Text = Settings.Default.StartUpPanelName; + chkAlwaysShowPanelTabs.Checked = Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelTabs; + chkAlwaysShowConnectionTabs.Checked = Properties.OptionsTabsPanelsPage.Default.AlwaysShowConnectionTabs; + chkOpenNewTabRightOfSelected.Checked = Properties.OptionsTabsPanelsPage.Default.OpenTabsRightOfSelected; + chkShowLogonInfoOnTabs.Checked = Properties.OptionsTabsPanelsPage.Default.ShowLogonInfoOnTabs; + chkShowProtocolOnTabs.Checked = Properties.OptionsTabsPanelsPage.Default.ShowProtocolOnTabs; + chkIdentifyQuickConnectTabs.Checked = Properties.OptionsTabsPanelsPage.Default.IdentifyQuickConnectTabs; + chkDoubleClickClosesTab.Checked = Properties.OptionsTabsPanelsPage.Default.DoubleClickOnTabClosesIt; + chkAlwaysShowPanelSelectionDlg.Checked = Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelSelectionDlg; + chkCreateEmptyPanelOnStart.Checked = Properties.OptionsTabsPanelsPage.Default.CreateEmptyPanelOnStartUp; + txtBoxPanelName.Text = Properties.OptionsTabsPanelsPage.Default.StartUpPanelName; UpdatePanelNameTextBox(); } @@ -53,18 +53,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.SaveSettings(); - Settings.Default.AlwaysShowPanelTabs = chkAlwaysShowPanelTabs.Checked; - Settings.Default.AlwaysShowConnectionTabs = chkAlwaysShowConnectionTabs.Checked; + Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelTabs = chkAlwaysShowPanelTabs.Checked; + Properties.OptionsTabsPanelsPage.Default.AlwaysShowConnectionTabs = chkAlwaysShowConnectionTabs.Checked; FrmMain.Default.ShowHidePanelTabs(); - Settings.Default.OpenTabsRightOfSelected = chkOpenNewTabRightOfSelected.Checked; - Settings.Default.ShowLogonInfoOnTabs = chkShowLogonInfoOnTabs.Checked; - Settings.Default.ShowProtocolOnTabs = chkShowProtocolOnTabs.Checked; - Settings.Default.IdentifyQuickConnectTabs = chkIdentifyQuickConnectTabs.Checked; - Settings.Default.DoubleClickOnTabClosesIt = chkDoubleClickClosesTab.Checked; - Settings.Default.AlwaysShowPanelSelectionDlg = chkAlwaysShowPanelSelectionDlg.Checked; - Settings.Default.CreateEmptyPanelOnStartUp = chkCreateEmptyPanelOnStart.Checked; - Settings.Default.StartUpPanelName = txtBoxPanelName.Text; + Properties.OptionsTabsPanelsPage.Default.OpenTabsRightOfSelected = chkOpenNewTabRightOfSelected.Checked; + Properties.OptionsTabsPanelsPage.Default.ShowLogonInfoOnTabs = chkShowLogonInfoOnTabs.Checked; + Properties.OptionsTabsPanelsPage.Default.ShowProtocolOnTabs = chkShowProtocolOnTabs.Checked; + Properties.OptionsTabsPanelsPage.Default.IdentifyQuickConnectTabs = chkIdentifyQuickConnectTabs.Checked; + Properties.OptionsTabsPanelsPage.Default.DoubleClickOnTabClosesIt = chkDoubleClickClosesTab.Checked; + Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelSelectionDlg = chkAlwaysShowPanelSelectionDlg.Checked; + Properties.OptionsTabsPanelsPage.Default.CreateEmptyPanelOnStartUp = chkCreateEmptyPanelOnStart.Checked; + Properties.OptionsTabsPanelsPage.Default.StartUpPanelName = txtBoxPanelName.Text; } private void UpdatePanelNameTextBox() diff --git a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs index 6266db90..dae03e3a 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs @@ -81,20 +81,17 @@ namespace mRemoteNG.UI.Forms.OptionsPages { base.SaveSettings(); - Settings.Default.ThemingActive = true; + Properties.OptionsThemePage.Default.ThemingActive = true; // Save the theme settings form close so we don't run into unexpected results while modifying... // Prompt the user that a restart is required to apply the new theme... if (cboTheme.SelectedItem != null ) // LoadSettings calls SaveSettings, so these might be null the first time around { - if (!Settings.Default.ThemeName.Equals(((ThemeInfo)cboTheme.SelectedItem).Name)) + if (!Properties.OptionsThemePage.Default.ThemeName.Equals(((ThemeInfo)cboTheme.SelectedItem).Name)) { - Settings.Default.ThemeName = ((ThemeInfo)cboTheme.SelectedItem).Name; - - CTaskDialog.MessageBox("Theme Changed", "Restart Required.", - "Please restart mRemoteNG to apply the selected theme.", - ETaskDialogButtons.Ok, ESysIcons.Information); + Properties.OptionsThemePage.Default.ThemeName = ((ThemeInfo)cboTheme.SelectedItem).Name; + CTaskDialog.MessageBox("Theme Changed", "Restart Required.", "Please restart mRemoteNG to apply the selected theme.", ETaskDialogButtons.Ok, ESysIcons.Information); } } diff --git a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs index d269b31e..95696fdb 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs @@ -60,19 +60,19 @@ namespace mRemoteNG.UI.Forms.OptionsPages public override void LoadSettings() { - chkCheckForUpdatesOnStartup.Checked = Settings.Default.CheckForUpdatesOnStartup; + chkCheckForUpdatesOnStartup.Checked = Properties.OptionsUpdatesPage.Default.CheckForUpdatesOnStartup; cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked; cboUpdateCheckFrequency.Items.Clear(); var nDaily = cboUpdateCheckFrequency.Items.Add(Language.Daily); var nWeekly = cboUpdateCheckFrequency.Items.Add(Language.Weekly); var nMonthly = cboUpdateCheckFrequency.Items.Add(Language.Monthly); - if (Settings.Default.CheckForUpdatesFrequencyDays < 1) + if (Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays < 1) { chkCheckForUpdatesOnStartup.Checked = false; cboUpdateCheckFrequency.SelectedIndex = nDaily; } // Daily else - switch (Settings.Default.CheckForUpdatesFrequencyDays) + switch (Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays) { case 1: cboUpdateCheckFrequency.SelectedIndex = nDaily; @@ -85,9 +85,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages break; default: var nCustom = - cboUpdateCheckFrequency.Items.Add(string.Format(Language.UpdateFrequencyCustom, - Settings - .Default.CheckForUpdatesFrequencyDays)); + cboUpdateCheckFrequency.Items.Add(string.Format(Language.UpdateFrequencyCustom, Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays)); cboUpdateCheckFrequency.SelectedIndex = nCustom; break; } @@ -95,7 +93,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages var stable = cboReleaseChannel.Items.Add(UpdateChannelInfo.STABLE); var beta = cboReleaseChannel.Items.Add(UpdateChannelInfo.PREVIEW); var dev = cboReleaseChannel.Items.Add(UpdateChannelInfo.NIGHTLY); - switch (Settings.Default.UpdateChannel) + switch (Properties.OptionsUpdatesPage.Default.UpdateChannel) { case UpdateChannelInfo.STABLE: cboReleaseChannel.SelectedIndex = stable; @@ -111,50 +109,49 @@ namespace mRemoteNG.UI.Forms.OptionsPages break; } - chkUseProxyForAutomaticUpdates.Checked = Settings.Default.UpdateUseProxy; - tblProxyBasic.Enabled = Settings.Default.UpdateUseProxy; - txtProxyAddress.Text = Settings.Default.UpdateProxyAddress; - numProxyPort.Value = Convert.ToDecimal(Settings.Default.UpdateProxyPort); + chkUseProxyForAutomaticUpdates.Checked = Properties.OptionsUpdatesPage.Default.UpdateUseProxy; + tblProxyBasic.Enabled = Properties.OptionsUpdatesPage.Default.UpdateUseProxy; + txtProxyAddress.Text = Properties.OptionsUpdatesPage.Default.UpdateProxyAddress; + numProxyPort.Value = Convert.ToDecimal(Properties.OptionsUpdatesPage.Default.UpdateProxyPort); - chkUseProxyAuthentication.Checked = Settings.Default.UpdateProxyUseAuthentication; - tblProxyAuthentication.Enabled = Settings.Default.UpdateProxyUseAuthentication; - txtProxyUsername.Text = Settings.Default.UpdateProxyAuthUser; + chkUseProxyAuthentication.Checked = Properties.OptionsUpdatesPage.Default.UpdateProxyUseAuthentication; + tblProxyAuthentication.Enabled = Properties.OptionsUpdatesPage.Default.UpdateProxyUseAuthentication; + txtProxyUsername.Text = Properties.OptionsUpdatesPage.Default.UpdateProxyAuthUser; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); txtProxyPassword.Text = - cryptographyProvider.Decrypt(Settings.Default.UpdateProxyAuthPass, Runtime.EncryptionKey); + cryptographyProvider.Decrypt(Properties.OptionsUpdatesPage.Default.UpdateProxyAuthPass, Runtime.EncryptionKey); - btnTestProxy.Enabled = Settings.Default.UpdateUseProxy; + btnTestProxy.Enabled = Properties.OptionsUpdatesPage.Default.UpdateUseProxy; } public override void SaveSettings() { base.SaveSettings(); - Settings.Default.CheckForUpdatesOnStartup = chkCheckForUpdatesOnStartup.Checked; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesOnStartup = chkCheckForUpdatesOnStartup.Checked; if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.Daily) { - Settings.Default.CheckForUpdatesFrequencyDays = 1; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays = 1; } else if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.Weekly) { - Settings.Default.CheckForUpdatesFrequencyDays = 7; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays = 7; } else if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.Monthly) { - Settings.Default.CheckForUpdatesFrequencyDays = 31; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays = 31; } - Settings.Default.UpdateChannel = cboReleaseChannel.Text; + Properties.OptionsUpdatesPage.Default.UpdateChannel = cboReleaseChannel.Text; - Settings.Default.UpdateUseProxy = chkUseProxyForAutomaticUpdates.Checked; - Settings.Default.UpdateProxyAddress = txtProxyAddress.Text; - Settings.Default.UpdateProxyPort = (int)numProxyPort.Value; + Properties.OptionsUpdatesPage.Default.UpdateUseProxy = chkUseProxyForAutomaticUpdates.Checked; + Properties.OptionsUpdatesPage.Default.UpdateProxyAddress = txtProxyAddress.Text; + Properties.OptionsUpdatesPage.Default.UpdateProxyPort = (int)numProxyPort.Value; - Settings.Default.UpdateProxyUseAuthentication = chkUseProxyAuthentication.Checked; - Settings.Default.UpdateProxyAuthUser = txtProxyUsername.Text; + Properties.OptionsUpdatesPage.Default.UpdateProxyUseAuthentication = chkUseProxyAuthentication.Checked; + Properties.OptionsUpdatesPage.Default.UpdateProxyAuthUser = txtProxyUsername.Text; var cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - Settings.Default.UpdateProxyAuthPass = - cryptographyProvider.Encrypt(txtProxyPassword.Text, Runtime.EncryptionKey); + Properties.OptionsUpdatesPage.Default.UpdateProxyAuthPass = cryptographyProvider.Encrypt(txtProxyPassword.Text, Runtime.EncryptionKey); } #endregion diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs index d914cffa..07c11e7b 100644 --- a/mRemoteNG/UI/Forms/frmMain.cs +++ b/mRemoteNG/UI/Forms/frmMain.cs @@ -30,7 +30,7 @@ using System.Windows.Forms; using mRemoteNG.UI.Panels; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.UI.Controls; -using Settings = mRemoteNG.Properties.Settings; +using mRemoteNG.Properties; using mRemoteNG.Resources.Language; // ReSharper disable MemberCanBePrivate.Global @@ -61,7 +61,7 @@ namespace mRemoteNG.UI.Forms private FrmMain() { - _showFullPathInTitle = Settings.Default.ShowCompleteConsPathInTitle; + _showFullPathInTitle = Properties.OptionsAppearancePage.Default.ShowCompleteConsPathInTitle; InitializeComponent(); Fullscreen = new FullscreenHandler(this); @@ -161,8 +161,8 @@ namespace mRemoteNG.UI.Forms var uiLoader = new DockPanelLayoutLoader(this, messageCollector); uiLoader.LoadPanelsFromXml(); - LockToolbarPositions(Settings.Default.LockToolbars); - Settings.Default.PropertyChanged += OnApplicationSettingChanged; + LockToolbarPositions(Properties.Settings.Default.LockToolbars); + Properties.Settings.Default.PropertyChanged += OnApplicationSettingChanged; _themeManager.ThemeChanged += ApplyTheme; @@ -170,7 +170,7 @@ namespace mRemoteNG.UI.Forms Runtime.WindowList = new WindowList(); - if (Settings.Default.ResetPanels) + if (Properties.App.Default.ResetPanels) SetDefaultLayout(); else SetLayout(); @@ -197,21 +197,19 @@ namespace mRemoteNG.UI.Forms FrmSplashScreen.getInstance().Close(); - if (Settings.Default.StartMinimized) + if (Properties.OptionsStartupExitPage.Default.StartMinimized) { WindowState = FormWindowState.Minimized; - if (Settings.Default.MinimizeToTray) + if (Properties.OptionsAppearancePage.Default.MinimizeToTray) ShowInTaskbar = false; } - if (Settings.Default.StartFullScreen) + if (Properties.OptionsStartupExitPage.Default.StartFullScreen) { Fullscreen.Value = true; } - if (!Settings.Default.CreateEmptyPanelOnStartUp) return; - var panelName = !string.IsNullOrEmpty(Settings.Default.StartUpPanelName) - ? Settings.Default.StartUpPanelName - : Language.NewPanel; + if (!Properties.OptionsTabsPanelsPage.Default.CreateEmptyPanelOnStartUp) return; + var panelName = !string.IsNullOrEmpty(Properties.OptionsTabsPanelsPage.Default.StartUpPanelName) ? Properties.OptionsTabsPanelsPage.Default.StartUpPanelName : Language.NewPanel; var panelAdder = new PanelAdder(); if (!panelAdder.DoesPanelExist(panelName)) @@ -230,20 +228,20 @@ namespace mRemoteNG.UI.Forms { switch (propertyChangedEventArgs.PropertyName) { - case nameof(Settings.LockToolbars): - LockToolbarPositions(Settings.Default.LockToolbars); + case nameof(Properties.Settings.LockToolbars): + LockToolbarPositions(Properties.Settings.Default.LockToolbars); break; - case nameof(Settings.ViewMenuExternalTools): - LockToolbarPositions(Settings.Default.LockToolbars); + case nameof(Properties.Settings.ViewMenuExternalTools): + LockToolbarPositions(Properties.Settings.Default.LockToolbars); break; - case nameof(Settings.ViewMenuMessages): - LockToolbarPositions(Settings.Default.LockToolbars); + case nameof(Properties.Settings.ViewMenuMessages): + LockToolbarPositions(Properties.Settings.Default.LockToolbars); break; - case nameof(Settings.ViewMenuMultiSSH): - LockToolbarPositions(Settings.Default.LockToolbars); + case nameof(Properties.Settings.ViewMenuMultiSSH): + LockToolbarPositions(Properties.Settings.Default.LockToolbars); break; - case nameof(Settings.ViewMenuQuickConnect): - LockToolbarPositions(Settings.Default.LockToolbars); + case nameof(Properties.Settings.ViewMenuQuickConnect): + LockToolbarPositions(Properties.Settings.Default.LockToolbars); break; default: return; @@ -268,14 +266,12 @@ namespace mRemoteNG.UI.Forms UpdateWindowTitle(); } - private void ConnectionsServiceOnConnectionsSaved(object sender, - ConnectionsSavedEventArgs connectionsSavedEventArgs) + private void ConnectionsServiceOnConnectionsSaved(object sender, ConnectionsSavedEventArgs connectionsSavedEventArgs) { if (connectionsSavedEventArgs.UsingDatabase) return; - _backupPruner.PruneBackupFiles(connectionsSavedEventArgs.ConnectionFileName, - Settings.Default.BackupFileKeepCount); + _backupPruner.PruneBackupFiles(connectionsSavedEventArgs.ConnectionFileName, Properties.OptionsBackupPage.Default.BackupFileKeepCount); } private void SetMenuDependencies() @@ -344,7 +340,7 @@ namespace mRemoteNG.UI.Forms private void PromptForUpdatesPreference() { - if (Settings.Default.CheckForUpdatesAsked) return; + if (Properties.OptionsUpdatesPage.Default.CheckForUpdatesAsked) return; string[] commandButtons = { Language.AskUpdatesCommandRecommended, @@ -352,15 +348,11 @@ namespace mRemoteNG.UI.Forms Language.AskUpdatesCommandAskLater }; - CTaskDialog.ShowTaskDialogBox(this, GeneralAppInfo.ProductName, Language.AskUpdatesMainInstruction, - string.Format(Language.AskUpdatesContent, GeneralAppInfo.ProductName), - "", "", "", "", string.Join(" | ", commandButtons), ETaskDialogButtons.None, - ESysIcons.Question, - ESysIcons.Question); + CTaskDialog.ShowTaskDialogBox(this, GeneralAppInfo.ProductName, Language.AskUpdatesMainInstruction, string.Format(Language.AskUpdatesContent, GeneralAppInfo.ProductName), "", "", "", "", string.Join(" | ", commandButtons), ETaskDialogButtons.None, ESysIcons.Question, ESysIcons.Question); if (CTaskDialog.CommandButtonResult == 0 | CTaskDialog.CommandButtonResult == 1) { - Settings.Default.CheckForUpdatesAsked = true; + Properties.OptionsUpdatesPage.Default.CheckForUpdatesAsked = true; } if (CTaskDialog.CommandButtonResult != 1) return; @@ -373,12 +365,12 @@ namespace mRemoteNG.UI.Forms private async Task CheckForUpdates() { - if (!Settings.Default.CheckForUpdatesOnStartup) return; + if (!Properties.OptionsUpdatesPage.Default.CheckForUpdatesOnStartup) return; var nextUpdateCheck = - Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Settings.Default.CheckForUpdatesFrequencyDays)))); + Convert.ToDateTime(Properties.OptionsUpdatesPage.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Properties.OptionsUpdatesPage.Default.CheckForUpdatesFrequencyDays)))); - if (!Settings.Default.UpdatePending && DateTime.UtcNow <= nextUpdateCheck) return; + if (!Properties.OptionsUpdatesPage.Default.UpdatePending && DateTime.UtcNow <= nextUpdateCheck) return; if (!IsHandleCreated) CreateHandle(); // Make sure the handle is created so that InvokeRequired returns the correct result @@ -399,7 +391,7 @@ namespace mRemoteNG.UI.Forms Hide(); - if (Settings.Default.CloseToTray) + if (Properties.OptionsAppearancePage.Default.CloseToTray) { if (Runtime.NotificationAreaIcon == null) Runtime.NotificationAreaIcon = new NotificationAreaIcon(); @@ -429,18 +421,14 @@ namespace mRemoteNG.UI.Forms } if (openConnections > 0 && - (Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All | - (Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & - openConnections > 1) || Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Exit)) + (Properties.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All | + (Properties.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & + openConnections > 1) || Properties.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Exit)) { - var result = CTaskDialog.MessageBox(this, Application.ProductName, - Language.ConfirmExitMainInstruction, "", "", "", - Language.CheckboxDoNotShowThisMessageAgain, - ETaskDialogButtons.YesNo, ESysIcons.Question, - ESysIcons.Question); + var result = CTaskDialog.MessageBox(this, Application.ProductName, Language.ConfirmExitMainInstruction, "", "", "", Language.CheckboxDoNotShowThisMessageAgain, ETaskDialogButtons.YesNo, ESysIcons.Question, ESysIcons.Question); if (CTaskDialog.VerificationChecked) { - Settings.Default.ConfirmCloseConnection--; + Properties.Settings.Default.ConfirmCloseConnection--; } if (result == DialogResult.No) @@ -482,7 +470,7 @@ namespace mRemoteNG.UI.Forms { if (WindowState == FormWindowState.Minimized) { - if (!Settings.Default.MinimizeToTray) return; + if (!Properties.OptionsAppearancePage.Default.MinimizeToTray) return; if (Runtime.NotificationAreaIcon == null) { Runtime.NotificationAreaIcon = new NotificationAreaIcon(); @@ -664,9 +652,7 @@ namespace mRemoteNG.UI.Forms if (!string.IsNullOrEmpty(Runtime.ConnectionsService.ConnectionFileName)) { titleBuilder.Append(separator); - titleBuilder.Append(Settings.Default.ShowCompleteConsPathInTitle - ? Runtime.ConnectionsService.ConnectionFileName - : Path.GetFileName(Runtime.ConnectionsService.ConnectionFileName)); + titleBuilder.Append(Properties.OptionsAppearancePage.Default.ShowCompleteConsPathInTitle ? Runtime.ConnectionsService.ConnectionFileName : Path.GetFileName(Runtime.ConnectionsService.ConnectionFileName)); } } } @@ -676,7 +662,7 @@ namespace mRemoteNG.UI.Forms titleBuilder.Append(separator); titleBuilder.Append(SelectedConnection.Name); - if (Settings.Default.TrackActiveConnectionInConnectionTree) + if (Properties.Settings.Default.TrackActiveConnectionInConnectionTree) Windows.TreeForm.JumpToNode(SelectedConnection); } @@ -687,7 +673,7 @@ namespace mRemoteNG.UI.Forms { DocumentStyle newDocumentStyle; - if (Settings.Default.AlwaysShowPanelTabs) + if (Properties.OptionsTabsPanelsPage.Default.AlwaysShowPanelTabs) { newDocumentStyle = DocumentStyle.DockingWindow; // Show the panel tabs } @@ -749,7 +735,7 @@ namespace mRemoteNG.UI.Forms { pnlDock.Visible = false; - if (Settings.Default.ViewMenuMessages == true) + if (Properties.Settings.Default.ViewMenuMessages == true) { Windows.ErrorsForm.Show(pnlDock, DockState.DockBottomAutoHide); viewMenu._mMenViewErrorsAndInfos.Checked = true; @@ -758,7 +744,7 @@ namespace mRemoteNG.UI.Forms viewMenu._mMenViewErrorsAndInfos.Checked = false; - if (Settings.Default.ViewMenuExternalTools == true) + if (Properties.Settings.Default.ViewMenuExternalTools == true) { viewMenu.TsExternalTools.Visible = true; viewMenu._mMenViewExtAppsToolbar.Checked = true; @@ -769,7 +755,7 @@ namespace mRemoteNG.UI.Forms viewMenu._mMenViewExtAppsToolbar.Checked = false; } - if (Settings.Default.ViewMenuMultiSSH == true) + if (Properties.Settings.Default.ViewMenuMultiSSH == true) { viewMenu.TsMultiSsh.Visible = true; viewMenu._mMenViewMultiSshToolbar.Checked = true; @@ -780,7 +766,7 @@ namespace mRemoteNG.UI.Forms viewMenu._mMenViewMultiSshToolbar.Checked = false; } - if (Settings.Default.ViewMenuQuickConnect == true) + if (Properties.Settings.Default.ViewMenuQuickConnect == true) { viewMenu.TsQuickConnect.Visible = true; viewMenu._mMenViewQuickConnectToolbar.Checked = true; @@ -791,14 +777,14 @@ namespace mRemoteNG.UI.Forms viewMenu._mMenViewQuickConnectToolbar.Checked = false; } - if (Settings.Default.LockToolbars == true) + if (Properties.Settings.Default.LockToolbars == true) { - Settings.Default.LockToolbars = true; + Properties.Settings.Default.LockToolbars = true; viewMenu._mMenViewLockToolbars.Checked = true; } else { - Settings.Default.LockToolbars = false; + Properties.Settings.Default.LockToolbars = false; viewMenu._mMenViewLockToolbars.Checked = false; } diff --git a/mRemoteNG/UI/Forms/frmOptions.cs b/mRemoteNG/UI/Forms/frmOptions.cs index 0ed14f95..9090ee17 100644 --- a/mRemoteNG/UI/Forms/frmOptions.cs +++ b/mRemoteNG/UI/Forms/frmOptions.cs @@ -37,7 +37,7 @@ namespace mRemoteNG.UI.Forms FontOverrider.FontOverride(this); AddOptionsPagesToListView(); SetInitiallyActivatedPage(); - // ApplyLanguage(); + //ApplyLanguage(); // Handle the main page here and the individual pages in // AddOptionsPagesToListView() -- one less foreach loop.... Text = Language.OptionsPageTitle; diff --git a/mRemoteNG/UI/Menu/FileMenu.cs b/mRemoteNG/UI/Menu/FileMenu.cs index f12cdea8..2f2de7db 100644 --- a/mRemoteNG/UI/Menu/FileMenu.cs +++ b/mRemoteNG/UI/Menu/FileMenu.cs @@ -180,17 +180,16 @@ namespace mRemoteNG.UI.Menu var newFileName = saveFileDialog.FileName; - Runtime.ConnectionsService.SaveConnections(Runtime.ConnectionsService.ConnectionTreeModel, false, - new SaveFilter(), newFileName); + Runtime.ConnectionsService.SaveConnections(Runtime.ConnectionsService.ConnectionTreeModel, false, new SaveFilter(), newFileName); if (newFileName == Runtime.ConnectionsService.GetDefaultStartupConnectionFileName()) { - Settings.Default.LoadConsFromCustomLocation = false; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = false; } else { - Settings.Default.LoadConsFromCustomLocation = true; - Settings.Default.CustomConsPath = newFileName; + Properties.OptionsBackupPage.Default.LoadConsFromCustomLocation = true; + Properties.OptionsBackupPage.Default.BackupFilePath = newFileName; } } } diff --git a/mRemoteNG/UI/Menu/ViewMenu.cs b/mRemoteNG/UI/Menu/ViewMenu.cs index 3ae4b540..bd9dd21f 100644 --- a/mRemoteNG/UI/Menu/ViewMenu.cs +++ b/mRemoteNG/UI/Menu/ViewMenu.cs @@ -162,7 +162,7 @@ namespace mRemoteNG.UI.Menu _mMenViewFullscreen.ShortcutKeys = Keys.F11; _mMenViewFullscreen.Size = new System.Drawing.Size(228, 22); _mMenViewFullscreen.Text = Language.Fullscreen; - _mMenViewFullscreen.Checked = Settings.Default.MainFormKiosk; + _mMenViewFullscreen.Checked = Properties.App.Default.MainFormKiosk; _mMenViewFullscreen.Click += mMenViewFullscreen_Click; } diff --git a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs index 999cf168..47e56f51 100644 --- a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs +++ b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs @@ -1393,7 +1393,7 @@ namespace mRemoteNG.UI.Tabs if (m.Msg == (int)Msgs.WM_LBUTTONDBLCLK) { // If the option is not set, do nothing. Do not send the message to base. - if (!Settings.Default.DoubleClickOnTabClosesIt) return; + if (!Properties.OptionsTabsPanelsPage.Default.DoubleClickOnTabClosesIt) return; // Option is set, close the tab, then send to base. //DockPane.CloseActiveContent(); diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs index 3a5e4436..5c9ff5a0 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs @@ -141,7 +141,7 @@ namespace mRemoteNG.UI.Window new RootNodeExpander() }; - if (Settings.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect) + if (Properties.OptionsStartupExitPage.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect) actions.Add(new PreviousSessionOpener(Runtime.ConnectionInitiator)); ConnectionTree.PostSetupActions = actions; diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs index 792a8b6f..42dc43ea 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.cs @@ -103,14 +103,14 @@ namespace mRemoteNG.UI.Window { //Set the connection text based on name and preferences string titleText; - if (Settings.Default.ShowProtocolOnTabs) + if (Properties.OptionsTabsPanelsPage.Default.ShowProtocolOnTabs) titleText = connectionInfo.Protocol + @": "; else titleText = ""; titleText += connectionInfo.Name; - if (Settings.Default.ShowLogonInfoOnTabs) + if (Properties.OptionsTabsPanelsPage.Default.ShowLogonInfoOnTabs) { titleText += @" ("; if (connectionInfo.Domain != "") diff --git a/mRemoteNG/mRemoteNG.csproj b/mRemoteNG/mRemoteNG.csproj index 7bc981f4..d8bd3803 100644 --- a/mRemoteNG/mRemoteNG.csproj +++ b/mRemoteNG/mRemoteNG.csproj @@ -92,11 +92,81 @@ + + True + True + OptionsBackupPage.settings + + + True + True + OptionsAdvancedPage.settings + + + True + True + OptionsAppearancePage.settings + + + True + True + OptionsConnectionsPage.settings + + + True + True + OptionsCredentialsPage.settings + + + True + True + OptionsDBsPage.settings + + + True + True + OptionsNotificationsPage.settings + + + True + True + OptionsSecurityPage.settings + + + True + True + OptionsStartupExitPage.settings + + + True + True + OptionsTabsPanelsPage.settings + + + True + True + OptionsThemePage.settings + True True Settings.settings + + True + True + AppUI.settings + + + True + True + App.settings + + + True + True + OptionsUpdatesPage.settings + @@ -217,6 +287,50 @@ Always + + SettingsSingleFileGenerator + OptionsBackupPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsAdvancedPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsAppearancePage.Designer.cs + + + SettingsSingleFileGenerator + OptionsConnectionsPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsCredentialsPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsDBsPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsNotificationsPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsSecurityPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsStartupExitPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsTabsPanelsPage.Designer.cs + + + SettingsSingleFileGenerator + OptionsThemePage.Designer.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -224,6 +338,18 @@ Always + + SettingsSingleFileGenerator + AppUI.Designer.cs + + + SettingsSingleFileGenerator + App.Designer.cs + + + SettingsSingleFileGenerator + OptionsUpdatesPage.Designer.cs + Always diff --git a/mRemoteNGTests/mRemoteNGTests.csproj b/mRemoteNGTests/mRemoteNGTests.csproj index bb0e7bd6..56266181 100644 --- a/mRemoteNGTests/mRemoteNGTests.csproj +++ b/mRemoteNGTests/mRemoteNGTests.csproj @@ -15,7 +15,7 @@ - +