From c0a62407643aafc9a98398cab3abc6e6ed7a71ce Mon Sep 17 00:00:00 2001 From: Faryan Rezagholi Date: Sat, 13 Jun 2020 01:06:41 +0200 Subject: [PATCH] adjusted namespace --- mRemoteNG/App/CompatibilityChecker.cs | 2 + mRemoteNG/App/Export.cs | 4 +- mRemoteNG/App/Import.cs | 1 + mRemoteNG/App/Info/UpdateChannelInfo.cs | 1 + .../App/Initialization/CredsAndConsSetup.cs | 1 + .../Initialization/MessageCollectorSetup.cs | 1 + .../App/Initialization/StartupDataLogger.cs | 1 + mRemoteNG/App/Logger.cs | 1 + mRemoteNG/App/ProgramRoot.cs | 1 + mRemoteNG/App/Runtime.cs | 2 + mRemoteNG/App/Shutdown.cs | 2 + mRemoteNG/App/Startup.cs | 1 + mRemoteNG/App/SupportedCultures.cs | 1 + mRemoteNG/App/Update/AppUpdater.cs | 1 + .../Config/Connections/CsvConnectionsSaver.cs | 2 +- .../Multiuser/SqlConnectionsUpdateChecker.cs | 11 ++- .../Connections/SaveConnectionsOnEdit.cs | 2 +- .../Connections/SqlConnectionsLoader.cs | 2 +- .../Config/Connections/SqlConnectionsSaver.cs | 5 +- .../Connections/XmlConnectionsLoader.cs | 2 +- .../Config/Connections/XmlConnectionsSaver.cs | 4 +- .../Config/DataProviders/FileBackupCreator.cs | 5 +- .../Config/DataProviders/FileBackupPruner.cs | 2 +- .../Config/DataProviders/SqlDataProvider.cs | 2 +- .../DatabaseConnectorFactory.cs | 10 +-- .../Config/Import/ActiveDirectoryImporter.cs | 1 + .../Config/Import/MRemoteNGCsvImporter.cs | 2 +- .../Config/Import/MRemoteNGXmlImporter.cs | 2 +- mRemoteNG/Config/Import/PortScanImporter.cs | 1 + .../Import/PuttyConnectionManagerImporter.cs | 1 + .../Import/RemoteDesktopConnectionImporter.cs | 1 + .../RemoteDesktopConnectionManagerImporter.cs | 1 + ...vConnectionsDeserializerMremotengFormat.cs | 2 +- ...CsvConnectionsSerializerMremotengFormat.cs | 10 +-- .../MsSql/DataTableDeserializer.cs | 18 ++--- .../MsSql/DataTableSerializer.cs | 14 ++-- .../MsSql/LocalConnectionPropertiesModel.cs | 2 +- .../LocalConnectionPropertiesXmlSerializer.cs | 2 +- .../MsSql/SqlConnectionListMetaData.cs | 2 +- .../MsSql/SqlDatabaseMetaDataRetriever.cs | 2 +- .../Xml/XmlConnectionNodeSerializer26.cs | 10 +-- .../Xml/XmlConnectionNodeSerializer27.cs | 10 +-- .../Xml/XmlConnectionSerializerFactory.cs | 2 +- .../Xml/XmlConnectionsDeserializer.cs | 16 ++--- .../Xml/XmlConnectionsDocumentCompiler.cs | 12 ++-- .../Xml/XmlConnectionsDocumentEncryptor.cs | 2 +- .../Xml/XmlConnectionsSerializer.cs | 14 ++-- .../Xml/XmlRootNodeSerializer.cs | 8 +-- .../ActiveDirectoryDeserializer.cs | 4 +- .../MiscSerializers/PortScanDeserializer.cs | 3 +- .../PuttyConnectionManagerDeserializer.cs | 2 +- .../RemoteDesktopConnectionDeserializer.cs | 6 +- ...oteDesktopConnectionManagerDeserializer.cs | 4 +- .../Versioning/SqlDatabaseVersionVerifier.cs | 1 + .../Config/Settings/ExternalAppsLoader.cs | 2 +- mRemoteNG/Config/Settings/Settings.cs | 2 +- mRemoteNG/Config/Settings/SettingsLoader.cs | 72 +++++++++---------- mRemoteNG/Config/Settings/SettingsSaver.cs | 42 +++++------ .../Connection/AbstractConnectionRecord.cs | 2 + mRemoteNG/Connection/ConnectionInfo.cs | 2 + .../Connection/ConnectionInfoInheritance.cs | 1 + mRemoteNG/Connection/ConnectionInitiator.cs | 2 + mRemoteNG/Connection/ConnectionsService.cs | 4 +- .../Http/Connection.Protocol.HTTPBase.cs | 1 + .../Connection/Protocol/ICA/IcaProtocol.cs | 2 + .../Connection/Protocol/IntegratedProgram.cs | 2 + .../Connection.Protocol.PowerShell.cs | 1 + .../Connection/Protocol/ProtocolFactory.cs | 2 + mRemoteNG/Connection/Protocol/ProtocolType.cs | 3 +- mRemoteNG/Connection/Protocol/PuttyBase.cs | 2 + .../Protocol/RDP/AuthenticationLevel.cs | 3 +- .../Protocol/RDP/RDGatewayUsageMethod.cs | 3 +- .../RDP/RDGatewayUseConnectionCredentials.cs | 3 +- .../Connection/Protocol/RDP/RDPColors.cs | 3 +- .../Connection/Protocol/RDP/RDPResolutions.cs | 1 + .../Protocol/RDP/RDPSoundQuality.cs | 3 +- .../Connection/Protocol/RDP/RDPSounds.cs | 3 +- .../Connection/Protocol/RDP/RdpErrorCodes.cs | 1 + .../Connection/Protocol/RDP/RdpProtocol6.cs | 2 + .../Connection/Protocol/RDP/RdpProtocol7.cs | 1 + .../Connection/Protocol/RDP/RdpProtocol8.cs | 1 + .../Protocol/VNC/Connection.Protocol.VNC.cs | 1 + mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs | 1 + mRemoteNG/Connection/PuttySessionInfo.cs | 1 + mRemoteNG/Connection/WebHelper.cs | 1 + .../CredentialDeletionMsgBoxConfirmer.cs | 1 + .../Credential/PlaceholderCredentialRecord.cs | 1 + .../IMessageTypeFilteringOptions.cs | 2 +- .../LogMessageTypeFilteringOptions.cs | 4 +- ...otificationPanelMessageFilteringOptions.cs | 4 +- ...ionPanelSwitchOnMessageFilteringOptions.cs | 4 +- .../PopupMessageFilteringOptions.cs | 4 +- .../MessageWriters/PopupMessageWriter.cs | 1 + .../WriterDecorators/MessageFocusDecorator.cs | 1 + .../MessageTypeFilterDecorator.cs | 1 + mRemoteNG/Properties/Resources.Designer.cs | 5 +- mRemoteNG/Properties/Settings.Designer.cs | 2 +- .../Resources/Language/Language.Designer.cs | 5 +- .../Themes/ColorMapTheme.Designer.cs | 5 +- .../CryptoProviderFactoryFromSettings.cs | 4 +- .../PasswordIncludesLowerCaseConstraint.cs | 1 + .../PasswordIncludesNumbersConstraint.cs | 1 + ...wordIncludesSpecialCharactersConstraint.cs | 1 + .../PasswordIncludesUpperCaseConstraint.cs | 1 + .../PasswordLengthConstraint.cs | 1 + .../AeadCryptographyProvider.cs | 1 + .../LegacyRijndaelCryptographyProvider.cs | 1 + .../Themes/MremoteNGPaletteManipulator.cs | 1 + mRemoteNG/Themes/ThemeManager.cs | 1 + .../Cmdline/StartupArgumentsInterpreter.cs | 2 + .../ConnectionsTreeToMenuItemsConverter.cs | 6 +- mRemoteNG/Tools/ExternalTool.cs | 5 +- mRemoteNG/Tools/ExternalToolArgumentParser.cs | 1 + mRemoteNG/Tools/MiscTools.cs | 4 +- mRemoteNG/Tools/NotificationAreaIcon.cs | 6 +- mRemoteNG/Tools/ProcessController.cs | 1 + mRemoteNG/Tools/PuttyProcessController.cs | 1 + mRemoteNG/Tools/ReconnectGroup.Designer.cs | 6 +- mRemoteNG/Tools/ReconnectGroup.cs | 3 +- mRemoteNG/Tools/ScanHost.cs | 1 + mRemoteNG/Tools/SecureTransfer.cs | 1 + mRemoteNG/Tools/Tools.LocalizedAttributes.cs | 1 + .../ClickHandlers/ExpandNodeClickHandler.cs | 5 +- .../ClickHandlers/ITreeNodeClickHandler.cs | 2 +- .../OpenConnectionClickHandler.cs | 3 +- .../SwitchToConnectionClickHandler.cs | 3 +- .../TreeNodeCompositeClickHandler.cs | 3 +- .../Tree/ConnectionTreeDragAndDropHandler.cs | 1 + mRemoteNG/Tree/ConnectionTreeModel.cs | 1 + mRemoteNG/Tree/PreviousSessionOpener.cs | 1 + .../Tree/PreviouslyOpenedFolderExpander.cs | 1 + mRemoteNG/Tree/Root/RootNodeInfo.cs | 1 + .../Tree/Root/RootPuttySessionsNodeInfo.cs | 4 +- mRemoteNG/Tree/RootNodeExpander.cs | 1 + .../SelectedConnectionDeletionConfirmer.cs | 1 + mRemoteNG/UI/Controls/Base/NGSearchBox.cs | 3 +- .../UI/Controls/ConnectionContextMenu.cs | 43 +++++------ .../ConnectionInfoPropertyGrid.cs | 2 + .../ConnectionTree/ConnectionTree.Designer.cs | 2 +- .../Controls/ConnectionTree/ConnectionTree.cs | 5 +- .../ConnectionTreeSearchTextFilter.cs | 2 +- .../ConnectionTree/IConnectionTree.cs | 3 +- .../ConnectionTree/IConnectionTreeDelegate.cs | 2 +- .../UI/Controls/ConnectionTree/NameColumn.cs | 2 +- .../UI/Controls/CredentialRecordListBox.cs | 1 + .../UI/Controls/CredentialRecordListView.cs | 1 + .../UI/Controls/ExternalToolsToolStrip.cs | 1 + mRemoteNG/UI/Controls/IPTextBox.cs | 1 + mRemoteNG/UI/Controls/MultiSshToolStrip.cs | 1 + .../NewPasswordWithVerification.Designer.cs | 2 +- mRemoteNG/UI/Controls/QuickConnectComboBox.cs | 1 + .../UI/Controls/QuickConnectToolStrip.cs | 10 +-- mRemoteNG/UI/Controls/StatusImageList.cs | 8 +-- mRemoteNG/UI/DialogFactory.cs | 1 + mRemoteNG/UI/Forms/ExportForm.Designer.cs | 2 +- mRemoteNG/UI/Forms/ExportForm.cs | 1 + mRemoteNG/UI/Forms/FrmAbout.Designer.cs | 4 +- mRemoteNG/UI/Forms/FrmAbout.cs | 10 +-- .../UI/Forms/FrmSplashScreen.Designer.cs | 2 +- mRemoteNG/UI/Forms/Input/FrmInputBox.cs | 1 + .../OptionsPages/AdvancedPage.Designer.cs | 2 +- .../UI/Forms/OptionsPages/AdvancedPage.cs | 6 +- .../UI/Forms/OptionsPages/AppearancePage.cs | 4 +- .../UI/Forms/OptionsPages/ComponentsPage.cs | 20 +++--- .../OptionsPages/ConnectionsPage.Designer.cs | 2 +- .../UI/Forms/OptionsPages/ConnectionsPage.cs | 4 +- .../UI/Forms/OptionsPages/CredentialsPage.cs | 4 +- .../Forms/OptionsPages/NotificationsPage.cs | 4 +- .../UI/Forms/OptionsPages/SecurityPage.cs | 6 +- .../OptionsPages/SqlServerPage.Designer.cs | 2 +- .../UI/Forms/OptionsPages/SqlServerPage.cs | 10 +-- .../UI/Forms/OptionsPages/StartupExitPage.cs | 4 +- .../OptionsPages/TabsPanelsPage.Designer.cs | 2 +- .../UI/Forms/OptionsPages/TabsPanelsPage.cs | 5 +- mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs | 4 +- .../UI/Forms/OptionsPages/UpdatesPage.cs | 4 +- mRemoteNG/UI/Forms/PasswordForm.Designer.cs | 6 +- mRemoteNG/UI/Forms/PasswordForm.cs | 1 + .../UI/Forms/UnhandledExceptionWindow.cs | 1 + mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs | 8 +-- mRemoteNG/UI/Forms/frmChoosePanel.cs | 1 + mRemoteNG/UI/Forms/frmMain.cs | 2 + mRemoteNG/UI/Forms/frmOptions.cs | 4 +- mRemoteNG/UI/Menu/AdvancedWindowMenu.cs | 1 + mRemoteNG/UI/Menu/FileMenu.cs | 24 ++++--- mRemoteNG/UI/Menu/HelpMenu.cs | 16 +++-- mRemoteNG/UI/Menu/ToolsMenu.cs | 13 ++-- mRemoteNG/UI/Menu/ViewMenu.cs | 30 ++++---- mRemoteNG/UI/Panels/PanelAdder.cs | 9 +-- mRemoteNG/UI/Tabs/ConnectionTab.cs | 2 + mRemoteNG/UI/Tabs/DockPaneStripNG.cs | 2 + mRemoteNG/UI/TaskDialog/CommandButton.cs | 4 +- mRemoteNG/UI/TaskDialog/frmTaskDialog.cs | 1 + .../ActiveDirectoryImportWindow.Designer.cs | 2 +- .../UI/Window/ActiveDirectoryImportWindow.cs | 1 + mRemoteNG/UI/Window/ConfigWindow.cs | 24 ++++--- .../Window/ConnectionTreeWindow.Designer.cs | 33 +++++---- mRemoteNG/UI/Window/ConnectionTreeWindow.cs | 10 ++- .../UI/Window/ConnectionWindow.Designer.cs | 30 ++++---- mRemoteNG/UI/Window/ConnectionWindow.cs | 4 +- .../UI/Window/ErrorAndInfoWindow.Designer.cs | 14 ++-- mRemoteNG/UI/Window/ErrorAndInfoWindow.cs | 17 ++--- .../UI/Window/ExternalToolsWindow.Designer.cs | 12 ++-- mRemoteNG/UI/Window/ExternalToolsWindow.cs | 1 + mRemoteNG/UI/Window/HelpWindow.Designer.cs | 2 +- .../UI/Window/PortScanWindow.Designer.cs | 2 +- mRemoteNG/UI/Window/PortScanWindow.cs | 1 + mRemoteNG/UI/Window/SSHTransferWindow.cs | 3 +- .../UI/Window/ScreenshotManagerWindow.cs | 13 ++-- mRemoteNG/UI/Window/UltraVNCWindow.cs | 3 +- mRemoteNG/UI/Window/UpdateWindow.Designer.cs | 2 +- mRemoteNG/UI/Window/UpdateWindow.cs | 1 + .../Config/CredentialHarvesterTests.cs | 2 +- ...ectionsDeserializerMremotengFormatTests.cs | 2 +- ...nnectionsSerializerMremotengFormatTests.cs | 2 +- .../Xml/ValidateXmlSchemas.cs | 4 +- .../Xml/XmlConnectionsDeserializerTests.cs | 2 +- .../XmlConnectionsDocumentCompilerTests.cs | 4 +- .../XmlConnectionsDocumentEncryptorTests.cs | 4 +- .../Xml/XmlConnectionsSerializerTests.cs | 4 +- .../Xml/XmlRootNodeSerializerTests.cs | 2 +- .../Serializers/DataTableDeserializerTests.cs | 2 +- .../Serializers/DataTableSerializerTests.cs | 2 +- .../PortScanDeserializerTests.cs | 1 + ...PuttyConnectionManagerDeserializerTests.cs | 1 + ...emoteDesktopConnectionDeserializerTests.cs | 1 + ...topConnectionManager27DeserializerTests.cs | 1 + ...sktopConnectionManagerDeserializerTests.cs | 1 + .../XmlSerializationLifeCycleTests.cs | 4 +- .../MessageTypeFilterDecoratorTests.cs | 1 + .../ExpandNodeClickHandlerTests.cs | 2 + .../OpenConnectionClickHandlerTests.cs | 1 + .../SwitchToConnectionClickHandlerTests.cs | 1 + .../TreeNodeCompositeClickHandlerTests.cs | 1 + mRemoteNGTests/Tree/ConnectionTreeTests.cs | 1 + .../Tree/PreviousSessionOpenerTests.cs | 1 + .../PreviouslyOpenedFolderExpanderTests.cs | 1 + .../UI/Controls/ConnectionTreeTests.cs | 1 + 238 files changed, 621 insertions(+), 432 deletions(-) diff --git a/mRemoteNG/App/CompatibilityChecker.cs b/mRemoteNG/App/CompatibilityChecker.cs index 0920681e..6b791398 100644 --- a/mRemoteNG/App/CompatibilityChecker.cs +++ b/mRemoteNG/App/CompatibilityChecker.cs @@ -4,6 +4,8 @@ using System.Windows.Forms; using Microsoft.Win32; using mRemoteNG.App.Info; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.UI.TaskDialog; diff --git a/mRemoteNG/App/Export.cs b/mRemoteNG/App/Export.cs index df8baad3..25408132 100644 --- a/mRemoteNG/App/Export.cs +++ b/mRemoteNG/App/Export.cs @@ -4,8 +4,8 @@ using System.Windows.Forms; using mRemoteNG.Config.Connections; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; -using mRemoteNG.Config.Serializers.Csv; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; diff --git a/mRemoteNG/App/Import.cs b/mRemoteNG/App/Import.cs index bf496321..7ed9e5a3 100644 --- a/mRemoteNG/App/Import.cs +++ b/mRemoteNG/App/Import.cs @@ -6,6 +6,7 @@ using mRemoteNG.Config.Import; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.App diff --git a/mRemoteNG/App/Info/UpdateChannelInfo.cs b/mRemoteNG/App/Info/UpdateChannelInfo.cs index c5f3ec46..17b03841 100644 --- a/mRemoteNG/App/Info/UpdateChannelInfo.cs +++ b/mRemoteNG/App/Info/UpdateChannelInfo.cs @@ -1,4 +1,5 @@ using System; +using mRemoteNG.Properties; // ReSharper disable InconsistentNaming diff --git a/mRemoteNG/App/Initialization/CredsAndConsSetup.cs b/mRemoteNG/App/Initialization/CredsAndConsSetup.cs index 43a0ac08..935e3eea 100644 --- a/mRemoteNG/App/Initialization/CredsAndConsSetup.cs +++ b/mRemoteNG/App/Initialization/CredsAndConsSetup.cs @@ -1,5 +1,6 @@ using System.IO; using mRemoteNG.Config.Connections; +using mRemoteNG.Properties; namespace mRemoteNG.App.Initialization { diff --git a/mRemoteNG/App/Initialization/MessageCollectorSetup.cs b/mRemoteNG/App/Initialization/MessageCollectorSetup.cs index faf6a394..9c51237a 100644 --- a/mRemoteNG/App/Initialization/MessageCollectorSetup.cs +++ b/mRemoteNG/App/Initialization/MessageCollectorSetup.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using mRemoteNG.Messages; +using mRemoteNG.Messages.MessageFilteringOptions; using mRemoteNG.Messages.MessageWriters; using mRemoteNG.Messages.WriterDecorators; diff --git a/mRemoteNG/App/Initialization/StartupDataLogger.cs b/mRemoteNG/App/Initialization/StartupDataLogger.cs index ded52c9a..eab7a3c7 100644 --- a/mRemoteNG/App/Initialization/StartupDataLogger.cs +++ b/mRemoteNG/App/Initialization/StartupDataLogger.cs @@ -3,6 +3,7 @@ using System.Management; using System.Threading; using System.Windows.Forms; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; namespace mRemoteNG.App.Initialization { diff --git a/mRemoteNG/App/Logger.cs b/mRemoteNG/App/Logger.cs index ef6df7a2..500987d0 100644 --- a/mRemoteNG/App/Logger.cs +++ b/mRemoteNG/App/Logger.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using log4net; using log4net.Appender; using log4net.Config; +using mRemoteNG.Properties; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/App/ProgramRoot.cs b/mRemoteNG/App/ProgramRoot.cs index 47523b57..7a57d5bf 100644 --- a/mRemoteNG/App/ProgramRoot.cs +++ b/mRemoteNG/App/ProgramRoot.cs @@ -2,6 +2,7 @@ using System.Diagnostics; using System.Threading; using System.Windows.Forms; +using mRemoteNG.Properties; using mRemoteNG.UI.Forms; namespace mRemoteNG.App diff --git a/mRemoteNG/App/Runtime.cs b/mRemoteNG/App/Runtime.cs index c5a915c8..23d0e3aa 100644 --- a/mRemoteNG/App/Runtime.cs +++ b/mRemoteNG/App/Runtime.cs @@ -15,6 +15,8 @@ using System.IO; using System.Security; using System.Threading; using System.Windows.Forms; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.App { diff --git a/mRemoteNG/App/Shutdown.cs b/mRemoteNG/App/Shutdown.cs index da6a985a..dd06609e 100644 --- a/mRemoteNG/App/Shutdown.cs +++ b/mRemoteNG/App/Shutdown.cs @@ -3,6 +3,8 @@ using System; using System.Diagnostics; using System.Windows.Forms; using mRemoteNG.Config.Putty; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Controls; using mRemoteNG.UI.Forms; diff --git a/mRemoteNG/App/Startup.cs b/mRemoteNG/App/Startup.cs index 531190bf..d92aa242 100644 --- a/mRemoteNG/App/Startup.cs +++ b/mRemoteNG/App/Startup.cs @@ -9,6 +9,7 @@ using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Connection; using mRemoteNG.Messages; +using mRemoteNG.Properties; using mRemoteNG.Tools; using mRemoteNG.Tools.Cmdline; using mRemoteNG.UI; diff --git a/mRemoteNG/App/SupportedCultures.cs b/mRemoteNG/App/SupportedCultures.cs index 1ee52261..b3e2511c 100644 --- a/mRemoteNG/App/SupportedCultures.cs +++ b/mRemoteNG/App/SupportedCultures.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Globalization; using System.Runtime.Serialization; +using mRemoteNG.Properties; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/App/Update/AppUpdater.cs b/mRemoteNG/App/Update/AppUpdater.cs index 3532a596..74e60e52 100644 --- a/mRemoteNG/App/Update/AppUpdater.cs +++ b/mRemoteNG/App/Update/AppUpdater.cs @@ -7,6 +7,7 @@ using System.Reflection; using mRemoteNG.App.Info; using mRemoteNG.Security.SymmetricEncryption; using System.Security.Cryptography; +using mRemoteNG.Properties; #if !PORTABLE using mRemoteNG.Tools; diff --git a/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs b/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs index d8d3ef2a..94a94f11 100644 --- a/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/CsvConnectionsSaver.cs @@ -1,7 +1,7 @@ using System; using mRemoteNG.App; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers.Csv; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; using mRemoteNG.Security; using mRemoteNG.Tree; diff --git a/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs b/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs index bdd6fc4e..5ae462a4 100644 --- a/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs +++ b/mRemoteNG/Config/Connections/Multiuser/SqlConnectionsUpdateChecker.cs @@ -1,13 +1,12 @@ -using mRemoteNG.App; -using mRemoteNG.Config.Connections.Multiuser; -using mRemoteNG.Config.DatabaseConnectors; -using mRemoteNG.Messages; -using System; +using System; using System.Data; using System.Data.Common; using System.Threading; +using mRemoteNG.App; +using mRemoteNG.Config.DatabaseConnectors; +using mRemoteNG.Messages; -namespace mRemoteNG.Config.Connections +namespace mRemoteNG.Config.Connections.Multiuser { public class SqlConnectionsUpdateChecker : IConnectionsUpdateChecker { diff --git a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs index cbf001a3..e8a31d5e 100644 --- a/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs +++ b/mRemoteNG/Config/Connections/SaveConnectionsOnEdit.cs @@ -48,7 +48,7 @@ namespace mRemoteNG.Config.Connections private void SaveConnectionOnEdit(string propertyName = "") { - if (!mRemoteNG.Settings.Default.SaveConnectionsAfterEveryEdit) + if (!Properties.Settings.Default.SaveConnectionsAfterEveryEdit) return; if (FrmMain.Default.IsClosing) return; diff --git a/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs b/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs index d6c7260d..29701d7b 100644 --- a/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs +++ b/mRemoteNG/Config/Connections/SqlConnectionsLoader.cs @@ -5,7 +5,7 @@ using System.Security; using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; -using mRemoteNG.Config.Serializers.MsSql; +using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Config.Serializers.Versioning; using mRemoteNG.Container; using mRemoteNG.Security; diff --git a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs index e8082f3f..7781fe57 100644 --- a/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/SqlConnectionsSaver.cs @@ -7,11 +7,12 @@ using mRemoteNG.App.Info; using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; -using mRemoteNG.Config.Serializers.MsSql; +using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Config.Serializers.Versioning; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; @@ -177,7 +178,7 @@ namespace mRemoteNG.Config.Connections private bool SqlUserIsReadOnly() { - return mRemoteNG.Settings.Default.SQLReadOnly; + return Properties.Settings.Default.SQLReadOnly; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs b/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs index b8af35d0..b1e3bf5f 100644 --- a/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs +++ b/mRemoteNG/Config/Connections/XmlConnectionsLoader.cs @@ -1,10 +1,10 @@ using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers.Xml; using mRemoteNG.Tools; using mRemoteNG.Tree; using System; using System.IO; using System.Security; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNG.Config.Connections { diff --git a/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs b/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs index e4452af9..00365807 100644 --- a/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs +++ b/mRemoteNG/Config/Connections/XmlConnectionsSaver.cs @@ -2,7 +2,7 @@ using System.Linq; using mRemoteNG.App; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Security; using mRemoteNG.Security.Factories; using mRemoteNG.Tree; @@ -37,7 +37,7 @@ namespace mRemoteNG.Config.Connections cryptographyProvider, connectionTreeModel, _saveFilter, - mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile); + Properties.Settings.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 fe6fd9ca..57c9fbef 100644 --- a/mRemoteNG/Config/DataProviders/FileBackupCreator.cs +++ b/mRemoteNG/Config/DataProviders/FileBackupCreator.cs @@ -2,6 +2,7 @@ using System.IO; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.DataProviders { @@ -15,7 +16,7 @@ namespace mRemoteNG.Config.DataProviders return; var backupFileName = - string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now); + string.Format(Properties.Settings.Default.BackupFileNameFormat, fileName, DateTime.Now); File.Copy(fileName, backupFileName); } catch (Exception ex) @@ -38,7 +39,7 @@ namespace mRemoteNG.Config.DataProviders private bool FeatureIsTurnedOff() { - return mRemoteNG.Settings.Default.BackupFileKeepCount == 0; + return Properties.Settings.Default.BackupFileKeepCount == 0; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/DataProviders/FileBackupPruner.cs b/mRemoteNG/Config/DataProviders/FileBackupPruner.cs index a85ce1f9..eeec7873 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(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, "*"); + var searchPattern = string.Format(Properties.Settings.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 93f73f29..2bb27d99 100644 --- a/mRemoteNG/Config/DataProviders/SqlDataProvider.cs +++ b/mRemoteNG/Config/DataProviders/SqlDataProvider.cs @@ -108,7 +108,7 @@ namespace mRemoteNG.Config.DataProviders private bool DbUserIsReadOnly() { - return mRemoteNG.Settings.Default.SQLReadOnly; + return Properties.Settings.Default.SQLReadOnly; } } } \ No newline at end of file diff --git a/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs b/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs index 602a0bed..9b6e7cfa 100644 --- a/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs +++ b/mRemoteNG/Config/DatabaseConnectors/DatabaseConnectorFactory.cs @@ -7,12 +7,12 @@ namespace mRemoteNG.Config.DatabaseConnectors { public static IDatabaseConnector DatabaseConnectorFromSettings() { - var sqlType = mRemoteNG.Settings.Default.SQLServerType; - var sqlHost = mRemoteNG.Settings.Default.SQLHost; - var sqlCatalog = mRemoteNG.Settings.Default.SQLDatabaseName; - var sqlUsername = mRemoteNG.Settings.Default.SQLUser; + 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 cryptographyProvider = new LegacyRijndaelCryptographyProvider(); - var sqlPassword = cryptographyProvider.Decrypt(mRemoteNG.Settings.Default.SQLPass, Runtime.EncryptionKey); + var sqlPassword = cryptographyProvider.Decrypt(Properties.Settings.Default.SQLPass, Runtime.EncryptionKey); return DatabaseConnector(sqlType, sqlHost, sqlCatalog, sqlUsername, sqlPassword); } diff --git a/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs b/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs index 32b1e9d9..4d8e0765 100644 --- a/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs +++ b/mRemoteNG/Config/Import/ActiveDirectoryImporter.cs @@ -2,6 +2,7 @@ using System; using System.Linq; using mRemoteNG.App; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; using mRemoteNG.Tools; diff --git a/mRemoteNG/Config/Import/MRemoteNGCsvImporter.cs b/mRemoteNG/Config/Import/MRemoteNGCsvImporter.cs index 58f4983d..0e5a230d 100644 --- a/mRemoteNG/Config/Import/MRemoteNGCsvImporter.cs +++ b/mRemoteNG/Config/Import/MRemoteNGCsvImporter.cs @@ -2,7 +2,7 @@ using System.Linq; using mRemoteNG.App; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers.Csv; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; using mRemoteNG.Container; using mRemoteNG.Messages; diff --git a/mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs b/mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs index 464f439e..35e78a96 100644 --- a/mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs +++ b/mRemoteNG/Config/Import/MRemoteNGXmlImporter.cs @@ -2,7 +2,7 @@ using System.Linq; using mRemoteNG.App; using mRemoteNG.Config.DataProviders; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Container; using mRemoteNG.Messages; diff --git a/mRemoteNG/Config/Import/PortScanImporter.cs b/mRemoteNG/Config/Import/PortScanImporter.cs index 738710f1..089f6c96 100644 --- a/mRemoteNG/Config/Import/PortScanImporter.cs +++ b/mRemoteNG/Config/Import/PortScanImporter.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.Linq; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Tools; diff --git a/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs b/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs index 594ebe67..878ad516 100644 --- a/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs +++ b/mRemoteNG/Config/Import/PuttyConnectionManagerImporter.cs @@ -1,6 +1,7 @@ using System.Linq; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs b/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs index 15af3e52..6e027d86 100644 --- a/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs +++ b/mRemoteNG/Config/Import/RemoteDesktopConnectionImporter.cs @@ -2,6 +2,7 @@ using System.IO; using System.Linq; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs b/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs index c4db3252..e39e6b61 100644 --- a/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs +++ b/mRemoteNG/Config/Import/RemoteDesktopConnectionManagerImporter.cs @@ -1,6 +1,7 @@ using System.Linq; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Container; diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs index 94c3cd78..4fb99b83 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormat.cs @@ -11,7 +11,7 @@ using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.Csv +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv { public class CsvConnectionsDeserializerMremotengFormat : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs index 38f243b4..1b36e0fe 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormat.cs @@ -1,15 +1,15 @@ -using mRemoteNG.Connection; +using System; +using System.Linq; +using System.Text; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Credential; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using System; -using System.Linq; -using System.Text; -namespace mRemoteNG.Config.Serializers.Csv +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Csv { public class CsvConnectionsSerializerMremotengFormat : ISerializer { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs index 3abdc19d..4bea21bc 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableDeserializer.cs @@ -1,4 +1,9 @@ -using mRemoteNG.App; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Security; +using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.Http; @@ -6,17 +11,12 @@ using mRemoteNG.Connection.Protocol.ICA; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Container; -using mRemoteNG.Tree; -using mRemoteNG.Tree.Root; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Security; using mRemoteNG.Security; using mRemoteNG.Tools; +using mRemoteNG.Tree; +using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class DataTableDeserializer : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs index 30909cc8..90dcbf2c 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/DataTableSerializer.cs @@ -1,16 +1,16 @@ -using mRemoteNG.Connection; +using System; +using System.Collections.Generic; +using System.Data; +using System.Linq; +using System.Security; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Security; -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class DataTableSerializer : ISerializer { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs index ad6862b2..1df5fa90 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesModel.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class LocalConnectionPropertiesModel { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs index 57ec9b3f..c644b73b 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/LocalConnectionPropertiesXmlSerializer.cs @@ -6,7 +6,7 @@ using System.Text; using System.Xml; using System.Xml.Linq; -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class LocalConnectionPropertiesXmlSerializer : ISerializer, string>, diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs index e61a1228..525c811c 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlConnectionListMetaData.cs @@ -1,6 +1,6 @@ using System; -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class SqlConnectionListMetaData { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs index 72d26359..f51ce665 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/MsSql/SqlDatabaseMetaDataRetriever.cs @@ -10,7 +10,7 @@ using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.MsSql +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql { public class SqlDatabaseMetaDataRetriever { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs index 3d6f19b7..2a6d7836 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer26.cs @@ -1,11 +1,11 @@ -using mRemoteNG.Connection; -using mRemoteNG.Container; -using mRemoteNG.Security; -using System; +using System; using System.Security; using System.Xml.Linq; +using mRemoteNG.Connection; +using mRemoteNG.Container; +using mRemoteNG.Security; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { // ReSharper disable once InconsistentNaming public class XmlConnectionNodeSerializer26 : ISerializer diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs index 43d4f3ed..196921a5 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionNodeSerializer27.cs @@ -1,12 +1,12 @@ -using mRemoteNG.App; +using System; +using System.Security; +using System.Xml.Linq; +using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; -using System; -using System.Security; -using System.Xml.Linq; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { // ReSharper disable once InconsistentNaming public class XmlConnectionNodeSerializer27 : ISerializer diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs index c8dbf362..6fe7f485 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionSerializerFactory.cs @@ -4,7 +4,7 @@ using mRemoteNG.Security; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlConnectionSerializerFactory { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs index 9300ff47..9dc2a5d2 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializer.cs @@ -1,4 +1,9 @@ -using mRemoteNG.App; +using System; +using System.Globalization; +using System.Security; +using System.Windows.Forms; +using System.Xml; +using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.Http; @@ -7,20 +12,15 @@ using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Forms; using mRemoteNG.UI.TaskDialog; -using System; -using System.Globalization; -using System.Security; -using System.Windows.Forms; -using System.Xml; -using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlConnectionsDeserializer : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs index 8dc44dd1..00233a9e 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompiler.cs @@ -1,14 +1,14 @@ -using mRemoteNG.Connection; +using System; +using System.Linq; +using System.Security; +using System.Xml.Linq; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using System; -using System.Linq; -using System.Security; -using System.Xml.Linq; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlConnectionsDocumentCompiler { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptor.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptor.cs index 62f3d641..c254a674 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptor.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptor.cs @@ -2,7 +2,7 @@ using System.Xml.Linq; using mRemoteNG.Security; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlConnectionsDocumentEncryptor { diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs index 83255876..ca3fb421 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializer.cs @@ -1,16 +1,16 @@ -using mRemoteNG.App; -using mRemoteNG.Connection; -using mRemoteNG.Security; -using mRemoteNG.Tree; -using mRemoteNG.Tree.Root; -using System; +using System; using System.IO; using System.Linq; using System.Text; using System.Xml; using System.Xml.Linq; +using mRemoteNG.App; +using mRemoteNG.Connection; +using mRemoteNG.Security; +using mRemoteNG.Tree; +using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlConnectionsSerializer : ISerializer, ISerializer diff --git a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs index 75a4391e..bc56f425 100644 --- a/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs +++ b/mRemoteNG/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializer.cs @@ -1,9 +1,9 @@ -using mRemoteNG.Security; -using mRemoteNG.Tree.Root; -using System; +using System; using System.Xml.Linq; +using mRemoteNG.Security; +using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers.Xml +namespace mRemoteNG.Config.Serializers.ConnectionSerializers.Xml { public class XmlRootNodeSerializer { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs index e914cffb..3ae0d6b4 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/ActiveDirectoryDeserializer.cs @@ -6,12 +6,12 @@ using mRemoteNG.Config.Import; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; - -namespace mRemoteNG.Config.Serializers +namespace mRemoteNG.Config.Serializers.MiscSerializers { public class ActiveDirectoryDeserializer { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/PortScanDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/PortScanDeserializer.cs index 737c01a1..3d6e96fe 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/PortScanDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/PortScanDeserializer.cs @@ -6,8 +6,7 @@ using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; - -namespace mRemoteNG.Config.Serializers +namespace mRemoteNG.Config.Serializers.MiscSerializers { public class PortScanDeserializer : IDeserializer, ConnectionTreeModel> { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs index 039f9a09..5c0ce124 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializer.cs @@ -7,7 +7,7 @@ using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -namespace mRemoteNG.Config.Serializers +namespace mRemoteNG.Config.Serializers.MiscSerializers { public class PuttyConnectionManagerDeserializer : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs index 442a80d0..f710f9df 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializer.cs @@ -1,10 +1,10 @@ -using mRemoteNG.Connection; +using System; +using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; -using System; -namespace mRemoteNG.Config.Serializers +namespace mRemoteNG.Config.Serializers.MiscSerializers { public class RemoteDesktopConnectionDeserializer : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs index 873783f6..fa31737c 100644 --- a/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs +++ b/mRemoteNG/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializer.cs @@ -7,11 +7,11 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; - -namespace mRemoteNG.Config.Serializers +namespace mRemoteNG.Config.Serializers.MiscSerializers { public class RemoteDesktopConnectionManagerDeserializer : IDeserializer { diff --git a/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs b/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs index 17d80204..83fbe08b 100644 --- a/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs +++ b/mRemoteNG/Config/Serializers/Versioning/SqlDatabaseVersionVerifier.cs @@ -3,6 +3,7 @@ using mRemoteNG.App.Info; using mRemoteNG.Config.DatabaseConnectors; using mRemoteNG.Messages; using System; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Config.Serializers.Versioning { diff --git a/mRemoteNG/Config/Settings/ExternalAppsLoader.cs b/mRemoteNG/Config/Settings/ExternalAppsLoader.cs index a81d4b09..3bb1a183 100644 --- a/mRemoteNG/Config/Settings/ExternalAppsLoader.cs +++ b/mRemoteNG/Config/Settings/ExternalAppsLoader.cs @@ -105,7 +105,7 @@ namespace mRemoteNG.Config.Settings Runtime.ExternalToolsService.ExternalTools.Add(extA); } - _externalToolsToolStrip.SwitchToolBarText(mRemoteNG.Settings.Default.ExtAppsTBShowText); + _externalToolsToolStrip.SwitchToolBarText(Properties.Settings.Default.ExtAppsTBShowText); _externalToolsToolStrip.AddExternalToolsToToolBar(); } } diff --git a/mRemoteNG/Config/Settings/Settings.cs b/mRemoteNG/Config/Settings/Settings.cs index af8a8703..97f9b1f4 100644 --- a/mRemoteNG/Config/Settings/Settings.cs +++ b/mRemoteNG/Config/Settings/Settings.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG +namespace mRemoteNG.Config.Settings { // This class allows you to handle specific events on the settings class: // The SettingChanging event is raised before a setting's value is changed. diff --git a/mRemoteNG/Config/Settings/SettingsLoader.cs b/mRemoteNG/Config/Settings/SettingsLoader.cs index 6e250a5b..180e9948 100644 --- a/mRemoteNG/Config/Settings/SettingsLoader.cs +++ b/mRemoteNG/Config/Settings/SettingsLoader.cs @@ -74,7 +74,7 @@ namespace mRemoteNG.Config.Settings LoadExternalAppsFromXml(); SetAlwaysShowPanelTabs(); - if (mRemoteNG.Settings.Default.ResetToolbars) + if (Properties.Settings.Default.ResetToolbars) SetToolbarsDefault(); else LoadToolbarsFromSettings(); @@ -87,16 +87,16 @@ namespace mRemoteNG.Config.Settings private static void SetAlwaysShowPanelTabs() { - if (mRemoteNG.Settings.Default.AlwaysShowPanelTabs) + if (Properties.Settings.Default.AlwaysShowPanelTabs) FrmMain.Default.pnlDock.DocumentStyle = DocumentStyle.DockingWindow; } private void SetSupportedCulture() { - if (mRemoteNG.Settings.Default.OverrideUICulture == "" || - !SupportedCultures.IsNameSupported(mRemoteNG.Settings.Default.OverrideUICulture)) return; - Thread.CurrentThread.CurrentUICulture = new CultureInfo(mRemoteNG.Settings.Default.OverrideUICulture); + 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); @@ -105,22 +105,22 @@ namespace mRemoteNG.Config.Settings private void SetApplicationWindowPositionAndSize() { MainForm.WindowState = FormWindowState.Normal; - if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Normal) + if (Properties.Settings.Default.MainFormState == FormWindowState.Normal) { - if (!mRemoteNG.Settings.Default.MainFormLocation.IsEmpty) - MainForm.Location = mRemoteNG.Settings.Default.MainFormLocation; - if (!mRemoteNG.Settings.Default.MainFormSize.IsEmpty) - MainForm.Size = mRemoteNG.Settings.Default.MainFormSize; + if (!Properties.Settings.Default.MainFormLocation.IsEmpty) + MainForm.Location = Properties.Settings.Default.MainFormLocation; + if (!Properties.Settings.Default.MainFormSize.IsEmpty) + MainForm.Size = Properties.Settings.Default.MainFormSize; } else { - if (!mRemoteNG.Settings.Default.MainFormRestoreLocation.IsEmpty) - MainForm.Location = mRemoteNG.Settings.Default.MainFormRestoreLocation; - if (!mRemoteNG.Settings.Default.MainFormRestoreSize.IsEmpty) - MainForm.Size = mRemoteNG.Settings.Default.MainFormRestoreSize; + 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 (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Maximized) + if (Properties.Settings.Default.MainFormState == FormWindowState.Maximized) { MainForm.WindowState = FormWindowState.Maximized; } @@ -145,33 +145,33 @@ namespace mRemoteNG.Config.Settings private void SetAutoSave() { - if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes <= 0) return; - MainForm.tmrAutoSave.Interval = mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000; + if (Properties.Settings.Default.AutoSaveEveryMinutes <= 0) return; + MainForm.tmrAutoSave.Interval = Properties.Settings.Default.AutoSaveEveryMinutes * 60000; MainForm.tmrAutoSave.Enabled = true; } private void SetKioskMode() { - if (!mRemoteNG.Settings.Default.MainFormKiosk) return; + if (!Properties.Settings.Default.MainFormKiosk) return; MainForm.Fullscreen.Value = true; } private static void SetShowSystemTrayIcon() { - if (mRemoteNG.Settings.Default.ShowSystemTrayIcon) + if (Properties.Settings.Default.ShowSystemTrayIcon) Runtime.NotificationAreaIcon = new NotificationAreaIcon(); } private static void SetPuttyPath() { - PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath - ? mRemoteNG.Settings.Default.CustomPuttyPath + PuttyBase.PuttyPath = Properties.Settings.Default.UseCustomPuttyPath + ? Properties.Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath; } private void EnsureSettingsAreSavedInNewestVersion() { - if (mRemoteNG.Settings.Default.DoUpgrade) + if (Properties.Settings.Default.DoUpgrade) UpgradeSettingsVersion(); } @@ -179,20 +179,20 @@ namespace mRemoteNG.Config.Settings { try { - mRemoteNG.Settings.Default.Save(); - mRemoteNG.Settings.Default.Upgrade(); + Properties.Settings.Default.Save(); + Properties.Settings.Default.Upgrade(); } catch (Exception ex) { _messageCollector.AddExceptionMessage("Settings.Upgrade() failed", ex); } - mRemoteNG.Settings.Default.DoUpgrade = false; + Properties.Settings.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. - mRemoteNG.Settings.Default.UpdatePending = false; + Properties.Settings.Default.UpdatePending = false; } private void SetToolbarsDefault() @@ -236,30 +236,30 @@ namespace mRemoteNG.Config.Settings private void AddQuickConnectPanel() { SetToolstripGripStyle(_quickConnectToolStrip); - _quickConnectToolStrip.Visible = mRemoteNG.Settings.Default.QuickyTBVisible; - var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.QuickyTBParentDock); - toolStripPanel.Join(_quickConnectToolStrip, mRemoteNG.Settings.Default.QuickyTBLocation); + _quickConnectToolStrip.Visible = Properties.Settings.Default.QuickyTBVisible; + var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.QuickyTBParentDock); + toolStripPanel.Join(_quickConnectToolStrip, Properties.Settings.Default.QuickyTBLocation); } private void AddExternalAppsPanel() { SetToolstripGripStyle(_externalToolsToolStrip); - _externalToolsToolStrip.Visible = mRemoteNG.Settings.Default.ExtAppsTBVisible; - var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.ExtAppsTBParentDock); - toolStripPanel.Join(_externalToolsToolStrip, mRemoteNG.Settings.Default.ExtAppsTBLocation); + _externalToolsToolStrip.Visible = Properties.Settings.Default.ExtAppsTBVisible; + var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.ExtAppsTBParentDock); + toolStripPanel.Join(_externalToolsToolStrip, Properties.Settings.Default.ExtAppsTBLocation); } private void AddMultiSshPanel() { SetToolstripGripStyle(_multiSshToolStrip); - _multiSshToolStrip.Visible = mRemoteNG.Settings.Default.MultiSshToolbarVisible; - var toolStripPanel = ToolStripPanelFromString(mRemoteNG.Settings.Default.MultiSshToolbarParentDock); - toolStripPanel.Join(_multiSshToolStrip, mRemoteNG.Settings.Default.MultiSshToolbarLocation); + _multiSshToolStrip.Visible = Properties.Settings.Default.MultiSshToolbarVisible; + var toolStripPanel = ToolStripPanelFromString(Properties.Settings.Default.MultiSshToolbarParentDock); + toolStripPanel.Join(_multiSshToolStrip, Properties.Settings.Default.MultiSshToolbarLocation); } private void SetToolstripGripStyle(ToolStrip toolbar) { - toolbar.GripStyle = mRemoteNG.Settings.Default.LockToolbars + toolbar.GripStyle = Properties.Settings.Default.LockToolbars ? ToolStripGripStyle.Hidden : ToolStripGripStyle.Visible; } diff --git a/mRemoteNG/Config/Settings/SettingsSaver.cs b/mRemoteNG/Config/Settings/SettingsSaver.cs index b8fe2b6b..7c35e5b8 100644 --- a/mRemoteNG/Config/Settings/SettingsSaver.cs +++ b/mRemoteNG/Config/Settings/SettingsSaver.cs @@ -25,32 +25,32 @@ namespace mRemoteNG.Config.Settings frmMain.WindowState = FormWindowState.Maximized; } - mRemoteNG.Settings.Default.MainFormLocation = frmMain.Location; - mRemoteNG.Settings.Default.MainFormSize = frmMain.Size; + Properties.Settings.Default.MainFormLocation = frmMain.Location; + Properties.Settings.Default.MainFormSize = frmMain.Size; if (frmMain.WindowState != FormWindowState.Normal) { - mRemoteNG.Settings.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location; - mRemoteNG.Settings.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size; + Properties.Settings.Default.MainFormRestoreLocation = frmMain.RestoreBounds.Location; + Properties.Settings.Default.MainFormRestoreSize = frmMain.RestoreBounds.Size; } - mRemoteNG.Settings.Default.MainFormState = frmMain.WindowState; + Properties.Settings.Default.MainFormState = frmMain.WindowState; if (frmMain.Fullscreen != null) { - mRemoteNG.Settings.Default.MainFormKiosk = frmMain.Fullscreen.Value; + Properties.Settings.Default.MainFormKiosk = frmMain.Fullscreen.Value; } - mRemoteNG.Settings.Default.FirstStart = false; - mRemoteNG.Settings.Default.ResetPanels = false; - mRemoteNG.Settings.Default.ResetToolbars = false; - mRemoteNG.Settings.Default.NoReconnect = false; + Properties.Settings.Default.FirstStart = false; + Properties.Settings.Default.ResetPanels = false; + Properties.Settings.Default.ResetToolbars = false; + Properties.Settings.Default.NoReconnect = false; SaveExternalAppsToolbarLocation(externalToolsToolStrip); SaveQuickConnectToolbarLocation(quickConnectToolStrip); SaveMultiSshToolbarLocation(multiSshToolStrip); - mRemoteNG.Settings.Default.Save(); + Properties.Settings.Default.Save(); SaveDockPanelLayout(); SaveExternalApps(); @@ -63,35 +63,35 @@ namespace mRemoteNG.Config.Settings private static void SaveExternalAppsToolbarLocation(ExternalToolsToolStrip externalToolsToolStrip) { - mRemoteNG.Settings.Default.ExtAppsTBLocation = externalToolsToolStrip.Location; - mRemoteNG.Settings.Default.ExtAppsTBVisible = externalToolsToolStrip.Visible; - mRemoteNG.Settings.Default.ExtAppsTBShowText = externalToolsToolStrip.CMenToolbarShowText.Checked; + Properties.Settings.Default.ExtAppsTBLocation = externalToolsToolStrip.Location; + Properties.Settings.Default.ExtAppsTBVisible = externalToolsToolStrip.Visible; + Properties.Settings.Default.ExtAppsTBShowText = externalToolsToolStrip.CMenToolbarShowText.Checked; if (externalToolsToolStrip.Parent != null) { - mRemoteNG.Settings.Default.ExtAppsTBParentDock = externalToolsToolStrip.Parent.Dock.ToString(); + Properties.Settings.Default.ExtAppsTBParentDock = externalToolsToolStrip.Parent.Dock.ToString(); } } private static void SaveQuickConnectToolbarLocation(Control quickConnectToolStrip) { - mRemoteNG.Settings.Default.QuickyTBLocation = quickConnectToolStrip.Location; - mRemoteNG.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible; + Properties.Settings.Default.QuickyTBLocation = quickConnectToolStrip.Location; + Properties.Settings.Default.QuickyTBVisible = quickConnectToolStrip.Visible; if (quickConnectToolStrip.Parent != null) { - mRemoteNG.Settings.Default.QuickyTBParentDock = quickConnectToolStrip.Parent.Dock.ToString(); + Properties.Settings.Default.QuickyTBParentDock = quickConnectToolStrip.Parent.Dock.ToString(); } } private static void SaveMultiSshToolbarLocation(MultiSshToolStrip multiSshToolStrip) { - mRemoteNG.Settings.Default.MultiSshToolbarLocation = multiSshToolStrip.Location; - mRemoteNG.Settings.Default.MultiSshToolbarVisible = multiSshToolStrip.Visible; + Properties.Settings.Default.MultiSshToolbarLocation = multiSshToolStrip.Location; + Properties.Settings.Default.MultiSshToolbarVisible = multiSshToolStrip.Visible; if (multiSshToolStrip.Parent != null) { - mRemoteNG.Settings.Default.MultiSshToolbarParentDock = multiSshToolStrip.Parent.Dock.ToString(); + Properties.Settings.Default.MultiSshToolbarParentDock = multiSshToolStrip.Parent.Dock.ToString(); } } diff --git a/mRemoteNG/Connection/AbstractConnectionRecord.cs b/mRemoteNG/Connection/AbstractConnectionRecord.cs index 78795b88..4247f925 100644 --- a/mRemoteNG/Connection/AbstractConnectionRecord.cs +++ b/mRemoteNG/Connection/AbstractConnectionRecord.cs @@ -5,6 +5,8 @@ using mRemoteNG.Connection.Protocol.Http; using mRemoteNG.Connection.Protocol.ICA; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tools.Attributes; diff --git a/mRemoteNG/Connection/ConnectionInfo.cs b/mRemoteNG/Connection/ConnectionInfo.cs index ec132535..752e293e 100644 --- a/mRemoteNG/Connection/ConnectionInfo.cs +++ b/mRemoteNG/Connection/ConnectionInfo.cs @@ -15,6 +15,8 @@ using mRemoteNG.Connection.Protocol.SSH; using mRemoteNG.Connection.Protocol.Telnet; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tree; diff --git a/mRemoteNG/Connection/ConnectionInfoInheritance.cs b/mRemoteNG/Connection/ConnectionInfoInheritance.cs index 74251cd1..6491e015 100644 --- a/mRemoteNG/Connection/ConnectionInfoInheritance.cs +++ b/mRemoteNG/Connection/ConnectionInfoInheritance.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Linq; using System.Reflection; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.Connection diff --git a/mRemoteNG/Connection/ConnectionInitiator.cs b/mRemoteNG/Connection/ConnectionInitiator.cs index cdec1908..4c52e6c6 100644 --- a/mRemoteNG/Connection/ConnectionInitiator.cs +++ b/mRemoteNG/Connection/ConnectionInitiator.cs @@ -5,6 +5,8 @@ using mRemoteNG.App; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree; using mRemoteNG.UI.Forms; diff --git a/mRemoteNG/Connection/ConnectionsService.cs b/mRemoteNG/Connection/ConnectionsService.cs index 699622d8..ced89190 100644 --- a/mRemoteNG/Connection/ConnectionsService.cs +++ b/mRemoteNG/Connection/ConnectionsService.cs @@ -9,9 +9,11 @@ using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Config.DataProviders; using mRemoteNG.Config.Putty; -using mRemoteNG.Config.Serializers.MsSql; +using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Connection.Protocol; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tree; diff --git a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs index a430df80..823a4fe3 100644 --- a/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs +++ b/mRemoteNG/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs @@ -4,6 +4,7 @@ using CefSharp; using CefSharp.WinForms; using mRemoteNG.Tools; using mRemoteNG.App; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Tabs; diff --git a/mRemoteNG/Connection/Protocol/ICA/IcaProtocol.cs b/mRemoteNG/Connection/Protocol/ICA/IcaProtocol.cs index ec5ce9f7..7016d688 100644 --- a/mRemoteNG/Connection/Protocol/ICA/IcaProtocol.cs +++ b/mRemoteNG/Connection/Protocol/ICA/IcaProtocol.cs @@ -9,6 +9,8 @@ using System; using System.Threading; using System.Timers; using System.Windows.Forms; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.ICA diff --git a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs index acd40b42..377ca760 100644 --- a/mRemoteNG/Connection/Protocol/IntegratedProgram.cs +++ b/mRemoteNG/Connection/Protocol/IntegratedProgram.cs @@ -5,6 +5,8 @@ using System.Threading; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol diff --git a/mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs b/mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs index 603647f7..4197ad83 100644 --- a/mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs +++ b/mRemoteNG/Connection/Protocol/PowerShell/Connection.Protocol.PowerShell.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.PowerShell { diff --git a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs index 0195fed0..b7311c9b 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolFactory.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolFactory.cs @@ -8,6 +8,8 @@ using mRemoteNG.Connection.Protocol.Telnet; using mRemoteNG.Connection.Protocol.VNC; using System; using mRemoteNG.Connection.Protocol.PowerShell; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol { diff --git a/mRemoteNG/Connection/Protocol/ProtocolType.cs b/mRemoteNG/Connection/Protocol/ProtocolType.cs index 867a451c..c9933293 100644 --- a/mRemoteNG/Connection/Protocol/ProtocolType.cs +++ b/mRemoteNG/Connection/Protocol/ProtocolType.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol { diff --git a/mRemoteNG/Connection/Protocol/PuttyBase.cs b/mRemoteNG/Connection/Protocol/PuttyBase.cs index 0eb16521..cec7971f 100644 --- a/mRemoteNG/Connection/Protocol/PuttyBase.cs +++ b/mRemoteNG/Connection/Protocol/PuttyBase.cs @@ -9,6 +9,8 @@ using System.Diagnostics; using System.Drawing; using System.Threading; using System.Windows.Forms; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs b/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs index dcae7030..c9dce37e 100644 --- a/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs +++ b/mRemoteNG/Connection/Protocol/RDP/AuthenticationLevel.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs index 398d6eca..63f062be 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUsageMethod.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs index 8f5e6f19..5782790f 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDGatewayUseConnectionCredentials.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs b/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs index 34c03c60..64618efc 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPColors.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs b/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs index d4367e20..0e1c7021 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPResolutions.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs b/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs index cca98da1..cd6fa2d8 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPSoundQuality.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs b/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs index 13d84792..f33cf362 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RDPSounds.cs @@ -1,4 +1,5 @@ -using mRemoteNG.Tools; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs b/mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs index e0216758..a5dbf8c3 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpErrorCodes.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using mRemoteNG.App; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs index f1d64bdb..e86be714 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol6.cs @@ -7,6 +7,8 @@ using System.Windows.Forms; using AxMSTSCLib; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.UI; diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs index f5d29e87..1b6a0419 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol7.cs @@ -3,6 +3,7 @@ using mRemoteNG.App; using MSTSCLib; using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection.Protocol.RDP { diff --git a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs index 410bb93c..2e124862 100644 --- a/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs +++ b/mRemoteNG/Connection/Protocol/RDP/RdpProtocol8.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using AxMSTSCLib; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using MSTSCLib; namespace mRemoteNG.Connection.Protocol.RDP diff --git a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs index f2e76ec4..5efd07cc 100644 --- a/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs +++ b/mRemoteNG/Connection/Protocol/VNC/Connection.Protocol.VNC.cs @@ -3,6 +3,7 @@ using System.Threading; using System.ComponentModel; using System.Net.Sockets; using mRemoteNG.App; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.UI.Forms; diff --git a/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs b/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs index 35f74e9f..0c056d1e 100644 --- a/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs +++ b/mRemoteNG/Connection/Protocol/VNC/VNCEnum.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.Connection.Protocol.VNC diff --git a/mRemoteNG/Connection/PuttySessionInfo.cs b/mRemoteNG/Connection/PuttySessionInfo.cs index 33dc514e..76dbc9b5 100644 --- a/mRemoteNG/Connection/PuttySessionInfo.cs +++ b/mRemoteNG/Connection/PuttySessionInfo.cs @@ -4,6 +4,7 @@ using mRemoteNG.Tools; using System; using System.ComponentModel; using mRemoteNG.Connection.Protocol; +using mRemoteNG.Resources.Language; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; diff --git a/mRemoteNG/Connection/WebHelper.cs b/mRemoteNG/Connection/WebHelper.cs index c58f1b06..fa86cef7 100644 --- a/mRemoteNG/Connection/WebHelper.cs +++ b/mRemoteNG/Connection/WebHelper.cs @@ -1,4 +1,5 @@ using mRemoteNG.Connection.Protocol; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Connection { diff --git a/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs b/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs index ab64d25e..bbd1d6ca 100644 --- a/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs +++ b/mRemoteNG/Credential/CredentialDeletionMsgBoxConfirmer.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using mRemoteNG.Resources.Language; using mRemoteNG.Tree; diff --git a/mRemoteNG/Credential/PlaceholderCredentialRecord.cs b/mRemoteNG/Credential/PlaceholderCredentialRecord.cs index ee4d5fdc..9916893b 100644 --- a/mRemoteNG/Credential/PlaceholderCredentialRecord.cs +++ b/mRemoteNG/Credential/PlaceholderCredentialRecord.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Security; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Credential { diff --git a/mRemoteNG/Messages/MessageFilteringOptions/IMessageTypeFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/IMessageTypeFilteringOptions.cs index 6d38cc96..1bf6fa42 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/IMessageTypeFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/IMessageTypeFilteringOptions.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.Messages +namespace mRemoteNG.Messages.MessageFilteringOptions { public interface IMessageTypeFilteringOptions { diff --git a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs index 0dfd7661..8a45e3c2 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/LogMessageTypeFilteringOptions.cs @@ -1,4 +1,6 @@ -namespace mRemoteNG.Messages +using mRemoteNG.Properties; + +namespace mRemoteNG.Messages.MessageFilteringOptions { public class LogMessageTypeFilteringOptions : IMessageTypeFilteringOptions { diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs index 280b3d96..6996b951 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelMessageFilteringOptions.cs @@ -1,4 +1,6 @@ -namespace mRemoteNG.Messages +using mRemoteNG.Properties; + +namespace mRemoteNG.Messages.MessageFilteringOptions { public class NotificationPanelMessageFilteringOptions : IMessageTypeFilteringOptions { diff --git a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs index b77a3caa..9c3a4393 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/NotificationPanelSwitchOnMessageFilteringOptions.cs @@ -1,4 +1,6 @@ -namespace mRemoteNG.Messages +using mRemoteNG.Properties; + +namespace mRemoteNG.Messages.MessageFilteringOptions { public class NotificationPanelSwitchOnMessageFilteringOptions : IMessageTypeFilteringOptions { diff --git a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs index d19db9f6..3f7240cc 100644 --- a/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs +++ b/mRemoteNG/Messages/MessageFilteringOptions/PopupMessageFilteringOptions.cs @@ -1,4 +1,6 @@ -namespace mRemoteNG.Messages +using mRemoteNG.Properties; + +namespace mRemoteNG.Messages.MessageFilteringOptions { public class PopupMessageFilteringOptions : IMessageTypeFilteringOptions { diff --git a/mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs b/mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs index 07f5f57c..9b1c147e 100644 --- a/mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs +++ b/mRemoteNG/Messages/MessageWriters/PopupMessageWriter.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Messages.MessageWriters { diff --git a/mRemoteNG/Messages/WriterDecorators/MessageFocusDecorator.cs b/mRemoteNG/Messages/WriterDecorators/MessageFocusDecorator.cs index a3e30c68..73c6bf4d 100644 --- a/mRemoteNG/Messages/WriterDecorators/MessageFocusDecorator.cs +++ b/mRemoteNG/Messages/WriterDecorators/MessageFocusDecorator.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using System.Windows.Forms; +using mRemoteNG.Messages.MessageFilteringOptions; using mRemoteNG.Messages.MessageWriters; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Window; diff --git a/mRemoteNG/Messages/WriterDecorators/MessageTypeFilterDecorator.cs b/mRemoteNG/Messages/WriterDecorators/MessageTypeFilterDecorator.cs index ed8a4be2..2419a3b9 100644 --- a/mRemoteNG/Messages/WriterDecorators/MessageTypeFilterDecorator.cs +++ b/mRemoteNG/Messages/WriterDecorators/MessageTypeFilterDecorator.cs @@ -1,4 +1,5 @@ using System; +using mRemoteNG.Messages.MessageFilteringOptions; using mRemoteNG.Messages.MessageWriters; namespace mRemoteNG.Messages.WriterDecorators diff --git a/mRemoteNG/Properties/Resources.Designer.cs b/mRemoteNG/Properties/Resources.Designer.cs index caf1242f..4887bc3f 100644 --- a/mRemoteNG/Properties/Resources.Designer.cs +++ b/mRemoteNG/Properties/Resources.Designer.cs @@ -8,10 +8,7 @@ // //------------------------------------------------------------------------------ -namespace mRemoteNG { - using System; - - +namespace mRemoteNG.Properties { /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/mRemoteNG/Properties/Settings.Designer.cs b/mRemoteNG/Properties/Settings.Designer.cs index a33d0d1b..a933eeaa 100644 --- a/mRemoteNG/Properties/Settings.Designer.cs +++ b/mRemoteNG/Properties/Settings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace mRemoteNG { +namespace mRemoteNG.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] diff --git a/mRemoteNG/Resources/Language/Language.Designer.cs b/mRemoteNG/Resources/Language/Language.Designer.cs index b19c843b..a45c0770 100644 --- a/mRemoteNG/Resources/Language/Language.Designer.cs +++ b/mRemoteNG/Resources/Language/Language.Designer.cs @@ -8,10 +8,7 @@ // //------------------------------------------------------------------------------ -namespace mRemoteNG { - using System; - - +namespace mRemoteNG.Resources.Language { /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs b/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs index c65aea12..4c8f7bad 100644 --- a/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs +++ b/mRemoteNG/Resources/Themes/ColorMapTheme.Designer.cs @@ -8,10 +8,7 @@ // //------------------------------------------------------------------------------ -namespace mRemoteNG { - using System; - - +namespace mRemoteNG.Resources.Themes { /// /// A strongly-typed resource class, for looking up localized strings, etc. /// diff --git a/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs b/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs index 7873e992..1f63d132 100644 --- a/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs +++ b/mRemoteNG/Security/Factories/CryptoProviderFactoryFromSettings.cs @@ -1,4 +1,6 @@ -namespace mRemoteNG.Security.Factories +using mRemoteNG.Properties; + +namespace mRemoteNG.Security.Factories { public class CryptoProviderFactoryFromSettings : ICryptoProviderFactory { diff --git a/mRemoteNG/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs b/mRemoteNG/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs index 04d87a4c..e1f76978 100644 --- a/mRemoteNG/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs +++ b/mRemoteNG/Security/PasswordCreation/PasswordIncludesLowerCaseConstraint.cs @@ -1,6 +1,7 @@ using System; using System.Security; using System.Text.RegularExpressions; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.PasswordCreation { diff --git a/mRemoteNG/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs b/mRemoteNG/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs index b147f2b8..f3ddee22 100644 --- a/mRemoteNG/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs +++ b/mRemoteNG/Security/PasswordCreation/PasswordIncludesNumbersConstraint.cs @@ -1,6 +1,7 @@ using System; using System.Security; using System.Text.RegularExpressions; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.PasswordCreation { diff --git a/mRemoteNG/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs b/mRemoteNG/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs index b8c4494f..ea816131 100644 --- a/mRemoteNG/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs +++ b/mRemoteNG/Security/PasswordCreation/PasswordIncludesSpecialCharactersConstraint.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Security; using System.Text.RegularExpressions; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.PasswordCreation diff --git a/mRemoteNG/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs b/mRemoteNG/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs index b5e0f67c..0e45c71d 100644 --- a/mRemoteNG/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs +++ b/mRemoteNG/Security/PasswordCreation/PasswordIncludesUpperCaseConstraint.cs @@ -1,6 +1,7 @@ using System; using System.Security; using System.Text.RegularExpressions; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.PasswordCreation { diff --git a/mRemoteNG/Security/PasswordCreation/PasswordLengthConstraint.cs b/mRemoteNG/Security/PasswordCreation/PasswordLengthConstraint.cs index 68b30143..d5196aab 100644 --- a/mRemoteNG/Security/PasswordCreation/PasswordLengthConstraint.cs +++ b/mRemoteNG/Security/PasswordCreation/PasswordLengthConstraint.cs @@ -1,5 +1,6 @@ using System; using System.Security; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.PasswordCreation diff --git a/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs b/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs index 134f16b0..6042c9bd 100644 --- a/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs +++ b/mRemoteNG/Security/SymmetricEncryption/AeadCryptographyProvider.cs @@ -10,6 +10,7 @@ using System; using System.IO; using System.Security; using System.Text; +using mRemoteNG.Resources.Language; using mRemoteNG.Security.KeyDerivation; using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Engines; diff --git a/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs b/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs index 0b551de8..dbc5d31b 100644 --- a/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs +++ b/mRemoteNG/Security/SymmetricEncryption/LegacyRijndaelCryptographyProvider.cs @@ -5,6 +5,7 @@ using System.Security.Cryptography; using System.Text; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Security.SymmetricEncryption diff --git a/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs b/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs index e62b8913..704f828b 100644 --- a/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs +++ b/mRemoteNG/Themes/MremoteNGPaletteManipulator.cs @@ -3,6 +3,7 @@ using System.Drawing; using System.Globalization; using System.IO; using System.Xml; +using mRemoteNG.Resources.Themes; namespace mRemoteNG.Themes { diff --git a/mRemoteNG/Themes/ThemeManager.cs b/mRemoteNG/Themes/ThemeManager.cs index 53a6fbb8..07ce282b 100644 --- a/mRemoteNG/Themes/ThemeManager.cs +++ b/mRemoteNG/Themes/ThemeManager.cs @@ -7,6 +7,7 @@ using System.Diagnostics; using System.IO; using System.Linq; using mRemoteNG.Messages; +using mRemoteNG.Properties; using WeifenLuo.WinFormsUI.Docking; namespace mRemoteNG.Themes diff --git a/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs b/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs index 0bdcbc3e..f2cfc1e5 100644 --- a/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs +++ b/mRemoteNG/Tools/Cmdline/StartupArgumentsInterpreter.cs @@ -5,6 +5,8 @@ using System.IO; using System.Windows.Forms; using mRemoteNG.App.Info; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools.Cmdline diff --git a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs index 6bcbf357..9e2e635b 100644 --- a/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs +++ b/mRemoteNG/Tools/ConnectionsTreeToMenuItemsConverter.cs @@ -56,18 +56,18 @@ namespace mRemoteNG.Tools var nodeAsContainer = node as ContainerInfo; if (nodeAsContainer != null) { - menuItem.Image = Resources.Folder; + menuItem.Image = Properties.Resources.Folder; menuItem.Tag = nodeAsContainer; AddSubMenuNodes(nodeAsContainer.Children, menuItem); } else if (node.GetTreeNodeType() == TreeNodeType.PuttySession) { - menuItem.Image = Resources.PuttySessions; + menuItem.Image = Properties.Resources.PuttySessions; menuItem.Tag = node; } else if (node.GetTreeNodeType() == TreeNodeType.Connection) { - menuItem.Image = node.OpenConnections.Count > 0 ? Resources.Play : Resources.Pause; + menuItem.Image = node.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause; menuItem.Tag = node; } diff --git a/mRemoteNG/Tools/ExternalTool.cs b/mRemoteNG/Tools/ExternalTool.cs index 5eb6ef24..6998c663 100644 --- a/mRemoteNG/Tools/ExternalTool.cs +++ b/mRemoteNG/Tools/ExternalTool.cs @@ -9,6 +9,7 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody @@ -92,12 +93,12 @@ namespace mRemoteNG.Tools public Icon Icon { - get { return File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Resources.mRemoteNG_Icon; } + get { return File.Exists(FileName) ? MiscTools.GetIconFromFile(FileName) : Properties.Resources.mRemoteNG_Icon; } } public Image Image { - get { return Icon?.ToBitmap() ?? Resources.mRemoteNG_Icon.ToBitmap(); } + get { return Icon?.ToBitmap() ?? Properties.Resources.mRemoteNG_Icon.ToBitmap(); } } #endregion diff --git a/mRemoteNG/Tools/ExternalToolArgumentParser.cs b/mRemoteNG/Tools/ExternalToolArgumentParser.cs index a5e7b167..88f83a45 100644 --- a/mRemoteNG/Tools/ExternalToolArgumentParser.cs +++ b/mRemoteNG/Tools/ExternalToolArgumentParser.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using mRemoteNG.App; using mRemoteNG.Connection; +using mRemoteNG.Properties; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools.Cmdline; diff --git a/mRemoteNG/Tools/MiscTools.cs b/mRemoteNG/Tools/MiscTools.cs index c87f8618..b682be21 100644 --- a/mRemoteNG/Tools/MiscTools.cs +++ b/mRemoteNG/Tools/MiscTools.cs @@ -8,6 +8,8 @@ using System.IO; using System.Security; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using MySql.Data.Types; using static System.String; @@ -28,7 +30,7 @@ namespace mRemoteNG.Tools "GetIconFromFile failed (Tools.Misc) - using default icon" + Environment.NewLine + AEx.Message, true); - return Resources.mRemoteNG_Icon; + return Properties.Resources.mRemoteNG_Icon; } catch (Exception ex) { diff --git a/mRemoteNG/Tools/NotificationAreaIcon.cs b/mRemoteNG/Tools/NotificationAreaIcon.cs index 5b503d3a..af5afc61 100644 --- a/mRemoteNG/Tools/NotificationAreaIcon.cs +++ b/mRemoteNG/Tools/NotificationAreaIcon.cs @@ -4,6 +4,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; @@ -26,7 +28,7 @@ namespace mRemoteNG.Tools _cMenCons = new ToolStripMenuItem { Text = Language.Connections, - Image = Resources.Root + Image = Properties.Resources.Root }; var cMenSep1 = new ToolStripSeparator(); @@ -46,7 +48,7 @@ namespace mRemoteNG.Tools { Text = @"mRemoteNG", BalloonTipText = @"mRemoteNG", - Icon = Resources.mRemoteNG_Icon, + Icon = Properties.Resources.mRemoteNG_Icon, ContextMenuStrip = _cMen, Visible = true }; diff --git a/mRemoteNG/Tools/ProcessController.cs b/mRemoteNG/Tools/ProcessController.cs index dbea0eb6..57915b4b 100644 --- a/mRemoteNG/Tools/ProcessController.cs +++ b/mRemoteNG/Tools/ProcessController.cs @@ -3,6 +3,7 @@ using System; using System.Diagnostics; using System.Text; using mRemoteNG.App; +using mRemoteNG.Properties; using mRemoteNG.Tools.Cmdline; namespace mRemoteNG.Tools diff --git a/mRemoteNG/Tools/PuttyProcessController.cs b/mRemoteNG/Tools/PuttyProcessController.cs index 2497b828..43e1be15 100644 --- a/mRemoteNG/Tools/PuttyProcessController.cs +++ b/mRemoteNG/Tools/PuttyProcessController.cs @@ -1,3 +1,4 @@ +using mRemoteNG.Properties; using mRemoteNG.Tools.Cmdline; namespace mRemoteNG.Tools diff --git a/mRemoteNG/Tools/ReconnectGroup.Designer.cs b/mRemoteNG/Tools/ReconnectGroup.Designer.cs index 7ea7d5ad..1ec27188 100644 --- a/mRemoteNG/Tools/ReconnectGroup.Designer.cs +++ b/mRemoteNG/Tools/ReconnectGroup.Designer.cs @@ -67,7 +67,7 @@ this.btnClose.Name = "btnClose"; this.btnClose.Size = new System.Drawing.Size(159, 23); this.btnClose.TabIndex = 7; - this.btnClose.Text = global::mRemoteNG.Language._Close; + this.btnClose.Text = global::mRemoteNG.Resources.Language.Language._Close; this.btnClose.UseVisualStyleBackColor = true; this.btnClose.Click += new System.EventHandler(this.btnClose_Click); // @@ -89,13 +89,13 @@ this.chkReconnectWhenReady.Name = "chkReconnectWhenReady"; this.chkReconnectWhenReady.Size = new System.Drawing.Size(140, 17); this.chkReconnectWhenReady.TabIndex = 6; - this.chkReconnectWhenReady.Text = global::mRemoteNG.Language.CheckboxReconnectWhenReady; + this.chkReconnectWhenReady.Text = global::mRemoteNG.Resources.Language.Language.CheckboxReconnectWhenReady; this.chkReconnectWhenReady.UseVisualStyleBackColor = true; this.chkReconnectWhenReady.CheckedChanged += new System.EventHandler(this.chkReconnectWhenReady_CheckedChanged); // // pbServerStatus // - this.pbServerStatus.Image = global::mRemoteNG.Resources.HostStatus_Check; + this.pbServerStatus.Image = global::mRemoteNG.Properties.Resources.HostStatus_Check; this.pbServerStatus.Location = new System.Drawing.Point(99, 23); this.pbServerStatus.Name = "pbServerStatus"; this.pbServerStatus.Size = new System.Drawing.Size(16, 16); diff --git a/mRemoteNG/Tools/ReconnectGroup.cs b/mRemoteNG/Tools/ReconnectGroup.cs index d1f2d2ac..6aa9bc26 100644 --- a/mRemoteNG/Tools/ReconnectGroup.cs +++ b/mRemoteNG/Tools/ReconnectGroup.cs @@ -1,5 +1,6 @@ using System; using System.Drawing; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools { @@ -17,7 +18,7 @@ namespace mRemoteNG.Tools get => _ServerReady; set { - SetStatusImage(value ? Resources.HostStatus_On : Resources.HostStatus_Off); + SetStatusImage(value ? Properties.Resources.HostStatus_On : Properties.Resources.HostStatus_Off); _ServerReady = value; } diff --git a/mRemoteNG/Tools/ScanHost.cs b/mRemoteNG/Tools/ScanHost.cs index 7619b320..26c673be 100644 --- a/mRemoteNG/Tools/ScanHost.cs +++ b/mRemoteNG/Tools/ScanHost.cs @@ -8,6 +8,7 @@ using mRemoteNG.Connection.Protocol.SSH; using mRemoteNG.Connection.Protocol.Telnet; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tools diff --git a/mRemoteNG/Tools/SecureTransfer.cs b/mRemoteNG/Tools/SecureTransfer.cs index 6feb30a7..04c4e12b 100644 --- a/mRemoteNG/Tools/SecureTransfer.cs +++ b/mRemoteNG/Tools/SecureTransfer.cs @@ -1,6 +1,7 @@ using System; using System.IO; using mRemoteNG.App; +using mRemoteNG.Resources.Language; using Renci.SshNet; using Renci.SshNet.Sftp; using static System.IO.FileMode; diff --git a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs index ff5d8005..0f7c00aa 100644 --- a/mRemoteNG/Tools/Tools.LocalizedAttributes.cs +++ b/mRemoteNG/Tools/Tools.LocalizedAttributes.cs @@ -1,5 +1,6 @@ using System; using System.ComponentModel; +using mRemoteNG.Resources.Language; // ReSharper disable ArrangeAccessorOwnerBody diff --git a/mRemoteNG/Tree/ClickHandlers/ExpandNodeClickHandler.cs b/mRemoteNG/Tree/ClickHandlers/ExpandNodeClickHandler.cs index f67b31fd..41b14f13 100644 --- a/mRemoteNG/Tree/ClickHandlers/ExpandNodeClickHandler.cs +++ b/mRemoteNG/Tree/ClickHandlers/ExpandNodeClickHandler.cs @@ -1,10 +1,9 @@ using System; using mRemoteNG.Connection; using mRemoteNG.Container; -using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; - -namespace mRemoteNG.Tree +namespace mRemoteNG.Tree.ClickHandlers { public class ExpandNodeClickHandler : ITreeNodeClickHandler { diff --git a/mRemoteNG/Tree/ClickHandlers/ITreeNodeClickHandler.cs b/mRemoteNG/Tree/ClickHandlers/ITreeNodeClickHandler.cs index c2225397..58f99a76 100644 --- a/mRemoteNG/Tree/ClickHandlers/ITreeNodeClickHandler.cs +++ b/mRemoteNG/Tree/ClickHandlers/ITreeNodeClickHandler.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.Tree +namespace mRemoteNG.Tree.ClickHandlers { public interface ITreeNodeClickHandler { diff --git a/mRemoteNG/Tree/ClickHandlers/OpenConnectionClickHandler.cs b/mRemoteNG/Tree/ClickHandlers/OpenConnectionClickHandler.cs index cff2882f..81a2c8f3 100644 --- a/mRemoteNG/Tree/ClickHandlers/OpenConnectionClickHandler.cs +++ b/mRemoteNG/Tree/ClickHandlers/OpenConnectionClickHandler.cs @@ -1,8 +1,7 @@ using System; using mRemoteNG.Connection; - -namespace mRemoteNG.Tree +namespace mRemoteNG.Tree.ClickHandlers { public class OpenConnectionClickHandler : ITreeNodeClickHandler { diff --git a/mRemoteNG/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs b/mRemoteNG/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs index 0f5eb8ff..77f13a63 100644 --- a/mRemoteNG/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs +++ b/mRemoteNG/Tree/ClickHandlers/SwitchToConnectionClickHandler.cs @@ -1,8 +1,7 @@ using System; using mRemoteNG.Connection; - -namespace mRemoteNG.Tree +namespace mRemoteNG.Tree.ClickHandlers { public class SwitchToConnectionClickHandler : ITreeNodeClickHandler { diff --git a/mRemoteNG/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs b/mRemoteNG/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs index 3656301a..fc8ba718 100644 --- a/mRemoteNG/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs +++ b/mRemoteNG/Tree/ClickHandlers/TreeNodeCompositeClickHandler.cs @@ -2,8 +2,7 @@ using System.Collections.Generic; using mRemoteNG.Connection; - -namespace mRemoteNG.Tree +namespace mRemoteNG.Tree.ClickHandlers { public class TreeNodeCompositeClickHandler : ITreeNodeClickHandler { diff --git a/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs b/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs index d35d15e7..31ec0a1b 100644 --- a/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs +++ b/mRemoteNG/Tree/ConnectionTreeDragAndDropHandler.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using BrightIdeasSoftware; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tree.Root; diff --git a/mRemoteNG/Tree/ConnectionTreeModel.cs b/mRemoteNG/Tree/ConnectionTreeModel.cs index e1a83ad9..4400544b 100644 --- a/mRemoteNG/Tree/ConnectionTreeModel.cs +++ b/mRemoteNG/Tree/ConnectionTreeModel.cs @@ -3,6 +3,7 @@ using System.Collections.Specialized; using System.ComponentModel; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Properties; using mRemoteNG.Tree.Root; diff --git a/mRemoteNG/Tree/PreviousSessionOpener.cs b/mRemoteNG/Tree/PreviousSessionOpener.cs index bc6cffdd..20c33d2a 100644 --- a/mRemoteNG/Tree/PreviousSessionOpener.cs +++ b/mRemoteNG/Tree/PreviousSessionOpener.cs @@ -3,6 +3,7 @@ using mRemoteNG.Container; using mRemoteNG.UI.Controls; using System; using System.Linq; +using mRemoteNG.UI.Controls.ConnectionTree; namespace mRemoteNG.Tree diff --git a/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs b/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs index 2cbd278d..14334b08 100644 --- a/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs +++ b/mRemoteNG/Tree/PreviouslyOpenedFolderExpander.cs @@ -1,6 +1,7 @@ using System.Linq; using mRemoteNG.Container; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; namespace mRemoteNG.Tree diff --git a/mRemoteNG/Tree/Root/RootNodeInfo.cs b/mRemoteNG/Tree/Root/RootNodeInfo.cs index be8f30cb..1f96db22 100644 --- a/mRemoteNG/Tree/Root/RootNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootNodeInfo.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; diff --git a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs index 01286e6c..c0f926ff 100644 --- a/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs +++ b/mRemoteNG/Tree/Root/RootPuttySessionsNodeInfo.cs @@ -1,4 +1,6 @@ -using mRemoteNG.Tools; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; +using mRemoteNG.Tools; namespace mRemoteNG.Tree.Root { diff --git a/mRemoteNG/Tree/RootNodeExpander.cs b/mRemoteNG/Tree/RootNodeExpander.cs index bc02f0ae..569c81ac 100644 --- a/mRemoteNG/Tree/RootNodeExpander.cs +++ b/mRemoteNG/Tree/RootNodeExpander.cs @@ -1,4 +1,5 @@ using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; namespace mRemoteNG.Tree diff --git a/mRemoteNG/Tree/SelectedConnectionDeletionConfirmer.cs b/mRemoteNG/Tree/SelectedConnectionDeletionConfirmer.cs index 7a265aff..bf83cc6a 100644 --- a/mRemoteNG/Tree/SelectedConnectionDeletionConfirmer.cs +++ b/mRemoteNG/Tree/SelectedConnectionDeletionConfirmer.cs @@ -2,6 +2,7 @@ using mRemoteNG.Container; using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.Tree diff --git a/mRemoteNG/UI/Controls/Base/NGSearchBox.cs b/mRemoteNG/UI/Controls/Base/NGSearchBox.cs index 459754cb..1c9be747 100644 --- a/mRemoteNG/UI/Controls/Base/NGSearchBox.cs +++ b/mRemoteNG/UI/Controls/Base/NGSearchBox.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls.Base { @@ -26,7 +27,7 @@ namespace mRemoteNG.UI.Controls.Base private void AddClearButton() { - _pbClear.Image = Resources.Delete; + _pbClear.Image = Properties.Resources.Delete; _pbClear.Width = 20; _pbClear.Dock = DockStyle.Right; _pbClear.Cursor = Cursors.Default; diff --git a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs index 10b17921..4a6919a6 100644 --- a/mRemoteNG/UI/Controls/ConnectionContextMenu.cs +++ b/mRemoteNG/UI/Controls/ConnectionContextMenu.cs @@ -6,6 +6,7 @@ using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; @@ -50,11 +51,11 @@ namespace mRemoteNG.UI.Controls private ToolStripMenuItem _cMenTreeImportFile; private ToolStripMenuItem _cMenTreeImportActiveDirectory; private ToolStripMenuItem _cMenTreeImportPortScan; - private readonly ConnectionTree _connectionTree; + private readonly ConnectionTree.ConnectionTree _connectionTree; private readonly IConnectionInitiator _connectionInitiator; - public ConnectionContextMenu(ConnectionTree connectionTree) + public ConnectionContextMenu(ConnectionTree.ConnectionTree connectionTree) { _connectionTree = connectionTree; _connectionInitiator = new ConnectionInitiator(); @@ -145,7 +146,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnect // - _cMenTreeConnect.Image = Resources.Play; + _cMenTreeConnect.Image = Properties.Resources.Play; _cMenTreeConnect.Name = "_cMenTreeConnect"; _cMenTreeConnect.Size = new System.Drawing.Size(199, 22); _cMenTreeConnect.Text = "Connect"; @@ -168,7 +169,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsConnectToConsoleSession // - _cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Resources.monitor_go; + _cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Properties.Resources.monitor_go; _cMenTreeConnectWithOptionsConnectToConsoleSession.Name = "_cMenTreeConnectWithOptionsConnectToConsoleSession"; _cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); @@ -177,7 +178,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsDontConnectToConsoleSession // - _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Resources.monitor_delete; + _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Properties.Resources.monitor_delete; _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name = "_cMenTreeConnectWithOptionsDontConnectToConsoleSession"; _cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(245, 22); @@ -187,7 +188,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsConnectInFullscreen // - _cMenTreeConnectWithOptionsConnectInFullscreen.Image = Resources.arrow_out; + _cMenTreeConnectWithOptionsConnectInFullscreen.Image = Properties.Resources.arrow_out; _cMenTreeConnectWithOptionsConnectInFullscreen.Name = "_cMenTreeConnectWithOptionsConnectInFullscreen"; _cMenTreeConnectWithOptionsConnectInFullscreen.Size = new System.Drawing.Size(245, 22); _cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen"; @@ -195,7 +196,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsNoCredentials // - _cMenTreeConnectWithOptionsNoCredentials.Image = Resources.key_delete; + _cMenTreeConnectWithOptionsNoCredentials.Image = Properties.Resources.key_delete; _cMenTreeConnectWithOptionsNoCredentials.Name = "_cMenTreeConnectWithOptionsNoCredentials"; _cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(245, 22); _cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials"; @@ -203,7 +204,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsChoosePanelBeforeConnecting // - _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Resources.Panels; + _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Properties.Resources.Panels; _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "_cMenTreeConnectWithOptionsChoosePanelBeforeConnecting"; _cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = new System.Drawing.Size(245, 22); @@ -212,7 +213,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeConnectWithOptionsViewOnly // - _cMenTreeConnectWithOptionsViewOnly.Image = Resources.View; + _cMenTreeConnectWithOptionsViewOnly.Image = Properties.Resources.View; _cMenTreeConnectWithOptionsViewOnly.Name = "_cMenTreeConnectWithOptionsViewOnly"; _cMenTreeConnectWithOptionsViewOnly.Size = new System.Drawing.Size(245, 22); @@ -221,7 +222,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDisconnect // - _cMenTreeDisconnect.Image = Resources.Pause; + _cMenTreeDisconnect.Image = Properties.Resources.Pause; _cMenTreeDisconnect.Name = "_cMenTreeDisconnect"; _cMenTreeDisconnect.Size = new System.Drawing.Size(199, 22); _cMenTreeDisconnect.Text = "Disconnect"; @@ -234,14 +235,14 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsExternalApps // - _cMenTreeToolsExternalApps.Image = Resources.ExtApp; + _cMenTreeToolsExternalApps.Image = Properties.Resources.ExtApp; _cMenTreeToolsExternalApps.Name = "_cMenTreeToolsExternalApps"; _cMenTreeToolsExternalApps.Size = new System.Drawing.Size(199, 22); _cMenTreeToolsExternalApps.Text = "External Applications"; // // cMenTreeToolsTransferFile // - _cMenTreeToolsTransferFile.Image = Resources.SSHTransfer; + _cMenTreeToolsTransferFile.Image = Properties.Resources.SSHTransfer; _cMenTreeToolsTransferFile.Name = "_cMenTreeToolsTransferFile"; _cMenTreeToolsTransferFile.Size = new System.Drawing.Size(199, 22); _cMenTreeToolsTransferFile.Text = "Transfer File (SSH)"; @@ -254,7 +255,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDuplicate // - _cMenTreeDuplicate.Image = Resources.page_copy; + _cMenTreeDuplicate.Image = Properties.Resources.page_copy; _cMenTreeDuplicate.Name = "_cMenTreeDuplicate"; _cMenTreeDuplicate.Size = new System.Drawing.Size(199, 22); _cMenTreeDuplicate.Text = "Duplicate"; @@ -262,7 +263,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeRename // - _cMenTreeRename.Image = Resources.Rename; + _cMenTreeRename.Image = Properties.Resources.Rename; _cMenTreeRename.Name = "_cMenTreeRename"; _cMenTreeRename.Size = new System.Drawing.Size(199, 22); _cMenTreeRename.Text = "Rename"; @@ -270,7 +271,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeDelete // - _cMenTreeDelete.Image = Resources.Delete; + _cMenTreeDelete.Image = Properties.Resources.Delete; _cMenTreeDelete.Name = "_cMenTreeDelete"; _cMenTreeDelete.Size = new System.Drawing.Size(199, 22); _cMenTreeDelete.Text = "Delete"; @@ -335,7 +336,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeAddConnection // - _cMenTreeAddConnection.Image = Resources.Connection_Add; + _cMenTreeAddConnection.Image = Properties.Resources.Connection_Add; _cMenTreeAddConnection.Name = "_cMenTreeAddConnection"; _cMenTreeAddConnection.Size = new System.Drawing.Size(199, 22); _cMenTreeAddConnection.Text = "New Connection"; @@ -343,7 +344,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeAddFolder // - _cMenTreeAddFolder.Image = Resources.Folder_Add; + _cMenTreeAddFolder.Image = Properties.Resources.Folder_Add; _cMenTreeAddFolder.Name = "_cMenTreeAddFolder"; _cMenTreeAddFolder.Size = new System.Drawing.Size(199, 22); _cMenTreeAddFolder.Text = "New Folder"; @@ -367,7 +368,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsSortAscending // - _cMenTreeToolsSortAscending.Image = Resources.Sort_AZ; + _cMenTreeToolsSortAscending.Image = Properties.Resources.Sort_AZ; _cMenTreeToolsSortAscending.Name = "_cMenTreeToolsSortAscending"; _cMenTreeToolsSortAscending.Size = new System.Drawing.Size(161, 22); _cMenTreeToolsSortAscending.Text = "Ascending (A-Z)"; @@ -375,7 +376,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeToolsSortDescending // - _cMenTreeToolsSortDescending.Image = Resources.Sort_ZA; + _cMenTreeToolsSortDescending.Image = Properties.Resources.Sort_ZA; _cMenTreeToolsSortDescending.Name = "_cMenTreeToolsSortDescending"; _cMenTreeToolsSortDescending.Size = new System.Drawing.Size(161, 22); _cMenTreeToolsSortDescending.Text = "Descending (Z-A)"; @@ -383,7 +384,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeMoveUp // - _cMenTreeMoveUp.Image = Resources.Arrow_Up; + _cMenTreeMoveUp.Image = Properties.Resources.Arrow_Up; _cMenTreeMoveUp.Name = "_cMenTreeMoveUp"; _cMenTreeMoveUp.Size = new System.Drawing.Size(199, 22); _cMenTreeMoveUp.Text = "Move up"; @@ -391,7 +392,7 @@ namespace mRemoteNG.UI.Controls // // cMenTreeMoveDown // - _cMenTreeMoveDown.Image = Resources.Arrow_Down; + _cMenTreeMoveDown.Image = Properties.Resources.Arrow_Down; _cMenTreeMoveDown.Name = "_cMenTreeMoveDown"; _cMenTreeMoveDown.Size = new System.Drawing.Size(199, 22); _cMenTreeMoveDown.Text = "Move down"; diff --git a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs index 534f9cea..3a591a50 100644 --- a/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs +++ b/mRemoteNG/UI/Controls/ConnectionInfoPropertyGrid/ConnectionInfoPropertyGrid.cs @@ -11,6 +11,8 @@ using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tools; using mRemoteNG.Tools.Attributes; diff --git a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs index f8c8d7b0..6155067b 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.Designer.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { partial class ConnectionTree { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs index 9dd93ce3..7cbc6b5b 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTree.cs @@ -9,14 +9,17 @@ using mRemoteNG.App; using mRemoteNG.Config.Putty; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using mRemoteNG.Tree.Root; // ReSharper disable ArrangeAccessorOwnerBody -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { public partial class ConnectionTree : TreeListView, IConnectionTree { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTreeSearchTextFilter.cs b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTreeSearchTextFilter.cs index f2d782e6..1761713c 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTreeSearchTextFilter.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/ConnectionTreeSearchTextFilter.cs @@ -2,7 +2,7 @@ using BrightIdeasSoftware; using mRemoteNG.Connection; -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { public class ConnectionTreeSearchTextFilter : IModelFilter { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTree.cs b/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTree.cs index 3edc9287..ada70bdd 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTree.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTree.cs @@ -3,8 +3,7 @@ using mRemoteNG.Connection; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; - -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { public interface IConnectionTree { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs b/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs index bf063f54..fb76c31a 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/IConnectionTreeDelegate.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { public interface IConnectionTreeDelegate { diff --git a/mRemoteNG/UI/Controls/ConnectionTree/NameColumn.cs b/mRemoteNG/UI/Controls/ConnectionTree/NameColumn.cs index 848bfa2c..54b2bf6c 100644 --- a/mRemoteNG/UI/Controls/ConnectionTree/NameColumn.cs +++ b/mRemoteNG/UI/Controls/ConnectionTree/NameColumn.cs @@ -1,7 +1,7 @@ using BrightIdeasSoftware; using mRemoteNG.Connection; -namespace mRemoteNG.UI.Controls +namespace mRemoteNG.UI.Controls.ConnectionTree { public class NameColumn : OLVColumn { diff --git a/mRemoteNG/UI/Controls/CredentialRecordListBox.cs b/mRemoteNG/UI/Controls/CredentialRecordListBox.cs index 83a76b7d..e3c46f7c 100644 --- a/mRemoteNG/UI/Controls/CredentialRecordListBox.cs +++ b/mRemoteNG/UI/Controls/CredentialRecordListBox.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; using mRemoteNG.Credential; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { diff --git a/mRemoteNG/UI/Controls/CredentialRecordListView.cs b/mRemoteNG/UI/Controls/CredentialRecordListView.cs index 539490ec..58397ca6 100644 --- a/mRemoteNG/UI/Controls/CredentialRecordListView.cs +++ b/mRemoteNG/UI/Controls/CredentialRecordListView.cs @@ -4,6 +4,7 @@ using System.Linq; using BrightIdeasSoftware; using mRemoteNG.Credential; using mRemoteNG.Credential.Repositories; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools.CustomCollections; using mRemoteNG.UI.Controls.PageSequence; diff --git a/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs b/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs index e2e97748..d89a46da 100644 --- a/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs +++ b/mRemoteNG/UI/Controls/ExternalToolsToolStrip.cs @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree; diff --git a/mRemoteNG/UI/Controls/IPTextBox.cs b/mRemoteNG/UI/Controls/IPTextBox.cs index 5d490992..dcd5927d 100644 --- a/mRemoteNG/UI/Controls/IPTextBox.cs +++ b/mRemoteNG/UI/Controls/IPTextBox.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; namespace mRemoteNG.UI.Controls diff --git a/mRemoteNG/UI/Controls/MultiSshToolStrip.cs b/mRemoteNG/UI/Controls/MultiSshToolStrip.cs index 47d9ad50..9764d9f4 100644 --- a/mRemoteNG/UI/Controls/MultiSshToolStrip.cs +++ b/mRemoteNG/UI/Controls/MultiSshToolStrip.cs @@ -7,6 +7,7 @@ using System.Linq; using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { diff --git a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs index 23663175..536a8272 100644 --- a/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs +++ b/mRemoteNG/UI/Controls/NewPasswordWithVerification.Designer.cs @@ -67,7 +67,7 @@ // // imgError // - this.imgError.Image = global::mRemoteNG.Resources.ErrorSmall; + this.imgError.Image = global::mRemoteNG.Properties.Resources.ErrorSmall; this.imgError.Location = new System.Drawing.Point(3, 81); this.imgError.Name = "imgError"; this.imgError.Size = new System.Drawing.Size(16, 16); diff --git a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs index 9e101631..43c9b329 100644 --- a/mRemoteNG/UI/Controls/QuickConnectComboBox.cs +++ b/mRemoteNG/UI/Controls/QuickConnectComboBox.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Controls { diff --git a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs index 27cce922..0ed9d440 100644 --- a/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs +++ b/mRemoteNG/UI/Controls/QuickConnectToolStrip.cs @@ -8,6 +8,8 @@ using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools; @@ -104,7 +106,7 @@ namespace mRemoteNG.UI.Controls // btnQuickConnect // _btnQuickConnect.DropDown = _mnuQuickConnectProtocol; - _btnQuickConnect.Image = Resources.Play_Quick; + _btnQuickConnect.Image = Properties.Resources.Play_Quick; _btnQuickConnect.ImageTransparentColor = Color.Magenta; _btnQuickConnect.Margin = new Padding(0, 1, 3, 2); _btnQuickConnect.Name = "btnQuickConnect"; @@ -125,7 +127,7 @@ namespace mRemoteNG.UI.Controls // _btnConnections.DisplayStyle = ToolStripItemDisplayStyle.Image; _btnConnections.DropDown = _mnuConnections; - _btnConnections.Image = Resources.Root; + _btnConnections.Image = Properties.Resources.Root; _btnConnections.ImageScaling = ToolStripItemImageScaling.SizeToFit; _btnConnections.ImageTransparentColor = Color.Magenta; _btnConnections.Name = "btnConnections"; @@ -256,7 +258,7 @@ namespace mRemoteNG.UI.Controls .ConnectionTreeModel).ToArray(); _btnConnections.DropDownItems.AddRange(rootMenuItems); - ToolStripMenuItem favorites = new ToolStripMenuItem(Language.Favorites, Resources.star); + ToolStripMenuItem favorites = new ToolStripMenuItem(Language.Favorites, Properties.Resources.star); var rootNodes = Runtime.ConnectionsService.ConnectionTreeModel.RootNodes; List favoritesList = new List(); @@ -268,7 +270,7 @@ namespace mRemoteNG.UI.Controls { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Resources.Play : Resources.Pause + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause }; favoriteMenuItem.MouseUp += ConnectionsMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Controls/StatusImageList.cs b/mRemoteNG/UI/Controls/StatusImageList.cs index 419b8e63..59cbcb13 100644 --- a/mRemoteNG/UI/Controls/StatusImageList.cs +++ b/mRemoteNG/UI/Controls/StatusImageList.cs @@ -78,7 +78,7 @@ namespace mRemoteNG.UI.Controls ImageList.Images.Add(BuildConnectionIconName(connection.Icon, false), image); ImageList.Images.Add(BuildConnectionIconName(connection.Icon, true), - Overlay(image, Resources.ConnectedOverlay)); + Overlay(image, Properties.Resources.ConnectedOverlay)); return name; } @@ -97,9 +97,9 @@ namespace mRemoteNG.UI.Controls { try { - imageList.Images.Add("Root", Resources.Root); - imageList.Images.Add("Folder", Resources.Folder); - imageList.Images.Add("PuttySessions", Resources.PuttySessions); + imageList.Images.Add("Root", Properties.Resources.Root); + imageList.Images.Add("Folder", Properties.Resources.Folder); + imageList.Images.Add("PuttySessions", Properties.Resources.PuttySessions); } catch (Exception ex) { diff --git a/mRemoteNG/UI/DialogFactory.cs b/mRemoteNG/UI/DialogFactory.cs index 478522a7..ac734c91 100644 --- a/mRemoteNG/UI/DialogFactory.cs +++ b/mRemoteNG/UI/DialogFactory.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.TaskDialog; namespace mRemoteNG.UI diff --git a/mRemoteNG/UI/Forms/ExportForm.Designer.cs b/mRemoteNG/UI/Forms/ExportForm.Designer.cs index d70ac834..fda85ae9 100644 --- a/mRemoteNG/UI/Forms/ExportForm.Designer.cs +++ b/mRemoteNG/UI/Forms/ExportForm.Designer.cs @@ -294,7 +294,7 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.btnOK); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Icon = global::mRemoteNG.Resources.ConnectionsSaveAs_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.ConnectionsSaveAs_Icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "ExportForm"; diff --git a/mRemoteNG/UI/Forms/ExportForm.cs b/mRemoteNG/UI/Forms/ExportForm.cs index b48a62b4..3ffc896d 100644 --- a/mRemoteNG/UI/Forms/ExportForm.cs +++ b/mRemoteNG/UI/Forms/ExportForm.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using mRemoteNG.Config.Connections; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; namespace mRemoteNG.UI.Forms diff --git a/mRemoteNG/UI/Forms/FrmAbout.Designer.cs b/mRemoteNG/UI/Forms/FrmAbout.Designer.cs index 1e6c0715..85175aa7 100644 --- a/mRemoteNG/UI/Forms/FrmAbout.Designer.cs +++ b/mRemoteNG/UI/Forms/FrmAbout.Designer.cs @@ -1,4 +1,4 @@ -namespace mRemoteNG.UI.Window +namespace mRemoteNG.UI.Forms { public partial class FrmAbout { @@ -22,7 +22,7 @@ // pbLogo // this.pbLogo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(52)))), ((int)(((byte)(58)))), ((int)(((byte)(64))))); - this.pbLogo.BackgroundImage = global::mRemoteNG.Resources.Header_dark; + this.pbLogo.BackgroundImage = global::mRemoteNG.Properties.Resources.Header_dark; this.pbLogo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center; this.pbLogo.Dock = System.Windows.Forms.DockStyle.Top; this.pbLogo.Location = new System.Drawing.Point(0, 0); diff --git a/mRemoteNG/UI/Forms/FrmAbout.cs b/mRemoteNG/UI/Forms/FrmAbout.cs index 0bdb763b..dcb59c12 100644 --- a/mRemoteNG/UI/Forms/FrmAbout.cs +++ b/mRemoteNG/UI/Forms/FrmAbout.cs @@ -1,10 +1,10 @@ -using mRemoteNG.App.Info; -using mRemoteNG.Themes; +using System.Diagnostics; using System.Windows.Forms; -using System.Diagnostics; -using mRemoteNG.UI.Forms; +using mRemoteNG.App.Info; +using mRemoteNG.Resources.Language; +using mRemoteNG.Themes; -namespace mRemoteNG.UI.Window +namespace mRemoteNG.UI.Forms { public partial class FrmAbout : Form { diff --git a/mRemoteNG/UI/Forms/FrmSplashScreen.Designer.cs b/mRemoteNG/UI/Forms/FrmSplashScreen.Designer.cs index 53864ab5..080df07d 100644 --- a/mRemoteNG/UI/Forms/FrmSplashScreen.Designer.cs +++ b/mRemoteNG/UI/Forms/FrmSplashScreen.Designer.cs @@ -34,7 +34,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.BackgroundImage = global::mRemoteNG.Resources.Header_dark; + this.BackgroundImage = global::mRemoteNG.Properties.Resources.Header_dark; this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.ClientSize = new System.Drawing.Size(450, 120); this.ControlBox = false; diff --git a/mRemoteNG/UI/Forms/Input/FrmInputBox.cs b/mRemoteNG/UI/Forms/Input/FrmInputBox.cs index 4bc482e7..743ed1fa 100644 --- a/mRemoteNG/UI/Forms/Input/FrmInputBox.cs +++ b/mRemoteNG/UI/Forms/Input/FrmInputBox.cs @@ -1,4 +1,5 @@ using System.Windows.Forms; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; namespace mRemoteNG.UI.Forms.Input diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs index d899b3b2..24f3c4ae 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.Designer.cs @@ -140,7 +140,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // btnLaunchPutty // this.btnLaunchPutty._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; - this.btnLaunchPutty.Image = global::mRemoteNG.Resources.PuttyConfig; + this.btnLaunchPutty.Image = global::mRemoteNG.Properties.Resources.PuttyConfig; this.btnLaunchPutty.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnLaunchPutty.Location = new System.Drawing.Point(373, 109); this.btnLaunchPutty.Name = "btnLaunchPutty"; diff --git a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs index 4d07e52f..6a469830 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AdvancedPage.cs @@ -5,6 +5,8 @@ using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Config.Putty; using mRemoteNG.Connection.Protocol; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.UI.Forms.OptionsPages @@ -15,9 +17,9 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Config_Icon; + PageIcon = Properties.Resources.Config_Icon; var display = new DisplayProperties(); - var img = display.ScaleImage(Resources.PuttyConfig); + var img = display.ScaleImage(Properties.Resources.PuttyConfig); btnLaunchPutty.Image = img; } diff --git a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs index 46f817a1..7077288c 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/AppearancePage.cs @@ -1,6 +1,8 @@ using System; using System.Windows.Forms; using mRemoteNG.App; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.UI.Forms.OptionsPages @@ -11,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Panels_Icon; + PageIcon = Properties.Resources.Panels_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs index 9e95e624..6074b8b1 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ComponentsPage.cs @@ -9,6 +9,8 @@ using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; namespace mRemoteNG.UI.Forms.OptionsPages @@ -18,7 +20,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages public ComponentsPage() { ApplyTheme(); - PageIcon = Resources.ComponentsCheck_Icon; + PageIcon = Properties.Resources.ComponentsCheck_Icon; InitializeComponent(); FontOverrider.FontOverride(this); ThemeManager.getInstance().ThemeChanged += ApplyTheme; @@ -60,7 +62,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages if (supportedVersions.Any()) { - pbCheck1.Image = Resources.Good_Symbol; + pbCheck1.Image = Properties.Resources.Good_Symbol; lblCheck1.ForeColor = Color.DarkOliveGreen; lblCheck1.Text = "RDP (Remote Desktop) " + Language.CheckSucceeded; txtCheck1.Text = string.Format(Language.CcRDPOK, string.Join(", ", supportedVersions)); @@ -68,7 +70,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages } else { - pbCheck1.Image = Resources.Bad_Symbol; + pbCheck1.Image = Properties.Resources.Bad_Symbol; lblCheck1.ForeColor = Color.Firebrick; lblCheck1.Text = "RDP (Remote Desktop) " + Language.CheckFailed; txtCheck1.Text = string.Format(Language.CcRDPFailed, GeneralAppInfo.UrlForum); @@ -94,7 +96,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages System.Windows.Forms.Application.DoEvents(); } - pbCheck2.Image = Resources.Good_Symbol; + pbCheck2.Image = Properties.Resources.Good_Symbol; lblCheck2.ForeColor = Color.DarkOliveGreen; lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.CheckSucceeded; txtCheck2.Text = string.Format(Language.CcVNCOK, vnc.ProductVersion); @@ -103,7 +105,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages } catch (Exception) { - pbCheck2.Image = Resources.Bad_Symbol; + pbCheck2.Image = Properties.Resources.Bad_Symbol; lblCheck2.ForeColor = Color.Firebrick; lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.CheckFailed; txtCheck2.Text = string.Format(Language.CcVNCFailed, GeneralAppInfo.UrlForum); @@ -130,7 +132,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { var versionInfo = FileVersionInfo.GetVersionInfo(pPath); - pbCheck3.Image = Resources.Good_Symbol; + pbCheck3.Image = Properties.Resources.Good_Symbol; lblCheck3.ForeColor = Color.DarkOliveGreen; lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.CheckSucceeded; txtCheck3.Text = @@ -139,7 +141,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages } else { - pbCheck3.Image = Resources.Bad_Symbol; + pbCheck3.Image = Properties.Resources.Bad_Symbol; lblCheck3.ForeColor = Color.Firebrick; lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.CheckFailed; txtCheck3.Text = Language.CcPuttyFailed; @@ -161,7 +163,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { ica.Parent = this; - pbCheck4.Image = Resources.Good_Symbol; + pbCheck4.Image = Properties.Resources.Good_Symbol; lblCheck4.ForeColor = Color.DarkOliveGreen; lblCheck4.Text = @"ICA (Citrix ICA) " + Language.CheckSucceeded; txtCheck4.Text = string.Format(Language.CcICAOK, ica.Version); @@ -170,7 +172,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages } catch (Exception ex) { - pbCheck4.Image = Resources.Bad_Symbol; + pbCheck4.Image = Properties.Resources.Bad_Symbol; lblCheck4.ForeColor = Color.Firebrick; lblCheck4.Text = @"ICA (Citrix ICA) " + Language.CheckFailed; txtCheck4.Text = string.Format(Language.CcICAFailed, GeneralAppInfo.UrlForum); diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs index eac5202e..eec189d6 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.Designer.cs @@ -152,7 +152,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkSingleClickOnOpenedConnectionSwitchesToIt.Name = "chkSingleClickOnOpenedConnectionSwitchesToIt"; this.chkSingleClickOnOpenedConnectionSwitchesToIt.Size = new System.Drawing.Size(492, 17); this.chkSingleClickOnOpenedConnectionSwitchesToIt.TabIndex = 1; - this.chkSingleClickOnOpenedConnectionSwitchesToIt.Text = global::mRemoteNG.Language.SingleClickOnOpenConnectionSwitchesToIt; + this.chkSingleClickOnOpenedConnectionSwitchesToIt.Text = global::mRemoteNG.Resources.Language.Language.SingleClickOnOpenConnectionSwitchesToIt; this.chkSingleClickOnOpenedConnectionSwitchesToIt.UseVisualStyleBackColor = true; // // lblAutoSave1 diff --git a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs index dee84e71..f4d306de 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ConnectionsPage.cs @@ -1,5 +1,7 @@ using mRemoteNG.Config; using System; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -11,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Root_Icon; + PageIcon = Properties.Resources.Root_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs index 7b5601a0..29ffa06f 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/CredentialsPage.cs @@ -1,5 +1,7 @@ using System; using mRemoteNG.App; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; namespace mRemoteNG.UI.Forms.OptionsPages @@ -10,7 +12,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Key_Icon; + PageIcon = Properties.Resources.Key_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs index 4b354b12..aad68bf6 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/NotificationsPage.cs @@ -2,6 +2,8 @@ using System.IO; using System.Windows.Forms; using mRemoteNG.App; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -11,7 +13,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Error_Icon; + PageIcon = Properties.Resources.Error_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs index 6a3f3f1c..bb59d251 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SecurityPage.cs @@ -4,7 +4,9 @@ using System.Diagnostics; using System.Linq; using System.Windows.Forms; using mRemoteNG.App; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Security.Factories; @@ -18,7 +20,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages PopulateEncryptionEngineDropDown(); PopulateBlockCipherDropDown(); ApplyTheme(); - PageIcon = Resources.Shield_Icon; + PageIcon = Properties.Resources.Shield_Icon; } [Browsable(false)] diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs index 43d13015..269b0ec3 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.Designer.cs @@ -185,7 +185,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages // // imgConnectionStatus // - this.imgConnectionStatus.Image = global::mRemoteNG.Resources.Help; + this.imgConnectionStatus.Image = global::mRemoteNG.Properties.Resources.Help; this.imgConnectionStatus.Location = new System.Drawing.Point(162, 272); this.imgConnectionStatus.Name = "imgConnectionStatus"; this.imgConnectionStatus.Size = new System.Drawing.Size(16, 16); diff --git a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs index f63f2410..4bfdd0c4 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/SqlServerPage.cs @@ -3,6 +3,8 @@ using mRemoteNG.App; using mRemoteNG.Config.Connections; using mRemoteNG.Config.Connections.Multiuser; using mRemoteNG.Config.DatabaseConnectors; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; namespace mRemoteNG.UI.Forms.OptionsPages @@ -15,7 +17,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Database_Icon; + PageIcon = Properties.Resources.Database_Icon; _databaseConnectionTester = new DatabaseConnectionTester(); } @@ -120,7 +122,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages var password = txtSQLPassword.Text; lblTestConnectionResults.Text = Language.TestingConnection; - imgConnectionStatus.Image = Resources.loading_spinner; + imgConnectionStatus.Image = Properties.Resources.loading_spinner; btnTestConnection.Enabled = false; var connectionTestResult = @@ -163,8 +165,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages private void UpdateConnectionImage(bool connectionSuccess) { imgConnectionStatus.Image = connectionSuccess - ? Resources.tick - : Resources.exclamation; + ? Properties.Resources.tick + : Properties.Resources.exclamation; } private string BuildTestFailedMessage(string specificMessage) diff --git a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs index f49bf77d..bbce35bc 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/StartupExitPage.cs @@ -1,4 +1,6 @@ using System; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms.OptionsPages { @@ -8,7 +10,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.StartupExit_Icon; + PageIcon = Properties.Resources.StartupExit_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs index 11c16e2b..9225b6fd 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs @@ -78,7 +78,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages this.chkIdentifyQuickConnectTabs.Name = "chkIdentifyQuickConnectTabs"; this.chkIdentifyQuickConnectTabs.Size = new System.Drawing.Size(315, 17); this.chkIdentifyQuickConnectTabs.TabIndex = 4; - this.chkIdentifyQuickConnectTabs.Text = global::mRemoteNG.Language.IdentifyQuickConnectTabs; + this.chkIdentifyQuickConnectTabs.Text = global::mRemoteNG.Resources.Language.Language.IdentifyQuickConnectTabs; this.chkIdentifyQuickConnectTabs.UseVisualStyleBackColor = true; // // chkOpenNewTabRightOfSelected diff --git a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs index 89999dcf..14440ffb 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/TabsPanelsPage.cs @@ -1,3 +1,6 @@ +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; + namespace mRemoteNG.UI.Forms.OptionsPages { public sealed partial class TabsPanelsPage @@ -6,7 +9,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Tab_Icon; + PageIcon = Properties.Resources.Tab_Icon; } public override string PageName diff --git a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs index 592d8dcc..f59f8579 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/ThemePage.cs @@ -4,6 +4,8 @@ using mRemoteNG.Themes; using System.Linq; using System.Collections.Generic; using BrightIdeasSoftware; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms.Input; using mRemoteNG.UI.TaskDialog; @@ -22,7 +24,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages public ThemePage() { InitializeComponent(); - PageIcon = Resources.Appearance_Icon; + PageIcon = Properties.Resources.Appearance_Icon; _themeManager = ThemeManager.getInstance(); if (!_themeManager.ThemingActive) return; _themeManager = ThemeManager.getInstance(); diff --git a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs index 56250d5b..e9a85294 100644 --- a/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs +++ b/mRemoteNG/UI/Forms/OptionsPages/UpdatesPage.cs @@ -4,6 +4,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; using mRemoteNG.App.Update; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tools; using mRemoteNG.UI.TaskDialog; @@ -22,7 +24,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages { InitializeComponent(); ApplyTheme(); - PageIcon = Resources.Update_Icon; + PageIcon = Properties.Resources.Update_Icon; } #region Public Methods diff --git a/mRemoteNG/UI/Forms/PasswordForm.Designer.cs b/mRemoteNG/UI/Forms/PasswordForm.Designer.cs index 1cb6665f..74bfdb94 100644 --- a/mRemoteNG/UI/Forms/PasswordForm.Designer.cs +++ b/mRemoteNG/UI/Forms/PasswordForm.Designer.cs @@ -75,7 +75,7 @@ namespace mRemoteNG.UI.Forms this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 23); this.btnOK.TabIndex = 7; - this.btnOK.Text = global::mRemoteNG.Language._Ok; + this.btnOK.Text = global::mRemoteNG.Resources.Language.Language._Ok; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.BtnOK_Click); // @@ -88,7 +88,7 @@ namespace mRemoteNG.UI.Forms this.btnCancel.Name = "btnCancel"; this.btnCancel.Size = new System.Drawing.Size(75, 23); this.btnCancel.TabIndex = 6; - this.btnCancel.Text = global::mRemoteNG.Language._Cancel; + this.btnCancel.Text = global::mRemoteNG.Resources.Language.Language._Cancel; this.btnCancel.UseVisualStyleBackColor = true; this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click); // @@ -108,7 +108,7 @@ namespace mRemoteNG.UI.Forms // // pbLock // - this.pbLock.Image = global::mRemoteNG.Resources.Lock; + this.pbLock.Image = global::mRemoteNG.Properties.Resources.Lock; this.pbLock.Location = new System.Drawing.Point(3, 12); this.pbLock.Name = "pbLock"; this.tableLayoutPanel1.SetRowSpan(this.pbLock, 6); diff --git a/mRemoteNG/UI/Forms/PasswordForm.cs b/mRemoteNG/UI/Forms/PasswordForm.cs index 439a2761..4b11b434 100644 --- a/mRemoteNG/UI/Forms/PasswordForm.cs +++ b/mRemoteNG/UI/Forms/PasswordForm.cs @@ -1,6 +1,7 @@ using System; using System.Security; using System.Windows.Forms; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Themes; using mRemoteNG.Tools; diff --git a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs b/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs index 4f1f7a71..e3bf663d 100644 --- a/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs +++ b/mRemoteNG/UI/Forms/UnhandledExceptionWindow.cs @@ -5,6 +5,7 @@ using System.Text; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs index 65e27399..27a8576b 100644 --- a/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs +++ b/mRemoteNG/UI/Forms/frmChoosePanel.Designer.cs @@ -52,7 +52,7 @@ namespace mRemoteNG.UI.Forms this.btnOK.Name = "btnOK"; this.btnOK.Size = new System.Drawing.Size(75, 24); this.btnOK.TabIndex = 20; - this.btnOK.Text = global::mRemoteNG.Language._Ok; + this.btnOK.Text = global::mRemoteNG.Resources.Language.Language._Ok; this.btnOK.UseVisualStyleBackColor = true; this.btnOK.Click += new System.EventHandler(this.btnOK_Click); // @@ -68,13 +68,13 @@ namespace mRemoteNG.UI.Forms // btnNew // this.btnNew._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; - this.btnNew.Image = global::mRemoteNG.Resources.Panel_Add; + this.btnNew.Image = global::mRemoteNG.Properties.Resources.Panel_Add; this.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnNew.Location = new System.Drawing.Point(86, 72); this.btnNew.Name = "btnNew"; this.btnNew.Size = new System.Drawing.Size(75, 24); this.btnNew.TabIndex = 40; - this.btnNew.Text = global::mRemoteNG.Language._New; + this.btnNew.Text = global::mRemoteNG.Resources.Language.Language._New; this.btnNew.UseVisualStyleBackColor = true; this.btnNew.Click += new System.EventHandler(this.btnNew_Click); // @@ -90,7 +90,7 @@ namespace mRemoteNG.UI.Forms this.Controls.Add(this.cbPanels); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; - this.Icon = global::mRemoteNG.Resources.Panels_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.Panels_Icon; this.MaximizeBox = false; this.MinimizeBox = false; this.Name = "FrmChoosePanel"; diff --git a/mRemoteNG/UI/Forms/frmChoosePanel.cs b/mRemoteNG/UI/Forms/frmChoosePanel.cs index c2263da5..08c0938d 100644 --- a/mRemoteNG/UI/Forms/frmChoosePanel.cs +++ b/mRemoteNG/UI/Forms/frmChoosePanel.cs @@ -1,5 +1,6 @@ using System.Windows.Forms; using mRemoteNG.App; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.UI.Forms.Input; using mRemoteNG.UI.Panels; diff --git a/mRemoteNG/UI/Forms/frmMain.cs b/mRemoteNG/UI/Forms/frmMain.cs index 5d7a6319..e19b3d44 100644 --- a/mRemoteNG/UI/Forms/frmMain.cs +++ b/mRemoteNG/UI/Forms/frmMain.cs @@ -31,6 +31,8 @@ using WeifenLuo.WinFormsUI.Docking; using CefSharp; using CefSharp.WinForms; using CefSharp.SchemeHandler; +using mRemoteNG.Resources.Language; +using Settings = mRemoteNG.Properties.Settings; // ReSharper disable MemberCanBePrivate.Global diff --git a/mRemoteNG/UI/Forms/frmOptions.cs b/mRemoteNG/UI/Forms/frmOptions.cs index 1f2a1a2b..0989631c 100644 --- a/mRemoteNG/UI/Forms/frmOptions.cs +++ b/mRemoteNG/UI/Forms/frmOptions.cs @@ -6,6 +6,8 @@ using System.Linq; using System.Windows.Forms; using mRemoteNG.Themes; using System.Configuration; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Forms { @@ -99,7 +101,7 @@ namespace mRemoteNG.UI.Forms private object ImageGetter(object rowobject) { var page = rowobject as OptionsPage; - return page?.PageIcon == null ? _display.ScaleImage(Resources.Help) : _display.ScaleImage(page.PageIcon); + return page?.PageIcon == null ? _display.ScaleImage(Properties.Resources.Help) : _display.ScaleImage(page.PageIcon); } private void SetInitiallyActivatedPage() diff --git a/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs b/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs index eb43d314..db8385ab 100644 --- a/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs +++ b/mRemoteNG/UI/Menu/AdvancedWindowMenu.cs @@ -1,5 +1,6 @@ using System; using System.Windows.Forms; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; namespace mRemoteNG.UI.Menu diff --git a/mRemoteNG/UI/Menu/FileMenu.cs b/mRemoteNG/UI/Menu/FileMenu.cs index 5c14c3a8..cc850778 100644 --- a/mRemoteNG/UI/Menu/FileMenu.cs +++ b/mRemoteNG/UI/Menu/FileMenu.cs @@ -4,6 +4,8 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Security; using mRemoteNG.Tree; using mRemoteNG.UI.Forms; @@ -99,7 +101,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileNewConnection // - _mMenFileNewConnection.Image = Resources.Connection_Add; + _mMenFileNewConnection.Image = Properties.Resources.Connection_Add; _mMenFileNewConnection.Name = "mMenFileNewConnection"; _mMenFileNewConnection.ShortcutKeys = Keys.Control | Keys.N; _mMenFileNewConnection.Size = new System.Drawing.Size(281, 22); @@ -108,7 +110,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileNewFolder // - _mMenFileNewFolder.Image = Resources.Folder_Add; + _mMenFileNewFolder.Image = Properties.Resources.Folder_Add; _mMenFileNewFolder.Name = "mMenFileNewFolder"; _mMenFileNewFolder.ShortcutKeys = (Keys.Control | Keys.Shift) | Keys.N; @@ -123,7 +125,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileNew // - _mMenFileNew.Image = Resources.Connections_New; + _mMenFileNew.Image = Properties.Resources.Connections_New; _mMenFileNew.Name = "mMenFileNew"; _mMenFileNew.Size = new System.Drawing.Size(281, 22); _mMenFileNew.Text = Language.NewConnectionFile; @@ -131,7 +133,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileLoad // - _mMenFileLoad.Image = Resources.Connections_Load; + _mMenFileLoad.Image = Properties.Resources.Connections_Load; _mMenFileLoad.Name = "mMenFileLoad"; _mMenFileLoad.ShortcutKeys = Keys.Control | Keys.O; _mMenFileLoad.Size = new System.Drawing.Size(281, 22); @@ -140,7 +142,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileSave // - _mMenFileSave.Image = Resources.Connections_Save; + _mMenFileSave.Image = Properties.Resources.Connections_Save; _mMenFileSave.Name = "mMenFileSave"; _mMenFileSave.ShortcutKeys = Keys.Control | Keys.S; _mMenFileSave.Size = new System.Drawing.Size(281, 22); @@ -149,7 +151,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileSaveAs // - _mMenFileSaveAs.Image = Resources.Connections_SaveAs; + _mMenFileSaveAs.Image = Properties.Resources.Connections_SaveAs; _mMenFileSaveAs.Name = "mMenFileSaveAs"; _mMenFileSaveAs.ShortcutKeys = (Keys.Control | Keys.Shift) | Keys.S; @@ -164,7 +166,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileDelete // - _mMenFileDelete.Image = Resources.Delete; + _mMenFileDelete.Image = Properties.Resources.Delete; _mMenFileDelete.Name = "mMenFileDelete"; _mMenFileDelete.Size = new System.Drawing.Size(281, 22); _mMenFileDelete.Text = Language.Delete; @@ -172,7 +174,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileRename // - _mMenFileRename.Image = Resources.Rename; + _mMenFileRename.Image = Properties.Resources.Rename; _mMenFileRename.Name = "mMenFileRename"; _mMenFileRename.Size = new System.Drawing.Size(281, 22); _mMenFileRename.Text = Language.Rename; @@ -180,7 +182,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileDuplicate // - _mMenFileDuplicate.Image = Resources.page_copy; + _mMenFileDuplicate.Image = Properties.Resources.page_copy; _mMenFileDuplicate.Name = "mMenFileDuplicate"; _mMenFileDuplicate.Size = new System.Drawing.Size(281, 22); _mMenFileDuplicate.Text = Language.Duplicate; @@ -193,7 +195,7 @@ namespace mRemoteNG.UI.Menu // // mMenReconnectAll // - _mMenReconnectAll.Image = Resources.Refresh; + _mMenReconnectAll.Image = Properties.Resources.Refresh; _mMenReconnectAll.Name = "mMenReconnectAll"; _mMenReconnectAll.Size = new System.Drawing.Size(281, 22); _mMenReconnectAll.Text = Language.ReconnectAllConnections; @@ -251,7 +253,7 @@ namespace mRemoteNG.UI.Menu // // mMenFileExit // - _mMenFileExit.Image = Resources.Quit; + _mMenFileExit.Image = Properties.Resources.Quit; _mMenFileExit.Name = "mMenFileExit"; _mMenFileExit.ShortcutKeys = Keys.Alt | Keys.F4; _mMenFileExit.Size = new System.Drawing.Size(281, 22); diff --git a/mRemoteNG/UI/Menu/HelpMenu.cs b/mRemoteNG/UI/Menu/HelpMenu.cs index 630703a3..a0e42f8b 100644 --- a/mRemoteNG/UI/Menu/HelpMenu.cs +++ b/mRemoteNG/UI/Menu/HelpMenu.cs @@ -3,6 +3,8 @@ using System.Diagnostics; using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Info; +using mRemoteNG.Resources.Language; +using mRemoteNG.UI.Forms; using mRemoteNG.UI.Window; namespace mRemoteNG.UI.Menu @@ -61,7 +63,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoHelp // - _mMenInfoHelp.Image = Resources.Help; + _mMenInfoHelp.Image = Properties.Resources.Help; _mMenInfoHelp.Name = "mMenInfoHelp"; _mMenInfoHelp.ShortcutKeys = Keys.F1; _mMenInfoHelp.Size = new System.Drawing.Size(190, 22); @@ -75,7 +77,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoWebsite // - _mMenInfoWebsite.Image = Resources.Website; + _mMenInfoWebsite.Image = Properties.Resources.Website; _mMenInfoWebsite.Name = "mMenInfoWebsite"; _mMenInfoWebsite.Size = new System.Drawing.Size(190, 22); _mMenInfoWebsite.Text = Language.Website; @@ -83,7 +85,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoDonate // - _mMenInfoDonate.Image = Resources.Donate; + _mMenInfoDonate.Image = Properties.Resources.Donate; _mMenInfoDonate.Name = "mMenInfoDonate"; _mMenInfoDonate.Size = new System.Drawing.Size(190, 22); _mMenInfoDonate.Text = Language.Donate; @@ -91,7 +93,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoForum // - _mMenInfoForum.Image = Resources.user_comment; + _mMenInfoForum.Image = Properties.Resources.user_comment; _mMenInfoForum.Name = "mMenInfoForum"; _mMenInfoForum.Size = new System.Drawing.Size(190, 22); _mMenInfoForum.Text = Language.SupportForum; @@ -99,7 +101,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoBugReport // - _mMenInfoBugReport.Image = Resources.Bug; + _mMenInfoBugReport.Image = Properties.Resources.Bug; _mMenInfoBugReport.Name = "mMenInfoBugReport"; _mMenInfoBugReport.Size = new System.Drawing.Size(190, 22); _mMenInfoBugReport.Text = Language.ReportBug; @@ -112,7 +114,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsUpdate // - _mMenToolsUpdate.Image = Resources.Update; + _mMenToolsUpdate.Image = Properties.Resources.Update; _mMenToolsUpdate.Name = "mMenToolsUpdate"; _mMenToolsUpdate.Size = new System.Drawing.Size(190, 22); _mMenToolsUpdate.Text = Language.CheckForUpdates; @@ -125,7 +127,7 @@ namespace mRemoteNG.UI.Menu // // mMenInfoAbout // - _mMenInfoAbout.Image = Resources.mRemoteNG; + _mMenInfoAbout.Image = Properties.Resources.mRemoteNG; _mMenInfoAbout.Name = "mMenInfoAbout"; _mMenInfoAbout.Size = new System.Drawing.Size(190, 22); _mMenInfoAbout.Text = Language.About; diff --git a/mRemoteNG/UI/Menu/ToolsMenu.cs b/mRemoteNG/UI/Menu/ToolsMenu.cs index d08f296a..a6944022 100644 --- a/mRemoteNG/UI/Menu/ToolsMenu.cs +++ b/mRemoteNG/UI/Menu/ToolsMenu.cs @@ -2,6 +2,7 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.Credential; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.Menu { @@ -51,7 +52,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsSSHTransfer // - _mMenToolsSshTransfer.Image = Resources.SSHTransfer; + _mMenToolsSshTransfer.Image = Properties.Resources.SSHTransfer; _mMenToolsSshTransfer.Name = "mMenToolsSSHTransfer"; _mMenToolsSshTransfer.Size = new System.Drawing.Size(184, 22); _mMenToolsSshTransfer.Text = Language.SshFileTransfer; @@ -59,7 +60,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsUVNCSC // - _mMenToolsUvncsc.Image = Resources.UVNC_SC; + _mMenToolsUvncsc.Image = Properties.Resources.UVNC_SC; _mMenToolsUvncsc.Name = "mMenToolsUVNCSC"; _mMenToolsUvncsc.Size = new System.Drawing.Size(184, 22); _mMenToolsUvncsc.Text = Language.UltraVNCSingleClick; @@ -68,7 +69,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsExternalApps // - _mMenToolsExternalApps.Image = Resources.ExtApp; + _mMenToolsExternalApps.Image = Properties.Resources.ExtApp; _mMenToolsExternalApps.Name = "mMenToolsExternalApps"; _mMenToolsExternalApps.Size = new System.Drawing.Size(184, 22); _mMenToolsExternalApps.Text = Language.ExternalTool; @@ -76,7 +77,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsPortScan // - _mMenToolsPortScan.Image = Resources.PortScan; + _mMenToolsPortScan.Image = Properties.Resources.PortScan; _mMenToolsPortScan.Name = "mMenToolsPortScan"; _mMenToolsPortScan.Size = new System.Drawing.Size(184, 22); _mMenToolsPortScan.Text = Language.PortScan; @@ -84,7 +85,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewScreenshotManager // - _mMenViewScreenshotManager.Image = Resources.Screenshot; + _mMenViewScreenshotManager.Image = Properties.Resources.Screenshot; _mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"; _mMenViewScreenshotManager.Size = new System.Drawing.Size(228, 22); _mMenViewScreenshotManager.Text = Language.Screenshots; @@ -97,7 +98,7 @@ namespace mRemoteNG.UI.Menu // // mMenToolsOptions // - _mMenToolsOptions.Image = Resources.Options; + _mMenToolsOptions.Image = Properties.Resources.Options; _mMenToolsOptions.Name = "mMenToolsOptions"; _mMenToolsOptions.Size = new System.Drawing.Size(184, 22); _mMenToolsOptions.Text = Language.Options; diff --git a/mRemoteNG/UI/Menu/ViewMenu.cs b/mRemoteNG/UI/Menu/ViewMenu.cs index 0a9c3ce0..cd89b28b 100644 --- a/mRemoteNG/UI/Menu/ViewMenu.cs +++ b/mRemoteNG/UI/Menu/ViewMenu.cs @@ -1,6 +1,8 @@ using System; using System.Windows.Forms; using mRemoteNG.App; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.UI.Panels; using mRemoteNG.UI.Window; @@ -93,7 +95,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewAddConnectionPanel // - _mMenViewAddConnectionPanel.Image = Resources.Panel_Add; + _mMenViewAddConnectionPanel.Image = Properties.Resources.Panel_Add; _mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"; _mMenViewAddConnectionPanel.Size = new System.Drawing.Size(228, 22); _mMenViewAddConnectionPanel.Text = Language.AddConnectionPanel; @@ -101,7 +103,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewConnectionPanels // - _mMenViewConnectionPanels.Image = Resources.Panels; + _mMenViewConnectionPanels.Image = Properties.Resources.Panels; _mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"; _mMenViewConnectionPanels.Size = new System.Drawing.Size(228, 22); _mMenViewConnectionPanels.Text = Language.ConnectionPanels; @@ -115,7 +117,7 @@ namespace mRemoteNG.UI.Menu // _mMenViewConnections.Checked = true; _mMenViewConnections.CheckState = CheckState.Checked; - _mMenViewConnections.Image = Resources.Root; + _mMenViewConnections.Image = Properties.Resources.Root; _mMenViewConnections.Name = "mMenViewConnections"; _mMenViewConnections.Size = new System.Drawing.Size(228, 22); _mMenViewConnections.Text = Language.Connections; @@ -125,7 +127,7 @@ namespace mRemoteNG.UI.Menu // _mMenViewConfig.Checked = true; _mMenViewConfig.CheckState = CheckState.Checked; - _mMenViewConfig.Image = Resources.cog; + _mMenViewConfig.Image = Properties.Resources.cog; _mMenViewConfig.Name = "mMenViewConfig"; _mMenViewConfig.Size = new System.Drawing.Size(228, 22); _mMenViewConfig.Text = Language.Config; @@ -135,7 +137,7 @@ namespace mRemoteNG.UI.Menu // _mMenViewErrorsAndInfos.Checked = true; _mMenViewErrorsAndInfos.CheckState = CheckState.Checked; - _mMenViewErrorsAndInfos.Image = Resources.ErrorsAndInfos; + _mMenViewErrorsAndInfos.Image = Properties.Resources.ErrorsAndInfos; _mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"; _mMenViewErrorsAndInfos.Size = new System.Drawing.Size(228, 22); _mMenViewErrorsAndInfos.Text = Language.Notifications; @@ -153,14 +155,14 @@ namespace mRemoteNG.UI.Menu _mMenViewJumpToConnectionsConfig, _mMenViewJumpToErrorsInfos }); - _mMenViewJumpTo.Image = Resources.JumpTo; + _mMenViewJumpTo.Image = Properties.Resources.JumpTo; _mMenViewJumpTo.Name = "mMenViewJumpTo"; _mMenViewJumpTo.Size = new System.Drawing.Size(228, 22); _mMenViewJumpTo.Text = Language.JumpTo; // // mMenViewJumpToConnectionsConfig // - _mMenViewJumpToConnectionsConfig.Image = Resources.Root; + _mMenViewJumpToConnectionsConfig.Image = Properties.Resources.Root; _mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig"; _mMenViewJumpToConnectionsConfig.ShortcutKeys = Keys.Control | Keys.Alt | Keys.C; _mMenViewJumpToConnectionsConfig.Size = new System.Drawing.Size(258, 22); @@ -169,7 +171,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewJumpToErrorsInfos // - _mMenViewJumpToErrorsInfos.Image = Resources.InformationSmall; + _mMenViewJumpToErrorsInfos.Image = Properties.Resources.InformationSmall; _mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos"; _mMenViewJumpToErrorsInfos.ShortcutKeys = Keys.Control | Keys.Alt | Keys.E; _mMenViewJumpToErrorsInfos.Size = new System.Drawing.Size(258, 22); @@ -178,7 +180,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewResetLayout // - _mMenViewResetLayout.Image = Resources.application_side_tree; + _mMenViewResetLayout.Image = Properties.Resources.application_side_tree; _mMenViewResetLayout.Name = "mMenViewResetLayout"; _mMenViewResetLayout.Size = new System.Drawing.Size(228, 22); _mMenViewResetLayout.Text = Language.ResetLayout; @@ -186,7 +188,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewLockToolbars // - _mMenViewLockToolbars.Image = Resources.application_side_tree; + _mMenViewLockToolbars.Image = Properties.Resources.application_side_tree; _mMenViewLockToolbars.Name = "mMenViewLockToolbars"; _mMenViewLockToolbars.Size = new System.Drawing.Size(228, 22); _mMenViewLockToolbars.Text = Language.LockToolbars; @@ -199,7 +201,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewQuickConnectToolbar // - _mMenViewQuickConnectToolbar.Image = Resources.Play_Quick; + _mMenViewQuickConnectToolbar.Image = Properties.Resources.Play_Quick; _mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"; _mMenViewQuickConnectToolbar.Size = new System.Drawing.Size(228, 22); _mMenViewQuickConnectToolbar.Text = Language.QuickConnectToolbar; @@ -207,7 +209,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewExtAppsToolbar // - _mMenViewExtAppsToolbar.Image = Resources.ExtApp; + _mMenViewExtAppsToolbar.Image = Properties.Resources.ExtApp; _mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar"; _mMenViewExtAppsToolbar.Size = new System.Drawing.Size(228, 22); _mMenViewExtAppsToolbar.Text = Language.ExternalToolsToolbar; @@ -215,7 +217,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewMultiSSHToolbar // - _mMenViewMultiSshToolbar.Image = Resources.Panels; + _mMenViewMultiSshToolbar.Image = Properties.Resources.Panels; _mMenViewMultiSshToolbar.Name = "mMenViewMultiSSHToolbar"; _mMenViewMultiSshToolbar.Size = new System.Drawing.Size(279, 26); _mMenViewMultiSshToolbar.Text = Language.MultiSshToolbar; @@ -228,7 +230,7 @@ namespace mRemoteNG.UI.Menu // // mMenViewFullscreen // - _mMenViewFullscreen.Image = Resources.arrow_out; + _mMenViewFullscreen.Image = Properties.Resources.arrow_out; _mMenViewFullscreen.Name = "mMenViewFullscreen"; _mMenViewFullscreen.ShortcutKeys = Keys.F11; _mMenViewFullscreen.Size = new System.Drawing.Size(228, 22); diff --git a/mRemoteNG/UI/Panels/PanelAdder.cs b/mRemoteNG/UI/Panels/PanelAdder.cs index fc9fb1f2..6117f723 100644 --- a/mRemoteNG/UI/Panels/PanelAdder.cs +++ b/mRemoteNG/UI/Panels/PanelAdder.cs @@ -7,6 +7,7 @@ using System; using System.Collections; using System.Linq; using System.Windows.Forms; +using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; namespace mRemoteNG.UI.Panels @@ -70,7 +71,7 @@ namespace mRemoteNG.UI.Panels var cMenScreens = new ToolStripMenuItem { Text = Language.SendTo, - Image = Resources.Monitor, + Image = Properties.Resources.Monitor, Tag = pnlcForm }; cMenScreens.DropDownItems.Add("Dummy"); @@ -83,7 +84,7 @@ namespace mRemoteNG.UI.Panels var cMenRen = new ToolStripMenuItem { Text = Language.Rename, - Image = Resources.Rename, + Image = Properties.Resources.Rename, Tag = pnlcForm }; cMenRen.Click += cMenConnectionPanelRename_Click; @@ -95,7 +96,7 @@ namespace mRemoteNG.UI.Panels var cMenClose = new ToolStripMenuItem { Text = Language._Close, - Image = Resources.Panel_Close, + Image = Properties.Resources.Panel_Close, Tag = pnlcForm }; cMenClose.Click += cMenConnectionPanelClose_Click; @@ -145,7 +146,7 @@ namespace mRemoteNG.UI.Panels var cMenScreen = new ToolStripMenuItem(Language.Screen + " " + Convert.ToString(i + 1)) { Tag = new ArrayList(), - Image = Resources.Monitor_GoTo + Image = Properties.Resources.Monitor_GoTo }; ((ArrayList)cMenScreen.Tag).Add(Screen.AllScreens[i]); ((ArrayList)cMenScreen.Tag).Add(cMenScreens.Tag); diff --git a/mRemoteNG/UI/Tabs/ConnectionTab.cs b/mRemoteNG/UI/Tabs/ConnectionTab.cs index e2761552..d8d1baab 100644 --- a/mRemoteNG/UI/Tabs/ConnectionTab.cs +++ b/mRemoteNG/UI/Tabs/ConnectionTab.cs @@ -6,6 +6,8 @@ using mRemoteNG.Config; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.VNC; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.TaskDialog; using WeifenLuo.WinFormsUI.Docking; diff --git a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs index 9cf9a1b0..2bb3da42 100644 --- a/mRemoteNG/UI/Tabs/DockPaneStripNG.cs +++ b/mRemoteNG/UI/Tabs/DockPaneStripNG.cs @@ -5,6 +5,8 @@ using System.Drawing.Drawing2D; using System.Security.Permissions; using System.Windows.Forms; using mRemoteNG.Connection; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; namespace mRemoteNG.UI.Tabs diff --git a/mRemoteNG/UI/TaskDialog/CommandButton.cs b/mRemoteNG/UI/TaskDialog/CommandButton.cs index 1cd0cea6..db2700a0 100644 --- a/mRemoteNG/UI/TaskDialog/CommandButton.cs +++ b/mRemoteNG/UI/TaskDialog/CommandButton.cs @@ -152,8 +152,8 @@ namespace mRemoteNG.UI.TaskDialog protected override void OnCreateControl() { base.OnCreateControl(); - imgArrow1 = Resources.green_arrow1; - imgArrow2 = Resources.green_arrow2; + imgArrow1 = Properties.Resources.green_arrow1; + imgArrow2 = Properties.Resources.green_arrow2; } //-------------------------------------------------------------------------------- diff --git a/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs b/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs index 55785aa9..c9ef5404 100644 --- a/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs +++ b/mRemoteNG/UI/TaskDialog/frmTaskDialog.cs @@ -4,6 +4,7 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Windows.Forms; +using mRemoteNG.Resources.Language; namespace mRemoteNG.UI.TaskDialog { diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs index 4aaa8305..4f96d921 100644 --- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.Designer.cs @@ -114,7 +114,7 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.btnChangeDomain); this.Controls.Add(this.btnImport); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Resources.ActiveDirectory_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.ActiveDirectory_Icon; this.Name = "ActiveDirectoryImportWindow"; this.TabText = "Active Directory Import"; this.Text = "Active Directory Import"; diff --git a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs index 79a19b13..95a2dfc7 100644 --- a/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs +++ b/mRemoteNG/UI/Window/ActiveDirectoryImportWindow.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; using mRemoteNG.Container; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; namespace mRemoteNG.UI.Window diff --git a/mRemoteNG/UI/Window/ConfigWindow.cs b/mRemoteNG/UI/Window/ConfigWindow.cs index 97e72890..522e51a3 100644 --- a/mRemoteNG/UI/Window/ConfigWindow.cs +++ b/mRemoteNG/UI/Window/ConfigWindow.cs @@ -9,6 +9,8 @@ using mRemoteNG.App; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls.ConnectionInfoPropertyGrid; @@ -127,7 +129,7 @@ namespace mRemoteNG.UI.Window //btnShowInheritance // _btnShowInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowInheritance.Image = Resources.Inheritance; + _btnShowInheritance.Image = Properties.Resources.Inheritance; _btnShowInheritance.ImageTransparentColor = Color.Magenta; _btnShowInheritance.Name = "_btnShowInheritance"; _btnShowInheritance.Size = new Size(23, 22); @@ -136,7 +138,7 @@ namespace mRemoteNG.UI.Window //btnShowDefaultInheritance // _btnShowDefaultInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowDefaultInheritance.Image = Resources.Inheritance_Default; + _btnShowDefaultInheritance.Image = Properties.Resources.Inheritance_Default; _btnShowDefaultInheritance.ImageTransparentColor = Color.Magenta; _btnShowDefaultInheritance.Name = "_btnShowDefaultInheritance"; _btnShowDefaultInheritance.Size = new Size(23, 22); @@ -147,7 +149,7 @@ namespace mRemoteNG.UI.Window _btnShowProperties.Checked = true; _btnShowProperties.CheckState = CheckState.Checked; _btnShowProperties.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowProperties.Image = Resources.Properties; + _btnShowProperties.Image = Properties.Resources.Properties; _btnShowProperties.ImageTransparentColor = Color.Magenta; _btnShowProperties.Name = "_btnShowProperties"; _btnShowProperties.Size = new Size(23, 22); @@ -156,7 +158,7 @@ namespace mRemoteNG.UI.Window //btnShowDefaultProperties // _btnShowDefaultProperties.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnShowDefaultProperties.Image = Resources.Properties_Default; + _btnShowDefaultProperties.Image = Properties.Resources.Properties_Default; _btnShowDefaultProperties.ImageTransparentColor = Color.Magenta; _btnShowDefaultProperties.Name = "_btnShowDefaultProperties"; _btnShowDefaultProperties.Size = new Size(23, 22); @@ -175,7 +177,7 @@ namespace mRemoteNG.UI.Window // _btnHostStatus.Alignment = ToolStripItemAlignment.Right; _btnHostStatus.DisplayStyle = ToolStripItemDisplayStyle.Image; - _btnHostStatus.Image = Resources.HostStatus_Check; + _btnHostStatus.Image = Properties.Resources.HostStatus_Check; _btnHostStatus.ImageTransparentColor = Color.Magenta; _btnHostStatus.Name = "_btnHostStatus"; _btnHostStatus.Size = new Size(23, 22); @@ -193,7 +195,7 @@ namespace mRemoteNG.UI.Window Controls.Add(_pGrid); Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0)); HideOnClose = true; - Icon = Resources.Config_Icon; + Icon = Properties.Resources.Config_Icon; Name = "ConfigWindow"; TabText = @"Config"; Text = @"Config"; @@ -597,7 +599,7 @@ namespace mRemoteNG.UI.Window { if (string.IsNullOrEmpty(hostName as string)) { - ShowStatusImage(Resources.HostStatus_Off); + ShowStatusImage(Properties.Resources.HostStatus_Off); return; } @@ -609,18 +611,18 @@ namespace mRemoteNG.UI.Window if (pReply?.Status == IPStatus.Success) { if ((string)_btnHostStatus.Tag == "checking") - ShowStatusImage(Resources.HostStatus_On); + ShowStatusImage(Properties.Resources.HostStatus_On); } else { if ((string)_btnHostStatus.Tag == "checking") - ShowStatusImage(Resources.HostStatus_Off); + ShowStatusImage(Properties.Resources.HostStatus_Off); } } catch (Exception) { if ((string)_btnHostStatus.Tag == "checking") - ShowStatusImage(Resources.HostStatus_Off); + ShowStatusImage(Properties.Resources.HostStatus_Off); } } @@ -644,7 +646,7 @@ namespace mRemoteNG.UI.Window { try { - _btnHostStatus.Image = Resources.HostStatus_Check; + _btnHostStatus.Image = Properties.Resources.HostStatus_Check; // To check status, ConnectionInfo must be an mRemoteNG.Connection.Info that is not a container if (!(connectionInfo is ConnectionInfo info)) return; if (info.IsContainer) return; diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs index 78a42cac..20254ed0 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.Designer.cs @@ -1,4 +1,7 @@ -namespace mRemoteNG.UI.Window +using mRemoteNG.Tree.ClickHandlers; +using mRemoteNG.UI.Controls.ConnectionTree; + +namespace mRemoteNG.UI.Window { public partial class ConnectionTreeWindow : BaseWindow { @@ -14,10 +17,10 @@ { this.components = new System.ComponentModel.Container(); mRemoteNG.Tree.ConnectionTreeModel connectionTreeModel2 = new mRemoteNG.Tree.ConnectionTreeModel(); - mRemoteNG.Tree.TreeNodeCompositeClickHandler treeNodeCompositeClickHandler3 = new mRemoteNG.Tree.TreeNodeCompositeClickHandler(); + TreeNodeCompositeClickHandler treeNodeCompositeClickHandler3 = new TreeNodeCompositeClickHandler(); mRemoteNG.Tree.AlwaysConfirmYes alwaysConfirmYes2 = new mRemoteNG.Tree.AlwaysConfirmYes(); - mRemoteNG.Tree.TreeNodeCompositeClickHandler treeNodeCompositeClickHandler4 = new mRemoteNG.Tree.TreeNodeCompositeClickHandler(); - this.ConnectionTree = new mRemoteNG.UI.Controls.ConnectionTree(); + TreeNodeCompositeClickHandler treeNodeCompositeClickHandler4 = new TreeNodeCompositeClickHandler(); + this.ConnectionTree = new ConnectionTree(); this.msMain = new System.Windows.Forms.MenuStrip(); this.mMenAddConnection = new System.Windows.Forms.ToolStripMenuItem(); this.mMenAddFolder = new System.Windows.Forms.ToolStripMenuItem(); @@ -43,7 +46,7 @@ this.ConnectionTree.ConnectionTreeModel = connectionTreeModel2; this.ConnectionTree.Cursor = System.Windows.Forms.Cursors.Default; this.ConnectionTree.Dock = System.Windows.Forms.DockStyle.Fill; - treeNodeCompositeClickHandler3.ClickHandlers = new mRemoteNG.Tree.ITreeNodeClickHandler[0]; + treeNodeCompositeClickHandler3.ClickHandlers = new ITreeNodeClickHandler[0]; this.ConnectionTree.DoubleClickHandler = treeNodeCompositeClickHandler3; this.ConnectionTree.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ConnectionTree.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None; @@ -54,11 +57,11 @@ this.ConnectionTree.MultiSelect = false; this.ConnectionTree.Name = "ConnectionTree"; this.ConnectionTree.NodeDeletionConfirmer = alwaysConfirmYes2; - this.ConnectionTree.PostSetupActions = new mRemoteNG.UI.Controls.IConnectionTreeDelegate[0]; + this.ConnectionTree.PostSetupActions = new IConnectionTreeDelegate[0]; this.ConnectionTree.SelectedBackColor = System.Drawing.SystemColors.Highlight; this.ConnectionTree.SelectedForeColor = System.Drawing.SystemColors.HighlightText; this.ConnectionTree.ShowGroups = false; - treeNodeCompositeClickHandler4.ClickHandlers = new mRemoteNG.Tree.ITreeNodeClickHandler[0]; + treeNodeCompositeClickHandler4.ClickHandlers = new ITreeNodeClickHandler[0]; this.ConnectionTree.SingleClickHandler = treeNodeCompositeClickHandler4; this.ConnectionTree.Size = new System.Drawing.Size(204, 366); this.ConnectionTree.TabIndex = 20; @@ -90,7 +93,7 @@ // mMenAddConnection // this.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddConnection.Image = global::mRemoteNG.Resources.Connection_Add; + this.mMenAddConnection.Image = global::mRemoteNG.Properties.Resources.Connection_Add; this.mMenAddConnection.Name = "mMenAddConnection"; this.mMenAddConnection.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); this.mMenAddConnection.Size = new System.Drawing.Size(24, 20); @@ -99,7 +102,7 @@ // mMenAddFolder // this.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenAddFolder.Image = global::mRemoteNG.Resources.Folder_Add; + this.mMenAddFolder.Image = global::mRemoteNG.Properties.Resources.Folder_Add; this.mMenAddFolder.Name = "mMenAddFolder"; this.mMenAddFolder.Size = new System.Drawing.Size(28, 20); this.mMenAddFolder.Click += new System.EventHandler(this.CMenTreeAddFolder_Click); @@ -107,7 +110,7 @@ // mMenViewExpandAllFolders // this.mMenViewExpandAllFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenViewExpandAllFolders.Image = global::mRemoteNG.Resources.Expand; + this.mMenViewExpandAllFolders.Image = global::mRemoteNG.Properties.Resources.Expand; this.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders"; this.mMenViewExpandAllFolders.Size = new System.Drawing.Size(28, 20); this.mMenViewExpandAllFolders.Text = "Expand all folders"; @@ -115,7 +118,7 @@ // mMenViewCollapseAllFolders // this.mMenViewCollapseAllFolders.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenViewCollapseAllFolders.Image = global::mRemoteNG.Resources.Collapse; + this.mMenViewCollapseAllFolders.Image = global::mRemoteNG.Properties.Resources.Collapse; this.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders"; this.mMenViewCollapseAllFolders.Size = new System.Drawing.Size(28, 20); this.mMenViewCollapseAllFolders.Text = "Collapse all folders"; @@ -123,14 +126,14 @@ // mMenSortAscending // this.mMenSort.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenSort.Image = global::mRemoteNG.Resources.Sort_AZ; + this.mMenSort.Image = global::mRemoteNG.Properties.Resources.Sort_AZ; this.mMenSort.Name = "mMenSort"; this.mMenSort.Size = new System.Drawing.Size(28, 20); // // mMenFavorites // this.mMenFavorites.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.mMenFavorites.Image = global::mRemoteNG.Resources.star; + this.mMenFavorites.Image = global::mRemoteNG.Properties.Resources.star; this.mMenFavorites.Name = "mMenFavorites"; this.mMenFavorites.Size = new System.Drawing.Size(28, 20); this.mMenFavorites.Text = "Favorites"; @@ -142,7 +145,7 @@ // pbSearch // this.pbSearch.Dock = System.Windows.Forms.DockStyle.Fill; - this.pbSearch.Image = global::mRemoteNG.Resources.Search; + this.pbSearch.Image = global::mRemoteNG.Properties.Resources.Search; this.pbSearch.Location = new System.Drawing.Point(0, 0); this.pbSearch.Margin = new System.Windows.Forms.Padding(0); this.pbSearch.Name = "pbSearch"; @@ -193,7 +196,7 @@ this.Controls.Add(this.msMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; - this.Icon = global::mRemoteNG.Resources.Root_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.Root_Icon; this.Name = "ConnectionTreeWindow"; this.TabText = "Connections"; this.Text = "Connections"; diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs index d1eaa698..9868435e 100644 --- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs @@ -8,10 +8,14 @@ using mRemoteNG.App; using mRemoteNG.Config.Connections; using mRemoteNG.Connection; using mRemoteNG.Container; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using mRemoteNG.UI.TaskDialog; using WeifenLuo.WinFormsUI.Docking; @@ -194,13 +198,13 @@ namespace mRemoteNG.UI.Window if (_sortedAz) { ConnectionTree.SortRecursive(ConnectionTree.GetRootConnectionNode(), ListSortDirection.Ascending); - mMenSort.Image = mRemoteNG.Resources.Sort_ZA; + mMenSort.Image = Properties.Resources.Sort_ZA; _sortedAz = false; } else { ConnectionTree.SortRecursive(ConnectionTree.GetRootConnectionNode(), ListSortDirection.Descending); - mMenSort.Image = mRemoteNG.Resources.Sort_AZ; + mMenSort.Image = Properties.Resources.Sort_AZ; _sortedAz = true; } }; @@ -218,7 +222,7 @@ namespace mRemoteNG.UI.Window { Text = containerInfo.Name, Tag = containerInfo, - Image = containerInfo.OpenConnections.Count > 0 ? Resources.Play : Resources.Pause + Image = containerInfo.OpenConnections.Count > 0 ? Properties.Resources.Play : Properties.Resources.Pause }; favoriteMenuItem.MouseUp += FavoriteMenuItem_MouseUp; favoritesList.Add(favoriteMenuItem); diff --git a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs index 888a4412..64048050 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.Designer.cs @@ -104,35 +104,35 @@ namespace mRemoteNG.UI.Window // // cmenTabDisconnect // - this.cmenTabDisconnect.Image = global::mRemoteNG.Resources.tab_delete; + this.cmenTabDisconnect.Image = global::mRemoteNG.Properties.Resources.tab_delete; this.cmenTabDisconnect.Name = "cmenTabDisconnect"; this.cmenTabDisconnect.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnect.Text = "Disconnect"; // // cmenTabDisconnectOthers // - this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Resources.tab_delete; + this.cmenTabDisconnectOthers.Image = global::mRemoteNG.Properties.Resources.tab_delete; this.cmenTabDisconnectOthers.Name = "cmenTabDisconnectOthers"; this.cmenTabDisconnectOthers.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnectOthers.Text = "Disconnect Other Tabs"; // // cmenTabDisconnectOthersRight // - this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Resources.tab_delete; + this.cmenTabDisconnectOthersRight.Image = global::mRemoteNG.Properties.Resources.tab_delete; this.cmenTabDisconnectOthersRight.Name = "cmenTabDisconnectOthersRight"; this.cmenTabDisconnectOthersRight.Size = new System.Drawing.Size(230, 22); this.cmenTabDisconnectOthersRight.Text = "Disconnect Tabs To The Right"; // // cmenTabRenameTab // - this.cmenTabRenameTab.Image = global::mRemoteNG.Resources.tab_edit; + this.cmenTabRenameTab.Image = global::mRemoteNG.Properties.Resources.tab_edit; this.cmenTabRenameTab.Name = "cmenTabRenameTab"; this.cmenTabRenameTab.Size = new System.Drawing.Size(230, 22); this.cmenTabRenameTab.Text = "Rename Tab"; // // cmenTabDuplicateTab // - this.cmenTabDuplicateTab.Image = global::mRemoteNG.Resources.tab_add; + this.cmenTabDuplicateTab.Image = global::mRemoteNG.Properties.Resources.tab_add; this.cmenTabDuplicateTab.Name = "cmenTabDuplicateTab"; this.cmenTabDuplicateTab.Size = new System.Drawing.Size(230, 22); this.cmenTabDuplicateTab.Text = "Duplicate Tab"; @@ -144,28 +144,28 @@ namespace mRemoteNG.UI.Window // // cmenTabFullscreen // - this.cmenTabFullscreen.Image = global::mRemoteNG.Resources.arrow_out; + this.cmenTabFullscreen.Image = global::mRemoteNG.Properties.Resources.arrow_out; this.cmenTabFullscreen.Name = "cmenTabFullscreen"; this.cmenTabFullscreen.Size = new System.Drawing.Size(230, 22); this.cmenTabFullscreen.Text = "Fullscreen (RDP)"; // // cmenTabSmartSize // - this.cmenTabSmartSize.Image = global::mRemoteNG.Resources.SmartSize; + this.cmenTabSmartSize.Image = global::mRemoteNG.Properties.Resources.SmartSize; this.cmenTabSmartSize.Name = "cmenTabSmartSize"; this.cmenTabSmartSize.Size = new System.Drawing.Size(230, 22); this.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)"; // // cmenTabViewOnly // - this.cmenTabViewOnly.Image = global::mRemoteNG.Resources.View; + this.cmenTabViewOnly.Image = global::mRemoteNG.Properties.Resources.View; this.cmenTabViewOnly.Name = "cmenTabViewOnly"; this.cmenTabViewOnly.Size = new System.Drawing.Size(230, 22); this.cmenTabViewOnly.Text = "View Only (VNC)"; // // cmenTabStartChat // - this.cmenTabStartChat.Image = global::mRemoteNG.Resources.Chat; + this.cmenTabStartChat.Image = global::mRemoteNG.Properties.Resources.Chat; this.cmenTabStartChat.Name = "cmenTabStartChat"; this.cmenTabStartChat.Size = new System.Drawing.Size(230, 22); this.cmenTabStartChat.Text = "Start Chat (VNC)"; @@ -173,14 +173,14 @@ namespace mRemoteNG.UI.Window // // cmenTabRefreshScreen // - this.cmenTabRefreshScreen.Image = global::mRemoteNG.Resources.Refresh; + this.cmenTabRefreshScreen.Image = global::mRemoteNG.Properties.Resources.Refresh; this.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen"; this.cmenTabRefreshScreen.Size = new System.Drawing.Size(230, 22); this.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)"; // // cmenTabTransferFile // - this.cmenTabTransferFile.Image = global::mRemoteNG.Resources.SSHTransfer; + this.cmenTabTransferFile.Image = global::mRemoteNG.Properties.Resources.SSHTransfer; this.cmenTabTransferFile.Name = "cmenTabTransferFile"; this.cmenTabTransferFile.Size = new System.Drawing.Size(230, 22); this.cmenTabTransferFile.Text = "Transfer File (SSH)"; @@ -190,7 +190,7 @@ namespace mRemoteNG.UI.Window this.cmenTabSendSpecialKeys.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmenTabSendSpecialKeysCtrlAltDel, this.cmenTabSendSpecialKeysCtrlEsc}); - this.cmenTabSendSpecialKeys.Image = global::mRemoteNG.Resources.Keyboard; + this.cmenTabSendSpecialKeys.Image = global::mRemoteNG.Properties.Resources.Keyboard; this.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys"; this.cmenTabSendSpecialKeys.Size = new System.Drawing.Size(230, 22); this.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)"; @@ -214,14 +214,14 @@ namespace mRemoteNG.UI.Window // // cmenTabScreenshot // - this.cmenTabScreenshot.Image = global::mRemoteNG.Resources.Screenshot_Add; + this.cmenTabScreenshot.Image = global::mRemoteNG.Properties.Resources.Screenshot_Add; this.cmenTabScreenshot.Name = "cmenTabScreenshot"; this.cmenTabScreenshot.Size = new System.Drawing.Size(230, 22); this.cmenTabScreenshot.Text = "Screenshot"; // // cmenTabPuttySettings // - this.cmenTabPuttySettings.Image = global::mRemoteNG.Resources.PuttyConfig; + this.cmenTabPuttySettings.Image = global::mRemoteNG.Properties.Resources.PuttyConfig; this.cmenTabPuttySettings.Name = "cmenTabPuttySettings"; this.cmenTabPuttySettings.Size = new System.Drawing.Size(230, 22); this.cmenTabPuttySettings.Text = "PuTTY Settings"; @@ -238,7 +238,7 @@ namespace mRemoteNG.UI.Window this.ClientSize = new System.Drawing.Size(632, 453); this.Controls.Add(this.connDock); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Resources.mRemoteNG_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.mRemoteNG_Icon; this.Name = "ConnectionWindow"; this.TabText = "UI.Window.Connection"; this.Text = "UI.Window.Connection"; diff --git a/mRemoteNG/UI/Window/ConnectionWindow.cs b/mRemoteNG/UI/Window/ConnectionWindow.cs index a29da410..e44d3ffb 100644 --- a/mRemoteNG/UI/Window/ConnectionWindow.cs +++ b/mRemoteNG/UI/Window/ConnectionWindow.cs @@ -11,6 +11,8 @@ using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Connection.Protocol.VNC; using mRemoteNG.Messages; +using mRemoteNG.Properties; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using mRemoteNG.Tools; using mRemoteNG.UI.Forms; @@ -614,7 +616,7 @@ namespace mRemoteNG.UI.Window /* rare failure here. While ExternalTool.Image already tries to default this * try again so it's not null/doesn't crash. */ - Image = externalTool.Image ?? Resources.mRemoteNG_Icon.ToBitmap() + Image = externalTool.Image ?? Properties.Resources.mRemoteNG_Icon.ToBitmap() }; nItem.Click += (sender, args) => StartExternalApp(((ToolStripMenuItem)sender).Tag as ExternalTool); diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs index 0eb2146a..0c0b34bd 100644 --- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.Designer.cs @@ -80,7 +80,7 @@ namespace mRemoteNG.UI.Window // // clmMessage // - this.clmMessage.Text = global::mRemoteNG.Language.Message; + this.clmMessage.Text = global::mRemoteNG.Resources.Language.Language.Message; this.clmMessage.Width = 184; // // cMenMC @@ -96,20 +96,20 @@ namespace mRemoteNG.UI.Window // // cMenMCCopy // - this.cMenMCCopy.Image = global::mRemoteNG.Resources.Copy; + this.cMenMCCopy.Image = global::mRemoteNG.Properties.Resources.Copy; this.cMenMCCopy.Name = "cMenMCCopy"; this.cMenMCCopy.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C))); this.cMenMCCopy.Size = new System.Drawing.Size(140, 22); - this.cMenMCCopy.Text = global::mRemoteNG.Language.Copy; + this.cMenMCCopy.Text = global::mRemoteNG.Resources.Language.Language.Copy; this.cMenMCCopy.Click += new System.EventHandler(this.cMenMCCopy_Click); // // cMenMCDelete // - this.cMenMCDelete.Image = global::mRemoteNG.Resources.Delete; + this.cMenMCDelete.Image = global::mRemoteNG.Properties.Resources.Delete; this.cMenMCDelete.Name = "cMenMCDelete"; this.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.cMenMCDelete.Size = new System.Drawing.Size(140, 22); - this.cMenMCDelete.Text = global::mRemoteNG.Language.Delete; + this.cMenMCDelete.Text = global::mRemoteNG.Resources.Language.Language.Delete; this.cMenMCDelete.Click += new System.EventHandler(this.cMenMCDelete_Click); // // imgListMC @@ -149,9 +149,9 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.pnlErrorMsg); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.HideOnClose = true; - this.Icon = global::mRemoteNG.Resources.Info_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.Info_Icon; this.Name = "ErrorAndInfoWindow"; - this.TabText = global::mRemoteNG.Language.Notifications; + this.TabText = global::mRemoteNG.Resources.Language.Language.Notifications; this.Text = "Notifications"; this.Load += new System.EventHandler(this.ErrorsAndInfos_Load); this.Resize += new System.EventHandler(this.ErrorsAndInfos_Resize); diff --git a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs index e498021b..796ad391 100644 --- a/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs +++ b/mRemoteNG/UI/Window/ErrorAndInfoWindow.cs @@ -7,6 +7,7 @@ using System.Text; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.Themes; using Message = mRemoteNG.Messages.Message; @@ -76,10 +77,10 @@ namespace mRemoteNG.UI.Window private void FillImageList() { imgListMC.ImageSize = _display.ScaleSize(imgListMC.ImageSize); - imgListMC.Images.Add(_display.ScaleImage(Resources.brick)); - imgListMC.Images.Add(_display.ScaleImage(Resources.InformationSmall)); - imgListMC.Images.Add(_display.ScaleImage(Resources.WarningSmall)); - imgListMC.Images.Add(_display.ScaleImage(Resources.ErrorSmall)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.brick)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.InformationSmall)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.WarningSmall)); + imgListMC.Images.Add(_display.ScaleImage(Properties.Resources.ErrorSmall)); } private void LayoutVertical() @@ -218,7 +219,7 @@ namespace mRemoteNG.UI.Window switch (eMsg.Class) { case MessageClass.DebugMsg: - pbError.Image = _display.ScaleImage(Resources.brick); + pbError.Image = _display.ScaleImage(Properties.Resources.brick); if (_themeManager.ThemingActive) { pnlErrorMsg.BackColor = Color.LightSteelBlue; @@ -228,7 +229,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.InformationMsg: - pbError.Image = _display.ScaleImage(Resources.Information); + pbError.Image = _display.ScaleImage(Properties.Resources.Information); if (_themeManager.ThemingActive) { pnlErrorMsg.BackColor = Color.LightSteelBlue; @@ -238,7 +239,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.WarningMsg: - pbError.Image = _display.ScaleImage(Resources.Warning); + pbError.Image = _display.ScaleImage(Properties.Resources.Warning); if (_themeManager.ActiveAndExtended) { //Inverse colors for dramatic effect @@ -258,7 +259,7 @@ namespace mRemoteNG.UI.Window break; case MessageClass.ErrorMsg: - pbError.Image = _display.ScaleImage(Resources._Error); + pbError.Image = _display.ScaleImage(Properties.Resources._Error); if (_themeManager.ActiveAndExtended) { pnlErrorMsg.BackColor = diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs index f5fc1f6e..07161e5d 100644 --- a/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs +++ b/mRemoteNG/UI/Window/ExternalToolsWindow.Designer.cs @@ -214,7 +214,7 @@ namespace mRemoteNG.UI.Window // // NewToolMenuItem // - this.NewToolMenuItem.Image = global::mRemoteNG.Resources.ExtApp_Add; + this.NewToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add; this.NewToolMenuItem.Name = "NewToolMenuItem"; this.NewToolMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Shift | System.Windows.Forms.Keys.F4))); this.NewToolMenuItem.Size = new System.Drawing.Size(219, 22); @@ -224,7 +224,7 @@ namespace mRemoteNG.UI.Window // DeleteToolMenuItem // this.DeleteToolMenuItem.Enabled = false; - this.DeleteToolMenuItem.Image = global::mRemoteNG.Resources.ExtApp_Delete; + this.DeleteToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete; this.DeleteToolMenuItem.Name = "DeleteToolMenuItem"; this.DeleteToolMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete; this.DeleteToolMenuItem.Size = new System.Drawing.Size(219, 22); @@ -239,7 +239,7 @@ namespace mRemoteNG.UI.Window // LaunchToolMenuItem // this.LaunchToolMenuItem.Enabled = false; - this.LaunchToolMenuItem.Image = global::mRemoteNG.Resources.ExtApp_Start; + this.LaunchToolMenuItem.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start; this.LaunchToolMenuItem.Name = "LaunchToolMenuItem"; this.LaunchToolMenuItem.Size = new System.Drawing.Size(219, 22); this.LaunchToolMenuItem.Text = "Launch External Tool"; @@ -516,7 +516,7 @@ namespace mRemoteNG.UI.Window // // NewToolToolstripButton // - this.NewToolToolstripButton.Image = global::mRemoteNG.Resources.ExtApp_Add; + this.NewToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Add; this.NewToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.NewToolToolstripButton.Name = "NewToolToolstripButton"; this.NewToolToolstripButton.Size = new System.Drawing.Size(51, 22); @@ -526,7 +526,7 @@ namespace mRemoteNG.UI.Window // DeleteToolToolstripButton // this.DeleteToolToolstripButton.Enabled = false; - this.DeleteToolToolstripButton.Image = global::mRemoteNG.Resources.ExtApp_Delete; + this.DeleteToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Delete; this.DeleteToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.DeleteToolToolstripButton.Name = "DeleteToolToolstripButton"; this.DeleteToolToolstripButton.Size = new System.Drawing.Size(60, 22); @@ -541,7 +541,7 @@ namespace mRemoteNG.UI.Window // LaunchToolToolstripButton // this.LaunchToolToolstripButton.Enabled = false; - this.LaunchToolToolstripButton.Image = global::mRemoteNG.Resources.ExtApp_Start; + this.LaunchToolToolstripButton.Image = global::mRemoteNG.Properties.Resources.ExtApp_Start; this.LaunchToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta; this.LaunchToolToolstripButton.Name = "LaunchToolToolstripButton"; this.LaunchToolToolstripButton.Size = new System.Drawing.Size(66, 22); diff --git a/mRemoteNG/UI/Window/ExternalToolsWindow.cs b/mRemoteNG/UI/Window/ExternalToolsWindow.cs index 023d915c..9ecd96fd 100644 --- a/mRemoteNG/UI/Window/ExternalToolsWindow.cs +++ b/mRemoteNG/UI/Window/ExternalToolsWindow.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using BrightIdeasSoftware; using mRemoteNG.App; using mRemoteNG.Config.Settings; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.UI.Forms; diff --git a/mRemoteNG/UI/Window/HelpWindow.Designer.cs b/mRemoteNG/UI/Window/HelpWindow.Designer.cs index d6e12ac1..8306555f 100644 --- a/mRemoteNG/UI/Window/HelpWindow.Designer.cs +++ b/mRemoteNG/UI/Window/HelpWindow.Designer.cs @@ -27,7 +27,7 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.cefBrwoser); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.SystemColors.ControlText; - this.Icon = global::mRemoteNG.Resources.Help_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.Help_Icon; this.Name = "HelpWindow"; this.TabText = "Help"; this.Text = "Help"; diff --git a/mRemoteNG/UI/Window/PortScanWindow.Designer.cs b/mRemoteNG/UI/Window/PortScanWindow.Designer.cs index a7be5998..17339368 100644 --- a/mRemoteNG/UI/Window/PortScanWindow.Designer.cs +++ b/mRemoteNG/UI/Window/PortScanWindow.Designer.cs @@ -412,7 +412,7 @@ namespace mRemoteNG.UI.Window // this.btnScan._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.OUT; this.btnScan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnScan.Image = global::mRemoteNG.Resources.Search; + this.btnScan.Image = global::mRemoteNG.Properties.Resources.Search; this.btnScan.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.btnScan.Location = new System.Drawing.Point(765, 99); this.btnScan.Name = "btnScan"; diff --git a/mRemoteNG/UI/Window/PortScanWindow.cs b/mRemoteNG/UI/Window/PortScanWindow.cs index a9d0b25a..97367f6f 100644 --- a/mRemoteNG/UI/Window/PortScanWindow.cs +++ b/mRemoteNG/UI/Window/PortScanWindow.cs @@ -8,6 +8,7 @@ using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.Tools; using mRemoteNG.Tree.Root; using WeifenLuo.WinFormsUI.Docking; diff --git a/mRemoteNG/UI/Window/SSHTransferWindow.cs b/mRemoteNG/UI/Window/SSHTransferWindow.cs index 68891301..f664c1c6 100644 --- a/mRemoteNG/UI/Window/SSHTransferWindow.cs +++ b/mRemoteNG/UI/Window/SSHTransferWindow.cs @@ -6,6 +6,7 @@ using mRemoteNG.Tools; using WeifenLuo.WinFormsUI.Docking; using System.Windows.Forms; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; namespace mRemoteNG.UI.Window @@ -102,7 +103,7 @@ namespace mRemoteNG.UI.Window // this.btnTransfer._mice = mRemoteNG.UI.Controls.Base.NGButton.MouseState.HOVER; this.btnTransfer.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnTransfer.Image = global::mRemoteNG.Resources.SSHTransfer; + this.btnTransfer.Image = global::mRemoteNG.Properties.Resources.SSHTransfer; this.btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnTransfer.Location = new System.Drawing.Point(562, 145); this.btnTransfer.Name = "btnTransfer"; diff --git a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs b/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs index eeea02bb..ded58043 100644 --- a/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs +++ b/mRemoteNG/UI/Window/ScreenshotManagerWindow.cs @@ -4,6 +4,7 @@ using System.Windows.Forms; using WeifenLuo.WinFormsUI.Docking; using mRemoteNG.App; using System.IO; +using mRemoteNG.Resources.Language; using mRemoteNG.UI.Forms; using mRemoteNG.Themes; @@ -77,7 +78,7 @@ namespace mRemoteNG.UI.Window mMenFileSaveAll, mMenFileRemoveAll }); - mMenFile.Image = Resources.File; + mMenFile.Image = Properties.Resources.File; mMenFile.Name = "mMenFile"; mMenFile.Size = new Size(53, 20); mMenFile.Text = "&File"; @@ -85,7 +86,7 @@ namespace mRemoteNG.UI.Window // // mMenFileSaveAll // - mMenFileSaveAll.Image = Resources.Screenshot_Save; + mMenFileSaveAll.Image = Properties.Resources.Screenshot_Save; mMenFileSaveAll.Name = "mMenFileSaveAll"; mMenFileSaveAll.Size = new Size(130, 22); mMenFileSaveAll.Text = "Save All"; @@ -93,7 +94,7 @@ namespace mRemoteNG.UI.Window // // mMenFileRemoveAll // - mMenFileRemoveAll.Image = Resources.Screenshot_Delete; + mMenFileRemoveAll.Image = Properties.Resources.Screenshot_Delete; mMenFileRemoveAll.Name = "mMenFileRemoveAll"; mMenFileRemoveAll.Size = new Size(130, 22); mMenFileRemoveAll.Text = "Remove All"; @@ -111,7 +112,7 @@ namespace mRemoteNG.UI.Window // // cMenScreenshotCopy // - cMenScreenshotCopy.Image = Resources.Screenshot_Copy; + cMenScreenshotCopy.Image = Properties.Resources.Screenshot_Copy; cMenScreenshotCopy.Name = "cMenScreenshotCopy"; cMenScreenshotCopy.Size = new Size(102, 22); cMenScreenshotCopy.Text = "Copy"; @@ -119,7 +120,7 @@ namespace mRemoteNG.UI.Window // // cMenScreenshotSave // - cMenScreenshotSave.Image = Resources.Screenshot_Save; + cMenScreenshotSave.Image = Properties.Resources.Screenshot_Save; cMenScreenshotSave.Name = "cMenScreenshotSave"; cMenScreenshotSave.Size = new Size(102, 22); cMenScreenshotSave.Text = "Save"; @@ -142,7 +143,7 @@ namespace mRemoteNG.UI.Window Controls.Add(msMain); Font = new Font("Segoe UI", 8.25F, FontStyle.Regular, GraphicsUnit.Point, 0); HideOnClose = true; - Icon = Resources.Screenshot_Icon; + Icon = Properties.Resources.Screenshot_Icon; MainMenuStrip = msMain; Name = "ScreenshotManagerWindow"; TabText = "Screenshots"; diff --git a/mRemoteNG/UI/Window/UltraVNCWindow.cs b/mRemoteNG/UI/Window/UltraVNCWindow.cs index ac313782..b847b51d 100644 --- a/mRemoteNG/UI/Window/UltraVNCWindow.cs +++ b/mRemoteNG/UI/Window/UltraVNCWindow.cs @@ -1,5 +1,6 @@ using System; using mRemoteNG.App; +using mRemoteNG.Resources.Language; using WeifenLuo.WinFormsUI.Docking; @@ -67,7 +68,7 @@ namespace mRemoteNG.UI.Window this.Controls.Add(this.tsMain); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Resources.UVNC_SC_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.UVNC_SC_Icon; this.Name = "UltraVNCWindow"; this.TabText = "UltraVNC SC"; this.Text = "UltraVNC SC"; diff --git a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs index e12e72ee..27650bdf 100644 --- a/mRemoteNG/UI/Window/UpdateWindow.Designer.cs +++ b/mRemoteNG/UI/Window/UpdateWindow.Designer.cs @@ -201,7 +201,7 @@ namespace mRemoteNG.UI.Window this.ClientSize = new System.Drawing.Size(734, 418); this.Controls.Add(this.tableLayoutPanel1); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Icon = global::mRemoteNG.Resources.Update_Icon; + this.Icon = global::mRemoteNG.Properties.Resources.Update_Icon; this.Name = "UpdateWindow"; this.TabText = "Update"; this.Text = "Update"; diff --git a/mRemoteNG/UI/Window/UpdateWindow.cs b/mRemoteNG/UI/Window/UpdateWindow.cs index 82fc2495..912efb41 100644 --- a/mRemoteNG/UI/Window/UpdateWindow.cs +++ b/mRemoteNG/UI/Window/UpdateWindow.cs @@ -8,6 +8,7 @@ using System.Windows.Forms; using mRemoteNG.App; using mRemoteNG.App.Update; using mRemoteNG.Messages; +using mRemoteNG.Resources.Language; using mRemoteNG.Themes; using WeifenLuo.WinFormsUI.Docking; diff --git a/mRemoteNGTests/Config/CredentialHarvesterTests.cs b/mRemoteNGTests/Config/CredentialHarvesterTests.cs index 7132acea..06eac360 100644 --- a/mRemoteNGTests/Config/CredentialHarvesterTests.cs +++ b/mRemoteNGTests/Config/CredentialHarvesterTests.cs @@ -1,5 +1,4 @@ using mRemoteNG.Config; -using mRemoteNG.Config.Serializers.Xml; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; @@ -10,6 +9,7 @@ using System; using System.Linq; using System.Security; using System.Xml.Linq; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.Config diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs index 62082704..c7bd7d7e 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsDeserializerMremotengFormatTests.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using mRemoteNG.Config.Serializers.Csv; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.Http; diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs index d9ca691d..2226ecae 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Csv/CsvConnectionsSerializerMremotengFormatTests.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using mRemoteNG.Config.Serializers.Csv; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Csv; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Credential; diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs index 7a6d4f04..ce6c6d78 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/ValidateXmlSchemas.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers.Xml; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; using mRemoteNG.Tree; @@ -11,6 +10,7 @@ using System.Runtime.CompilerServices; using System.Text; using System.Xml; using System.Xml.Schema; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml { diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs index 9b20a0e3..f4023b12 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDeserializerTests.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs index 5935b9ea..69fd48e2 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentCompilerTests.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers.Xml; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Security.Factories; @@ -8,6 +7,7 @@ using mRemoteNG.Tree.Root; using NUnit.Framework; using System.Linq; using System.Xml.XPath; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml { diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs index 517121cc..16740294 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsDocumentEncryptorTests.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers.Xml; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Security.Factories; @@ -8,6 +7,7 @@ using mRemoteNG.Tree.Root; using NUnit.Framework; using System.Linq; using System.Xml.Linq; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml { diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs index f378ba98..471d7415 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlConnectionsSerializerTests.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers.Xml; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; @@ -9,6 +8,7 @@ using NUnit.Framework; using System.Linq; using System.Xml; using System.Xml.Linq; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.Config.Serializers.ConnectionSerializers.Xml { diff --git a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs index caea7678..4eeb474e 100644 --- a/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/ConnectionSerializers/Xml/XmlRootNodeSerializerTests.cs @@ -1,7 +1,7 @@ using System; using System.Collections; using System.Xml.Linq; -using mRemoteNG.Config.Serializers.Xml; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; using mRemoteNG.Security; using mRemoteNG.Security.Factories; using mRemoteNG.Security.SymmetricEncryption; diff --git a/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs index 54cc8e22..0d1d1a89 100644 --- a/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/DataTableDeserializerTests.cs @@ -1,6 +1,6 @@ using System.Data; using System.Security; -using mRemoteNG.Config.Serializers.MsSql; +using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Connection; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; diff --git a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs index 1888f296..7bdb0e9c 100644 --- a/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/DataTableSerializerTests.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Security; -using mRemoteNG.Config.Serializers.MsSql; +using mRemoteNG.Config.Serializers.ConnectionSerializers.MsSql; using mRemoteNG.Connection; using mRemoteNG.Security; using mRemoteNG.Security.SymmetricEncryption; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs index 3d84c0e1..c2cdd276 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PortScanDeserializerTests.cs @@ -1,5 +1,6 @@ using System.Linq; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Tools; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs index 4f38639e..fa633a51 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/PuttyConnectionManagerDeserializerTests.cs @@ -1,5 +1,6 @@ using System.Linq; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Container; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs index df67f374..b5d6726d 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionDeserializerTests.cs @@ -5,6 +5,7 @@ using mRemoteNG.Tree; using mRemoteNGTests.Properties; using NUnit.Framework; using System.Linq; +using mRemoteNG.Config.Serializers.MiscSerializers; namespace mRemoteNGTests.Config.Serializers.MiscSerializers { diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs index db895856..7486e1ec 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManager27DeserializerTests.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; diff --git a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs index d49755f7..41ea17fd 100644 --- a/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs +++ b/mRemoteNGTests/Config/Serializers/MiscSerializers/RemoteDesktopConnectionManagerDeserializerTests.cs @@ -1,6 +1,7 @@ using System.IO; using System.Linq; using mRemoteNG.Config.Serializers; +using mRemoteNG.Config.Serializers.MiscSerializers; using mRemoteNG.Connection.Protocol; using mRemoteNG.Connection.Protocol.RDP; using mRemoteNG.Container; diff --git a/mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs b/mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs index 6975b975..44c547e5 100644 --- a/mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs +++ b/mRemoteNGTests/IntegrationTests/XmlSerializationLifeCycleTests.cs @@ -1,5 +1,4 @@ -using mRemoteNG.Config.Serializers.Xml; -using mRemoteNG.Connection; +using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Security; using mRemoteNG.Security.Factories; @@ -10,6 +9,7 @@ using NUnit.Framework; using System; using System.Linq; using System.Text; +using mRemoteNG.Config.Serializers.ConnectionSerializers.Xml; namespace mRemoteNGTests.IntegrationTests diff --git a/mRemoteNGTests/Messages/MessageWriters/MessageTypeFilterDecoratorTests.cs b/mRemoteNGTests/Messages/MessageWriters/MessageTypeFilterDecoratorTests.cs index baa037a8..99a51de1 100644 --- a/mRemoteNGTests/Messages/MessageWriters/MessageTypeFilterDecoratorTests.cs +++ b/mRemoteNGTests/Messages/MessageWriters/MessageTypeFilterDecoratorTests.cs @@ -1,4 +1,5 @@ using mRemoteNG.Messages; +using mRemoteNG.Messages.MessageFilteringOptions; using mRemoteNG.Messages.MessageWriters; using mRemoteNG.Messages.WriterDecorators; using NSubstitute; diff --git a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs index e4ffcb64..d7e53e9f 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/ExpandNodeClickHandlerTests.cs @@ -2,7 +2,9 @@ using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs index a6f19f96..c9bec4ff 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/OpenConnectionClickHandlerTests.cs @@ -2,6 +2,7 @@ using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs index 5cbdcd89..abc5a9fc 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/SwitchToConnectionClickHandlerTests.cs @@ -2,6 +2,7 @@ using mRemoteNG.Connection; using mRemoteNG.Container; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs index a578be52..c9036462 100644 --- a/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs +++ b/mRemoteNGTests/Tree/ClickHandlers/TreeNodeCompositeClickHandlerTests.cs @@ -1,6 +1,7 @@ using System; using mRemoteNG.Connection; using mRemoteNG.Tree; +using mRemoteNG.Tree.ClickHandlers; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/ConnectionTreeTests.cs b/mRemoteNGTests/Tree/ConnectionTreeTests.cs index be6f3020..12815b77 100644 --- a/mRemoteNGTests/Tree/ConnectionTreeTests.cs +++ b/mRemoteNGTests/Tree/ConnectionTreeTests.cs @@ -3,6 +3,7 @@ using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs b/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs index 372296fa..3b4f9622 100644 --- a/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs +++ b/mRemoteNGTests/Tree/PreviousSessionOpenerTests.cs @@ -3,6 +3,7 @@ using mRemoteNG.Connection; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs b/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs index 45df7c9d..eada0ed7 100644 --- a/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs +++ b/mRemoteNGTests/Tree/PreviouslyOpenedFolderExpanderTests.cs @@ -4,6 +4,7 @@ using mRemoteNG.Container; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework; diff --git a/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs b/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs index 55b9b24c..e071bf79 100644 --- a/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs +++ b/mRemoteNGTests/UI/Controls/ConnectionTreeTests.cs @@ -6,6 +6,7 @@ using mRemoteNG.Tools.Clipboard; using mRemoteNG.Tree; using mRemoteNG.Tree.Root; using mRemoteNG.UI.Controls; +using mRemoteNG.UI.Controls.ConnectionTree; using NSubstitute; using NUnit.Framework;