diff --git a/mRemoteV1/App/ApplicationEvents.cs b/mRemoteV1/App/ApplicationEvents.cs
index e941d7399..2f4e0a8c1 100644
--- a/mRemoteV1/App/ApplicationEvents.cs
+++ b/mRemoteV1/App/ApplicationEvents.cs
@@ -1,9 +1,9 @@
-using System;
-using System.Diagnostics;
-using Microsoft.VisualBasic.CompilerServices;
+//using System;
+//using System.Diagnostics;
+//using Microsoft.VisualBasic.CompilerServices;
-namespace mRemoteNG.My
-{
+//namespace mRemoteNG.App
+//{
// The following events are available for MyApplication:
//
// Startup: Raised when the application starts, before the startup form is created.
@@ -11,71 +11,71 @@ namespace mRemoteNG.My
// UnhandledException: Raised if the application encounters an unhandled exception.
// StartupNextInstance: Raised when launching a single-instance application and the application is already active.
// NetworkAvailabilityChanged: Raised when the network connection is connected or disconnected.
- partial class MyApplication : Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase
- {
- public System.Threading.Mutex mutex;
+// partial class MyApplication : Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase
+// {
+// public System.Threading.Mutex mutex;
- private void MyApplication_Startup(object sender, Microsoft.VisualBasic.ApplicationServices.StartupEventArgs e)
- {
- if (Settings.Default.SingleInstance)
- {
- string mutexID = "mRemoteNG_SingleInstanceMutex";
- mutex = new System.Threading.Mutex(false, mutexID);
+// private void MyApplication_Startup(object sender, Microsoft.VisualBasic.ApplicationServices.StartupEventArgs e)
+// {
+// if (mRemoteNG.Settings.Default.SingleInstance)
+// {
+// string mutexID = "mRemoteNG_SingleInstanceMutex";
+// mutex = new System.Threading.Mutex(false, mutexID);
- if (!mutex.WaitOne(0, false))
- {
- try
- {
- SwitchToCurrentInstance();
- }
- catch (Exception)
- {
- }
+// if (!mutex.WaitOne(0, false))
+// {
+// try
+// {
+// SwitchToCurrentInstance();
+// }
+// catch (Exception)
+// {
+// }
- ProjectData.EndApp();
- }
+// ProjectData.EndApp();
+// }
- GC.KeepAlive(mutex);
- }
- }
+// GC.KeepAlive(mutex);
+// }
+// }
- private IntPtr GetCurrentInstanceWindowHandle()
- {
- IntPtr hWnd = IntPtr.Zero;
- Process curProc = Process.GetCurrentProcess();
- foreach (Process proc in Process.GetProcessesByName(curProc.ProcessName))
- {
- if (proc.Id != curProc.Id && proc.MainModule.FileName == curProc.MainModule.FileName && proc.MainWindowHandle != IntPtr.Zero)
- {
- hWnd = proc.MainWindowHandle;
- break;
- }
- }
- return hWnd;
- }
+// private IntPtr GetCurrentInstanceWindowHandle()
+// {
+// IntPtr hWnd = IntPtr.Zero;
+// Process curProc = Process.GetCurrentProcess();
+// foreach (Process proc in Process.GetProcessesByName(curProc.ProcessName))
+// {
+// if (proc.Id != curProc.Id && proc.MainModule.FileName == curProc.MainModule.FileName && proc.MainWindowHandle != IntPtr.Zero)
+// {
+// hWnd = proc.MainWindowHandle;
+// break;
+// }
+// }
+// return hWnd;
+// }
- private void SwitchToCurrentInstance()
- {
- IntPtr hWnd = GetCurrentInstanceWindowHandle();
- if (hWnd != IntPtr.Zero)
- {
- //Restore window if minimized. Do not restore if already in
- //normal or maximised window state, since we don't want to
- //change the current state of the window.
- if (App.Native.IsIconic(hWnd) != 0)
- {
- App.Native.ShowWindow(hWnd, App.Native.SW_RESTORE);
- }
- App.Native.SetForegroundWindow(hWnd);
- }
- }
+// private void SwitchToCurrentInstance()
+// {
+// IntPtr hWnd = GetCurrentInstanceWindowHandle();
+// if (hWnd != IntPtr.Zero)
+// {
+// //Restore window if minimized. Do not restore if already in
+// //normal or maximised window state, since we don't want to
+// //change the current state of the window.
+// if (App.Native.IsIconic(hWnd) != 0)
+// {
+// App.Native.ShowWindow(hWnd, App.Native.SW_RESTORE);
+// }
+// App.Native.SetForegroundWindow(hWnd);
+// }
+// }
- private void MyApplication_Shutdown(object sender, System.EventArgs e)
- {
- if (mutex != null)
- {
- mutex.Close();
- }
- }
- }
-}
+// private void MyApplication_Shutdown(object sender, System.EventArgs e)
+// {
+// if (mutex != null)
+// {
+// mutex.Close();
+// }
+// }
+// }
+//}
diff --git a/mRemoteV1/App/Info/UpdateChannelInfo.cs b/mRemoteV1/App/Info/UpdateChannelInfo.cs
index feff47240..8a67013d0 100644
--- a/mRemoteV1/App/Info/UpdateChannelInfo.cs
+++ b/mRemoteV1/App/Info/UpdateChannelInfo.cs
@@ -9,7 +9,7 @@
#if DEBUG
return "update-debug.txt";
#else
- if ((string)(My.Settings.Default.UpdateChannel.ToLowerInvariant()) == "debug")
+ if ((string)(mRemoteNG.Settings.Default.UpdateChannel.ToLowerInvariant()) == "debug")
return "update-debug.txt";
else
return "update.txt";
diff --git a/mRemoteV1/App/ProgramRoot.cs b/mRemoteV1/App/ProgramRoot.cs
index 03b3daad6..079c1b186 100644
--- a/mRemoteV1/App/ProgramRoot.cs
+++ b/mRemoteV1/App/ProgramRoot.cs
@@ -1,20 +1,20 @@
-using System;
-using System.Windows.Forms;
-using mRemoteNG.UI.Forms;
+//using System;
+//using System.Windows.Forms;
+//using mRemoteNG.UI.Forms;
-namespace mRemoteNG.App
-{
- public static class ProgramRoot
- {
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- public static void Main(string[] args)
- {
- var mainForm = new frmMain();
- frmMain.Default = mainForm;
- Application.Run(mainForm);
- }
- }
-}
\ No newline at end of file
+//namespace mRemoteNG.App
+//{
+// //public static class ProgramRoot
+// //{
+// // ///
+// // /// The main entry point for the application.
+// // ///
+// // //[STAThread]
+// // //public static void Main(string[] args)
+// // //{
+// // // var mainForm = new frmMain();
+// // // frmMain.Default = mainForm;
+// // // Application.Run(mainForm);
+// // //}
+// //}
+//}
\ No newline at end of file
diff --git a/mRemoteV1/App/Runtime.cs b/mRemoteV1/App/Runtime.cs
index bfffd1062..87e3c1d4b 100644
--- a/mRemoteV1/App/Runtime.cs
+++ b/mRemoteV1/App/Runtime.cs
@@ -21,6 +21,7 @@ using System.IO;
using System.Threading;
using System.Windows.Forms;
using System.Xml;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
using WeifenLuo.WinFormsUI.Docking;
@@ -190,55 +191,55 @@ namespace mRemoteNG.App
public static void DefaultConnectionToSettings()
{
- My.Settings.Default.ConDefaultDescription = DefaultConnection.Description;
- My.Settings.Default.ConDefaultIcon = DefaultConnection.Icon;
- My.Settings.Default.ConDefaultUsername = DefaultConnection.Username;
- My.Settings.Default.ConDefaultPassword = DefaultConnection.Password;
- My.Settings.Default.ConDefaultDomain = DefaultConnection.Domain;
- My.Settings.Default.ConDefaultProtocol = DefaultConnection.Protocol.ToString();
- My.Settings.Default.ConDefaultPuttySession = DefaultConnection.PuttySession;
- My.Settings.Default.ConDefaultICAEncryptionStrength = DefaultConnection.ICAEncryption.ToString();
- My.Settings.Default.ConDefaultRDPAuthenticationLevel = DefaultConnection.RDPAuthenticationLevel.ToString();
- My.Settings.Default.ConDefaultLoadBalanceInfo = DefaultConnection.LoadBalanceInfo;
- My.Settings.Default.ConDefaultUseConsoleSession = DefaultConnection.UseConsoleSession;
- My.Settings.Default.ConDefaultUseCredSsp = DefaultConnection.UseCredSsp;
- My.Settings.Default.ConDefaultRenderingEngine = DefaultConnection.RenderingEngine.ToString();
- My.Settings.Default.ConDefaultResolution = DefaultConnection.Resolution.ToString();
- My.Settings.Default.ConDefaultAutomaticResize = DefaultConnection.AutomaticResize;
- My.Settings.Default.ConDefaultColors = DefaultConnection.Colors.ToString();
- My.Settings.Default.ConDefaultCacheBitmaps = DefaultConnection.CacheBitmaps;
- My.Settings.Default.ConDefaultDisplayWallpaper = DefaultConnection.DisplayWallpaper;
- My.Settings.Default.ConDefaultDisplayThemes = DefaultConnection.DisplayThemes;
- My.Settings.Default.ConDefaultEnableFontSmoothing = DefaultConnection.EnableFontSmoothing;
- My.Settings.Default.ConDefaultEnableDesktopComposition = DefaultConnection.EnableDesktopComposition;
- My.Settings.Default.ConDefaultRedirectKeys = DefaultConnection.RedirectKeys;
- My.Settings.Default.ConDefaultRedirectDiskDrives = DefaultConnection.RedirectDiskDrives;
- My.Settings.Default.ConDefaultRedirectPrinters = DefaultConnection.RedirectPrinters;
- My.Settings.Default.ConDefaultRedirectPorts = DefaultConnection.RedirectPorts;
- My.Settings.Default.ConDefaultRedirectSmartCards = DefaultConnection.RedirectSmartCards;
- My.Settings.Default.ConDefaultRedirectSound = DefaultConnection.RedirectSound.ToString();
- My.Settings.Default.ConDefaultPreExtApp = DefaultConnection.PreExtApp;
- My.Settings.Default.ConDefaultPostExtApp = DefaultConnection.PostExtApp;
- My.Settings.Default.ConDefaultMacAddress = DefaultConnection.MacAddress;
- My.Settings.Default.ConDefaultUserField = DefaultConnection.UserField;
- My.Settings.Default.ConDefaultVNCAuthMode = DefaultConnection.VNCAuthMode.ToString();
- My.Settings.Default.ConDefaultVNCColors = DefaultConnection.VNCColors.ToString();
- My.Settings.Default.ConDefaultVNCCompression = DefaultConnection.VNCCompression.ToString();
- My.Settings.Default.ConDefaultVNCEncoding = DefaultConnection.VNCEncoding.ToString();
- My.Settings.Default.ConDefaultVNCProxyIP = DefaultConnection.VNCProxyIP;
- My.Settings.Default.ConDefaultVNCProxyPassword = DefaultConnection.VNCProxyPassword;
- My.Settings.Default.ConDefaultVNCProxyPort = DefaultConnection.VNCProxyPort;
- My.Settings.Default.ConDefaultVNCProxyType = DefaultConnection.VNCProxyType.ToString();
- My.Settings.Default.ConDefaultVNCProxyUsername = DefaultConnection.VNCProxyUsername;
- My.Settings.Default.ConDefaultVNCSmartSizeMode = DefaultConnection.VNCSmartSizeMode.ToString();
- My.Settings.Default.ConDefaultVNCViewOnly = DefaultConnection.VNCViewOnly;
- My.Settings.Default.ConDefaultExtApp = DefaultConnection.ExtApp;
- My.Settings.Default.ConDefaultRDGatewayUsageMethod = DefaultConnection.RDGatewayUsageMethod.ToString();
- My.Settings.Default.ConDefaultRDGatewayHostname = DefaultConnection.RDGatewayHostname;
- My.Settings.Default.ConDefaultRDGatewayUsername = DefaultConnection.RDGatewayUsername;
- My.Settings.Default.ConDefaultRDGatewayPassword = DefaultConnection.RDGatewayPassword;
- My.Settings.Default.ConDefaultRDGatewayDomain = DefaultConnection.RDGatewayDomain;
- My.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials = DefaultConnection.RDGatewayUseConnectionCredentials.ToString();
+ mRemoteNG.Settings.Default.ConDefaultDescription = DefaultConnection.Description;
+ mRemoteNG.Settings.Default.ConDefaultIcon = DefaultConnection.Icon;
+ mRemoteNG.Settings.Default.ConDefaultUsername = DefaultConnection.Username;
+ mRemoteNG.Settings.Default.ConDefaultPassword = DefaultConnection.Password;
+ mRemoteNG.Settings.Default.ConDefaultDomain = DefaultConnection.Domain;
+ mRemoteNG.Settings.Default.ConDefaultProtocol = DefaultConnection.Protocol.ToString();
+ mRemoteNG.Settings.Default.ConDefaultPuttySession = DefaultConnection.PuttySession;
+ mRemoteNG.Settings.Default.ConDefaultICAEncryptionStrength = DefaultConnection.ICAEncryption.ToString();
+ mRemoteNG.Settings.Default.ConDefaultRDPAuthenticationLevel = DefaultConnection.RDPAuthenticationLevel.ToString();
+ mRemoteNG.Settings.Default.ConDefaultLoadBalanceInfo = DefaultConnection.LoadBalanceInfo;
+ mRemoteNG.Settings.Default.ConDefaultUseConsoleSession = DefaultConnection.UseConsoleSession;
+ mRemoteNG.Settings.Default.ConDefaultUseCredSsp = DefaultConnection.UseCredSsp;
+ mRemoteNG.Settings.Default.ConDefaultRenderingEngine = DefaultConnection.RenderingEngine.ToString();
+ mRemoteNG.Settings.Default.ConDefaultResolution = DefaultConnection.Resolution.ToString();
+ mRemoteNG.Settings.Default.ConDefaultAutomaticResize = DefaultConnection.AutomaticResize;
+ mRemoteNG.Settings.Default.ConDefaultColors = DefaultConnection.Colors.ToString();
+ mRemoteNG.Settings.Default.ConDefaultCacheBitmaps = DefaultConnection.CacheBitmaps;
+ mRemoteNG.Settings.Default.ConDefaultDisplayWallpaper = DefaultConnection.DisplayWallpaper;
+ mRemoteNG.Settings.Default.ConDefaultDisplayThemes = DefaultConnection.DisplayThemes;
+ mRemoteNG.Settings.Default.ConDefaultEnableFontSmoothing = DefaultConnection.EnableFontSmoothing;
+ mRemoteNG.Settings.Default.ConDefaultEnableDesktopComposition = DefaultConnection.EnableDesktopComposition;
+ mRemoteNG.Settings.Default.ConDefaultRedirectKeys = DefaultConnection.RedirectKeys;
+ mRemoteNG.Settings.Default.ConDefaultRedirectDiskDrives = DefaultConnection.RedirectDiskDrives;
+ mRemoteNG.Settings.Default.ConDefaultRedirectPrinters = DefaultConnection.RedirectPrinters;
+ mRemoteNG.Settings.Default.ConDefaultRedirectPorts = DefaultConnection.RedirectPorts;
+ mRemoteNG.Settings.Default.ConDefaultRedirectSmartCards = DefaultConnection.RedirectSmartCards;
+ mRemoteNG.Settings.Default.ConDefaultRedirectSound = DefaultConnection.RedirectSound.ToString();
+ mRemoteNG.Settings.Default.ConDefaultPreExtApp = DefaultConnection.PreExtApp;
+ mRemoteNG.Settings.Default.ConDefaultPostExtApp = DefaultConnection.PostExtApp;
+ mRemoteNG.Settings.Default.ConDefaultMacAddress = DefaultConnection.MacAddress;
+ mRemoteNG.Settings.Default.ConDefaultUserField = DefaultConnection.UserField;
+ mRemoteNG.Settings.Default.ConDefaultVNCAuthMode = DefaultConnection.VNCAuthMode.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCColors = DefaultConnection.VNCColors.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCCompression = DefaultConnection.VNCCompression.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCEncoding = DefaultConnection.VNCEncoding.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCProxyIP = DefaultConnection.VNCProxyIP;
+ mRemoteNG.Settings.Default.ConDefaultVNCProxyPassword = DefaultConnection.VNCProxyPassword;
+ mRemoteNG.Settings.Default.ConDefaultVNCProxyPort = DefaultConnection.VNCProxyPort;
+ mRemoteNG.Settings.Default.ConDefaultVNCProxyType = DefaultConnection.VNCProxyType.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCProxyUsername = DefaultConnection.VNCProxyUsername;
+ mRemoteNG.Settings.Default.ConDefaultVNCSmartSizeMode = DefaultConnection.VNCSmartSizeMode.ToString();
+ mRemoteNG.Settings.Default.ConDefaultVNCViewOnly = DefaultConnection.VNCViewOnly;
+ mRemoteNG.Settings.Default.ConDefaultExtApp = DefaultConnection.ExtApp;
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayUsageMethod = DefaultConnection.RDGatewayUsageMethod.ToString();
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayHostname = DefaultConnection.RDGatewayHostname;
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayUsername = DefaultConnection.RDGatewayUsername;
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayPassword = DefaultConnection.RDGatewayPassword;
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayDomain = DefaultConnection.RDGatewayDomain;
+ mRemoteNG.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials = DefaultConnection.RDGatewayUseConnectionCredentials.ToString();
}
#endregion
@@ -252,60 +253,60 @@ namespace mRemoteNG.App
public static void DefaultInheritanceToSettings()
{
- My.Settings.Default.InhDefaultDescription = DefaultInheritance.Description;
- My.Settings.Default.InhDefaultIcon = DefaultInheritance.Icon;
- My.Settings.Default.InhDefaultPanel = DefaultInheritance.Panel;
- My.Settings.Default.InhDefaultUsername = DefaultInheritance.Username;
- My.Settings.Default.InhDefaultPassword = DefaultInheritance.Password;
- My.Settings.Default.InhDefaultDomain = DefaultInheritance.Domain;
- My.Settings.Default.InhDefaultProtocol = DefaultInheritance.Protocol;
- My.Settings.Default.InhDefaultPort = DefaultInheritance.Port;
- My.Settings.Default.InhDefaultPuttySession = DefaultInheritance.PuttySession;
- My.Settings.Default.InhDefaultUseConsoleSession = DefaultInheritance.UseConsoleSession;
- My.Settings.Default.InhDefaultUseCredSsp = DefaultInheritance.UseCredSsp;
- My.Settings.Default.InhDefaultRenderingEngine = DefaultInheritance.RenderingEngine;
- My.Settings.Default.InhDefaultICAEncryptionStrength = DefaultInheritance.ICAEncryption;
- My.Settings.Default.InhDefaultRDPAuthenticationLevel = DefaultInheritance.RDPAuthenticationLevel;
- My.Settings.Default.InhDefaultLoadBalanceInfo = DefaultInheritance.LoadBalanceInfo;
- My.Settings.Default.InhDefaultResolution = DefaultInheritance.Resolution;
- My.Settings.Default.InhDefaultAutomaticResize = DefaultInheritance.AutomaticResize;
- My.Settings.Default.InhDefaultColors = DefaultInheritance.Colors;
- My.Settings.Default.InhDefaultCacheBitmaps = DefaultInheritance.CacheBitmaps;
- My.Settings.Default.InhDefaultDisplayWallpaper = DefaultInheritance.DisplayWallpaper;
- My.Settings.Default.InhDefaultDisplayThemes = DefaultInheritance.DisplayThemes;
- My.Settings.Default.InhDefaultEnableFontSmoothing = DefaultInheritance.EnableFontSmoothing;
- My.Settings.Default.InhDefaultEnableDesktopComposition = DefaultInheritance.EnableDesktopComposition;
- My.Settings.Default.InhDefaultRedirectKeys = DefaultInheritance.RedirectKeys;
- My.Settings.Default.InhDefaultRedirectDiskDrives = DefaultInheritance.RedirectDiskDrives;
- My.Settings.Default.InhDefaultRedirectPrinters = DefaultInheritance.RedirectPrinters;
- My.Settings.Default.InhDefaultRedirectPorts = DefaultInheritance.RedirectPorts;
- My.Settings.Default.InhDefaultRedirectSmartCards = DefaultInheritance.RedirectSmartCards;
- My.Settings.Default.InhDefaultRedirectSound = DefaultInheritance.RedirectSound;
- My.Settings.Default.InhDefaultPreExtApp = DefaultInheritance.PreExtApp;
- My.Settings.Default.InhDefaultPostExtApp = DefaultInheritance.PostExtApp;
- My.Settings.Default.InhDefaultMacAddress = DefaultInheritance.MacAddress;
- My.Settings.Default.InhDefaultUserField = DefaultInheritance.UserField;
+ mRemoteNG.Settings.Default.InhDefaultDescription = DefaultInheritance.Description;
+ mRemoteNG.Settings.Default.InhDefaultIcon = DefaultInheritance.Icon;
+ mRemoteNG.Settings.Default.InhDefaultPanel = DefaultInheritance.Panel;
+ mRemoteNG.Settings.Default.InhDefaultUsername = DefaultInheritance.Username;
+ mRemoteNG.Settings.Default.InhDefaultPassword = DefaultInheritance.Password;
+ mRemoteNG.Settings.Default.InhDefaultDomain = DefaultInheritance.Domain;
+ mRemoteNG.Settings.Default.InhDefaultProtocol = DefaultInheritance.Protocol;
+ mRemoteNG.Settings.Default.InhDefaultPort = DefaultInheritance.Port;
+ mRemoteNG.Settings.Default.InhDefaultPuttySession = DefaultInheritance.PuttySession;
+ mRemoteNG.Settings.Default.InhDefaultUseConsoleSession = DefaultInheritance.UseConsoleSession;
+ mRemoteNG.Settings.Default.InhDefaultUseCredSsp = DefaultInheritance.UseCredSsp;
+ mRemoteNG.Settings.Default.InhDefaultRenderingEngine = DefaultInheritance.RenderingEngine;
+ mRemoteNG.Settings.Default.InhDefaultICAEncryptionStrength = DefaultInheritance.ICAEncryption;
+ mRemoteNG.Settings.Default.InhDefaultRDPAuthenticationLevel = DefaultInheritance.RDPAuthenticationLevel;
+ mRemoteNG.Settings.Default.InhDefaultLoadBalanceInfo = DefaultInheritance.LoadBalanceInfo;
+ mRemoteNG.Settings.Default.InhDefaultResolution = DefaultInheritance.Resolution;
+ mRemoteNG.Settings.Default.InhDefaultAutomaticResize = DefaultInheritance.AutomaticResize;
+ mRemoteNG.Settings.Default.InhDefaultColors = DefaultInheritance.Colors;
+ mRemoteNG.Settings.Default.InhDefaultCacheBitmaps = DefaultInheritance.CacheBitmaps;
+ mRemoteNG.Settings.Default.InhDefaultDisplayWallpaper = DefaultInheritance.DisplayWallpaper;
+ mRemoteNG.Settings.Default.InhDefaultDisplayThemes = DefaultInheritance.DisplayThemes;
+ mRemoteNG.Settings.Default.InhDefaultEnableFontSmoothing = DefaultInheritance.EnableFontSmoothing;
+ mRemoteNG.Settings.Default.InhDefaultEnableDesktopComposition = DefaultInheritance.EnableDesktopComposition;
+ mRemoteNG.Settings.Default.InhDefaultRedirectKeys = DefaultInheritance.RedirectKeys;
+ mRemoteNG.Settings.Default.InhDefaultRedirectDiskDrives = DefaultInheritance.RedirectDiskDrives;
+ mRemoteNG.Settings.Default.InhDefaultRedirectPrinters = DefaultInheritance.RedirectPrinters;
+ mRemoteNG.Settings.Default.InhDefaultRedirectPorts = DefaultInheritance.RedirectPorts;
+ mRemoteNG.Settings.Default.InhDefaultRedirectSmartCards = DefaultInheritance.RedirectSmartCards;
+ mRemoteNG.Settings.Default.InhDefaultRedirectSound = DefaultInheritance.RedirectSound;
+ mRemoteNG.Settings.Default.InhDefaultPreExtApp = DefaultInheritance.PreExtApp;
+ mRemoteNG.Settings.Default.InhDefaultPostExtApp = DefaultInheritance.PostExtApp;
+ mRemoteNG.Settings.Default.InhDefaultMacAddress = DefaultInheritance.MacAddress;
+ mRemoteNG.Settings.Default.InhDefaultUserField = DefaultInheritance.UserField;
// VNC inheritance
- My.Settings.Default.InhDefaultVNCAuthMode = DefaultInheritance.VNCAuthMode;
- My.Settings.Default.InhDefaultVNCColors = DefaultInheritance.VNCColors;
- My.Settings.Default.InhDefaultVNCCompression = DefaultInheritance.VNCCompression;
- My.Settings.Default.InhDefaultVNCEncoding = DefaultInheritance.VNCEncoding;
- My.Settings.Default.InhDefaultVNCProxyIP = DefaultInheritance.VNCProxyIP;
- My.Settings.Default.InhDefaultVNCProxyPassword = DefaultInheritance.VNCProxyPassword;
- My.Settings.Default.InhDefaultVNCProxyPort = DefaultInheritance.VNCProxyPort;
- My.Settings.Default.InhDefaultVNCProxyType = DefaultInheritance.VNCProxyType;
- My.Settings.Default.InhDefaultVNCProxyUsername = DefaultInheritance.VNCProxyUsername;
- My.Settings.Default.InhDefaultVNCSmartSizeMode = DefaultInheritance.VNCSmartSizeMode;
- My.Settings.Default.InhDefaultVNCViewOnly = DefaultInheritance.VNCViewOnly;
+ mRemoteNG.Settings.Default.InhDefaultVNCAuthMode = DefaultInheritance.VNCAuthMode;
+ mRemoteNG.Settings.Default.InhDefaultVNCColors = DefaultInheritance.VNCColors;
+ mRemoteNG.Settings.Default.InhDefaultVNCCompression = DefaultInheritance.VNCCompression;
+ mRemoteNG.Settings.Default.InhDefaultVNCEncoding = DefaultInheritance.VNCEncoding;
+ mRemoteNG.Settings.Default.InhDefaultVNCProxyIP = DefaultInheritance.VNCProxyIP;
+ mRemoteNG.Settings.Default.InhDefaultVNCProxyPassword = DefaultInheritance.VNCProxyPassword;
+ mRemoteNG.Settings.Default.InhDefaultVNCProxyPort = DefaultInheritance.VNCProxyPort;
+ mRemoteNG.Settings.Default.InhDefaultVNCProxyType = DefaultInheritance.VNCProxyType;
+ mRemoteNG.Settings.Default.InhDefaultVNCProxyUsername = DefaultInheritance.VNCProxyUsername;
+ mRemoteNG.Settings.Default.InhDefaultVNCSmartSizeMode = DefaultInheritance.VNCSmartSizeMode;
+ mRemoteNG.Settings.Default.InhDefaultVNCViewOnly = DefaultInheritance.VNCViewOnly;
// Ext. App inheritance
- My.Settings.Default.InhDefaultExtApp = DefaultInheritance.ExtApp;
+ mRemoteNG.Settings.Default.InhDefaultExtApp = DefaultInheritance.ExtApp;
// RDP gateway inheritance
- My.Settings.Default.InhDefaultRDGatewayUsageMethod = DefaultInheritance.RDGatewayUsageMethod;
- My.Settings.Default.InhDefaultRDGatewayHostname = DefaultInheritance.RDGatewayHostname;
- My.Settings.Default.InhDefaultRDGatewayUsername = DefaultInheritance.RDGatewayUsername;
- My.Settings.Default.InhDefaultRDGatewayPassword = DefaultInheritance.RDGatewayPassword;
- My.Settings.Default.InhDefaultRDGatewayDomain = DefaultInheritance.RDGatewayDomain;
- My.Settings.Default.InhDefaultRDGatewayUseConnectionCredentials = DefaultInheritance.RDGatewayUseConnectionCredentials;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayUsageMethod = DefaultInheritance.RDGatewayUsageMethod;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayHostname = DefaultInheritance.RDGatewayHostname;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayUsername = DefaultInheritance.RDGatewayUsername;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayPassword = DefaultInheritance.RDGatewayPassword;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayDomain = DefaultInheritance.RDGatewayDomain;
+ mRemoteNG.Settings.Default.InhDefaultRDGatewayUseConnectionCredentials = DefaultInheritance.RDGatewayUseConnectionCredentials;
}
#endregion
@@ -344,7 +345,7 @@ namespace mRemoteNG.App
private static void SetConnectionWindowTitle(string title, ConnectionWindow connectionForm)
{
if (title == "")
- title = My.Language.strNewPanel;
+ title = Language.strNewPanel;
connectionForm.SetFormText(title.Replace("&", "&&"));
}
@@ -360,8 +361,8 @@ namespace mRemoteNG.App
private static ToolStripMenuItem CreateScreensMenuItem(DockContent pnlcForm)
{
ToolStripMenuItem cMenScreens = new ToolStripMenuItem();
- cMenScreens.Text = My.Language.strSendTo;
- cMenScreens.Image = My.Resources.Monitor;
+ cMenScreens.Text = Language.strSendTo;
+ cMenScreens.Image = Resources.Monitor;
cMenScreens.Tag = pnlcForm;
cMenScreens.DropDownItems.Add("Dummy");
cMenScreens.DropDownOpening += cMenConnectionPanelScreens_DropDownOpening;
@@ -371,8 +372,8 @@ namespace mRemoteNG.App
private static ToolStripMenuItem CreateRenameMenuItem(DockContent pnlcForm)
{
ToolStripMenuItem cMenRen = new ToolStripMenuItem();
- cMenRen.Text = My.Language.strRename;
- cMenRen.Image = My.Resources.Rename;
+ cMenRen.Text = Language.strRename;
+ cMenRen.Image = Resources.Rename;
cMenRen.Tag = pnlcForm;
cMenRen.Click += cMenConnectionPanelRename_Click;
return cMenRen;
@@ -385,7 +386,7 @@ namespace mRemoteNG.App
ConnectionWindow conW = default(ConnectionWindow);
conW = (ConnectionWindow)((Control)sender).Tag;
- string nTitle = Interaction.InputBox(Prompt: My.Language.strNewTitle + ":", DefaultResponse: Convert.ToString(((Control)((Control)sender).Tag).Text.Replace("&&", "&")));
+ string nTitle = Interaction.InputBox(Prompt: Language.strNewTitle + ":", DefaultResponse: Convert.ToString(((Control)((Control)sender).Tag).Text.Replace("&&", "&")));
if (!string.IsNullOrEmpty(nTitle))
{
@@ -407,9 +408,9 @@ namespace mRemoteNG.App
for (int i = 0; i <= Screen.AllScreens.Length - 1; i++)
{
- ToolStripMenuItem cMenScreen = new ToolStripMenuItem(My.Language.strScreen + " " + Convert.ToString(i + 1));
+ ToolStripMenuItem cMenScreen = new ToolStripMenuItem(Language.strScreen + " " + Convert.ToString(i + 1));
cMenScreen.Tag = new ArrayList();
- cMenScreen.Image = My.Resources.Monitor_GoTo;
+ cMenScreen.Image = Resources.Monitor_GoTo;
(cMenScreen.Tag as ArrayList).Add(Screen.AllScreens[i]);
(cMenScreen.Tag as ArrayList).Add(cMenScreens.Tag);
cMenScreen.Click += cMenConnectionPanelScreen_Click;
@@ -470,12 +471,12 @@ namespace mRemoteNG.App
if (filename == GetDefaultStartupConnectionFileName())
{
- My.Settings.Default.LoadConsFromCustomLocation = false;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
}
else
{
- My.Settings.Default.LoadConsFromCustomLocation = true;
- My.Settings.Default.CustomConsPath = filename;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = filename;
}
Directory.CreateDirectory(Path.GetDirectoryName(filename));
@@ -489,7 +490,7 @@ namespace mRemoteNG.App
xmlTextWriter.Indentation = 4;
xmlTextWriter.WriteStartDocument();
xmlTextWriter.WriteStartElement("Connections"); // Do not localize
- xmlTextWriter.WriteAttributeString("Name", My.Language.strConnections);
+ xmlTextWriter.WriteAttributeString("Name", Language.strConnections);
xmlTextWriter.WriteAttributeString("Export", "", "False");
xmlTextWriter.WriteAttributeString("Protected", "", "GiUis20DIbnYzWPcdaQKfjE2H5jh//L5v4RGrJMGNXuIq2CttB/d/BxaBP2LwRhY");
xmlTextWriter.WriteAttributeString("ConfVersion", "", "2.5");
@@ -512,7 +513,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddExceptionMessage(My.Language.strCouldNotCreateNewConnectionsFile, ex, MessageClass.ErrorMsg);
+ MessageCollector.AddExceptionMessage(Language.strCouldNotCreateNewConnectionsFile, ex, MessageClass.ErrorMsg);
}
}
@@ -551,7 +552,7 @@ namespace mRemoteNG.App
ConnectionList = new ConnectionList();
ContainerList = new ContainerList();
- if (!My.Settings.Default.UseSQLServer)
+ if (!mRemoteNG.Settings.Default.UseSQLServer)
{
if (withDialog)
{
@@ -590,15 +591,15 @@ namespace mRemoteNG.App
ConnectionTree.ResetTree();
connectionsLoader.RootTreeNode = Windows.treeForm.tvConnections.Nodes[0];
- connectionsLoader.UseSQL = My.Settings.Default.UseSQLServer;
- connectionsLoader.SQLHost = My.Settings.Default.SQLHost;
- connectionsLoader.SQLDatabaseName = My.Settings.Default.SQLDatabaseName;
- connectionsLoader.SQLUsername = My.Settings.Default.SQLUser;
- connectionsLoader.SQLPassword = Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey);
+ connectionsLoader.UseSQL = mRemoteNG.Settings.Default.UseSQLServer;
+ connectionsLoader.SQLHost = mRemoteNG.Settings.Default.SQLHost;
+ connectionsLoader.SQLDatabaseName = mRemoteNG.Settings.Default.SQLDatabaseName;
+ connectionsLoader.SQLUsername = mRemoteNG.Settings.Default.SQLUser;
+ connectionsLoader.SQLPassword = Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey);
connectionsLoader.SQLUpdate = update;
connectionsLoader.LoadConnections(false);
- if (My.Settings.Default.UseSQLServer == true)
+ if (mRemoteNG.Settings.Default.UseSQLServer == true)
{
LastSqlUpdate = DateTime.Now;
}
@@ -606,35 +607,35 @@ namespace mRemoteNG.App
{
if (connectionsLoader.ConnectionFileName == GetDefaultStartupConnectionFileName())
{
- My.Settings.Default.LoadConsFromCustomLocation = false;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
}
else
{
- My.Settings.Default.LoadConsFromCustomLocation = true;
- My.Settings.Default.CustomConsPath = connectionsLoader.ConnectionFileName;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = connectionsLoader.ConnectionFileName;
}
}
// re-enable sql update checking after updates are loaded
- if (My.Settings.Default.UseSQLServer && SQLConnProvider != null)
+ if (mRemoteNG.Settings.Default.UseSQLServer && SQLConnProvider != null)
{
SQLConnProvider.Enable();
}
}
catch (Exception ex)
{
- if (My.Settings.Default.UseSQLServer)
+ if (mRemoteNG.Settings.Default.UseSQLServer)
{
- MessageCollector.AddExceptionMessage(My.Language.strLoadFromSqlFailed, ex);
- string commandButtons = string.Join("|", new[] {My.Language.strCommandTryAgain, My.Language.strCommandOpenConnectionFile, string.Format(My.Language.strCommandExitProgram, Application.ProductName)});
- cTaskDialog.ShowCommandBox(Application.ProductName, My.Language.strLoadFromSqlFailed, My.Language.strLoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, eSysIcons.Error, eSysIcons.Error);
+ MessageCollector.AddExceptionMessage(Language.strLoadFromSqlFailed, ex);
+ string commandButtons = string.Join("|", new[] {Language.strCommandTryAgain, Language.strCommandOpenConnectionFile, string.Format(Language.strCommandExitProgram, Application.ProductName)});
+ cTaskDialog.ShowCommandBox(Application.ProductName, Language.strLoadFromSqlFailed, Language.strLoadFromSqlFailedContent, MiscTools.GetExceptionMessageRecursive(ex), "", "", commandButtons, false, eSysIcons.Error, eSysIcons.Error);
switch (cTaskDialog.CommandButtonResult)
{
case 0:
LoadConnections(withDialog, update);
return ;
case 1:
- My.Settings.Default.UseSQLServer = false;
+ mRemoteNG.Settings.Default.UseSQLServer = false;
LoadConnections(true, update);
return ;
default:
@@ -646,12 +647,12 @@ namespace mRemoteNG.App
{
if (ex is FileNotFoundException&& !withDialog)
{
- MessageCollector.AddExceptionMessage(string.Format(My.Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg);
+ MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoadedNew, connectionsLoader.ConnectionFileName), ex, MessageClass.InformationMsg);
NewConnections(Convert.ToString(connectionsLoader.ConnectionFileName));
return ;
}
- MessageCollector.AddExceptionMessage(string.Format(My.Language.strConnectionsFileCouldNotBeLoaded, connectionsLoader.ConnectionFileName), ex);
+ MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotBeLoaded, connectionsLoader.ConnectionFileName), ex);
if (!(connectionsLoader.ConnectionFileName == GetStartupConnectionFileName()))
{
LoadConnections(withDialog, update);
@@ -659,7 +660,7 @@ namespace mRemoteNG.App
}
else
{
- Interaction.MsgBox(string.Format(My.Language.strErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)), (int) MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, null);
+ Interaction.MsgBox(string.Format(Language.strErrorStartupConnectionFileLoad, Environment.NewLine, Application.ProductName, GetStartupConnectionFileName(), MiscTools.GetExceptionMessageRecursive(ex)), (int) MsgBoxStyle.OkOnly + MsgBoxStyle.Critical, null);
Application.Exit();
return ;
}
@@ -670,20 +671,20 @@ namespace mRemoteNG.App
protected static void CreateBackupFile(string fileName)
{
// This intentionally doesn't prune any existing backup files. We just assume the user doesn't want any new ones created.
- if (My.Settings.Default.BackupFileKeepCount == 0)
+ if (mRemoteNG.Settings.Default.BackupFileKeepCount == 0)
{
return ;
}
try
{
- string backupFileName = string.Format(My.Settings.Default.BackupFileNameFormat, fileName, DateTime.UtcNow);
+ string backupFileName = string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, DateTime.UtcNow);
File.Copy(fileName, backupFileName);
PruneBackupFiles(fileName);
}
catch (Exception ex)
{
- MessageCollector.AddExceptionMessage(My.Language.strConnectionsFileBackupFailed, ex, MessageClass.WarningMsg);
+ MessageCollector.AddExceptionMessage(Language.strConnectionsFileBackupFailed, ex, MessageClass.WarningMsg);
throw;
}
}
@@ -698,16 +699,16 @@ namespace mRemoteNG.App
return ;
}
- string searchPattern = string.Format(My.Settings.Default.BackupFileNameFormat, fileName, "*");
+ string searchPattern = string.Format(mRemoteNG.Settings.Default.BackupFileNameFormat, fileName, "*");
string[] files = Directory.GetFiles(directoryName, searchPattern);
- if (files.Length <= My.Settings.Default.BackupFileKeepCount)
+ if (files.Length <= mRemoteNG.Settings.Default.BackupFileKeepCount)
{
return ;
}
Array.Sort(files);
- Array.Resize(ref files, files.Length - My.Settings.Default.BackupFileKeepCount);
+ Array.Resize(ref files, files.Length - mRemoteNG.Settings.Default.BackupFileKeepCount);
foreach (string file in files)
{
@@ -730,13 +731,13 @@ namespace mRemoteNG.App
public static string GetStartupConnectionFileName()
{
- if (My.Settings.Default.LoadConsFromCustomLocation == false)
+ if (mRemoteNG.Settings.Default.LoadConsFromCustomLocation == false)
{
return GetDefaultStartupConnectionFileName();
}
else
{
- return My.Settings.Default.CustomConsPath;
+ return mRemoteNG.Settings.Default.CustomConsPath;
}
}
@@ -766,7 +767,7 @@ namespace mRemoteNG.App
try
{
- if (Update == true && My.Settings.Default.UseSQLServer == false)
+ if (Update == true && mRemoteNG.Settings.Default.UseSQLServer == false)
{
return;
}
@@ -778,7 +779,7 @@ namespace mRemoteNG.App
ConnectionsSaver conS = new ConnectionsSaver();
- if (!My.Settings.Default.UseSQLServer)
+ if (!mRemoteNG.Settings.Default.UseSQLServer)
{
conS.ConnectionFileName = GetStartupConnectionFileName();
}
@@ -789,25 +790,25 @@ namespace mRemoteNG.App
conS.SaveSecurity = new Security.Save(false);
conS.RootTreeNode = Windows.treeForm.tvConnections.Nodes[0];
- if (My.Settings.Default.UseSQLServer == true)
+ if (mRemoteNG.Settings.Default.UseSQLServer == true)
{
conS.SaveFormat = ConnectionsSaver.Format.SQL;
- conS.SQLHost = Convert.ToString(My.Settings.Default.SQLHost);
- conS.SQLDatabaseName = Convert.ToString(My.Settings.Default.SQLDatabaseName);
- conS.SQLUsername = Convert.ToString(My.Settings.Default.SQLUser);
- conS.SQLPassword = Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey);
+ conS.SQLHost = Convert.ToString(mRemoteNG.Settings.Default.SQLHost);
+ conS.SQLDatabaseName = Convert.ToString(mRemoteNG.Settings.Default.SQLDatabaseName);
+ conS.SQLUsername = Convert.ToString(mRemoteNG.Settings.Default.SQLUser);
+ conS.SQLPassword = Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.SQLPass), GeneralAppInfo.EncryptionKey);
}
conS.SaveConnections();
- if (My.Settings.Default.UseSQLServer == true)
+ if (mRemoteNG.Settings.Default.UseSQLServer == true)
{
LastSqlUpdate = DateTime.Now;
}
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionsFileCouldNotBeSaved + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionsFileCouldNotBeSaved + Environment.NewLine + ex.Message);
}
finally
{
@@ -837,8 +838,8 @@ namespace mRemoteNG.App
saveFileDialog.OverwritePrompt = true;
List fileTypes = new List();
- fileTypes.AddRange(new[] {My.Language.strFiltermRemoteXML, "*.xml"});
- fileTypes.AddRange(new[] {My.Language.strFilterAll, "*.*"});
+ fileTypes.AddRange(new[] {Language.strFiltermRemoteXML, "*.xml"});
+ fileTypes.AddRange(new[] {Language.strFilterAll, "*.*"});
saveFileDialog.Filter = string.Join("|", fileTypes.ToArray());
@@ -859,19 +860,19 @@ namespace mRemoteNG.App
if (saveFileDialog.FileName == GetDefaultStartupConnectionFileName())
{
- My.Settings.Default.LoadConsFromCustomLocation = false;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
}
else
{
- My.Settings.Default.LoadConsFromCustomLocation = true;
- My.Settings.Default.CustomConsPath = saveFileDialog.FileName;
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = saveFileDialog.FileName;
}
}
}
catch (Exception ex)
{
- MessageCollector.AddExceptionMessage(string.Format(My.Language.strConnectionsFileCouldNotSaveAs, connectionsSave.ConnectionFileName), ex);
+ MessageCollector.AddExceptionMessage(string.Format(Language.strConnectionsFileCouldNotSaveAs, connectionsSave.ConnectionFileName), ex);
}
finally
{
@@ -896,9 +897,9 @@ namespace mRemoteNG.App
ConnectionInfo newConnectionInfo = new ConnectionInfo();
- if (My.Settings.Default.IdentifyQuickConnectTabs)
+ if (mRemoteNG.Settings.Default.IdentifyQuickConnectTabs)
{
- newConnectionInfo.Name = string.Format(My.Language.strQuick, uri.Host);
+ newConnectionInfo.Name = string.Format(Language.strQuick, uri.Host);
}
else
{
@@ -921,7 +922,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddExceptionMessage(My.Language.strQuickConnectFailed, ex, MessageClass.ErrorMsg);
+ MessageCollector.AddExceptionMessage(Language.strQuickConnectFailed, ex, MessageClass.ErrorMsg);
return null;
}
}
@@ -934,7 +935,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -967,7 +968,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -979,7 +980,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -991,7 +992,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1003,7 +1004,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1015,7 +1016,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1025,7 +1026,7 @@ namespace mRemoteNG.App
{
if (ConnectionInfo.Hostname == "" && ConnectionInfo.Protocol != Connection.Protocol.ProtocolType.IntApp)
{
- MessageCollector.AddMessage(MessageClass.WarningMsg, My.Language.strConnectionOpenFailedNoHostname);
+ MessageCollector.AddMessage(MessageClass.WarningMsg, Language.strConnectionOpenFailedNoHostname);
return;
}
@@ -1069,7 +1070,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionOpenFailed + Environment.NewLine + ex.Message);
}
}
@@ -1146,7 +1147,7 @@ namespace mRemoteNG.App
private static string SetConnectionPanel(ConnectionInfo ConnectionInfo, ConnectionInfo.Force Force)
{
string connectionPanel = "";
- if (ConnectionInfo.Panel == "" || (Force & ConnectionInfo.Force.OverridePanel) == ConnectionInfo.Force.OverridePanel | My.Settings.Default.AlwaysShowPanelSelectionDlg)
+ if (ConnectionInfo.Panel == "" || (Force & ConnectionInfo.Force.OverridePanel) == ConnectionInfo.Force.OverridePanel | mRemoteNG.Settings.Default.AlwaysShowPanelSelectionDlg)
{
frmChoosePanel frmPnl = new frmChoosePanel();
if (frmPnl.ShowDialog() == DialogResult.OK)
@@ -1193,7 +1194,7 @@ namespace mRemoteNG.App
{
try
{
- MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strProtocolEventDisconnected, DisconnectedMessage), true);
+ MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strProtocolEventDisconnected, DisconnectedMessage), true);
ProtocolBase Prot = (ProtocolBase)sender;
if (Prot.InterfaceControl.Info.Protocol == ProtocolType.RDP)
@@ -1205,18 +1206,18 @@ namespace mRemoteNG.App
{
if (!string.IsNullOrEmpty(ReasonDescription))
{
- MessageCollector.AddMessage(MessageClass.WarningMsg, My.Language.strRdpDisconnected + Environment.NewLine + ReasonDescription + Environment.NewLine + string.Format(My.Language.strErrorCode, ReasonCode));
+ MessageCollector.AddMessage(MessageClass.WarningMsg, Language.strRdpDisconnected + Environment.NewLine + ReasonDescription + Environment.NewLine + string.Format(Language.strErrorCode, ReasonCode));
}
else
{
- MessageCollector.AddMessage(MessageClass.WarningMsg, My.Language.strRdpDisconnected + Environment.NewLine + string.Format(My.Language.strErrorCode, ReasonCode));
+ MessageCollector.AddMessage(MessageClass.WarningMsg, Language.strRdpDisconnected + Environment.NewLine + string.Format(Language.strErrorCode, ReasonCode));
}
}
}
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, string.Format(My.Language.strProtocolEventDisconnectFailed, ex.Message), true);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, string.Format(Language.strProtocolEventDisconnectFailed, ex.Message), true);
}
}
@@ -1226,9 +1227,9 @@ namespace mRemoteNG.App
{
ProtocolBase Prot = (ProtocolBase)sender;
- MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strConnenctionCloseEvent, true);
+ MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnenctionCloseEvent, true);
- MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(My.Language.strConnenctionClosedByUser, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString(), Environment.UserName));
+ MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnenctionClosedByUser, Prot.InterfaceControl.Info.Hostname, Prot.InterfaceControl.Info.Protocol.ToString(), Environment.UserName));
Prot.InterfaceControl.Info.OpenConnections.Remove(Prot);
@@ -1248,35 +1249,35 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnenctionCloseEventFailed + Environment.NewLine + ex.Message, true);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnenctionCloseEventFailed + Environment.NewLine + ex.Message, true);
}
}
public static void Prot_Event_Connected(object sender)
{
ProtocolBase prot = (ProtocolBase)sender;
- MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strConnectionEventConnected, true);
- MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(My.Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol.ToString(), Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField));
+ MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventConnected, true);
+ MessageCollector.AddMessage(MessageClass.ReportMsg, string.Format(Language.strConnectionEventConnectedDetail, prot.InterfaceControl.Info.Hostname, prot.InterfaceControl.Info.Protocol.ToString(), Environment.UserName, prot.InterfaceControl.Info.Description, prot.InterfaceControl.Info.UserField));
}
public static void Prot_Event_ErrorOccured(object sender, string ErrorMessage)
{
try
{
- MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strConnectionEventErrorOccured, true);
+ MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strConnectionEventErrorOccured, true);
ProtocolBase Prot = (ProtocolBase)sender;
if (Prot.InterfaceControl.Info.Protocol == ProtocolType.RDP)
{
if (Convert.ToInt32(ErrorMessage) > -1)
{
- MessageCollector.AddMessage(MessageClass.WarningMsg, string.Format(My.Language.strConnectionRdpErrorDetail, ErrorMessage, ProtocolRDP.FatalErrors.GetError(ErrorMessage)));
+ MessageCollector.AddMessage(MessageClass.WarningMsg, string.Format(Language.strConnectionRdpErrorDetail, ErrorMessage, ProtocolRDP.FatalErrors.GetError(ErrorMessage)));
}
}
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strConnectionEventConnectionFailed + Environment.NewLine + ex.Message, true);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strConnectionEventConnectionFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -1343,7 +1344,7 @@ namespace mRemoteNG.App
}
catch (Exception)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strLogWriteToFileFailed);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strLogWriteToFileFailed);
}
}
@@ -1362,7 +1363,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strLogWriteToFileFinalLocationFailed + Environment.NewLine + ex.Message, true);
+ MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strLogWriteToFileFinalLocationFailed + Environment.NewLine + ex.Message, true);
return false;
}
finally
diff --git a/mRemoteV1/App/Shutdown.cs b/mRemoteV1/App/Shutdown.cs
index 10e3d6244..39d7378d0 100644
--- a/mRemoteV1/App/Shutdown.cs
+++ b/mRemoteV1/App/Shutdown.cs
@@ -2,6 +2,7 @@
using mRemoteNG.Tools;
using System;
using System.Diagnostics;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
namespace mRemoteNG.App
@@ -36,7 +37,7 @@ namespace mRemoteNG.App
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strSettingsCouldNotBeSavedOrTrayDispose + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strSettingsCouldNotBeSavedOrTrayDispose + Environment.NewLine + ex.Message, true);
}
}
@@ -53,7 +54,7 @@ namespace mRemoteNG.App
private static void SaveConnections()
{
- if (My.Settings.Default.SaveConsOnExit)
+ if (mRemoteNG.Settings.Default.SaveConsOnExit)
Runtime.SaveConnections();
}
diff --git a/mRemoteV1/App/Startup.cs b/mRemoteV1/App/Startup.cs
index a4bff6ea4..a9ad7e7b5 100644
--- a/mRemoteV1/App/Startup.cs
+++ b/mRemoteV1/App/Startup.cs
@@ -41,7 +41,7 @@ namespace mRemoteNG.App
regKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa");
if (regKey != null)
{
- if (!((int)regKey.GetValue("FIPSAlgorithmPolicy") == 0))
+ if ((int)regKey.GetValue("FIPSAlgorithmPolicy") != 0)
{
isFipsPolicyEnabled = true;
}
@@ -51,7 +51,7 @@ namespace mRemoteNG.App
regKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey("System\\CurrentControlSet\\Control\\Lsa\\FIPSAlgorithmPolicy");
if (regKey != null)
{
- if (!((int)regKey.GetValue("Enabled") == 0))
+ if ((int)regKey.GetValue("Enabled") != 0)
{
isFipsPolicyEnabled = true;
}
@@ -65,7 +65,7 @@ namespace mRemoteNG.App
}
private static void CheckLenovoAutoScrollUtility()
{
- if (!Settings.Default.CompatibilityWarnLenovoAutoScrollUtility)
+ if (!mRemoteNG.Settings.Default.CompatibilityWarnLenovoAutoScrollUtility)
{
return;
}
@@ -86,7 +86,7 @@ namespace mRemoteNG.App
cTaskDialog.MessageBox(System.Windows.Forms.Application.ProductName, Language.strCompatibilityProblemDetected, string.Format(Language.strCompatibilityLenovoAutoScrollUtilityDetected, System.Windows.Forms.Application.ProductName), "", "", Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.OK, eSysIcons.Warning, eSysIcons.Warning);
if (cTaskDialog.VerificationChecked)
{
- Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false;
+ mRemoteNG.Settings.Default.CompatibilityWarnLenovoAutoScrollUtility = false;
}
}
@@ -152,7 +152,7 @@ namespace mRemoteNG.App
}
public static void LogStartupData()
{
- if (Settings.Default.WriteLogFile)
+ if (mRemoteNG.Settings.Default.WriteLogFile)
{
LogApplicationData();
LogCmdLineArgs();
@@ -243,7 +243,7 @@ namespace mRemoteNG.App
public static void CreateConnectionsProvider()
{
- if (Settings.Default.UseSQLServer == true)
+ if (mRemoteNG.Settings.Default.UseSQLServer == true)
{
SqlConnectionsProvider _sqlConnectionsProvider = new SqlConnectionsProvider();
}
@@ -260,8 +260,8 @@ namespace mRemoteNG.App
return;
}
- DateTime nextUpdateCheck = Convert.ToDateTime(Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(Settings.Default.CheckForUpdatesFrequencyDays))));
- if (!Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck)
+ DateTime nextUpdateCheck = Convert.ToDateTime(mRemoteNG.Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(Convert.ToDouble(mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays))));
+ if (!mRemoteNG.Settings.Default.UpdatePending && DateTime.UtcNow < nextUpdateCheck)
{
return;
}
@@ -414,46 +414,46 @@ namespace mRemoteNG.App
{
if (File.Exists((new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\" + cmd[ConsParam]))
{
- Settings.Default.LoadConsFromCustomLocation = true;
- Settings.Default.CustomConsPath = (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\" + cmd[ConsParam];
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\" + cmd[ConsParam];
return;
}
else if (File.Exists(App.Info.ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam]))
{
- Settings.Default.LoadConsFromCustomLocation = true;
- Settings.Default.CustomConsPath = App.Info.ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam];
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = App.Info.ConnectionsFileInfo.DefaultConnectionsPath + "\\" + cmd[ConsParam];
return;
}
}
else
{
- Settings.Default.LoadConsFromCustomLocation = true;
- Settings.Default.CustomConsPath = cmd[ConsParam];
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = true;
+ mRemoteNG.Settings.Default.CustomConsPath = cmd[ConsParam];
return;
}
}
if (!string.IsNullOrEmpty(ResetPosParam))
{
- Settings.Default.MainFormKiosk = false;
- Settings.Default.MainFormLocation = new Point(999, 999);
- Settings.Default.MainFormSize = new Size(900, 600);
- Settings.Default.MainFormState = FormWindowState.Normal;
+ mRemoteNG.Settings.Default.MainFormKiosk = false;
+ mRemoteNG.Settings.Default.MainFormLocation = new Point(999, 999);
+ mRemoteNG.Settings.Default.MainFormSize = new Size(900, 600);
+ mRemoteNG.Settings.Default.MainFormState = FormWindowState.Normal;
}
if (!string.IsNullOrEmpty(ResetPanelsParam))
{
- Settings.Default.ResetPanels = true;
+ mRemoteNG.Settings.Default.ResetPanels = true;
}
if (!string.IsNullOrEmpty(NoReconnectParam))
{
- Settings.Default.NoReconnect = true;
+ mRemoteNG.Settings.Default.NoReconnect = true;
}
if (!string.IsNullOrEmpty(ResetToolbarsParam))
{
- Settings.Default.ResetToolbars = true;
+ mRemoteNG.Settings.Default.ResetToolbars = true;
}
}
catch (Exception ex)
diff --git a/mRemoteV1/App/SupportedCultures.cs b/mRemoteV1/App/SupportedCultures.cs
index e45d96f3b..5b5b55d5a 100644
--- a/mRemoteV1/App/SupportedCultures.cs
+++ b/mRemoteV1/App/SupportedCultures.cs
@@ -22,7 +22,7 @@ namespace mRemoteNG.App
private SupportedCultures()
{
System.Globalization.CultureInfo CultureInfo = default(System.Globalization.CultureInfo);
- foreach (string CultureName in My.Settings.Default.SupportedUICultures.Split(','))
+ foreach (string CultureName in mRemoteNG.Settings.Default.SupportedUICultures.Split(','))
{
try
{
diff --git a/mRemoteV1/App/Update/AppUpdater.cs b/mRemoteV1/App/Update/AppUpdater.cs
index 85cb884b8..0fa1f6a78 100644
--- a/mRemoteV1/App/Update/AppUpdater.cs
+++ b/mRemoteV1/App/Update/AppUpdater.cs
@@ -107,7 +107,7 @@ namespace mRemoteNG.App.Update
public void SetProxySettings()
{
- SetProxySettings(Convert.ToBoolean(My.Settings.Default.UpdateUseProxy), Convert.ToString(My.Settings.Default.UpdateProxyAddress), Convert.ToInt32(My.Settings.Default.UpdateProxyPort), Convert.ToBoolean(My.Settings.Default.UpdateProxyUseAuthentication), Convert.ToString(My.Settings.Default.UpdateProxyAuthUser), Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.UpdateProxyAuthPass), Info.GeneralAppInfo.EncryptionKey));
+ SetProxySettings(Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateUseProxy), Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAddress), Convert.ToInt32(mRemoteNG.Settings.Default.UpdateProxyPort), Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateProxyUseAuthentication), Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAuthUser), Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAuthPass), Info.GeneralAppInfo.EncryptionKey));
}
public void SetProxySettings(bool useProxy, string address, int port, bool useAuthentication, string username, string password)
@@ -155,7 +155,7 @@ namespace mRemoteNG.App.Update
return false;
}
- return !(_currentAnnouncementInfo.Name == My.Settings.Default.LastAnnouncement);
+ return !(_currentAnnouncementInfo.Name == mRemoteNG.Settings.Default.LastAnnouncement);
}
public void GetUpdateInfoAsync()
@@ -285,17 +285,17 @@ namespace mRemoteNG.App.Update
private void GetUpdateInfo()
{
- Uri updateFileUri = new Uri(new Uri(Convert.ToString(My.Settings.Default.UpdateAddress)), new Uri(Info.UpdateChannelInfo.FileName, UriKind.Relative));
+ Uri updateFileUri = new Uri(new Uri(Convert.ToString(mRemoteNG.Settings.Default.UpdateAddress)), new Uri(Info.UpdateChannelInfo.FileName, UriKind.Relative));
DownloadStringCompletedEventArgs e = DownloadString(updateFileUri);
if (!e.Cancelled && e.Error == null)
{
_currentUpdateInfo = UpdateInfo.FromString(e.Result);
- My.Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
- if (!My.Settings.Default.UpdatePending)
+ mRemoteNG.Settings.Default.CheckForUpdatesLastCheck = DateTime.UtcNow;
+ if (!mRemoteNG.Settings.Default.UpdatePending)
{
- My.Settings.Default.UpdatePending = IsUpdateAvailable();
+ mRemoteNG.Settings.Default.UpdatePending = IsUpdateAvailable();
}
}
@@ -318,7 +318,7 @@ namespace mRemoteNG.App.Update
private void GetAnnouncementInfo()
{
- Uri announcementFileUri = new Uri(Convert.ToString(My.Settings.Default.AnnouncementAddress));
+ Uri announcementFileUri = new Uri(Convert.ToString(mRemoteNG.Settings.Default.AnnouncementAddress));
DownloadStringCompletedEventArgs e = DownloadString(announcementFileUri);
if (!e.Cancelled && e.Error == null)
@@ -327,7 +327,7 @@ namespace mRemoteNG.App.Update
if (!string.IsNullOrEmpty(_currentAnnouncementInfo.Name))
{
- My.Settings.Default.LastAnnouncement = _currentAnnouncementInfo.Name;
+ mRemoteNG.Settings.Default.LastAnnouncement = _currentAnnouncementInfo.Name;
}
}
diff --git a/mRemoteV1/Config/Connections/ConnectionsLoader.cs b/mRemoteV1/Config/Connections/ConnectionsLoader.cs
index b2abd04c9..69b4e0d28 100644
--- a/mRemoteV1/Config/Connections/ConnectionsLoader.cs
+++ b/mRemoteV1/Config/Connections/ConnectionsLoader.cs
@@ -191,8 +191,8 @@ namespace mRemoteNG.Config.Connections
cTaskDialog.ShowTaskDialogBox(
frmMain.Default,
System.Windows.Forms.Application.ProductName,
- "Incompatible database schema",
- string.Format("The database schema on the server is not supported. Please upgrade to a newer version of {0}.", System.Windows.Forms.Application.ProductName),
+ "Incompatible database schema",
+ $"The database schema on the server is not supported. Please upgrade to a newer version of {System.Windows.Forms.Application.ProductName}.",
string.Format("Schema Version: {1}{0}Highest Supported Version: {2}", Environment.NewLine, confVersion.ToString(), maxSupportedSchemaVersion.ToString()),
"",
"",
@@ -202,12 +202,12 @@ namespace mRemoteNG.Config.Connections
eSysIcons.Error,
eSysIcons.Error
);
- throw (new Exception(string.Format("Incompatible database schema (schema version {0}).", confVersion)));
+ throw (new Exception($"Incompatible database schema (schema version {confVersion})."));
}
RootTreeNode.Name = Convert.ToString(sqlRd["Name"]);
- RootNodeInfo rootInfo = new RootNodeInfo(RootNodeType.Connection);
+ var rootInfo = new RootNodeInfo(RootNodeType.Connection);
rootInfo.Name = RootTreeNode.Name;
rootInfo.TreeNode = RootTreeNode;
@@ -219,8 +219,8 @@ namespace mRemoteNG.Config.Connections
{
if (Authenticate(Convert.ToString(sqlRd["Protected"]), false, rootInfo) == false)
{
- My.Settings.Default.LoadConsFromCustomLocation = false;
- My.Settings.Default.CustomConsPath = "";
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
+ mRemoteNG.Settings.Default.CustomConsPath = "";
RootTreeNode.Remove();
return;
}
@@ -247,7 +247,7 @@ namespace mRemoteNG.Config.Connections
Windows.treeForm.tvConnections.EndUpdate();
//open connections from last mremote session
- if (My.Settings.Default.OpenConsFromLastSession == true && My.Settings.Default.NoReconnect == false)
+ if (mRemoteNG.Settings.Default.OpenConsFromLastSession && !mRemoteNG.Settings.Default.NoReconnect)
{
foreach (ConnectionInfo conI in ConnectionList)
{
@@ -761,8 +761,8 @@ namespace mRemoteNG.Config.Connections
{
if (Authenticate(Convert.ToString(xDom.DocumentElement.Attributes["Protected"].Value), false, rootInfo) == false)
{
- My.Settings.Default.LoadConsFromCustomLocation = false;
- My.Settings.Default.CustomConsPath = "";
+ mRemoteNG.Settings.Default.LoadConsFromCustomLocation = false;
+ mRemoteNG.Settings.Default.CustomConsPath = "";
RootTreeNode.Remove();
return;
}
@@ -809,7 +809,7 @@ namespace mRemoteNG.Config.Connections
Windows.treeForm.tvConnections.EndUpdate();
//open connections from last mremote session
- if (My.Settings.Default.OpenConsFromLastSession == true && My.Settings.Default.NoReconnect == false)
+ if (mRemoteNG.Settings.Default.OpenConsFromLastSession && !mRemoteNG.Settings.Default.NoReconnect)
{
foreach (ConnectionInfo conI in ConnectionList)
{
diff --git a/mRemoteV1/Config/Connections/ConnectionsSaver.cs b/mRemoteV1/Config/Connections/ConnectionsSaver.cs
index b6c375633..a9d7e4e3b 100644
--- a/mRemoteV1/Config/Connections/ConnectionsSaver.cs
+++ b/mRemoteV1/Config/Connections/ConnectionsSaver.cs
@@ -11,6 +11,7 @@ using System.Globalization;
using System.IO;
using System.Windows.Forms;
using System.Xml;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
using mRemoteNG.Tree.Root;
@@ -75,7 +76,7 @@ namespace mRemoteNG.Config.Connections
break;
default:
SaveToXml();
- if (My.Settings.Default.EncryptCompleteConnectionsFile)
+ if (mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile)
{
EncryptCompleteFile();
}
@@ -140,12 +141,12 @@ namespace mRemoteNG.Config.Connections
if (isVerified == false)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, string.Format(My.Language.strErrorBadDatabaseVersion, databaseVersion.ToString(), (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName));
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, string.Format(Language.strErrorBadDatabaseVersion, databaseVersion.ToString(), (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName));
}
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(My.Language.strErrorVerifyDatabaseVersionFailed, ex.Message));
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(Language.strErrorVerifyDatabaseVersionFailed, ex.Message));
}
finally
{
@@ -175,7 +176,7 @@ namespace mRemoteNG.Config.Connections
if (!VerifyDatabaseVersion(_sqlConnection))
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strErrorConnectionListSaveFailed);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strErrorConnectionListSaveFailed);
return ;
}
diff --git a/mRemoteV1/Config/KeyboardShortcuts/KeyboardShortcuts.cs b/mRemoteV1/Config/KeyboardShortcuts/KeyboardShortcuts.cs
index 5a730ff38..4c4812104 100644
--- a/mRemoteV1/Config/KeyboardShortcuts/KeyboardShortcuts.cs
+++ b/mRemoteV1/Config/KeyboardShortcuts/KeyboardShortcuts.cs
@@ -76,8 +76,8 @@ namespace mRemoteNG.Config.KeyboardShortcuts
return ;
}
_defaultMap = new KeyboardShortcutMap();
- _defaultMap.AddFromConfigString(ShortcutCommand.PreviousTab, Convert.ToString(My.Settings.Default.Properties["KeysPreviousTab"].DefaultValue));
- _defaultMap.AddFromConfigString(ShortcutCommand.NextTab, Convert.ToString(My.Settings.Default.Properties["KeysNextTab"].DefaultValue));
+ _defaultMap.AddFromConfigString(ShortcutCommand.PreviousTab, Convert.ToString(mRemoteNG.Settings.Default.Properties["KeysPreviousTab"].DefaultValue));
+ _defaultMap.AddFromConfigString(ShortcutCommand.NextTab, Convert.ToString(mRemoteNG.Settings.Default.Properties["KeysNextTab"].DefaultValue));
}
private static void Load()
@@ -87,8 +87,8 @@ namespace mRemoteNG.Config.KeyboardShortcuts
return ;
}
_map = new KeyboardShortcutMap();
- _map.AddFromConfigString(ShortcutCommand.PreviousTab, Convert.ToString(My.Settings.Default.KeysPreviousTab));
- _map.AddFromConfigString(ShortcutCommand.NextTab, Convert.ToString(My.Settings.Default.KeysNextTab));
+ _map.AddFromConfigString(ShortcutCommand.PreviousTab, Convert.ToString(mRemoteNG.Settings.Default.KeysPreviousTab));
+ _map.AddFromConfigString(ShortcutCommand.NextTab, Convert.ToString(mRemoteNG.Settings.Default.KeysNextTab));
_mapLoaded = true;
}
@@ -98,8 +98,8 @@ namespace mRemoteNG.Config.KeyboardShortcuts
{
return ;
}
- My.Settings.Default.KeysPreviousTab = _map.GetConfigString(ShortcutCommand.PreviousTab);
- My.Settings.Default.KeysNextTab = _map.GetConfigString(ShortcutCommand.NextTab);
+ mRemoteNG.Settings.Default.KeysPreviousTab = _map.GetConfigString(ShortcutCommand.PreviousTab);
+ mRemoteNG.Settings.Default.KeysNextTab = _map.GetConfigString(ShortcutCommand.NextTab);
}
private static void CancelKeyNotifications()
diff --git a/mRemoteV1/Config/Putty/Config.Putty.Provider.cs b/mRemoteV1/Config/Putty/Config.Putty.Provider.cs
index 9af7b9309..2a35a5b4e 100644
--- a/mRemoteV1/Config/Putty/Config.Putty.Provider.cs
+++ b/mRemoteV1/Config/Putty/Config.Putty.Provider.cs
@@ -128,22 +128,22 @@ namespace mRemoteNG.Config.Putty
{
Root.PuttySessions.PuttySessionsNodeInfo newRootInfo = new Root.PuttySessions.PuttySessionsNodeInfo();
- if (string.IsNullOrEmpty(Convert.ToString(My.Settings.Default.PuttySavedSessionsName)))
+ if (string.IsNullOrEmpty(Convert.ToString(mRemoteNG.Settings.Default.PuttySavedSessionsName)))
{
newRootInfo.Name = Language.strPuttySavedSessionsRootName;
}
else
{
- newRootInfo.Name = Convert.ToString(My.Settings.Default.PuttySavedSessionsName);
+ newRootInfo.Name = Convert.ToString(mRemoteNG.Settings.Default.PuttySavedSessionsName);
}
- if (string.IsNullOrEmpty(Convert.ToString(My.Settings.Default.PuttySavedSessionsPanel)))
+ if (string.IsNullOrEmpty(Convert.ToString(mRemoteNG.Settings.Default.PuttySavedSessionsPanel)))
{
newRootInfo.Panel = Language.strGeneral;
}
else
{
- newRootInfo.Panel = Convert.ToString(My.Settings.Default.PuttySavedSessionsPanel);
+ newRootInfo.Panel = Convert.ToString(mRemoteNG.Settings.Default.PuttySavedSessionsPanel);
}
return newRootInfo;
diff --git a/mRemoteV1/Config/Putty/Config.Putty.XmingProvider.cs b/mRemoteV1/Config/Putty/Config.Putty.XmingProvider.cs
index e7f3402bf..bd7872ee8 100644
--- a/mRemoteV1/Config/Putty/Config.Putty.XmingProvider.cs
+++ b/mRemoteV1/Config/Putty/Config.Putty.XmingProvider.cs
@@ -187,9 +187,9 @@ namespace mRemoteNG.Config.Putty
private static string GetPuttyConfPath()
{
string puttyPath = "";
- if (My.Settings.Default.UseCustomPuttyPath)
+ if (mRemoteNG.Settings.Default.UseCustomPuttyPath)
{
- puttyPath = Convert.ToString(My.Settings.Default.CustomPuttyPath);
+ puttyPath = Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath);
}
else
{
diff --git a/mRemoteV1/Config/Settings/SettingsLoader.cs b/mRemoteV1/Config/Settings/SettingsLoader.cs
index 384bd922e..18a423745 100644
--- a/mRemoteV1/Config/Settings/SettingsLoader.cs
+++ b/mRemoteV1/Config/Settings/SettingsLoader.cs
@@ -53,7 +53,7 @@ namespace mRemoteNG.Config.Settings
LoadExternalAppsFromXML();
SetAlwaysShowPanelTabs();
- if (My.Settings.Default.ResetToolbars == true)
+ if (mRemoteNG.Settings.Default.ResetToolbars == true)
SetToolbarsDefault();
else
LoadToolbarsFromSettings();
@@ -66,12 +66,12 @@ namespace mRemoteNG.Config.Settings
private static void SetConDefaultPassword()
{
- My.Settings.Default.ConDefaultPassword = Security.Crypt.Decrypt(My.Settings.Default.ConDefaultPassword, GeneralAppInfo.EncryptionKey);
+ mRemoteNG.Settings.Default.ConDefaultPassword = Security.Crypt.Decrypt(mRemoteNG.Settings.Default.ConDefaultPassword, GeneralAppInfo.EncryptionKey);
}
private static void SetAlwaysShowPanelTabs()
{
- if (My.Settings.Default.AlwaysShowPanelTabs)
+ if (mRemoteNG.Settings.Default.AlwaysShowPanelTabs)
{
frmMain.Default.pnlDock.DocumentStyle = DocumentStyle.DockingWindow;
}
@@ -79,15 +79,15 @@ namespace mRemoteNG.Config.Settings
private static void SetTheme()
{
- ThemeManager.LoadTheme(My.Settings.Default.ThemeName);
+ ThemeManager.LoadTheme(mRemoteNG.Settings.Default.ThemeName);
}
private static void SetSupportedCulture()
{
SupportedCultures.InstantiateSingleton();
- if (My.Settings.Default.OverrideUICulture != "" && SupportedCultures.IsNameSupported(My.Settings.Default.OverrideUICulture))
+ if (mRemoteNG.Settings.Default.OverrideUICulture != "" && SupportedCultures.IsNameSupported(mRemoteNG.Settings.Default.OverrideUICulture))
{
- Thread.CurrentThread.CurrentUICulture = new CultureInfo(My.Settings.Default.OverrideUICulture);
+ Thread.CurrentThread.CurrentUICulture = new CultureInfo(mRemoteNG.Settings.Default.OverrideUICulture);
Runtime.Log.InfoFormat("Override Culture: {0}/{1}", Thread.CurrentThread.CurrentUICulture.Name, Thread.CurrentThread.CurrentUICulture.NativeName);
}
}
@@ -95,22 +95,22 @@ namespace mRemoteNG.Config.Settings
private void SetApplicationWindowPositionAndSize()
{
_MainForm.WindowState = FormWindowState.Normal;
- if (My.Settings.Default.MainFormState == FormWindowState.Normal)
+ if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Normal)
{
- if (!My.Settings.Default.MainFormLocation.IsEmpty)
- _MainForm.Location = My.Settings.Default.MainFormLocation;
- if (!My.Settings.Default.MainFormSize.IsEmpty)
- _MainForm.Size = My.Settings.Default.MainFormSize;
+ if (!mRemoteNG.Settings.Default.MainFormLocation.IsEmpty)
+ _MainForm.Location = mRemoteNG.Settings.Default.MainFormLocation;
+ if (!mRemoteNG.Settings.Default.MainFormSize.IsEmpty)
+ _MainForm.Size = mRemoteNG.Settings.Default.MainFormSize;
}
else
{
- if (!My.Settings.Default.MainFormRestoreLocation.IsEmpty)
- _MainForm.Location = My.Settings.Default.MainFormRestoreLocation;
- if (!My.Settings.Default.MainFormRestoreSize.IsEmpty)
- _MainForm.Size = My.Settings.Default.MainFormRestoreSize;
+ 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 (My.Settings.Default.MainFormState == FormWindowState.Maximized)
+ if (mRemoteNG.Settings.Default.MainFormState == FormWindowState.Maximized)
{
_MainForm.WindowState = FormWindowState.Maximized;
}
@@ -135,16 +135,16 @@ namespace mRemoteNG.Config.Settings
private void SetAutoSave()
{
- if (My.Settings.Default.AutoSaveEveryMinutes > 0)
+ if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes > 0)
{
- this._MainForm.tmrAutoSave.Interval = Convert.ToInt32(My.Settings.Default.AutoSaveEveryMinutes * 60000);
+ this._MainForm.tmrAutoSave.Interval = Convert.ToInt32(mRemoteNG.Settings.Default.AutoSaveEveryMinutes * 60000);
this._MainForm.tmrAutoSave.Enabled = true;
}
}
private void SetKioskMode()
{
- if (My.Settings.Default.MainFormKiosk == true)
+ if (mRemoteNG.Settings.Default.MainFormKiosk == true)
{
_MainForm.Fullscreen.Value = true;
_MainForm.mMenViewFullscreen.Checked = true;
@@ -153,39 +153,39 @@ namespace mRemoteNG.Config.Settings
private static void SetShowSystemTrayIcon()
{
- if (My.Settings.Default.ShowSystemTrayIcon)
+ if (mRemoteNG.Settings.Default.ShowSystemTrayIcon)
Runtime.NotificationAreaIcon = new Tools.Controls.NotificationAreaIcon();
}
private static void SetPuttyPath()
{
- if (My.Settings.Default.UseCustomPuttyPath)
- PuttyBase.PuttyPath = Convert.ToString(My.Settings.Default.CustomPuttyPath);
+ if (mRemoteNG.Settings.Default.UseCustomPuttyPath)
+ PuttyBase.PuttyPath = Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath);
else
PuttyBase.PuttyPath = GeneralAppInfo.PuttyPath;
}
private static void EnsureSettingsAreSavedInNewestVersion()
{
- if (My.Settings.Default.DoUpgrade)
+ if (mRemoteNG.Settings.Default.DoUpgrade)
UpgradeSettingsVersion();
}
private static void UpgradeSettingsVersion()
{
try
{
- My.Settings.Default.Upgrade();
+ mRemoteNG.Settings.Default.Upgrade();
}
catch (Exception ex)
{
- Runtime.Log.Error("My.Settings.Upgrade() failed" + Environment.NewLine + ex.Message);
+ Runtime.Log.Error("Settings.Upgrade() failed" + Environment.NewLine + ex.Message);
}
- My.Settings.Default.DoUpgrade = false;
+ mRemoteNG.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.
- My.Settings.Default.UpdatePending = false;
+ mRemoteNG.Settings.Default.UpdatePending = false;
}
public void SetToolbarsDefault()
@@ -198,7 +198,7 @@ namespace mRemoteNG.Config.Settings
public void LoadToolbarsFromSettings()
{
- if (My.Settings.Default.QuickyTBLocation.X > My.Settings.Default.ExtAppsTBLocation.X)
+ if (mRemoteNG.Settings.Default.QuickyTBLocation.X > mRemoteNG.Settings.Default.ExtAppsTBLocation.X)
{
AddDynamicPanels();
AddStaticPanels();
@@ -212,14 +212,14 @@ namespace mRemoteNG.Config.Settings
private void AddStaticPanels()
{
- ToolStripPanelFromString(Convert.ToString(My.Settings.Default.QuickyTBParentDock)).Join(MainForm.tsQuickConnect, My.Settings.Default.QuickyTBLocation);
- MainForm.tsQuickConnect.Visible = Convert.ToBoolean(My.Settings.Default.QuickyTBVisible);
+ ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.QuickyTBParentDock)).Join(MainForm.tsQuickConnect, mRemoteNG.Settings.Default.QuickyTBLocation);
+ MainForm.tsQuickConnect.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.QuickyTBVisible);
}
private void AddDynamicPanels()
{
- ToolStripPanelFromString(Convert.ToString(My.Settings.Default.ExtAppsTBParentDock)).Join(MainForm.tsExternalTools, My.Settings.Default.ExtAppsTBLocation);
- MainForm.tsExternalTools.Visible = Convert.ToBoolean(My.Settings.Default.ExtAppsTBVisible);
+ ToolStripPanelFromString(Convert.ToString(mRemoteNG.Settings.Default.ExtAppsTBParentDock)).Join(MainForm.tsExternalTools, mRemoteNG.Settings.Default.ExtAppsTBLocation);
+ MainForm.tsExternalTools.Visible = Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBVisible);
}
private ToolStripPanel ToolStripPanelFromString(string Panel)
@@ -318,7 +318,7 @@ namespace mRemoteNG.Config.Settings
Runtime.ExternalTools.Add(extA);
}
- MainForm.SwitchToolBarText(Convert.ToBoolean(My.Settings.Default.ExtAppsTBShowText));
+ MainForm.SwitchToolBarText(Convert.ToBoolean(mRemoteNG.Settings.Default.ExtAppsTBShowText));
xDom = null;
diff --git a/mRemoteV1/Config/Settings/SettingsSaver.cs b/mRemoteV1/Config/Settings/SettingsSaver.cs
index 19a7c7fd2..37f22a65a 100644
--- a/mRemoteV1/Config/Settings/SettingsSaver.cs
+++ b/mRemoteV1/Config/Settings/SettingsSaver.cs
@@ -26,43 +26,46 @@ namespace mRemoteNG.Config.Settings
with1.WindowState = FormWindowState.Maximized;
}
- My.Settings.Default.MainFormLocation = with1.Location;
- My.Settings.Default.MainFormSize = with1.Size;
+ mRemoteNG.Settings.Default.MainFormLocation = with1.Location;
+ mRemoteNG.Settings.Default.MainFormSize = with1.Size;
if (with1.WindowState != FormWindowState.Normal)
{
- My.Settings.Default.MainFormRestoreLocation = with1.RestoreBounds.Location;
- My.Settings.Default.MainFormRestoreSize = with1.RestoreBounds.Size;
+ mRemoteNG.Settings.Default.MainFormRestoreLocation = with1.RestoreBounds.Location;
+ mRemoteNG.Settings.Default.MainFormRestoreSize = with1.RestoreBounds.Size;
}
- My.Settings.Default.MainFormState = with1.WindowState;
+ mRemoteNG.Settings.Default.MainFormState = with1.WindowState;
- My.Settings.Default.MainFormKiosk = with1.Fullscreen.Value;
+ if (with1.Fullscreen != null)
+ {
+ mRemoteNG.Settings.Default.MainFormKiosk = with1.Fullscreen.Value;
+ }
- My.Settings.Default.FirstStart = false;
- My.Settings.Default.ResetPanels = false;
- My.Settings.Default.ResetToolbars = false;
- My.Settings.Default.NoReconnect = false;
+ mRemoteNG.Settings.Default.FirstStart = false;
+ mRemoteNG.Settings.Default.ResetPanels = false;
+ mRemoteNG.Settings.Default.ResetToolbars = false;
+ mRemoteNG.Settings.Default.NoReconnect = false;
- My.Settings.Default.ExtAppsTBLocation = with1.tsExternalTools.Location;
+ mRemoteNG.Settings.Default.ExtAppsTBLocation = with1.tsExternalTools.Location;
if (with1.tsExternalTools.Parent != null)
{
- My.Settings.Default.ExtAppsTBParentDock = with1.tsExternalTools.Parent.Dock.ToString();
+ mRemoteNG.Settings.Default.ExtAppsTBParentDock = with1.tsExternalTools.Parent.Dock.ToString();
}
- My.Settings.Default.ExtAppsTBVisible = with1.tsExternalTools.Visible;
- My.Settings.Default.ExtAppsTBShowText = with1.cMenToolbarShowText.Checked;
+ mRemoteNG.Settings.Default.ExtAppsTBVisible = with1.tsExternalTools.Visible;
+ mRemoteNG.Settings.Default.ExtAppsTBShowText = with1.cMenToolbarShowText.Checked;
- My.Settings.Default.QuickyTBLocation = with1.tsQuickConnect.Location;
+ mRemoteNG.Settings.Default.QuickyTBLocation = with1.tsQuickConnect.Location;
if (with1.tsQuickConnect.Parent != null)
{
- My.Settings.Default.QuickyTBParentDock = with1.tsQuickConnect.Parent.Dock.ToString();
+ mRemoteNG.Settings.Default.QuickyTBParentDock = with1.tsQuickConnect.Parent.Dock.ToString();
}
- My.Settings.Default.QuickyTBVisible = with1.tsQuickConnect.Visible;
+ mRemoteNG.Settings.Default.QuickyTBVisible = with1.tsQuickConnect.Visible;
- My.Settings.Default.ConDefaultPassword =
- Crypt.Encrypt(Convert.ToString(My.Settings.Default.ConDefaultPassword), GeneralAppInfo.EncryptionKey);
+ mRemoteNG.Settings.Default.ConDefaultPassword =
+ Crypt.Encrypt(Convert.ToString(mRemoteNG.Settings.Default.ConDefaultPassword), GeneralAppInfo.EncryptionKey);
- My.Settings.Default.Save();
+ mRemoteNG.Settings.Default.Save();
SavePanelsToXML();
SaveExternalAppsToXML();
diff --git a/mRemoteV1/Config/SqlConnectorImp.cs b/mRemoteV1/Config/SqlConnectorImp.cs
index ebf84eaab..703b0faf6 100644
--- a/mRemoteV1/Config/SqlConnectorImp.cs
+++ b/mRemoteV1/Config/SqlConnectorImp.cs
@@ -33,7 +33,7 @@ namespace mRemoteNG.Config
{
GetSqlConnectionDataFromSettings();
- if (My.Settings.Default.SQLUser != "")
+ if (mRemoteNG.Settings.Default.SQLUser != "")
BuildSqlConnectionStringWithCustomCredentials();
else
BuildSqlConnectionStringWithDefaultCredentials();
@@ -51,10 +51,10 @@ namespace mRemoteNG.Config
private void GetSqlConnectionDataFromSettings()
{
- _sqlHost = My.Settings.Default.SQLHost;
- _sqlCatalog = My.Settings.Default.SQLDatabaseName;
- _sqlUsername = My.Settings.Default.SQLUser;
- _sqlPassword = Security.Crypt.Decrypt(My.Settings.Default.SQLPass, GeneralAppInfo.EncryptionKey);
+ _sqlHost = mRemoteNG.Settings.Default.SQLHost;
+ _sqlCatalog = mRemoteNG.Settings.Default.SQLDatabaseName;
+ _sqlUsername = mRemoteNG.Settings.Default.SQLUser;
+ _sqlPassword = Security.Crypt.Decrypt(mRemoteNG.Settings.Default.SQLPass, GeneralAppInfo.EncryptionKey);
}
public void Connect()
diff --git a/mRemoteV1/Connection/ConnectionInfo.cs b/mRemoteV1/Connection/ConnectionInfo.cs
index 842ba1618..9c9e586ab 100644
--- a/mRemoteV1/Connection/ConnectionInfo.cs
+++ b/mRemoteV1/Connection/ConnectionInfo.cs
@@ -15,6 +15,7 @@ using mRemoteNG.Connection.Protocol.Rlogin;
using mRemoteNG.Container;
using mRemoteNG.Connection.Protocol;
using mRemoteNG.Messages;
+using mRemoteNG.My;
namespace mRemoteNG.Connection
@@ -835,95 +836,95 @@ namespace mRemoteNG.Connection
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(My.Language.strConnectionSetDefaultPortFailed, ex, MessageClass.ErrorMsg);
+ Runtime.MessageCollector.AddExceptionMessage(Language.strConnectionSetDefaultPortFailed, ex, MessageClass.ErrorMsg);
return 0;
}
}
private void SetTreeDisplayDefaults()
{
- _name = My.Language.strNewConnection;
- _description = My.Settings.Default.ConDefaultDescription;
- _icon = My.Settings.Default.ConDefaultIcon;
- _panel = My.Language.strGeneral;
+ _name = Language.strNewConnection;
+ _description = mRemoteNG.Settings.Default.ConDefaultDescription;
+ _icon = mRemoteNG.Settings.Default.ConDefaultIcon;
+ _panel = Language.strGeneral;
}
private void SetConnectionDefaults()
{
_hostname = string.Empty;
- _username = My.Settings.Default.ConDefaultUsername;
- _password = My.Settings.Default.ConDefaultPassword;
- _domain = My.Settings.Default.ConDefaultDomain;
+ _username = mRemoteNG.Settings.Default.ConDefaultUsername;
+ _password = mRemoteNG.Settings.Default.ConDefaultPassword;
+ _domain = mRemoteNG.Settings.Default.ConDefaultDomain;
}
private void SetProtocolDefaults()
{
- _protocol = (ProtocolType)System.Enum.Parse(typeof(ProtocolType), My.Settings.Default.ConDefaultProtocol);
- _extApp = My.Settings.Default.ConDefaultExtApp;
+ _protocol = (ProtocolType)System.Enum.Parse(typeof(ProtocolType), mRemoteNG.Settings.Default.ConDefaultProtocol);
+ _extApp = mRemoteNG.Settings.Default.ConDefaultExtApp;
_port = 0;
- _puttySession = My.Settings.Default.ConDefaultPuttySession;
- _icaEncryption = (ProtocolICA.EncryptionStrength) Enum.Parse(typeof(ProtocolICA.EncryptionStrength), My.Settings.Default.ConDefaultICAEncryptionStrength);
- _useConsoleSession = My.Settings.Default.ConDefaultUseConsoleSession;
- _rdpAuthenticationLevel = (ProtocolRDP.AuthenticationLevel) Enum.Parse(typeof(ProtocolRDP.AuthenticationLevel), My.Settings.Default.ConDefaultRDPAuthenticationLevel);
- _loadBalanceInfo = My.Settings.Default.ConDefaultLoadBalanceInfo;
- _renderingEngine = (HTTPBase.RenderingEngine) Enum.Parse(typeof(HTTPBase.RenderingEngine), My.Settings.Default.ConDefaultRenderingEngine);
- _useCredSsp = My.Settings.Default.ConDefaultUseCredSsp;
+ _puttySession = mRemoteNG.Settings.Default.ConDefaultPuttySession;
+ _icaEncryption = (ProtocolICA.EncryptionStrength) Enum.Parse(typeof(ProtocolICA.EncryptionStrength), mRemoteNG.Settings.Default.ConDefaultICAEncryptionStrength);
+ _useConsoleSession = mRemoteNG.Settings.Default.ConDefaultUseConsoleSession;
+ _rdpAuthenticationLevel = (ProtocolRDP.AuthenticationLevel) Enum.Parse(typeof(ProtocolRDP.AuthenticationLevel), mRemoteNG.Settings.Default.ConDefaultRDPAuthenticationLevel);
+ _loadBalanceInfo = mRemoteNG.Settings.Default.ConDefaultLoadBalanceInfo;
+ _renderingEngine = (HTTPBase.RenderingEngine) Enum.Parse(typeof(HTTPBase.RenderingEngine), mRemoteNG.Settings.Default.ConDefaultRenderingEngine);
+ _useCredSsp = mRemoteNG.Settings.Default.ConDefaultUseCredSsp;
}
private void SetRDGatewayDefaults()
{
- _rdGatewayUsageMethod = (ProtocolRDP.RDGatewayUsageMethod) Enum.Parse(typeof(ProtocolRDP.RDGatewayUsageMethod), My.Settings.Default.ConDefaultRDGatewayUsageMethod);
- _rdGatewayHostname = My.Settings.Default.ConDefaultRDGatewayHostname;
- _rdGatewayUseConnectionCredentials = (ProtocolRDP.RDGatewayUseConnectionCredentials) Enum.Parse(typeof(ProtocolRDP.RDGatewayUseConnectionCredentials), My.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); ;
- _rdGatewayUsername = My.Settings.Default.ConDefaultRDGatewayUsername;
- _rdGatewayPassword = My.Settings.Default.ConDefaultRDGatewayPassword;
- _rdGatewayDomain = My.Settings.Default.ConDefaultRDGatewayDomain;
+ _rdGatewayUsageMethod = (ProtocolRDP.RDGatewayUsageMethod) Enum.Parse(typeof(ProtocolRDP.RDGatewayUsageMethod), mRemoteNG.Settings.Default.ConDefaultRDGatewayUsageMethod);
+ _rdGatewayHostname = mRemoteNG.Settings.Default.ConDefaultRDGatewayHostname;
+ _rdGatewayUseConnectionCredentials = (ProtocolRDP.RDGatewayUseConnectionCredentials) Enum.Parse(typeof(ProtocolRDP.RDGatewayUseConnectionCredentials), mRemoteNG.Settings.Default.ConDefaultRDGatewayUseConnectionCredentials); ;
+ _rdGatewayUsername = mRemoteNG.Settings.Default.ConDefaultRDGatewayUsername;
+ _rdGatewayPassword = mRemoteNG.Settings.Default.ConDefaultRDGatewayPassword;
+ _rdGatewayDomain = mRemoteNG.Settings.Default.ConDefaultRDGatewayDomain;
}
private void SetAppearanceDefaults()
{
- _resolution = (ProtocolRDP.RDPResolutions) Enum.Parse(typeof(ProtocolRDP.RDPResolutions), My.Settings.Default.ConDefaultResolution);
- _automaticResize = My.Settings.Default.ConDefaultAutomaticResize;
- _colors = (ProtocolRDP.RDPColors) Enum.Parse(typeof(ProtocolRDP.RDPColors), My.Settings.Default.ConDefaultColors);
- _cacheBitmaps = My.Settings.Default.ConDefaultCacheBitmaps;
- _displayWallpaper = My.Settings.Default.ConDefaultDisplayWallpaper;
- _displayThemes = My.Settings.Default.ConDefaultDisplayThemes;
- _enableFontSmoothing = My.Settings.Default.ConDefaultEnableFontSmoothing;
- _enableDesktopComposition = My.Settings.Default.ConDefaultEnableDesktopComposition;
+ _resolution = (ProtocolRDP.RDPResolutions) Enum.Parse(typeof(ProtocolRDP.RDPResolutions), mRemoteNG.Settings.Default.ConDefaultResolution);
+ _automaticResize = mRemoteNG.Settings.Default.ConDefaultAutomaticResize;
+ _colors = (ProtocolRDP.RDPColors) Enum.Parse(typeof(ProtocolRDP.RDPColors), mRemoteNG.Settings.Default.ConDefaultColors);
+ _cacheBitmaps = mRemoteNG.Settings.Default.ConDefaultCacheBitmaps;
+ _displayWallpaper = mRemoteNG.Settings.Default.ConDefaultDisplayWallpaper;
+ _displayThemes = mRemoteNG.Settings.Default.ConDefaultDisplayThemes;
+ _enableFontSmoothing = mRemoteNG.Settings.Default.ConDefaultEnableFontSmoothing;
+ _enableDesktopComposition = mRemoteNG.Settings.Default.ConDefaultEnableDesktopComposition;
}
private void SetRedirectDefaults()
{
- _redirectKeys = My.Settings.Default.ConDefaultRedirectKeys;
- _redirectDiskDrives = My.Settings.Default.ConDefaultRedirectDiskDrives;
- _redirectPrinters = My.Settings.Default.ConDefaultRedirectPrinters;
- _redirectPorts = My.Settings.Default.ConDefaultRedirectPorts;
- _redirectSmartCards = My.Settings.Default.ConDefaultRedirectSmartCards;
- _redirectSound = (ProtocolRDP.RDPSounds) Enum.Parse(typeof(ProtocolRDP.RDPSounds), My.Settings.Default.ConDefaultRedirectSound);
+ _redirectKeys = mRemoteNG.Settings.Default.ConDefaultRedirectKeys;
+ _redirectDiskDrives = mRemoteNG.Settings.Default.ConDefaultRedirectDiskDrives;
+ _redirectPrinters = mRemoteNG.Settings.Default.ConDefaultRedirectPrinters;
+ _redirectPorts = mRemoteNG.Settings.Default.ConDefaultRedirectPorts;
+ _redirectSmartCards = mRemoteNG.Settings.Default.ConDefaultRedirectSmartCards;
+ _redirectSound = (ProtocolRDP.RDPSounds) Enum.Parse(typeof(ProtocolRDP.RDPSounds), mRemoteNG.Settings.Default.ConDefaultRedirectSound);
}
private void SetMiscDefaults()
{
_constantId = MiscTools.CreateConstantID();
- _preExtApp = My.Settings.Default.ConDefaultPreExtApp;
- _postExtApp = My.Settings.Default.ConDefaultPostExtApp;
- _macAddress = My.Settings.Default.ConDefaultMacAddress;
- _userField = My.Settings.Default.ConDefaultUserField;
+ _preExtApp = mRemoteNG.Settings.Default.ConDefaultPreExtApp;
+ _postExtApp = mRemoteNG.Settings.Default.ConDefaultPostExtApp;
+ _macAddress = mRemoteNG.Settings.Default.ConDefaultMacAddress;
+ _userField = mRemoteNG.Settings.Default.ConDefaultUserField;
}
private void SetVNCDefaults()
{
- _vncCompression = (ProtocolVNC.Compression) Enum.Parse(typeof(ProtocolVNC.Compression), My.Settings.Default.ConDefaultVNCCompression);
- _vncEncoding = (ProtocolVNC.Encoding) Enum.Parse(typeof(ProtocolVNC.Encoding), My.Settings.Default.ConDefaultVNCEncoding);
- _vncAuthMode = (ProtocolVNC.AuthMode) Enum.Parse(typeof(ProtocolVNC.AuthMode), My.Settings.Default.ConDefaultVNCAuthMode);
- _vncProxyType = (ProtocolVNC.ProxyType) Enum.Parse(typeof(ProtocolVNC.ProxyType), My.Settings.Default.ConDefaultVNCProxyType);
- _vncProxyIP = My.Settings.Default.ConDefaultVNCProxyIP;
- _vncProxyPort = My.Settings.Default.ConDefaultVNCProxyPort;
- _vncProxyUsername = My.Settings.Default.ConDefaultVNCProxyUsername;
- _vncProxyPassword = My.Settings.Default.ConDefaultVNCProxyPassword;
- _vncColors = (ProtocolVNC.Colors) Enum.Parse(typeof(ProtocolVNC.Colors), My.Settings.Default.ConDefaultVNCColors);
- _vncSmartSizeMode = (ProtocolVNC.SmartSizeMode) Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), My.Settings.Default.ConDefaultVNCSmartSizeMode);
- _vncViewOnly = My.Settings.Default.ConDefaultVNCViewOnly;
+ _vncCompression = (ProtocolVNC.Compression) Enum.Parse(typeof(ProtocolVNC.Compression), mRemoteNG.Settings.Default.ConDefaultVNCCompression);
+ _vncEncoding = (ProtocolVNC.Encoding) Enum.Parse(typeof(ProtocolVNC.Encoding), mRemoteNG.Settings.Default.ConDefaultVNCEncoding);
+ _vncAuthMode = (ProtocolVNC.AuthMode) Enum.Parse(typeof(ProtocolVNC.AuthMode), mRemoteNG.Settings.Default.ConDefaultVNCAuthMode);
+ _vncProxyType = (ProtocolVNC.ProxyType) Enum.Parse(typeof(ProtocolVNC.ProxyType), mRemoteNG.Settings.Default.ConDefaultVNCProxyType);
+ _vncProxyIP = mRemoteNG.Settings.Default.ConDefaultVNCProxyIP;
+ _vncProxyPort = mRemoteNG.Settings.Default.ConDefaultVNCProxyPort;
+ _vncProxyUsername = mRemoteNG.Settings.Default.ConDefaultVNCProxyUsername;
+ _vncProxyPassword = mRemoteNG.Settings.Default.ConDefaultVNCProxyPassword;
+ _vncColors = (ProtocolVNC.Colors) Enum.Parse(typeof(ProtocolVNC.Colors), mRemoteNG.Settings.Default.ConDefaultVNCColors);
+ _vncSmartSizeMode = (ProtocolVNC.SmartSizeMode) Enum.Parse(typeof(ProtocolVNC.SmartSizeMode), mRemoteNG.Settings.Default.ConDefaultVNCSmartSizeMode);
+ _vncViewOnly = mRemoteNG.Settings.Default.ConDefaultVNCViewOnly;
}
private void SetNonBrowsablePropertiesDefaults()
diff --git a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
index 590699a75..cf4410ce8 100644
--- a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
+++ b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
@@ -3,6 +3,7 @@ using Microsoft.VisualBasic;
using System.Windows.Forms;
using mRemoteNG.Tools;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG.Connection.Protocol.Http
{
@@ -23,7 +24,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (RenderingEngine == RenderingEngine.Gecko)
{
this.Control = new MiniGeckoBrowser.MiniGeckoBrowser();
- (this.Control as MiniGeckoBrowser.MiniGeckoBrowser).XULrunnerPath = Convert.ToString(My.Settings.Default.XULRunnerPath);
+ (this.Control as MiniGeckoBrowser.MiniGeckoBrowser).XULrunnerPath = Convert.ToString(mRemoteNG.Settings.Default.XULRunnerPath);
}
else
{
@@ -34,7 +35,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectionFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strHttpConnectionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -80,7 +81,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpSetPropsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strHttpSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -140,7 +141,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strHttpConnectFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strHttpConnectFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -227,7 +228,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -278,7 +279,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, Language.strHttpDocumentTileChangeFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
diff --git a/mRemoteV1/Connection/Protocol/ICA/Connection.Protocol.ICA.cs b/mRemoteV1/Connection/Protocol/ICA/Connection.Protocol.ICA.cs
index 2521c6890..d6a39b223 100644
--- a/mRemoteV1/Connection/Protocol/ICA/Connection.Protocol.ICA.cs
+++ b/mRemoteV1/Connection/Protocol/ICA/Connection.Protocol.ICA.cs
@@ -7,6 +7,7 @@ using mRemoteNG.App;
using System.Threading;
using mRemoteNG.Tools;
using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
@@ -58,7 +59,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaControlFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaControlFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -114,7 +115,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetPropsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -131,7 +132,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaConnectionFailed + Environment.NewLine + ex.Message);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaConnectionFailed + Environment.NewLine + ex.Message);
return false;
}
}
@@ -153,13 +154,13 @@ namespace mRemoteNG.Connection.Protocol.ICA
if (string.IsNullOrEmpty(_user))
{
- if ((string) My.Settings.Default.EmptyCredentials == "windows")
+ if ((string) mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
_ICAClient.Username = Environment.UserName;
}
- else if ((string) My.Settings.Default.EmptyCredentials == "custom")
+ else if ((string) mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- _ICAClient.Username = My.Settings.Default.DefaultUsername;
+ _ICAClient.Username = mRemoteNG.Settings.Default.DefaultUsername;
}
}
else
@@ -169,11 +170,11 @@ namespace mRemoteNG.Connection.Protocol.ICA
if (string.IsNullOrEmpty(_pass))
{
- if ((string) My.Settings.Default.EmptyCredentials == "custom")
+ if ((string) mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- if (My.Settings.Default.DefaultPassword != "")
+ if (mRemoteNG.Settings.Default.DefaultPassword != "")
{
- _ICAClient.SetProp("ClearPassword", Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey));
+ _ICAClient.SetProp("ClearPassword", Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey));
}
}
}
@@ -184,13 +185,13 @@ namespace mRemoteNG.Connection.Protocol.ICA
if (string.IsNullOrEmpty(_dom))
{
- if ((string) My.Settings.Default.EmptyCredentials == "windows")
+ if ((string) mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
_ICAClient.Domain = Environment.UserDomainName;
}
- else if ((string) My.Settings.Default.EmptyCredentials == "custom")
+ else if ((string) mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- _ICAClient.Domain = My.Settings.Default.DefaultDomain;
+ _ICAClient.Domain = mRemoteNG.Settings.Default.DefaultDomain;
}
}
else
@@ -200,7 +201,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetCredentialsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaSetCredentialsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -237,7 +238,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetResolutionFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaSetResolutionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -294,7 +295,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strIcaSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strIcaSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -319,7 +320,7 @@ namespace mRemoteNG.Connection.Protocol.ICA
{
base.Event_Disconnected(this, e.ToString());
- if (My.Settings.Default.ReconnectOnDisconnect)
+ if (mRemoteNG.Settings.Default.ReconnectOnDisconnect)
{
ReconnectGroup = new ReconnectGroup();
//this.Load += ReconnectGroup_Load;
diff --git a/mRemoteV1/Connection/Protocol/IntegratedProgram.cs b/mRemoteV1/Connection/Protocol/IntegratedProgram.cs
index 85c0bbe25..e59feba3c 100644
--- a/mRemoteV1/Connection/Protocol/IntegratedProgram.cs
+++ b/mRemoteV1/Connection/Protocol/IntegratedProgram.cs
@@ -5,6 +5,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Threading;
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Connection.Protocol
@@ -51,10 +52,10 @@ namespace mRemoteNG.Connection.Protocol
_process.Exited += ProcessExited;
_process.Start();
- _process.WaitForInputIdle(Convert.ToInt32(My.Settings.Default.MaxPuttyWaitTime * 1000));
+ _process.WaitForInputIdle(Convert.ToInt32(mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000));
int startTicks = Environment.TickCount;
- while (_handle.ToInt32() == 0 & Environment.TickCount < startTicks + (My.Settings.Default.MaxPuttyWaitTime * 1000))
+ while (_handle.ToInt32() == 0 & Environment.TickCount < startTicks + (mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000))
{
_process.Refresh();
if (!(_process.MainWindowTitle == "Default IME"))
@@ -68,10 +69,10 @@ namespace mRemoteNG.Connection.Protocol
}
Native.SetParent(_handle, InterfaceControl.Handle);
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strIntAppStuff, true);
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(My.Language.strIntAppHandle, _handle.ToString()), true);
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(My.Language.strIntAppTitle, _process.MainWindowTitle), true);
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(My.Language.strIntAppParentHandle, InterfaceControl.Parent.Handle.ToString()), true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, Language.strIntAppStuff, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(Language.strIntAppHandle, _handle.ToString()), true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(Language.strIntAppTitle, _process.MainWindowTitle), true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, string.Format(Language.strIntAppParentHandle, InterfaceControl.Parent.Handle.ToString()), true);
Resize(this, new EventArgs());
base.Connect();
@@ -79,7 +80,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(My.Language.strIntAppConnectionFailed, ex);
+ Runtime.MessageCollector.AddExceptionMessage(Language.strIntAppConnectionFailed, ex);
return false;
}
}
@@ -96,7 +97,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(message: My.Language.strIntAppFocusFailed, ex: ex, logOnly: true);
+ Runtime.MessageCollector.AddExceptionMessage(message: Language.strIntAppFocusFailed, ex: ex, logOnly: true);
}
}
@@ -112,7 +113,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(message: My.Language.strIntAppResizeFailed, ex: ex, logOnly: true);
+ Runtime.MessageCollector.AddExceptionMessage(message: Language.strIntAppResizeFailed, ex: ex, logOnly: true);
}
}
@@ -127,7 +128,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(message: My.Language.strIntAppKillFailed, ex: ex, logOnly: true);
+ Runtime.MessageCollector.AddExceptionMessage(message: Language.strIntAppKillFailed, ex: ex, logOnly: true);
}
try
@@ -139,7 +140,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(message: My.Language.strIntAppDisposeFailed, ex: ex, logOnly: true);
+ Runtime.MessageCollector.AddExceptionMessage(message: Language.strIntAppDisposeFailed, ex: ex, logOnly: true);
}
base.Close();
diff --git a/mRemoteV1/Connection/Protocol/ProtocolFactory.cs b/mRemoteV1/Connection/Protocol/ProtocolFactory.cs
index 74dfec972..4fa367be3 100644
--- a/mRemoteV1/Connection/Protocol/ProtocolFactory.cs
+++ b/mRemoteV1/Connection/Protocol/ProtocolFactory.cs
@@ -9,6 +9,7 @@ using mRemoteNG.Connection.Protocol.VNC;
using System;
using System.Collections.Generic;
using System.Text;
+using mRemoteNG.My;
namespace mRemoteNG.Connection.Protocol
{
@@ -60,7 +61,7 @@ namespace mRemoteNG.Connection.Protocol
newProtocol = new IntegratedProgram();
if (connectionInfo.ExtApp == "")
{
- throw (new Exception(My.Language.strNoExtAppDefined));
+ throw (new Exception(Language.strNoExtAppDefined));
}
break;
}
diff --git a/mRemoteV1/Connection/Protocol/PuttyBase.cs b/mRemoteV1/Connection/Protocol/PuttyBase.cs
index 1f11f537a..41b8f8f86 100644
--- a/mRemoteV1/Connection/Protocol/PuttyBase.cs
+++ b/mRemoteV1/Connection/Protocol/PuttyBase.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
using System.Drawing;
using System.Threading;
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Connection.Protocol
@@ -107,13 +108,13 @@ namespace mRemoteNG.Connection.Protocol
}
else
{
- if (My.Settings.Default.EmptyCredentials == "windows")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
username = Environment.UserName;
}
- else if (My.Settings.Default.EmptyCredentials == "custom")
+ else if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- username = Convert.ToString(My.Settings.Default.DefaultUsername);
+ username = Convert.ToString(mRemoteNG.Settings.Default.DefaultUsername);
}
}
@@ -123,9 +124,9 @@ namespace mRemoteNG.Connection.Protocol
}
else
{
- if (My.Settings.Default.EmptyCredentials == "custom")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- password = Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey);
+ password = Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey);
}
}
@@ -159,10 +160,10 @@ namespace mRemoteNG.Connection.Protocol
PuttyProcess.Exited += ProcessExited;
PuttyProcess.Start();
- PuttyProcess.WaitForInputIdle(Convert.ToInt32(My.Settings.Default.MaxPuttyWaitTime * 1000));
+ PuttyProcess.WaitForInputIdle(Convert.ToInt32(mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000));
int startTicks = Environment.TickCount;
- while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + (My.Settings.Default.MaxPuttyWaitTime * 1000))
+ while (PuttyHandle.ToInt32() == 0 & Environment.TickCount < startTicks + (mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000))
{
if (_isPuttyNg)
{
@@ -185,10 +186,10 @@ namespace mRemoteNG.Connection.Protocol
Native.SetParent(PuttyHandle, InterfaceControl.Handle);
}
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strPuttyStuff, true);
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strPuttyHandle, PuttyHandle.ToString()), true);
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strPuttyTitle, PuttyProcess.MainWindowTitle), true);
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strPuttyParentHandle, InterfaceControl.Parent.Handle.ToString()), true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strPuttyStuff, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyHandle, PuttyHandle.ToString()), true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyTitle, PuttyProcess.MainWindowTitle), true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strPuttyParentHandle, InterfaceControl.Parent.Handle.ToString()), true);
Resize(this, new EventArgs());
base.Connect();
@@ -196,7 +197,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyConnectionFailed + Environment.NewLine + ex.Message);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyConnectionFailed + Environment.NewLine + ex.Message);
return false;
}
}
@@ -213,7 +214,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyFocusFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyFocusFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -229,7 +230,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyResizeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyResizeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -244,7 +245,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyKillFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyKillFailed + Environment.NewLine + ex.Message, true);
}
try
@@ -253,7 +254,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyDisposeFailed + Environment.NewLine + ex.Message, true);
}
base.Close();
@@ -268,7 +269,7 @@ namespace mRemoteNG.Connection.Protocol
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strPuttyShowSettingsDialogFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strPuttyShowSettingsDialogFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
diff --git a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
index 8c566501f..d5974f0ab 100644
--- a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
+++ b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
@@ -9,6 +9,7 @@ using System.Threading;
using System.ComponentModel;
using mRemoteNG.Messages;
using mRemoteNG.App;
+using mRemoteNG.My;
using MSTSCLib;
using mRemoteNG.Tools;
using mRemoteNG.UI.Forms;
@@ -82,7 +83,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetRedirectKeysFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetRedirectKeysFailed + Environment.NewLine + ex.Message, true);
}
}
}
@@ -116,7 +117,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (System.Runtime.InteropServices.COMException ex)
{
- Runtime.MessageCollector.AddExceptionMessage(My.Language.strRdpControlCreationFailed, ex);
+ Runtime.MessageCollector.AddExceptionMessage(Language.strRdpControlCreationFailed, ex);
Control.Dispose();
return false;
}
@@ -132,7 +133,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
//not user changeable
_rdpClient.AdvancedSettings2.GrabFocusOnConnect = true;
_rdpClient.AdvancedSettings3.EnableAutoReconnect = true;
- _rdpClient.AdvancedSettings3.MaxReconnectAttempts = Convert.ToInt32(My.Settings.Default.RdpReconnectionCount);
+ _rdpClient.AdvancedSettings3.MaxReconnectAttempts = Convert.ToInt32(mRemoteNG.Settings.Default.RdpReconnectionCount);
_rdpClient.AdvancedSettings2.keepAliveInterval = 60000; //in milliseconds (10.000 = 10 seconds)
_rdpClient.AdvancedSettings5.AuthenticationLevel = 0;
_rdpClient.AdvancedSettings2.EncryptionEnabled = 1;
@@ -157,7 +158,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
SetPerformanceFlags();
- _rdpClient.ConnectingText = My.Language.strConnecting;
+ _rdpClient.ConnectingText = Language.strConnecting;
Control.Anchor = AnchorStyles.None;
@@ -165,7 +166,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetPropsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -183,7 +184,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpConnectionOpenFailed + Environment.NewLine + ex.Message);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpConnectionOpenFailed + Environment.NewLine + ex.Message);
}
return false;
@@ -197,7 +198,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpDisconnectFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpDisconnectFailed + Environment.NewLine + ex.Message, true);
base.Close();
}
}
@@ -210,7 +211,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpToggleFullscreenFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpToggleFullscreenFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -222,7 +223,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -237,7 +238,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpFocusFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpFocusFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -329,12 +330,12 @@ namespace mRemoteNG.Connection.Protocol.RDP
{
if (_rdpClient.TransportSettings.GatewayIsSupported == 0)
{
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strRdpGatewayNotSupported, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strRdpGatewayNotSupported, true);
return ;
}
else
{
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, My.Language.strRdpGatewayIsSupported, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.strRdpGatewayIsSupported, true);
}
if (_connectionInfo.RDGatewayUsageMethod != RDGatewayUsageMethod.Never)
@@ -370,7 +371,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetGatewayFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetGatewayFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -395,18 +396,18 @@ namespace mRemoteNG.Connection.Protocol.RDP
if (_rdpVersion >= Versions.RDC61)
{
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strRdpSetConsoleSwitch, _rdpVersion), true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strRdpSetConsoleSwitch, _rdpVersion), true);
//_rdpClient.AdvancedSettings7.ConnectToAdministerServer = value;
}
else
{
- Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(My.Language.strRdpSetConsoleSwitch, _rdpVersion), true);
+ Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.strRdpSetConsoleSwitch, _rdpVersion), true);
_rdpClient.AdvancedSettings2.ConnectToServerConsole = value;
}
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(My.Language.strRdpSetConsoleSessionFailed, ex, MessageClass.ErrorMsg, true);
+ Runtime.MessageCollector.AddExceptionMessage(Language.strRdpSetConsoleSessionFailed, ex, MessageClass.ErrorMsg, true);
}
}
@@ -425,13 +426,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
if (string.IsNullOrEmpty(userName))
{
- if (My.Settings.Default.EmptyCredentials == "windows")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
_rdpClient.UserName = Environment.UserName;
}
- else if (My.Settings.Default.EmptyCredentials == "custom")
+ else if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- _rdpClient.UserName = Convert.ToString(My.Settings.Default.DefaultUsername);
+ _rdpClient.UserName = Convert.ToString(mRemoteNG.Settings.Default.DefaultUsername);
}
}
else
@@ -441,11 +442,11 @@ namespace mRemoteNG.Connection.Protocol.RDP
if (string.IsNullOrEmpty(password))
{
- if (My.Settings.Default.EmptyCredentials == "custom")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- if (My.Settings.Default.DefaultPassword != "")
+ if (mRemoteNG.Settings.Default.DefaultPassword != "")
{
- _rdpClient.AdvancedSettings2.ClearTextPassword = Security.Crypt.Decrypt(Convert.ToString(My.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey);
+ _rdpClient.AdvancedSettings2.ClearTextPassword = Security.Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.DefaultPassword), App.Info.GeneralAppInfo.EncryptionKey);
}
}
}
@@ -456,13 +457,13 @@ namespace mRemoteNG.Connection.Protocol.RDP
if (string.IsNullOrEmpty(domain))
{
- if (My.Settings.Default.EmptyCredentials == "windows")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
_rdpClient.Domain = Environment.UserDomainName;
}
- else if (My.Settings.Default.EmptyCredentials == "custom")
+ else if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
- _rdpClient.Domain = Convert.ToString(My.Settings.Default.DefaultDomain);
+ _rdpClient.Domain = Convert.ToString(mRemoteNG.Settings.Default.DefaultDomain);
}
}
else
@@ -472,7 +473,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetCredentialsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetCredentialsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -509,7 +510,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetResolutionFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetResolutionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -524,7 +525,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetPortFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetPortFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -540,7 +541,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetRedirectionFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetRedirectionFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -573,7 +574,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetPerformanceFlagsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetPerformanceFlagsFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -585,7 +586,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetAuthenticationLevelFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetAuthenticationLevelFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -618,7 +619,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -638,7 +639,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
Event_Disconnected(this, discReason + "\r\n" + reason);
}
- if (My.Settings.Default.ReconnectOnDisconnect)
+ if (mRemoteNG.Settings.Default.ReconnectOnDisconnect)
{
ReconnectGroup = new ReconnectGroup();
ReconnectGroup.CloseClicked += Event_ReconnectGroupCloseClicked;
@@ -833,15 +834,15 @@ namespace mRemoteNG.Connection.Protocol.RDP
protected static void InitDescription()
{
_description = new Hashtable();
- _description.Add("0", "My.Language.strRdpErrorUnknown");
- _description.Add("1", "My.Language.strRdpErrorCode1");
- _description.Add("2", "My.Language.strRdpErrorOutOfMemory");
- _description.Add("3", "My.Language.strRdpErrorWindowCreation");
- _description.Add("4", "My.Language.strRdpErrorCode2");
- _description.Add("5", "My.Language.strRdpErrorCode3");
- _description.Add("6", "My.Language.strRdpErrorCode4");
- _description.Add("7", "My.Language.strRdpErrorConnection");
- _description.Add("100", "My.Language.strRdpErrorWinsock");
+ _description.Add("0", "Language.strRdpErrorUnknown");
+ _description.Add("1", "Language.strRdpErrorCode1");
+ _description.Add("2", "Language.strRdpErrorOutOfMemory");
+ _description.Add("3", "Language.strRdpErrorWindowCreation");
+ _description.Add("4", "Language.strRdpErrorCode2");
+ _description.Add("5", "Language.strRdpErrorCode3");
+ _description.Add("6", "Language.strRdpErrorCode4");
+ _description.Add("7", "Language.strRdpErrorConnection");
+ _description.Add("100", "Language.strRdpErrorWinsock");
}
public static string GetError(string id)
@@ -856,8 +857,8 @@ namespace mRemoteNG.Connection.Protocol.RDP
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, My.Language.strRdpErrorGetFailure + Environment.NewLine + ex.Message, true);
- return string.Format(My.Language.strRdpErrorUnknown, id);
+ Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.strRdpErrorGetFailure + Environment.NewLine + ex.Message, true);
+ return string.Format(Language.strRdpErrorUnknown, id);
}
}
}
diff --git a/mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs b/mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs
index d919cfa0f..664e33b09 100644
--- a/mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs
+++ b/mRemoteV1/Connection/Protocol/VNC/Connection.Protocol.VNC.cs
@@ -2,6 +2,7 @@ using System;
using Microsoft.VisualBasic;
using mRemoteNG.App;
using System.ComponentModel;
+using mRemoteNG.My;
using mRemoteNG.Tools;
using mRemoteNG.UI.Forms;
@@ -105,8 +106,8 @@ namespace mRemoteNG.Connection.Protocol.VNC
// VNC.RestrictPixel = False
//End If
- //VNC.ConnectingText = My.Language.strInheritConnecting & " (SmartCode VNC viewer)"
- //VNC.DisconnectedText = My.Language.strInheritDisconnected
+ //VNC.ConnectingText = Language.strInheritConnecting & " (SmartCode VNC viewer)"
+ //VNC.DisconnectedText = Language.strInheritDisconnected
//VNC.MessageBoxes = False
//VNC.EndInit()
@@ -114,7 +115,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetPropsFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncSetPropsFailed + Environment.NewLine + ex.Message, true);
return false;
}
}
@@ -129,7 +130,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionOpenFailed + Environment.NewLine + ex.Message);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncConnectionOpenFailed + Environment.NewLine + ex.Message);
return false;
}
@@ -144,7 +145,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncConnectionDisconnectFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncConnectionDisconnectFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -164,7 +165,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSendSpecialKeysFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncSendSpecialKeysFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -177,7 +178,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncToggleSmartSizeFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -189,7 +190,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncToggleViewOnlyFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncToggleViewOnlyFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -206,7 +207,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncStartChatFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncStartChatFailed + Environment.NewLine + ex.Message, true);
}
}
@@ -234,7 +235,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncRefreshFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncRefreshFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
@@ -254,7 +255,7 @@ namespace mRemoteNG.Connection.Protocol.VNC
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strVncSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strVncSetEventHandlersFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
diff --git a/mRemoteV1/Messages/MessageCollector.cs b/mRemoteV1/Messages/MessageCollector.cs
index 0b850e44b..ab6f6a52e 100644
--- a/mRemoteV1/Messages/MessageCollector.cs
+++ b/mRemoteV1/Messages/MessageCollector.cs
@@ -38,18 +38,18 @@ namespace mRemoteNG.Messages
return;
}
- if (Settings.Default.SwitchToMCOnInformation && nMsg.MsgClass == MessageClass.InformationMsg)
+ if (mRemoteNG.Settings.Default.SwitchToMCOnInformation && nMsg.MsgClass == MessageClass.InformationMsg)
AddInfoMessage(OnlyLog, nMsg);
- if (Settings.Default.SwitchToMCOnWarning && nMsg.MsgClass == MessageClass.WarningMsg)
+ if (mRemoteNG.Settings.Default.SwitchToMCOnWarning && nMsg.MsgClass == MessageClass.WarningMsg)
AddWarningMessage(OnlyLog, nMsg);
- if (Settings.Default.SwitchToMCOnError && nMsg.MsgClass == MessageClass.ErrorMsg)
+ if (mRemoteNG.Settings.Default.SwitchToMCOnError && nMsg.MsgClass == MessageClass.ErrorMsg)
AddErrorMessage(OnlyLog, nMsg);
if (!OnlyLog)
{
- if (Settings.Default.ShowNoMessageBoxes)
+ if (mRemoteNG.Settings.Default.ShowNoMessageBoxes)
_ECTimer.Enabled = true;
else
ShowMessageBox(nMsg);
@@ -62,14 +62,14 @@ namespace mRemoteNG.Messages
private void AddInfoMessage(bool OnlyLog, Message nMsg)
{
Debug.Print("Info: " + nMsg.MsgText);
- if (Settings.Default.WriteLogFile)
+ if (mRemoteNG.Settings.Default.WriteLogFile)
Runtime.Log.Info(nMsg.MsgText);
}
private void AddWarningMessage(bool OnlyLog, Message nMsg)
{
Debug.Print("Warning: " + nMsg.MsgText);
- if (Settings.Default.WriteLogFile)
+ if (mRemoteNG.Settings.Default.WriteLogFile)
Runtime.Log.Warn(nMsg.MsgText);
}
@@ -82,7 +82,7 @@ namespace mRemoteNG.Messages
private static void AddReportMessage(Message nMsg)
{
Debug.Print("Report: " + nMsg.MsgText);
- if (Settings.Default.WriteLogFile)
+ if (mRemoteNG.Settings.Default.WriteLogFile)
Runtime.Log.Info(nMsg.MsgText);
}
diff --git a/mRemoteV1/Program.cs b/mRemoteV1/Program.cs
new file mode 100644
index 000000000..c55572100
--- /dev/null
+++ b/mRemoteV1/Program.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using mRemoteNG.UI.Forms;
+using mRemoteNG.UI.Forms.OptionsPages;
+using Microsoft.VisualBasic.CompilerServices;
+
+namespace mRemoteNG
+{
+
+ public class Program
+ {
+ public static Mutex mutex;
+ [STAThread]
+ public static void Main(string[] args)
+ {
+ if (Settings.Default.SingleInstance)
+ {
+ mutex = new Mutex(false, $"Global\\{appGuid}");
+ if (!mutex.WaitOne(0, false))
+ {
+ try
+ {
+ SwitchToCurrentInstance();
+ }
+ catch (Exception)
+ {
+ }
+
+ ProjectData.EndApp();
+ }
+
+ GC.KeepAlive(mutex);
+ }
+ else
+ {
+ Application.EnableVisualStyles();
+ Application.SetCompatibleTextRenderingDefault(false);
+ var mainForm = new frmMain();
+ frmMain.Default = mainForm;
+ Application.Run(mainForm);
+ }
+ }
+
+ private static void SwitchToCurrentInstance()
+ {
+ IntPtr hWnd = GetCurrentInstanceWindowHandle();
+ if (hWnd != IntPtr.Zero)
+ {
+ //Restore window if minimized. Do not restore if already in
+ //normal or maximised window state, since we don't want to
+ //change the current state of the window.
+ if (App.Native.IsIconic(hWnd) != 0)
+ {
+ App.Native.ShowWindow(hWnd, App.Native.SW_RESTORE);
+ }
+ App.Native.SetForegroundWindow(hWnd);
+ }
+ }
+
+ private static IntPtr GetCurrentInstanceWindowHandle()
+ {
+ var hWnd = IntPtr.Zero;
+ var curProc = Process.GetCurrentProcess();
+ foreach (var proc in Process.GetProcessesByName(curProc.ProcessName))
+ {
+ if (proc.Id != curProc.Id && proc.MainModule.FileName == curProc.MainModule.FileName && proc.MainWindowHandle != IntPtr.Zero)
+ {
+ hWnd = proc.MainWindowHandle;
+ break;
+ }
+ }
+ return hWnd;
+ }
+ private static string appGuid = "0AF940D9-0700-4F95-A85C-9D99149EDE07";
+ }
+}
diff --git a/mRemoteV1/Properties/Application.Designer.cs b/mRemoteV1/Properties/Application.Designer.cs
index d670256ed..7d3391722 100644
--- a/mRemoteV1/Properties/Application.Designer.cs
+++ b/mRemoteV1/Properties/Application.Designer.cs
@@ -14,34 +14,34 @@ using mRemoteNG.UI.Forms;
-namespace mRemoteNG.My
-{
- //NOTE: This file is auto-generated; do not modify it directly. To make changes,
- // or if you encounter build errors in this file, go to the Project Designer
- // (go to Project Properties or double-click the My Project node in
- // Solution Explorer), and make changes on the Application tab.
- //
- public partial class MyApplication
- {
- [STAThread]
- static void Main()
- {
- (new MyApplication()).Run(new string[] {});
- }
+//namespace mRemoteNG.My
+//{
+// //NOTE: This file is auto-generated; do not modify it directly. To make changes,
+// // or if you encounter build errors in this file, go to the Project Designer
+// // (go to Project Properties or double-click the My Project node in
+// // Solution Explorer), and make changes on the Application tab.
+// //
+// public partial class MyApplication
+// {
+// [STAThread]
+// static void Main()
+// {
+// (new App.MyApplication()).Run(new string[] {});
+// }
- [global::System.Diagnostics.DebuggerStepThrough()]
- public MyApplication() : base(Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
- {
- this.IsSingleInstance = false;
- this.EnableVisualStyles = true;
- this.SaveMySettingsOnExit = true;
- this.ShutdownStyle = Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses;
- }
+// [global::System.Diagnostics.DebuggerStepThrough()]
+// public MyApplication() : base(Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
+// {
+// this.IsSingleInstance = false;
+// this.EnableVisualStyles = true;
+// this.SaveMySettingsOnExit = true;
+// this.ShutdownStyle = Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses;
+// }
- [global::System.Diagnostics.DebuggerStepThroughAttribute()]
- protected override void OnCreateMainForm()
- {
- this.MainForm = frmMain.Default;
- }
- }
-}
+// [global::System.Diagnostics.DebuggerStepThroughAttribute()]
+// protected override void OnCreateMainForm()
+// {
+// this.MainForm = frmMain.Default;
+// }
+// }
+//}
diff --git a/mRemoteV1/Properties/Settings.Designer.cs b/mRemoteV1/Properties/Settings.Designer.cs
index 8e02b8ff3..f8178d639 100644
--- a/mRemoteV1/Properties/Settings.Designer.cs
+++ b/mRemoteV1/Properties/Settings.Designer.cs
@@ -8,7 +8,7 @@
//
//------------------------------------------------------------------------------
-namespace mRemoteNG.My {
+namespace mRemoteNG {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -24,7 +24,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public global::System.Drawing.Point MainFormLocation {
get {
@@ -36,7 +35,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public global::System.Drawing.Size MainFormSize {
get {
@@ -48,7 +46,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Normal")]
public global::System.Windows.Forms.FormWindowState MainFormState {
@@ -61,7 +58,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MainFormKiosk {
@@ -74,7 +70,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool DoUpgrade {
@@ -87,7 +82,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string CustomPuttyPath {
@@ -100,7 +94,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ShowNoMessageBoxes {
@@ -113,7 +106,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SwitchToMCOnInformation {
@@ -126,7 +118,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SwitchToMCOnWarning {
@@ -139,7 +130,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SwitchToMCOnError {
@@ -152,7 +142,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool AutomaticallyGetSessionInfo {
@@ -165,7 +154,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool LoadConsFromCustomLocation {
@@ -178,7 +166,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string CustomConsPath {
@@ -191,7 +178,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool SaveConsOnExit {
@@ -204,7 +190,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool CheckForUpdatesOnStartup {
@@ -217,7 +202,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowDescriptionTooltipsInTree {
@@ -230,7 +214,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowSystemTrayIcon {
@@ -243,7 +226,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool OpenTabsRightOfSelected {
@@ -256,7 +238,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowLogonInfoOnTabs {
@@ -269,7 +250,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool SingleClickOnConnectionOpensIt {
@@ -282,7 +262,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("noinfo")]
public string EmptyCredentials {
@@ -295,7 +274,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string DefaultUsername {
@@ -308,7 +286,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string DefaultPassword {
@@ -321,7 +298,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string DefaultDomain {
@@ -334,7 +310,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool WriteLogFile {
@@ -347,7 +322,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UseCustomPuttyPath {
@@ -360,7 +334,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool FirstStart {
@@ -373,7 +346,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ShowProtocolOnTabs {
@@ -398,7 +370,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UpdateUseProxy {
@@ -411,7 +382,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string UpdateProxyAddress {
@@ -424,7 +394,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("80")]
public int UpdateProxyPort {
@@ -437,7 +406,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UpdateProxyUseAuthentication {
@@ -450,7 +418,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string UpdateProxyAuthUser {
@@ -463,7 +430,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string UpdateProxyAuthPass {
@@ -476,7 +442,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultDescription {
@@ -489,7 +454,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultUsername {
@@ -502,7 +466,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultPassword {
@@ -515,7 +478,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultDomain {
@@ -528,7 +490,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("RDP")]
public string ConDefaultProtocol {
@@ -541,7 +502,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Default Settings")]
public string ConDefaultPuttySession {
@@ -554,7 +514,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultUseConsoleSession {
@@ -567,7 +526,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("FitToWindow")]
public string ConDefaultResolution {
@@ -580,7 +538,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Colors16Bit")]
public string ConDefaultColors {
@@ -593,7 +550,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ConDefaultCacheBitmaps {
@@ -606,7 +562,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultDisplayWallpaper {
@@ -619,7 +574,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultDisplayThemes {
@@ -632,7 +586,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultRedirectKeys {
@@ -645,7 +598,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultRedirectDiskDrives {
@@ -658,7 +610,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultRedirectPrinters {
@@ -671,7 +622,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultRedirectPorts {
@@ -684,7 +634,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultRedirectSmartCards {
@@ -697,7 +646,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("DoNotPlay")]
public string ConDefaultRedirectSound {
@@ -710,7 +658,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("2")]
public int MaxPuttyWaitTime {
@@ -723,7 +670,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool SingleInstance {
@@ -736,7 +682,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool OpenConsFromLastSession {
@@ -749,7 +694,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool NoReconnect {
@@ -762,7 +706,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public int AutoSaveEveryMinutes {
@@ -775,7 +718,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ExtAppsTBVisible {
@@ -788,7 +730,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ExtAppsTBShowText {
@@ -801,7 +742,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0, 0")]
public global::System.Drawing.Point ExtAppsTBLocation {
@@ -814,7 +754,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Bottom")]
public string ExtAppsTBParentDock {
@@ -827,7 +766,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool QuickyTBVisible {
@@ -840,7 +778,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("3, 24")]
public global::System.Drawing.Point QuickyTBLocation {
@@ -853,7 +790,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Top")]
public string QuickyTBParentDock {
@@ -878,7 +814,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UseSQLServer {
@@ -891,7 +826,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string SQLHost {
@@ -904,7 +838,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string SQLUser {
@@ -917,7 +850,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string SQLPass {
@@ -930,7 +862,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultCacheBitmaps {
@@ -943,7 +874,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultColors {
@@ -956,7 +886,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultDescription {
@@ -969,7 +898,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultDisplayThemes {
@@ -982,7 +910,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultDisplayWallpaper {
@@ -995,7 +922,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultDomain {
@@ -1008,7 +934,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultIcon {
@@ -1021,7 +946,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPassword {
@@ -1034,7 +958,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPort {
@@ -1047,7 +970,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultProtocol {
@@ -1060,7 +982,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPuttySession {
@@ -1073,7 +994,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectDiskDrives {
@@ -1086,7 +1006,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectKeys {
@@ -1099,7 +1018,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectPorts {
@@ -1112,7 +1030,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectPrinters {
@@ -1125,7 +1042,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectSmartCards {
@@ -1138,7 +1054,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRedirectSound {
@@ -1151,7 +1066,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultResolution {
@@ -1164,7 +1078,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUseConsoleSession {
@@ -1177,7 +1090,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUsername {
@@ -1190,7 +1102,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPanel {
@@ -1203,7 +1114,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("EncrBasic")]
public string ConDefaultICAEncryptionStrength {
@@ -1216,7 +1126,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultICAEncryptionStrength {
@@ -1229,7 +1138,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultPreExtApp {
@@ -1242,7 +1150,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultPostExtApp {
@@ -1255,7 +1162,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPreExtApp {
@@ -1268,7 +1174,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultPostExtApp {
@@ -1281,7 +1186,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool SetHostnameLikeDisplayName {
@@ -1294,7 +1198,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool DoubleClickOnTabClosesIt {
@@ -1307,7 +1210,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ReconnectOnDisconnect {
@@ -1320,7 +1222,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool AlwaysShowPanelSelectionDlg {
@@ -1333,7 +1234,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("AuthVNC")]
public string ConDefaultVNCAuthMode {
@@ -1346,7 +1246,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("ColNormal")]
public string ConDefaultVNCColors {
@@ -1359,7 +1258,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("SmartSAspect")]
public string ConDefaultVNCSmartSizeMode {
@@ -1372,7 +1270,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultVNCViewOnly {
@@ -1385,7 +1282,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("CompNone")]
public string ConDefaultVNCCompression {
@@ -1398,7 +1294,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("EncHextile")]
public string ConDefaultVNCEncoding {
@@ -1411,7 +1306,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultVNCProxyIP {
@@ -1424,7 +1318,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultVNCProxyPassword {
@@ -1437,7 +1330,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("0")]
public int ConDefaultVNCProxyPort {
@@ -1450,7 +1342,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("ProxyNone")]
public string ConDefaultVNCProxyType {
@@ -1463,7 +1354,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultVNCProxyUsername {
@@ -1476,7 +1366,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCAuthMode {
@@ -1489,7 +1378,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCColors {
@@ -1502,7 +1390,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCSmartSizeMode {
@@ -1515,7 +1402,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCViewOnly {
@@ -1528,7 +1414,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCCompression {
@@ -1541,7 +1426,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCEncoding {
@@ -1554,7 +1438,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCProxyIP {
@@ -1567,7 +1450,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCProxyPassword {
@@ -1580,7 +1462,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCProxyPort {
@@ -1593,7 +1474,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCProxyType {
@@ -1606,7 +1486,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultVNCProxyUsername {
@@ -1619,7 +1498,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool MinimizeToTray {
@@ -1632,7 +1510,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool SingleClickSwitchesToOpenConnection {
@@ -1645,7 +1522,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("NoAuth")]
public string ConDefaultRDPAuthenticationLevel {
@@ -1658,7 +1534,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDPAuthenticationLevel {
@@ -1671,7 +1546,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("5500")]
public int UVNCSCPort {
@@ -1684,7 +1558,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool StartupComponentsCheck {
@@ -1697,7 +1570,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string XULRunnerPath {
@@ -1710,7 +1582,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("IE")]
public string ConDefaultRenderingEngine {
@@ -1723,7 +1594,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRenderingEngine {
@@ -1736,7 +1606,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultMacAddress {
@@ -1749,7 +1618,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultMacAddress {
@@ -1762,7 +1630,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool EncryptCompleteConnectionsFile {
@@ -1775,7 +1642,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultUserField {
@@ -1788,7 +1654,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUserField {
@@ -1801,7 +1666,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultExtApp {
@@ -1814,7 +1678,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultExtApp {
@@ -1827,7 +1690,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string LastAnnouncement {
@@ -1840,7 +1702,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool CheckForUpdatesAsked {
@@ -1853,7 +1714,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("7")]
public int CheckForUpdatesFrequencyDays {
@@ -1866,7 +1726,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("1980-01-01")]
public global::System.DateTime CheckForUpdatesLastCheck {
@@ -1879,7 +1738,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool UpdatePending {
@@ -1892,7 +1750,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Never")]
public string ConDefaultRDGatewayUsageMethod {
@@ -1905,7 +1762,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("Yes")]
public string ConDefaultRDGatewayUseConnectionCredentials {
@@ -1918,7 +1774,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("mRemoteNG")]
public string ConDefaultIcon {
@@ -1931,7 +1786,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayUsageMethod {
@@ -1944,7 +1798,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayHostname {
@@ -1957,7 +1810,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayUsername {
@@ -1970,7 +1822,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayPassword {
@@ -1983,7 +1834,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayDomain {
@@ -1996,7 +1846,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultRDGatewayUseConnectionCredentials {
@@ -2009,7 +1858,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("5")]
public int RdpReconnectionCount {
@@ -2022,7 +1870,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string OverrideUICulture {
@@ -2044,7 +1891,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultRDGatewayHostname {
@@ -2057,7 +1903,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultRDGatewayUsername {
@@ -2070,7 +1915,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultRDGatewayPassword {
@@ -2083,7 +1927,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultRDGatewayDomain {
@@ -2096,7 +1939,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultEnableFontSmoothing {
@@ -2109,7 +1951,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultEnableFontSmoothing {
@@ -2122,7 +1963,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool ConDefaultEnableDesktopComposition {
@@ -2135,7 +1975,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultEnableDesktopComposition {
@@ -2148,7 +1987,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("4")]
public int ConfirmCloseConnection {
@@ -2161,7 +1999,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public global::System.Drawing.Size MainFormRestoreSize {
get {
@@ -2173,7 +2010,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public global::System.Drawing.Point MainFormRestoreLocation {
get {
@@ -2185,7 +2021,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("mRemoteNG")]
public string SQLDatabaseName {
@@ -2198,7 +2033,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("10")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2212,7 +2046,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("{0}.{1:yyyyMMdd-HHmmssffff}.backup")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2226,7 +2059,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultUseCredSsp {
@@ -2239,7 +2071,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ConDefaultUseCredSsp {
@@ -2252,7 +2083,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2266,7 +2096,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2280,7 +2109,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("release")]
public string UpdateChannel {
@@ -2290,7 +2118,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ThemeName {
@@ -2303,7 +2130,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ShowConfigHelpText {
@@ -2316,7 +2142,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string PuttySavedSessionsName {
@@ -2329,7 +2154,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string PuttySavedSessionsPanel {
@@ -2342,7 +2166,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool CompatibilityWarnLenovoAutoScrollUtility {
@@ -2355,7 +2178,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://update.mremoteng.org/announcement.txt")]
public string AnnouncementAddress {
@@ -2365,7 +2187,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.ApplicationScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("https://update.mremoteng.org/")]
public string UpdateAddress {
@@ -2375,7 +2196,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("")]
public string ConDefaultLoadBalanceInfo {
@@ -2388,7 +2208,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("True")]
public bool ConDefaultAutomaticResize {
@@ -2401,7 +2220,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultLoadBalanceInfo {
@@ -2414,7 +2232,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("False")]
public bool InhDefaultAutomaticResize {
@@ -2427,7 +2244,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("RDP")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2441,7 +2257,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("9/9, 33/8")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
@@ -2455,7 +2270,6 @@ namespace mRemoteNG.My {
}
[global::System.Configuration.UserScopedSettingAttribute()]
- //[global::System.Configuration.SettingsProviderAttribute(typeof(mRemoteNG.Config.Settings.Providers.ChooseProvider))]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("9/8, 34/8")]
[global::System.Configuration.SettingsManageabilityAttribute(global::System.Configuration.SettingsManageability.Roaming)]
diff --git a/mRemoteV1/Properties/Settings.settings b/mRemoteV1/Properties/Settings.settings
index 3f46a3e42..f0e785a2d 100644
--- a/mRemoteV1/Properties/Settings.settings
+++ b/mRemoteV1/Properties/Settings.settings
@@ -1,572 +1,572 @@
-
+
-
+
-
+
-
+
Normal
-
+
False
-
+
True
-
+
-
+
True
-
+
True
-
+
True
-
+
True
-
+
False
-
+
False
-
+
-
+
True
-
+
True
-
+
False
-
+
False
-
+
True
-
+
False
-
+
False
-
+
noinfo
-
+
-
+
-
+
-
+
False
-
+
False
-
+
True
-
+
False
False
-
+
False
-
+
-
+
80
-
+
False
-
+
-
+
-
+
-
+
-
+
-
+
-
+
RDP
-
+
Default Settings
-
+
False
-
+
FitToWindow
-
+
Colors16Bit
-
+
True
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
DoNotPlay
-
+
2
-
+
False
-
+
False
-
+
False
-
+
0
-
+
False
-
+
True
-
+
0, 0
-
+
Bottom
-
+
True
-
+
3, 24
-
+
Top
False
-
+
False
-
+
-
+
-
+
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
EncrBasic
-
+
False
-
+
-
+
-
+
False
-
+
False
-
+
False
-
+
True
-
+
False
-
+
False
-
+
AuthVNC
-
+
ColNormal
-
+
SmartSAspect
-
+
False
-
+
CompNone
-
+
EncHextile
-
+
-
+
-
+
0
-
+
ProxyNone
-
+
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
NoAuth
-
+
False
-
+
5500
-
+
False
-
+
-
+
IE
-
+
False
-
+
-
+
False
-
+
False
-
+
-
+
False
-
+
-
+
False
-
+
-
+
False
-
+
7
-
+
1980-01-01
-
+
False
-
+
Never
-
+
Yes
-
+
mRemoteNG
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
False
-
+
5
-
+
de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW
-
+
-
+
-
+
-
+
-
+
False
-
+
False
-
+
False
-
+
False
-
+
4
-
+
-
+
-
+
mRemoteNG
-
+
10
-
+
{0}.{1:yyyyMMdd-HHmmssffff}.backup
-
+
False
-
+
True
-
+
False
-
+
False
-
+
release
-
+
-
+
True
-
+
-
+
-
+
True
-
+
https://update.mremoteng.org/announcement.txt
-
+
https://update.mremoteng.org/
-
+
-
+
True
-
+
False
-
+
False
-
+
RDP
-
+
9/9, 33/8
-
+
9/8, 34/8
diff --git a/mRemoteV1/Resources/Notes/Misc.txt b/mRemoteV1/Resources/Notes/Misc.txt
index fb25d9a60..b22b7a6fd 100644
--- a/mRemoteV1/Resources/Notes/Misc.txt
+++ b/mRemoteV1/Resources/Notes/Misc.txt
@@ -4,8 +4,8 @@ How to build the portable package:
to Inherits PortableSettingsProvider
In App.Info.Settings:
change SettingsPath
- from GetFolderPath(SpecialFolder.ApplicationData) & "\" & My.Application.Info.CompanyName.Replace(" ", "_") & "\" & My.Application.Info.ProductName
- to My.Application.Info.DirectoryPath
+ from GetFolderPath(SpecialFolder.ApplicationData) & "\" & Application.Info.CompanyName.Replace(" ", "_") & "\" & Application.Info.ProductName
+ to Application.Info.DirectoryPath
How to add a new language:
Create a new Language.XX.resx file in the My Project folder
diff --git a/mRemoteV1/Security/Security.Crypt.cs b/mRemoteV1/Security/Security.Crypt.cs
index e8f06d3fc..539e117fe 100644
--- a/mRemoteV1/Security/Security.Crypt.cs
+++ b/mRemoteV1/Security/Security.Crypt.cs
@@ -3,6 +3,7 @@ using System.IO;
using System.Security.Cryptography;
using System.Text;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG.Security
@@ -46,7 +47,7 @@ namespace mRemoteNG.Security
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(My.Language.strErrorEncryptionFailed, ex.Message));
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(Language.strErrorEncryptionFailed, ex.Message));
}
return StrToEncrypt;
@@ -103,7 +104,7 @@ namespace mRemoteNG.Security
// Ignore CryptographicException "Padding is invalid and cannot be removed." when password is incorrect.
if (!(ex is CryptographicException))
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(My.Language.strErrorDecryptionFailed, ex.Message));
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, string.Format(Language.strErrorDecryptionFailed, ex.Message));
}
}
diff --git a/mRemoteV1/Tools/ExternalTool.cs b/mRemoteV1/Tools/ExternalTool.cs
index 3955e5c46..7db8b3b0d 100644
--- a/mRemoteV1/Tools/ExternalTool.cs
+++ b/mRemoteV1/Tools/ExternalTool.cs
@@ -7,6 +7,7 @@ using System.IO;
using System.ComponentModel;
using mRemoteNG.Connection;
using mRemoteNG.Connection.Protocol;
+using mRemoteNG.My;
namespace mRemoteNG.Tools
@@ -126,7 +127,7 @@ namespace mRemoteNG.Tools
newConnectionInfo.Protocol = ProtocolType.IntApp;
newConnectionInfo.ExtApp = DisplayName;
newConnectionInfo.Name = DisplayName;
- newConnectionInfo.Panel = My.Language.strMenuExternalTools;
+ newConnectionInfo.Panel = Language.strMenuExternalTools;
}
}
}
\ No newline at end of file
diff --git a/mRemoteV1/Tools/MiscTools.cs b/mRemoteV1/Tools/MiscTools.cs
index cf032c0f7..428e0c3dd 100644
--- a/mRemoteV1/Tools/MiscTools.cs
+++ b/mRemoteV1/Tools/MiscTools.cs
@@ -14,6 +14,7 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Windows.Forms;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
@@ -269,12 +270,12 @@ namespace mRemoteNG.Tools
{
if (value.GetType() == typeof(string))
{
- if ((value).ToString().ToLower() == My.Language.strYes.ToLower())
+ if ((value).ToString().ToLower() == Language.strYes.ToLower())
{
return true;
}
- if ((value).ToString().ToLower() == My.Language.strNo.ToLower())
+ if ((value).ToString().ToLower() == Language.strNo.ToLower())
{
return false;
}
@@ -289,7 +290,7 @@ namespace mRemoteNG.Tools
{
if (destinationType == typeof(string))
{
- return ((Convert.ToBoolean(value)) ? My.Language.strYes : My.Language.strNo);
+ return ((Convert.ToBoolean(value)) ? Language.strYes : Language.strNo);
}
return base.ConvertTo(context, culture, value, destinationType);
diff --git a/mRemoteV1/Tools/ProcessController.cs b/mRemoteV1/Tools/ProcessController.cs
index 38a607eac..fc42217eb 100644
--- a/mRemoteV1/Tools/ProcessController.cs
+++ b/mRemoteV1/Tools/ProcessController.cs
@@ -157,11 +157,11 @@ namespace mRemoteNG.Tools
return IntPtr.Zero;
}
- Process.WaitForInputIdle(My.Settings.Default.MaxPuttyWaitTime * 1000);
+ Process.WaitForInputIdle(mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000);
Handle = IntPtr.Zero;
int startTicks = Environment.TickCount;
- while (Handle == IntPtr.Zero && Environment.TickCount < startTicks + (My.Settings.Default.MaxPuttyWaitTime * 1000))
+ while (Handle == IntPtr.Zero && Environment.TickCount < startTicks + (mRemoteNG.Settings.Default.MaxPuttyWaitTime * 1000))
{
Process.Refresh();
Handle = Process.MainWindowHandle;
diff --git a/mRemoteV1/Tools/PuttyProcessController.cs b/mRemoteV1/Tools/PuttyProcessController.cs
index b62e54ab9..9d07961ea 100644
--- a/mRemoteV1/Tools/PuttyProcessController.cs
+++ b/mRemoteV1/Tools/PuttyProcessController.cs
@@ -7,9 +7,9 @@ namespace mRemoteNG.Tools
public bool Start(CommandLineArguments arguments = null)
{
string filename = "";
- if (My.Settings.Default.UseCustomPuttyPath)
+ if (mRemoteNG.Settings.Default.UseCustomPuttyPath)
{
- filename = My.Settings.Default.CustomPuttyPath;
+ filename = mRemoteNG.Settings.Default.CustomPuttyPath;
}
else
{
diff --git a/mRemoteV1/Tools/PuttyTypeDetector.cs b/mRemoteV1/Tools/PuttyTypeDetector.cs
index 86a78de44..73e85c3f1 100644
--- a/mRemoteV1/Tools/PuttyTypeDetector.cs
+++ b/mRemoteV1/Tools/PuttyTypeDetector.cs
@@ -1,6 +1,7 @@
+using System;
using System.Diagnostics;
using mRemoteNG.Connection.Protocol;
-
+using System.IO;
namespace mRemoteNG.Tools
{
@@ -37,61 +38,25 @@ namespace mRemoteNG.Tools
private static bool IsPutty(string filename)
{
- bool result = false;
- try
- {
- result = System.Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY"));
- }
- catch
- {
- result = false;
- }
- return result;
+ return !string.IsNullOrEmpty(filename) && File.Exists(filename) && Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY"));
}
-
- private static bool IsPuttyNg(string filename)
- {
- bool result = false;
- try
- {
- result = System.Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTYNG"));
- }
- catch
- {
- result = false;
- }
- return result;
- }
-
- private static bool IsKitty(string filename)
- {
- bool result = false;
- try
- {
- result = System.Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY") && FileVersionInfo.GetVersionInfo(filename).Comments.Contains("KiTTY"));
- }
- catch
- {
- result = false;
- }
- return result;
- }
-
- private static bool IsXming(string filename)
- {
- bool result = false;
- try
- {
- result = System.Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY") && FileVersionInfo.GetVersionInfo(filename).ProductVersion.Contains("Xming"));
- }
- catch
- {
- result = false;
- }
- return result;
- }
-
- public enum PuttyType
+
+ private static bool IsPuttyNg(string filename)
+ {
+ return !string.IsNullOrEmpty(filename) && File.Exists(filename) && Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTYNG"));
+ }
+
+ private static bool IsKitty(string filename)
+ {
+ return !string.IsNullOrEmpty(filename) && File.Exists(filename) && Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY") && FileVersionInfo.GetVersionInfo(filename).Comments.Contains("KiTTY"));
+ }
+
+ private static bool IsXming(string filename)
+ {
+ return !string.IsNullOrEmpty(filename) && File.Exists(filename) && Convert.ToBoolean(FileVersionInfo.GetVersionInfo(filename).InternalName.Contains("PuTTY") && FileVersionInfo.GetVersionInfo(filename).ProductVersion.Contains("Xming"));
+ }
+
+ public enum PuttyType
{
Unknown = 0,
Putty,
diff --git a/mRemoteV1/Tools/ReconnectGroup.Designer.cs b/mRemoteV1/Tools/ReconnectGroup.Designer.cs
index 1c0a70eb3..8e910b9c0 100644
--- a/mRemoteV1/Tools/ReconnectGroup.Designer.cs
+++ b/mRemoteV1/Tools/ReconnectGroup.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG
{
[global::Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]
@@ -100,7 +102,7 @@ namespace mRemoteNG
//
//pbServerStatus
//
- this.pbServerStatus.Image = My.Resources.HostStatus_Check;
+ this.pbServerStatus.Image = 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/mRemoteV1/Tools/ReconnectGroup.cs b/mRemoteV1/Tools/ReconnectGroup.cs
index 26d7afb6c..b8e7384a9 100644
--- a/mRemoteV1/Tools/ReconnectGroup.cs
+++ b/mRemoteV1/Tools/ReconnectGroup.cs
@@ -1,4 +1,5 @@
using System.Drawing;
+using mRemoteNG.My;
namespace mRemoteNG
@@ -20,11 +21,11 @@ namespace mRemoteNG
{
if (value == true)
{
- SetStatusImage(My.Resources.HostStatus_On);
+ SetStatusImage(Resources.HostStatus_On);
}
else
{
- SetStatusImage(My.Resources.HostStatus_Off);
+ SetStatusImage(Resources.HostStatus_Off);
}
_ServerReady = value;
@@ -140,10 +141,10 @@ namespace mRemoteNG
private void ApplyLanguage()
{
- grpAutomaticReconnect.Text = My.Language.strGroupboxAutomaticReconnect;
- btnClose.Text = My.Language.strButtonClose;
- lblServerStatus.Text = My.Language.strLabelServerStatus;
- chkReconnectWhenReady.Text = My.Language.strCheckboxReconnectWhenReady;
+ grpAutomaticReconnect.Text = Language.strGroupboxAutomaticReconnect;
+ btnClose.Text = Language.strButtonClose;
+ lblServerStatus.Text = Language.strLabelServerStatus;
+ chkReconnectWhenReady.Text = Language.strCheckboxReconnectWhenReady;
}
}
}
\ No newline at end of file
diff --git a/mRemoteV1/Tools/Tools.Controls.cs b/mRemoteV1/Tools/Tools.Controls.cs
index 16b01140e..55e21ecf7 100644
--- a/mRemoteV1/Tools/Tools.Controls.cs
+++ b/mRemoteV1/Tools/Tools.Controls.cs
@@ -3,6 +3,7 @@ using Microsoft.VisualBasic;
using System.Collections;
using System.Windows.Forms;
using mRemoteNG.App;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
@@ -79,13 +80,13 @@ namespace mRemoteNG.Tools
try
{
this._cMenCons = new ToolStripMenuItem();
- this._cMenCons.Text = My.Language.strConnections;
- this._cMenCons.Image = My.Resources.Root;
+ this._cMenCons.Text = Language.strConnections;
+ this._cMenCons.Image = Resources.Root;
this._cMenSep1 = new ToolStripSeparator();
this._cMenExit = new ToolStripMenuItem();
- this._cMenExit.Text = My.Language.strMenuExit;
+ this._cMenExit.Text = Language.strMenuExit;
this._cMenExit.Click += cMenExit_Click;
this._cMen = new ContextMenuStrip();
@@ -96,7 +97,7 @@ namespace mRemoteNG.Tools
this._nI = new NotifyIcon();
this._nI.Text = "mRemote";
this._nI.BalloonTipText = "mRemote";
- this._nI.Icon = My.Resources.mRemote_Icon;
+ this._nI.Icon = Resources.mRemote_Icon;
this._nI.ContextMenuStrip = this._cMen;
this._nI.Visible = true;
@@ -149,7 +150,7 @@ namespace mRemoteNG.Tools
if (Tree.ConnectionTreeNode.GetNodeType(tNode) == Tree.TreeNodeType.Container)
{
- tMenItem.Image = My.Resources.Folder;
+ tMenItem.Image = Resources.Folder;
tMenItem.Tag = tNode.Tag;
menToolStrip.DropDownItems.Add(tMenItem);
@@ -189,7 +190,7 @@ namespace mRemoteNG.Tools
frmMain.Default.Show();
frmMain.Default.WindowState = frmMain.Default.PreviousWindowState;
- if (My.Settings.Default.ShowSystemTrayIcon == false)
+ if (mRemoteNG.Settings.Default.ShowSystemTrayIcon == false)
{
App.Runtime.NotificationAreaIcon.Dispose();
App.Runtime.NotificationAreaIcon = null;
@@ -231,7 +232,7 @@ namespace mRemoteNG.Tools
saveFileDialog.FileName = App.Info.ConnectionsFileInfo.DefaultConnectionsFile;
saveFileDialog.OverwritePrompt = true;
- saveFileDialog.Filter = My.Language.strFiltermRemoteXML + "|*.xml|" + My.Language.strFilterAll + "|*.*";
+ saveFileDialog.Filter = Language.strFiltermRemoteXML + "|*.xml|" + Language.strFilterAll + "|*.*";
return saveFileDialog;
}
@@ -244,7 +245,7 @@ namespace mRemoteNG.Tools
saveFileDialog.FileName = App.Info.ConnectionsFileInfo.DefaultConnectionsFile;
saveFileDialog.OverwritePrompt = true;
- saveFileDialog.Filter = My.Language.strFiltermRemoteXML + "|*.xml|" + My.Language.strFiltermRemoteCSV + "|*.csv|" + My.Language.strFiltervRD2008CSV + "|*.csv|" + My.Language.strFilterAll + "|*.*";
+ saveFileDialog.Filter = Language.strFiltermRemoteXML + "|*.xml|" + Language.strFiltermRemoteCSV + "|*.csv|" + Language.strFiltervRD2008CSV + "|*.csv|" + Language.strFilterAll + "|*.*";
return saveFileDialog;
}
@@ -254,7 +255,7 @@ namespace mRemoteNG.Tools
OpenFileDialog lDlg = new OpenFileDialog();
lDlg.CheckFileExists = true;
lDlg.InitialDirectory = App.Info.ConnectionsFileInfo.DefaultConnectionsPath;
- lDlg.Filter = My.Language.strFiltermRemoteXML + "|*.xml|" + My.Language.strFilterAll + "|*.*";
+ lDlg.Filter = Language.strFiltermRemoteXML + "|*.xml|" + Language.strFilterAll + "|*.*";
return lDlg;
}
@@ -264,7 +265,7 @@ namespace mRemoteNG.Tools
OpenFileDialog openFileDialog = new OpenFileDialog();
openFileDialog.CheckFileExists = true;
openFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal);
- openFileDialog.Filter = string.Join("|", new[] {My.Language.strFilterRDP, "*.rdp", My.Language.strFilterAll, "*.*"});
+ openFileDialog.Filter = string.Join("|", new[] {Language.strFilterRDP, "*.rdp", Language.strFilterAll, "*.*"});
openFileDialog.Multiselect = true;
return openFileDialog;
}
diff --git a/mRemoteV1/Tools/Tools.LocalizedAttributes.cs b/mRemoteV1/Tools/Tools.LocalizedAttributes.cs
index 2c2a23311..4931b1eba 100644
--- a/mRemoteV1/Tools/Tools.LocalizedAttributes.cs
+++ b/mRemoteV1/Tools/Tools.LocalizedAttributes.cs
@@ -1,5 +1,6 @@
using System;
using System.ComponentModel;
+using mRemoteNG.My;
namespace mRemoteNG.Tools
@@ -32,7 +33,7 @@ namespace mRemoteNG.Tools
OrderPrefix += Convert.ToString("\t");
}
- return OrderPrefix + My.Language.ResourceManager.GetString(value);
+ return OrderPrefix + Language.ResourceManager.GetString(value);
}
}
@@ -54,7 +55,7 @@ namespace mRemoteNG.Tools
if (!this.Localized)
{
this.Localized = true;
- this.DisplayNameValue = My.Language.ResourceManager.GetString(this.DisplayNameValue);
+ this.DisplayNameValue = Language.ResourceManager.GetString(this.DisplayNameValue);
}
return base.DisplayName;
@@ -78,7 +79,7 @@ namespace mRemoteNG.Tools
if (!this.Localized)
{
this.Localized = true;
- this.DescriptionValue = My.Language.ResourceManager.GetString(this.DescriptionValue);
+ this.DescriptionValue = Language.ResourceManager.GetString(this.DescriptionValue);
}
return base.Description;
@@ -89,7 +90,7 @@ namespace mRemoteNG.Tools
[AttributeUsage(AttributeTargets.All, AllowMultiple = false, Inherited = true)]
public class LocalizedDefaultValueAttribute : DefaultValueAttribute
{
- public LocalizedDefaultValueAttribute(string name) : base(My.Language.ResourceManager.GetString(name))
+ public LocalizedDefaultValueAttribute(string name) : base(Language.ResourceManager.GetString(name))
{
}
@@ -122,7 +123,7 @@ namespace mRemoteNG.Tools
if (!this.Localized)
{
this.Localized = true;
- this.DisplayNameValue = string.Format(My.Language.strFormatInherit, My.Language.ResourceManager.GetString(this.DisplayNameValue));
+ this.DisplayNameValue = string.Format(Language.strFormatInherit, Language.ResourceManager.GetString(this.DisplayNameValue));
}
return base.DisplayName;
@@ -147,7 +148,7 @@ namespace mRemoteNG.Tools
if (!this.Localized)
{
this.Localized = true;
- this.DescriptionValue = string.Format(My.Language.strFormatInheritDescription, My.Language.ResourceManager.GetString(this.DescriptionValue));
+ this.DescriptionValue = string.Format(Language.strFormatInheritDescription, Language.ResourceManager.GetString(this.DescriptionValue));
}
return base.Description;
diff --git a/mRemoteV1/Tools/Tools.PortScan.cs b/mRemoteV1/Tools/Tools.PortScan.cs
index ab7e1b493..1269e1c9f 100644
--- a/mRemoteV1/Tools/Tools.PortScan.cs
+++ b/mRemoteV1/Tools/Tools.PortScan.cs
@@ -13,6 +13,7 @@ using System.Net;
using System.Net.NetworkInformation;
using System.Threading;
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Tools.PortScan
@@ -240,11 +241,11 @@ namespace mRemoteNG.Tools.PortScan
{
if (value)
{
- return My.Language.strYes;
+ return Language.strYes;
}
else
{
- return My.Language.strNo;
+ return Language.strNo;
}
}
diff --git a/mRemoteV1/Tree/ConnectionTree.cs b/mRemoteV1/Tree/ConnectionTree.cs
index 8d53fe725..5e0f024c1 100644
--- a/mRemoteV1/Tree/ConnectionTree.cs
+++ b/mRemoteV1/Tree/ConnectionTree.cs
@@ -5,6 +5,7 @@ using mRemoteNG.Tools.Sorting;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Tree
{
@@ -50,14 +51,14 @@ namespace mRemoteNG.Tree
{
if (Tree.ConnectionTreeNode.IsEmpty(SelectedNode) == false)
{
- if (Interaction.MsgBox(string.Format(My.Language.strConfirmDeleteNodeFolder, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
+ if (Interaction.MsgBox(string.Format(Language.strConfirmDeleteNodeFolder, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
{
SelectedNode.Remove();
}
}
else
{
- if (Interaction.MsgBox(string.Format(My.Language.strConfirmDeleteNodeFolderNotEmpty, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
+ if (Interaction.MsgBox(string.Format(Language.strConfirmDeleteNodeFolderNotEmpty, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
{
foreach (TreeNode tNode in SelectedNode.Nodes)
{
@@ -69,7 +70,7 @@ namespace mRemoteNG.Tree
}
else if (Tree.ConnectionTreeNode.GetNodeType(SelectedNode) == TreeNodeType.Connection)
{
- if (Interaction.MsgBox(string.Format(My.Language.strConfirmDeleteNodeConnection, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
+ if (Interaction.MsgBox(string.Format(Language.strConfirmDeleteNodeConnection, SelectedNode.Text), (Microsoft.VisualBasic.MsgBoxStyle)(MsgBoxStyle.YesNo | MsgBoxStyle.Question), null) == MsgBoxResult.Yes)
{
SelectedNode.Remove();
}
@@ -104,7 +105,7 @@ namespace mRemoteNG.Tree
{
try
{
- if (My.Settings.Default.ShowDescriptionTooltipsInTree)
+ if (mRemoteNG.Settings.Default.ShowDescriptionTooltipsInTree)
{
//Find the node under the mouse.
TreeNode new_node = _TreeView.GetNodeAt(e.X, e.Y);
@@ -332,7 +333,7 @@ namespace mRemoteNG.Tree
{
TreeView.BeginUpdate();
TreeView.Nodes.Clear();
- TreeView.Nodes.Add(My.Language.strConnections);
+ TreeView.Nodes.Add(Language.strConnections);
TreeView.EndUpdate();
}
}
diff --git a/mRemoteV1/Tree/ConnectionTreeNode.cs b/mRemoteV1/Tree/ConnectionTreeNode.cs
index e93219094..bcc68d243 100644
--- a/mRemoteV1/Tree/ConnectionTreeNode.cs
+++ b/mRemoteV1/Tree/ConnectionTreeNode.cs
@@ -5,6 +5,7 @@ using mRemoteNG.Images;
using System;
using System.Windows.Forms;
using mRemoteNG.Messages;
+using mRemoteNG.My;
using mRemoteNG.Root.PuttySessions;
using mRemoteNG.Tree.Root;
@@ -129,17 +130,17 @@ namespace mRemoteNG.Tree
{
case TreeNodeType.Connection:
case TreeNodeType.PuttySession:
- defaultName = My.Language.strNewConnection;
+ defaultName = Language.strNewConnection;
treeNode.ImageIndex = (int)TreeImageType.ConnectionClosed;
treeNode.SelectedImageIndex = (int)TreeImageType.ConnectionClosed;
break;
case TreeNodeType.Container:
- defaultName = My.Language.strNewFolder;
+ defaultName = Language.strNewFolder;
treeNode.ImageIndex = (int)TreeImageType.Container;
treeNode.SelectedImageIndex = (int)TreeImageType.Container;
break;
case TreeNodeType.Root:
- defaultName = My.Language.strNewRoot;
+ defaultName = Language.strNewRoot;
treeNode.ImageIndex = (int)TreeImageType.Root;
treeNode.SelectedImageIndex = (int)TreeImageType.Root;
break;
@@ -172,7 +173,7 @@ namespace mRemoteNG.Tree
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, string.Format(My.Language.strErrorCloneNodeFailed, ex.Message));
+ Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg, string.Format(Language.strErrorCloneNodeFailed, ex.Message));
}
}
@@ -255,7 +256,7 @@ namespace mRemoteNG.Tree
return;
connectionInfo.Name = newName;
- if (My.Settings.Default.SetHostnameLikeDisplayName)
+ if (mRemoteNG.Settings.Default.SetHostnameLikeDisplayName)
connectionInfo.Hostname = newName;
}
#endregion
diff --git a/mRemoteV1/Tree/Root/PuttySessionsNodeInfo.cs b/mRemoteV1/Tree/Root/PuttySessionsNodeInfo.cs
index 1eb9e9cc0..656c365fb 100644
--- a/mRemoteV1/Tree/Root/PuttySessionsNodeInfo.cs
+++ b/mRemoteV1/Tree/Root/PuttySessionsNodeInfo.cs
@@ -34,7 +34,7 @@ namespace mRemoteNG.Root.PuttySessions
{
TreeNode.Text = value;
}
- Settings.Default.PuttySavedSessionsName = value;
+ mRemoteNG.Settings.Default.PuttySavedSessionsName = value;
}
}
@@ -51,7 +51,7 @@ namespace mRemoteNG.Root.PuttySessions
return ;
}
_panel = value;
- Settings.Default.PuttySavedSessionsPanel = value;
+ mRemoteNG.Settings.Default.PuttySavedSessionsPanel = value;
}
}
#endregion
diff --git a/mRemoteV1/Tree/Root/RootNodeInfo.cs b/mRemoteV1/Tree/Root/RootNodeInfo.cs
index 90895ef49..3e952d155 100644
--- a/mRemoteV1/Tree/Root/RootNodeInfo.cs
+++ b/mRemoteV1/Tree/Root/RootNodeInfo.cs
@@ -1,6 +1,7 @@
using mRemoteNG.Tools;
using System.ComponentModel;
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Tree.Root
@@ -13,7 +14,7 @@ namespace mRemoteNG.Tree.Root
public RootNodeInfo(RootNodeType rootType)
{
- _name = My.Language.strConnections;
+ _name = Language.strConnections;
Type = rootType;
}
diff --git a/mRemoteV1/UI/Controls/QuickConnectComboBox.cs b/mRemoteV1/UI/Controls/QuickConnectComboBox.cs
index 5f60dfb81..f8e546548 100644
--- a/mRemoteV1/UI/Controls/QuickConnectComboBox.cs
+++ b/mRemoteV1/UI/Controls/QuickConnectComboBox.cs
@@ -11,6 +11,7 @@ using System.Windows.Forms;
using mRemoteNG.Connection;
using mRemoteNG.Connection.Protocol;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG.Controls
@@ -183,7 +184,7 @@ namespace mRemoteNG.Controls
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddExceptionMessage(My.Language.strQuickConnectAddFailed, ex, Messages.MessageClass.ErrorMsg, true);
+ Runtime.MessageCollector.AddExceptionMessage(Language.strQuickConnectAddFailed, ex, Messages.MessageClass.ErrorMsg, true);
}
}
diff --git a/mRemoteV1/UI/Forms/ExportForm.Designer.cs b/mRemoteV1/UI/Forms/ExportForm.Designer.cs
index e8a319a3d..41c45a3b6 100644
--- a/mRemoteV1/UI/Forms/ExportForm.Designer.cs
+++ b/mRemoteV1/UI/Forms/ExportForm.Designer.cs
@@ -1,4 +1,5 @@
using System.Windows.Forms;
+using mRemoteNG.My;
namespace mRemoteNG.Forms
@@ -263,7 +264,7 @@ namespace mRemoteNG.Forms
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOK);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
- this.Icon = My.Resources.Connections_SaveAs_Icon;
+ this.Icon = Resources.Connections_SaveAs_Icon;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "ExportForm";
diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
index 71d558cb4..b8163b40a 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Forms.OptionsPages
{
public partial class AdvancedPage : OptionsPage
@@ -197,7 +199,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
//
// btnLaunchPutty
//
- this.btnLaunchPutty.Image = global::mRemoteNG.My.Resources.PuttyConfig;
+ this.btnLaunchPutty.Image = Resources.PuttyConfig;
this.btnLaunchPutty.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnLaunchPutty.Location = new System.Drawing.Point(373, 159);
this.btnLaunchPutty.Name = "btnLaunchPutty";
diff --git a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
index 35b3791db..e831ee899 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/AdvancedPage.cs
@@ -48,51 +48,51 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- chkWriteLogFile.Checked = Settings.Default.WriteLogFile;
+ chkWriteLogFile.Checked = mRemoteNG.Settings.Default.WriteLogFile;
- chkEncryptCompleteFile.Checked = Settings.Default.EncryptCompleteConnectionsFile;
- chkAutomaticallyGetSessionInfo.Checked = Settings.Default.AutomaticallyGetSessionInfo;
- chkAutomaticReconnect.Checked = Settings.Default.ReconnectOnDisconnect;
- numPuttyWaitTime.Value = Settings.Default.MaxPuttyWaitTime;
+ chkEncryptCompleteFile.Checked = mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile;
+ chkAutomaticallyGetSessionInfo.Checked = mRemoteNG.Settings.Default.AutomaticallyGetSessionInfo;
+ chkAutomaticReconnect.Checked = mRemoteNG.Settings.Default.ReconnectOnDisconnect;
+ numPuttyWaitTime.Value = mRemoteNG.Settings.Default.MaxPuttyWaitTime;
- chkUseCustomPuttyPath.Checked = Settings.Default.UseCustomPuttyPath;
- txtCustomPuttyPath.Text = Settings.Default.CustomPuttyPath;
+ chkUseCustomPuttyPath.Checked = mRemoteNG.Settings.Default.UseCustomPuttyPath;
+ txtCustomPuttyPath.Text = mRemoteNG.Settings.Default.CustomPuttyPath;
SetPuttyLaunchButtonEnabled();
- numUVNCSCPort.Value = Settings.Default.UVNCSCPort;
+ numUVNCSCPort.Value = mRemoteNG.Settings.Default.UVNCSCPort;
- txtXULrunnerPath.Text = Settings.Default.XULRunnerPath;
+ txtXULrunnerPath.Text = mRemoteNG.Settings.Default.XULRunnerPath;
}
public override void SaveSettings()
{
- Settings.Default.WriteLogFile = chkWriteLogFile.Checked;
- Settings.Default.EncryptCompleteConnectionsFile = chkEncryptCompleteFile.Checked;
- Settings.Default.AutomaticallyGetSessionInfo = chkAutomaticallyGetSessionInfo.Checked;
- Settings.Default.ReconnectOnDisconnect = chkAutomaticReconnect.Checked;
+ mRemoteNG.Settings.Default.WriteLogFile = chkWriteLogFile.Checked;
+ mRemoteNG.Settings.Default.EncryptCompleteConnectionsFile = chkEncryptCompleteFile.Checked;
+ mRemoteNG.Settings.Default.AutomaticallyGetSessionInfo = chkAutomaticallyGetSessionInfo.Checked;
+ mRemoteNG.Settings.Default.ReconnectOnDisconnect = chkAutomaticReconnect.Checked;
var puttyPathChanged = false;
- if (Settings.Default.CustomPuttyPath != txtCustomPuttyPath.Text)
+ if (mRemoteNG.Settings.Default.CustomPuttyPath != txtCustomPuttyPath.Text)
{
puttyPathChanged = true;
- Settings.Default.CustomPuttyPath = txtCustomPuttyPath.Text;
+ mRemoteNG.Settings.Default.CustomPuttyPath = txtCustomPuttyPath.Text;
}
- if (Settings.Default.UseCustomPuttyPath != chkUseCustomPuttyPath.Checked)
+ if (mRemoteNG.Settings.Default.UseCustomPuttyPath != chkUseCustomPuttyPath.Checked)
{
puttyPathChanged = true;
- Settings.Default.UseCustomPuttyPath = chkUseCustomPuttyPath.Checked;
+ mRemoteNG.Settings.Default.UseCustomPuttyPath = chkUseCustomPuttyPath.Checked;
}
if (puttyPathChanged)
{
- PuttyBase.PuttyPath = Settings.Default.UseCustomPuttyPath ? Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath;
+ PuttyBase.PuttyPath = mRemoteNG.Settings.Default.UseCustomPuttyPath ? mRemoteNG.Settings.Default.CustomPuttyPath : GeneralAppInfo.PuttyPath;
Sessions.AddSessionsToTree();
}
- Settings.Default.MaxPuttyWaitTime = (int) numPuttyWaitTime.Value;
- Settings.Default.UVNCSCPort = (int) numUVNCSCPort.Value;
- Settings.Default.XULRunnerPath = txtXULrunnerPath.Text;
+ mRemoteNG.Settings.Default.MaxPuttyWaitTime = (int) numPuttyWaitTime.Value;
+ mRemoteNG.Settings.Default.UVNCSCPort = (int) numUVNCSCPort.Value;
+ mRemoteNG.Settings.Default.XULRunnerPath = txtXULrunnerPath.Text;
- Settings.Default.Save();
+ mRemoteNG.Settings.Default.Save();
}
#endregion
diff --git a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
index 51467c432..5071fe81c 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/AppearancePage.cs
@@ -41,20 +41,20 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
cboLanguage.Items.Add(nativeName);
}
- if (!string.IsNullOrEmpty(Settings.Default.OverrideUICulture) &&
- SupportedCultures.IsNameSupported(Settings.Default.OverrideUICulture))
+ if (!string.IsNullOrEmpty(mRemoteNG.Settings.Default.OverrideUICulture) &&
+ SupportedCultures.IsNameSupported(mRemoteNG.Settings.Default.OverrideUICulture))
{
- cboLanguage.SelectedItem = SupportedCultures.get_CultureNativeName(Settings.Default.OverrideUICulture);
+ cboLanguage.SelectedItem = SupportedCultures.get_CultureNativeName(mRemoteNG.Settings.Default.OverrideUICulture);
}
if (cboLanguage.SelectedIndex == -1)
{
cboLanguage.SelectedIndex = 0;
}
- chkShowDescriptionTooltipsInTree.Checked = Settings.Default.ShowDescriptionTooltipsInTree;
- chkShowFullConnectionsFilePathInTitle.Checked = Settings.Default.ShowCompleteConsPathInTitle;
- chkShowSystemTrayIcon.Checked = Settings.Default.ShowSystemTrayIcon;
- chkMinimizeToSystemTray.Checked = Settings.Default.MinimizeToTray;
+ chkShowDescriptionTooltipsInTree.Checked = mRemoteNG.Settings.Default.ShowDescriptionTooltipsInTree;
+ chkShowFullConnectionsFilePathInTitle.Checked = mRemoteNG.Settings.Default.ShowCompleteConsPathInTitle;
+ chkShowSystemTrayIcon.Checked = mRemoteNG.Settings.Default.ShowSystemTrayIcon;
+ chkMinimizeToSystemTray.Checked = mRemoteNG.Settings.Default.MinimizeToTray;
}
public override void SaveSettings()
@@ -63,20 +63,20 @@ namespace mRemoteNG.UI.Forms.OptionsPages
if (cboLanguage.SelectedIndex > 0 &&
SupportedCultures.IsNativeNameSupported(Convert.ToString(cboLanguage.SelectedItem)))
{
- Settings.Default.OverrideUICulture =
+ mRemoteNG.Settings.Default.OverrideUICulture =
SupportedCultures.get_CultureName(Convert.ToString(cboLanguage.SelectedItem));
}
else
{
- Settings.Default.OverrideUICulture = string.Empty;
+ mRemoteNG.Settings.Default.OverrideUICulture = string.Empty;
}
- Settings.Default.ShowDescriptionTooltipsInTree = chkShowDescriptionTooltipsInTree.Checked;
- Settings.Default.ShowCompleteConsPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked;
+ mRemoteNG.Settings.Default.ShowDescriptionTooltipsInTree = chkShowDescriptionTooltipsInTree.Checked;
+ mRemoteNG.Settings.Default.ShowCompleteConsPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked;
frmMain.Default.ShowFullPathInTitle = chkShowFullConnectionsFilePathInTitle.Checked;
- Settings.Default.ShowSystemTrayIcon = chkShowSystemTrayIcon.Checked;
- if (Settings.Default.ShowSystemTrayIcon)
+ mRemoteNG.Settings.Default.ShowSystemTrayIcon = chkShowSystemTrayIcon.Checked;
+ if (mRemoteNG.Settings.Default.ShowSystemTrayIcon)
{
if (Runtime.NotificationAreaIcon == null)
{
@@ -92,7 +92,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
}
}
- Settings.Default.MinimizeToTray = chkMinimizeToSystemTray.Checked;
+ mRemoteNG.Settings.Default.MinimizeToTray = chkMinimizeToSystemTray.Checked;
}
}
}
\ No newline at end of file
diff --git a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
index e00688c00..e5fc7098d 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/ConnectionsPage.cs
@@ -52,43 +52,43 @@ namespace mRemoteNG.UI.Forms.OptionsPages
base.SaveSettings();
chkSingleClickOnConnectionOpensIt.Checked =
- Convert.ToBoolean(Settings.Default.SingleClickOnConnectionOpensIt);
+ Convert.ToBoolean(mRemoteNG.Settings.Default.SingleClickOnConnectionOpensIt);
chkSingleClickOnOpenedConnectionSwitchesToIt.Checked =
- Convert.ToBoolean(Settings.Default.SingleClickSwitchesToOpenConnection);
- chkHostnameLikeDisplayName.Checked = Convert.ToBoolean(Settings.Default.SetHostnameLikeDisplayName);
+ Convert.ToBoolean(mRemoteNG.Settings.Default.SingleClickSwitchesToOpenConnection);
+ chkHostnameLikeDisplayName.Checked = Convert.ToBoolean(mRemoteNG.Settings.Default.SetHostnameLikeDisplayName);
- numRdpReconnectionCount.Value = Convert.ToDecimal(Settings.Default.RdpReconnectionCount);
+ numRdpReconnectionCount.Value = Convert.ToDecimal(mRemoteNG.Settings.Default.RdpReconnectionCount);
- numAutoSave.Value = Convert.ToDecimal(Settings.Default.AutoSaveEveryMinutes);
+ numAutoSave.Value = Convert.ToDecimal(mRemoteNG.Settings.Default.AutoSaveEveryMinutes);
// ReSharper disable once StringLiteralTypo
- if (Settings.Default.EmptyCredentials == "noinfo")
+ if (mRemoteNG.Settings.Default.EmptyCredentials == "noinfo")
{
radCredentialsNoInfo.Checked = true;
}
- else if (Settings.Default.EmptyCredentials == "windows")
+ else if (mRemoteNG.Settings.Default.EmptyCredentials == "windows")
{
radCredentialsWindows.Checked = true;
}
- else if (Settings.Default.EmptyCredentials == "custom")
+ else if (mRemoteNG.Settings.Default.EmptyCredentials == "custom")
{
radCredentialsCustom.Checked = true;
}
- txtCredentialsUsername.Text = Convert.ToString(Settings.Default.DefaultUsername);
- txtCredentialsPassword.Text = Crypt.Decrypt(Convert.ToString(Settings.Default.DefaultPassword),
+ txtCredentialsUsername.Text = Convert.ToString(mRemoteNG.Settings.Default.DefaultUsername);
+ txtCredentialsPassword.Text = Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.DefaultPassword),
GeneralAppInfo.EncryptionKey);
- txtCredentialsDomain.Text = Convert.ToString(Settings.Default.DefaultDomain);
+ txtCredentialsDomain.Text = Convert.ToString(mRemoteNG.Settings.Default.DefaultDomain);
- if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Never)
+ if (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Never)
{
radCloseWarnNever.Checked = true;
}
- else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Exit)
+ else if (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Exit)
{
radCloseWarnExit.Checked = true;
}
- else if (Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Multiple)
+ else if (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int) ConfirmCloseEnum.Multiple)
{
radCloseWarnMultiple.Checked = true;
}
@@ -100,16 +100,16 @@ namespace mRemoteNG.UI.Forms.OptionsPages
public override void SaveSettings()
{
- Settings.Default.SingleClickOnConnectionOpensIt = chkSingleClickOnConnectionOpensIt.Checked;
- Settings.Default.SingleClickSwitchesToOpenConnection = chkSingleClickOnOpenedConnectionSwitchesToIt.Checked;
- Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked;
+ mRemoteNG.Settings.Default.SingleClickOnConnectionOpensIt = chkSingleClickOnConnectionOpensIt.Checked;
+ mRemoteNG.Settings.Default.SingleClickSwitchesToOpenConnection = chkSingleClickOnOpenedConnectionSwitchesToIt.Checked;
+ mRemoteNG.Settings.Default.SetHostnameLikeDisplayName = chkHostnameLikeDisplayName.Checked;
- Settings.Default.RdpReconnectionCount = (int) numRdpReconnectionCount.Value;
+ mRemoteNG.Settings.Default.RdpReconnectionCount = (int) numRdpReconnectionCount.Value;
- Settings.Default.AutoSaveEveryMinutes = (int) numAutoSave.Value;
- if (Settings.Default.AutoSaveEveryMinutes > 0)
+ mRemoteNG.Settings.Default.AutoSaveEveryMinutes = (int) numAutoSave.Value;
+ if (mRemoteNG.Settings.Default.AutoSaveEveryMinutes > 0)
{
- frmMain.Default.tmrAutoSave.Interval = Convert.ToInt32(Settings.Default.AutoSaveEveryMinutes*60000);
+ frmMain.Default.tmrAutoSave.Interval = Convert.ToInt32(mRemoteNG.Settings.Default.AutoSaveEveryMinutes*60000);
frmMain.Default.tmrAutoSave.Enabled = true;
}
else
@@ -120,36 +120,36 @@ namespace mRemoteNG.UI.Forms.OptionsPages
if (radCredentialsNoInfo.Checked)
{
// ReSharper disable once StringLiteralTypo
- Settings.Default.EmptyCredentials = "noinfo";
+ mRemoteNG.Settings.Default.EmptyCredentials = "noinfo";
}
else if (radCredentialsWindows.Checked)
{
- Settings.Default.EmptyCredentials = "windows";
+ mRemoteNG.Settings.Default.EmptyCredentials = "windows";
}
else if (radCredentialsCustom.Checked)
{
- Settings.Default.EmptyCredentials = "custom";
+ mRemoteNG.Settings.Default.EmptyCredentials = "custom";
}
- Settings.Default.DefaultUsername = txtCredentialsUsername.Text;
- Settings.Default.DefaultPassword = Crypt.Encrypt(txtCredentialsPassword.Text, GeneralAppInfo.EncryptionKey);
- Settings.Default.DefaultDomain = txtCredentialsDomain.Text;
+ mRemoteNG.Settings.Default.DefaultUsername = txtCredentialsUsername.Text;
+ mRemoteNG.Settings.Default.DefaultPassword = Crypt.Encrypt(txtCredentialsPassword.Text, GeneralAppInfo.EncryptionKey);
+ mRemoteNG.Settings.Default.DefaultDomain = txtCredentialsDomain.Text;
if (radCloseWarnAll.Checked)
{
- Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.All;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.All;
}
if (radCloseWarnMultiple.Checked)
{
- Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Multiple;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Multiple;
}
if (radCloseWarnExit.Checked)
{
- Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Exit;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Exit;
}
if (radCloseWarnNever.Checked)
{
- Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Never;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection = (int) ConfirmCloseEnum.Never;
}
}
diff --git a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
index 8fd199cee..3a6db96f3 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/SqlServerPage.cs
@@ -38,22 +38,22 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- chkUseSQLServer.Checked = Settings.Default.UseSQLServer;
- txtSQLServer.Text = Settings.Default.SQLHost;
- txtSQLDatabaseName.Text = Settings.Default.SQLDatabaseName;
- txtSQLUsername.Text = Settings.Default.SQLUser;
- txtSQLPassword.Text = Crypt.Decrypt(Settings.Default.SQLPass, GeneralAppInfo.EncryptionKey);
+ chkUseSQLServer.Checked = mRemoteNG.Settings.Default.UseSQLServer;
+ txtSQLServer.Text = mRemoteNG.Settings.Default.SQLHost;
+ txtSQLDatabaseName.Text = mRemoteNG.Settings.Default.SQLDatabaseName;
+ txtSQLUsername.Text = mRemoteNG.Settings.Default.SQLUser;
+ txtSQLPassword.Text = Crypt.Decrypt(mRemoteNG.Settings.Default.SQLPass, GeneralAppInfo.EncryptionKey);
}
public override void SaveSettings()
{
base.SaveSettings();
- Settings.Default.UseSQLServer = chkUseSQLServer.Checked;
- Settings.Default.SQLHost = txtSQLServer.Text;
- Settings.Default.SQLDatabaseName = txtSQLDatabaseName.Text;
- Settings.Default.SQLUser = txtSQLUsername.Text;
- Settings.Default.SQLPass = Crypt.Encrypt(txtSQLPassword.Text, GeneralAppInfo.EncryptionKey);
+ mRemoteNG.Settings.Default.UseSQLServer = chkUseSQLServer.Checked;
+ mRemoteNG.Settings.Default.SQLHost = txtSQLServer.Text;
+ mRemoteNG.Settings.Default.SQLDatabaseName = txtSQLDatabaseName.Text;
+ mRemoteNG.Settings.Default.SQLUser = txtSQLUsername.Text;
+ mRemoteNG.Settings.Default.SQLPass = Crypt.Encrypt(txtSQLPassword.Text, GeneralAppInfo.EncryptionKey);
ReinitializeSqlUpdater();
}
@@ -62,8 +62,8 @@ namespace mRemoteNG.UI.Forms.OptionsPages
if (Runtime.SQLConnProvider != null)
{
Runtime.SQLConnProvider.Dispose();
- frmMain.Default.AreWeUsingSqlServerForSavingConnections = Settings.Default.UseSQLServer;
- if (Settings.Default.UseSQLServer)
+ frmMain.Default.AreWeUsingSqlServerForSavingConnections = mRemoteNG.Settings.Default.UseSQLServer;
+ if (mRemoteNG.Settings.Default.UseSQLServer)
{
Runtime.SQLConnProvider = new SqlConnectionsProvider();
Runtime.SQLConnProvider.Enable();
diff --git a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
index 8def215df..6cce36abb 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/StartupExitPage.cs
@@ -30,18 +30,18 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- Settings.Default.SaveConsOnExit = chkSaveConsOnExit.Checked;
- Settings.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked;
- Settings.Default.SingleInstance = chkSingleInstance.Checked;
- Settings.Default.StartupComponentsCheck = chkProperInstallationOfComponentsAtStartup.Checked;
+ mRemoteNG.Settings.Default.SaveConsOnExit = chkSaveConsOnExit.Checked;
+ mRemoteNG.Settings.Default.OpenConsFromLastSession = chkReconnectOnStart.Checked;
+ mRemoteNG.Settings.Default.SingleInstance = chkSingleInstance.Checked;
+ mRemoteNG.Settings.Default.StartupComponentsCheck = chkProperInstallationOfComponentsAtStartup.Checked;
}
public void StartupExitPage_Load(object sender, EventArgs e)
{
- chkSaveConsOnExit.Checked = Settings.Default.SaveConsOnExit;
- chkReconnectOnStart.Checked = Settings.Default.OpenConsFromLastSession;
- chkSingleInstance.Checked = Settings.Default.SingleInstance;
- chkProperInstallationOfComponentsAtStartup.Checked = Settings.Default.StartupComponentsCheck;
+ chkSaveConsOnExit.Checked = mRemoteNG.Settings.Default.SaveConsOnExit;
+ chkReconnectOnStart.Checked = mRemoteNG.Settings.Default.OpenConsFromLastSession;
+ chkSingleInstance.Checked = mRemoteNG.Settings.Default.SingleInstance;
+ chkProperInstallationOfComponentsAtStartup.Checked = mRemoteNG.Settings.Default.StartupComponentsCheck;
}
}
}
\ No newline at end of file
diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs
index 340c70a9f..72aa66e9c 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Forms.OptionsPages
{
[global::Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]
@@ -63,7 +65,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
this.chkIdentifyQuickConnectTabs.Name = "chkIdentifyQuickConnectTabs";
this.chkIdentifyQuickConnectTabs.Size = new System.Drawing.Size(293, 17);
this.chkIdentifyQuickConnectTabs.TabIndex = 16;
- this.chkIdentifyQuickConnectTabs.Text = global::mRemoteNG.My.Language.strIdentifyQuickConnectTabs;
+ this.chkIdentifyQuickConnectTabs.Text = Language.strIdentifyQuickConnectTabs;
this.chkIdentifyQuickConnectTabs.UseVisualStyleBackColor = true;
//
//chkUseOnlyErrorsAndInfosPanel
diff --git a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
index 7bad8870a..15e614c44 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/TabsPanelsPage.cs
@@ -39,38 +39,38 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- chkAlwaysShowPanelTabs.Checked = Settings.Default.AlwaysShowPanelTabs;
- chkOpenNewTabRightOfSelected.Checked = Settings.Default.OpenTabsRightOfSelected;
- chkShowLogonInfoOnTabs.Checked = Settings.Default.ShowLogonInfoOnTabs;
- chkShowProtocolOnTabs.Checked = Settings.Default.ShowProtocolOnTabs;
- chkIdentifyQuickConnectTabs.Checked = Settings.Default.IdentifyQuickConnectTabs;
- chkDoubleClickClosesTab.Checked = Settings.Default.DoubleClickOnTabClosesIt;
- chkAlwaysShowPanelSelectionDlg.Checked = Settings.Default.AlwaysShowPanelSelectionDlg;
+ chkAlwaysShowPanelTabs.Checked = mRemoteNG.Settings.Default.AlwaysShowPanelTabs;
+ chkOpenNewTabRightOfSelected.Checked = mRemoteNG.Settings.Default.OpenTabsRightOfSelected;
+ chkShowLogonInfoOnTabs.Checked = mRemoteNG.Settings.Default.ShowLogonInfoOnTabs;
+ chkShowProtocolOnTabs.Checked = mRemoteNG.Settings.Default.ShowProtocolOnTabs;
+ chkIdentifyQuickConnectTabs.Checked = mRemoteNG.Settings.Default.IdentifyQuickConnectTabs;
+ chkDoubleClickClosesTab.Checked = mRemoteNG.Settings.Default.DoubleClickOnTabClosesIt;
+ chkAlwaysShowPanelSelectionDlg.Checked = mRemoteNG.Settings.Default.AlwaysShowPanelSelectionDlg;
- chkUseOnlyErrorsAndInfosPanel.Checked = Settings.Default.ShowNoMessageBoxes;
- chkMCInformation.Checked = Settings.Default.SwitchToMCOnInformation;
- chkMCWarnings.Checked = Settings.Default.SwitchToMCOnWarning;
- chkMCErrors.Checked = Settings.Default.SwitchToMCOnError;
+ chkUseOnlyErrorsAndInfosPanel.Checked = mRemoteNG.Settings.Default.ShowNoMessageBoxes;
+ chkMCInformation.Checked = mRemoteNG.Settings.Default.SwitchToMCOnInformation;
+ chkMCWarnings.Checked = mRemoteNG.Settings.Default.SwitchToMCOnWarning;
+ chkMCErrors.Checked = mRemoteNG.Settings.Default.SwitchToMCOnError;
}
public override void SaveSettings()
{
base.SaveSettings();
- Settings.Default.AlwaysShowPanelTabs = chkAlwaysShowPanelTabs.Checked;
+ mRemoteNG.Settings.Default.AlwaysShowPanelTabs = chkAlwaysShowPanelTabs.Checked;
frmMain.Default.ShowHidePanelTabs();
- Settings.Default.OpenTabsRightOfSelected = chkOpenNewTabRightOfSelected.Checked;
- Settings.Default.ShowLogonInfoOnTabs = chkShowLogonInfoOnTabs.Checked;
- Settings.Default.ShowProtocolOnTabs = chkShowProtocolOnTabs.Checked;
- Settings.Default.IdentifyQuickConnectTabs = chkIdentifyQuickConnectTabs.Checked;
- Settings.Default.DoubleClickOnTabClosesIt = chkDoubleClickClosesTab.Checked;
- Settings.Default.AlwaysShowPanelSelectionDlg = chkAlwaysShowPanelSelectionDlg.Checked;
+ mRemoteNG.Settings.Default.OpenTabsRightOfSelected = chkOpenNewTabRightOfSelected.Checked;
+ mRemoteNG.Settings.Default.ShowLogonInfoOnTabs = chkShowLogonInfoOnTabs.Checked;
+ mRemoteNG.Settings.Default.ShowProtocolOnTabs = chkShowProtocolOnTabs.Checked;
+ mRemoteNG.Settings.Default.IdentifyQuickConnectTabs = chkIdentifyQuickConnectTabs.Checked;
+ mRemoteNG.Settings.Default.DoubleClickOnTabClosesIt = chkDoubleClickClosesTab.Checked;
+ mRemoteNG.Settings.Default.AlwaysShowPanelSelectionDlg = chkAlwaysShowPanelSelectionDlg.Checked;
- Settings.Default.ShowNoMessageBoxes = chkUseOnlyErrorsAndInfosPanel.Checked;
- Settings.Default.SwitchToMCOnInformation = chkMCInformation.Checked;
- Settings.Default.SwitchToMCOnWarning = chkMCWarnings.Checked;
- Settings.Default.SwitchToMCOnError = chkMCErrors.Checked;
+ mRemoteNG.Settings.Default.ShowNoMessageBoxes = chkUseOnlyErrorsAndInfosPanel.Checked;
+ mRemoteNG.Settings.Default.SwitchToMCOnInformation = chkMCInformation.Checked;
+ mRemoteNG.Settings.Default.SwitchToMCOnWarning = chkMCWarnings.Checked;
+ mRemoteNG.Settings.Default.SwitchToMCOnError = chkMCErrors.Checked;
}
public void chkUseOnlyErrorsAndInfosPanel_CheckedChanged(object sender, EventArgs e)
diff --git a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs
index 2302c451e..eaeb7fa3d 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/ThemePage.cs
@@ -46,7 +46,7 @@ namespace mRemoteNG.UI.Forms.OptionsPages
base.SaveSettings();
ThemeManager.SaveThemes(_themeList);
- Settings.Default.ThemeName = ThemeManager.ActiveTheme.Name;
+ mRemoteNG.Settings.Default.ThemeName = ThemeManager.ActiveTheme.Name;
}
public override void RevertSettings()
diff --git a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs
index 3eff18897..1d00c70c4 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/UpdatesPage.cs
@@ -61,26 +61,26 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- chkCheckForUpdatesOnStartup.Checked = Convert.ToBoolean(Settings.Default.CheckForUpdatesOnStartup);
+ chkCheckForUpdatesOnStartup.Checked = Convert.ToBoolean(mRemoteNG.Settings.Default.CheckForUpdatesOnStartup);
cboUpdateCheckFrequency.Enabled = chkCheckForUpdatesOnStartup.Checked;
cboUpdateCheckFrequency.Items.Clear();
var nDaily = cboUpdateCheckFrequency.Items.Add(Language.strUpdateFrequencyDaily);
var nWeekly = cboUpdateCheckFrequency.Items.Add(Language.strUpdateFrequencyWeekly);
var nMonthly = cboUpdateCheckFrequency.Items.Add(Language.strUpdateFrequencyMonthly);
- if (Settings.Default.CheckForUpdatesFrequencyDays < 1)
+ if (mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays < 1)
{
chkCheckForUpdatesOnStartup.Checked = false;
cboUpdateCheckFrequency.SelectedIndex = nDaily;
} // Daily
- else if (Settings.Default.CheckForUpdatesFrequencyDays == 1)
+ else if (mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays == 1)
{
cboUpdateCheckFrequency.SelectedIndex = nDaily;
} // Weekly
- else if (Settings.Default.CheckForUpdatesFrequencyDays == 7)
+ else if (mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays == 7)
{
cboUpdateCheckFrequency.SelectedIndex = nWeekly;
} // Monthly
- else if (Settings.Default.CheckForUpdatesFrequencyDays == 31)
+ else if (mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays == 31)
{
cboUpdateCheckFrequency.SelectedIndex = nMonthly;
}
@@ -88,22 +88,22 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
var nCustom =
cboUpdateCheckFrequency.Items.Add(string.Format(Language.strUpdateFrequencyCustom,
- Settings.Default.CheckForUpdatesFrequencyDays));
+ mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays));
cboUpdateCheckFrequency.SelectedIndex = nCustom;
}
- chkUseProxyForAutomaticUpdates.Checked = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
- pnlProxyBasic.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
- txtProxyAddress.Text = Convert.ToString(Settings.Default.UpdateProxyAddress);
- numProxyPort.Value = Convert.ToDecimal(Settings.Default.UpdateProxyPort);
+ chkUseProxyForAutomaticUpdates.Checked = Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateUseProxy);
+ pnlProxyBasic.Enabled = Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateUseProxy);
+ txtProxyAddress.Text = Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAddress);
+ numProxyPort.Value = Convert.ToDecimal(mRemoteNG.Settings.Default.UpdateProxyPort);
- chkUseProxyAuthentication.Checked = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication);
- pnlProxyAuthentication.Enabled = Convert.ToBoolean(Settings.Default.UpdateProxyUseAuthentication);
- txtProxyUsername.Text = Convert.ToString(Settings.Default.UpdateProxyAuthUser);
- txtProxyPassword.Text = Crypt.Decrypt(Convert.ToString(Settings.Default.UpdateProxyAuthPass),
+ chkUseProxyAuthentication.Checked = Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateProxyUseAuthentication);
+ pnlProxyAuthentication.Enabled = Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateProxyUseAuthentication);
+ txtProxyUsername.Text = Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAuthUser);
+ txtProxyPassword.Text = Crypt.Decrypt(Convert.ToString(mRemoteNG.Settings.Default.UpdateProxyAuthPass),
GeneralAppInfo.EncryptionKey);
- btnTestProxy.Enabled = Convert.ToBoolean(Settings.Default.UpdateUseProxy);
+ btnTestProxy.Enabled = Convert.ToBoolean(mRemoteNG.Settings.Default.UpdateUseProxy);
#if PORTABLE
foreach (Control Control in Controls)
@@ -120,27 +120,27 @@ namespace mRemoteNG.UI.Forms.OptionsPages
{
base.SaveSettings();
- Settings.Default.CheckForUpdatesOnStartup = chkCheckForUpdatesOnStartup.Checked;
+ mRemoteNG.Settings.Default.CheckForUpdatesOnStartup = chkCheckForUpdatesOnStartup.Checked;
if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.strUpdateFrequencyDaily)
{
- Settings.Default.CheckForUpdatesFrequencyDays = 1;
+ mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays = 1;
}
else if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.strUpdateFrequencyWeekly)
{
- Settings.Default.CheckForUpdatesFrequencyDays = 7;
+ mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays = 7;
}
else if (cboUpdateCheckFrequency.SelectedItem.ToString() == Language.strUpdateFrequencyMonthly)
{
- Settings.Default.CheckForUpdatesFrequencyDays = 31;
+ mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays = 31;
}
- Settings.Default.UpdateUseProxy = chkUseProxyForAutomaticUpdates.Checked;
- Settings.Default.UpdateProxyAddress = txtProxyAddress.Text;
- Settings.Default.UpdateProxyPort = (int) numProxyPort.Value;
+ mRemoteNG.Settings.Default.UpdateUseProxy = chkUseProxyForAutomaticUpdates.Checked;
+ mRemoteNG.Settings.Default.UpdateProxyAddress = txtProxyAddress.Text;
+ mRemoteNG.Settings.Default.UpdateProxyPort = (int) numProxyPort.Value;
- Settings.Default.UpdateProxyUseAuthentication = chkUseProxyAuthentication.Checked;
- Settings.Default.UpdateProxyAuthUser = txtProxyUsername.Text;
- Settings.Default.UpdateProxyAuthPass = Crypt.Encrypt(txtProxyPassword.Text, GeneralAppInfo.EncryptionKey);
+ mRemoteNG.Settings.Default.UpdateProxyUseAuthentication = chkUseProxyAuthentication.Checked;
+ mRemoteNG.Settings.Default.UpdateProxyAuthUser = txtProxyUsername.Text;
+ mRemoteNG.Settings.Default.UpdateProxyAuthPass = Crypt.Encrypt(txtProxyPassword.Text, GeneralAppInfo.EncryptionKey);
}
#endregion
diff --git a/mRemoteV1/UI/Forms/PasswordForm.Designer.cs b/mRemoteV1/UI/Forms/PasswordForm.Designer.cs
index c210df293..3d156eb72 100644
--- a/mRemoteV1/UI/Forms/PasswordForm.Designer.cs
+++ b/mRemoteV1/UI/Forms/PasswordForm.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.Forms
{
[global::Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]public
@@ -73,7 +75,7 @@ namespace mRemoteNG.Forms
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(75, 23);
this.btnOK.TabIndex = 7;
- this.btnOK.Text = mRemoteNG.My.Language.strButtonOK;
+ this.btnOK.Text = Language.strButtonOK;
this.btnOK.UseVisualStyleBackColor = true;
//
//btnCancel
@@ -84,7 +86,7 @@ namespace mRemoteNG.Forms
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(75, 23);
this.btnCancel.TabIndex = 6;
- this.btnCancel.Text = global::mRemoteNG.My.Language.strButtonCancel;
+ this.btnCancel.Text = Language.strButtonCancel;
this.btnCancel.UseVisualStyleBackColor = true;
//
//lblStatus
@@ -102,7 +104,7 @@ namespace mRemoteNG.Forms
//
//pbLock
//
- this.pbLock.Image = My.Resources.Lock;
+ this.pbLock.Image = Resources.Lock;
this.pbLock.Location = new System.Drawing.Point(12, 12);
this.pbLock.Name = "pbLock";
this.pbLock.Size = new System.Drawing.Size(64, 64);
diff --git a/mRemoteV1/UI/Forms/SplashPage.Designer.cs b/mRemoteV1/UI/Forms/SplashPage.Designer.cs
index 5ad1b98d1..c7cf44c7e 100644
--- a/mRemoteV1/UI/Forms/SplashPage.Designer.cs
+++ b/mRemoteV1/UI/Forms/SplashPage.Designer.cs
@@ -1,4 +1,6 @@
-namespace mRemoteNG.UI.Forms
+using mRemoteNG.My;
+
+namespace mRemoteNG.UI.Forms
{
partial class SplashPage
{
@@ -34,7 +36,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.BackgroundImage = global::mRemoteNG.My.Resources.Logo;
+ this.BackgroundImage = Resources.Logo;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.ClientSize = new System.Drawing.Size(492, 128);
this.ControlBox = false;
diff --git a/mRemoteV1/UI/Forms/frmChoosePanel.Designer.cs b/mRemoteV1/UI/Forms/frmChoosePanel.Designer.cs
index 581640721..e09cac30a 100644
--- a/mRemoteV1/UI/Forms/frmChoosePanel.Designer.cs
+++ b/mRemoteV1/UI/Forms/frmChoosePanel.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG
{
[global::Microsoft.VisualBasic.CompilerServices.DesignerGenerated()]
@@ -57,7 +59,7 @@ namespace mRemoteNG
this.btnOK.Name = "btnOK";
this.btnOK.Size = new System.Drawing.Size(69, 23);
this.btnOK.TabIndex = 20;
- this.btnOK.Text = My.Language.strButtonOK;
+ this.btnOK.Text = Language.strButtonOK;
this.btnOK.UseVisualStyleBackColor = true;
//
//lblDescription
@@ -66,18 +68,18 @@ namespace mRemoteNG
this.lblDescription.Name = "lblDescription";
this.lblDescription.Size = new System.Drawing.Size(229, 29);
this.lblDescription.TabIndex = 0;
- this.lblDescription.Text = My.Language.strLabelSelectPanel;
+ this.lblDescription.Text = Language.strLabelSelectPanel;
//
//btnNew
//
this.btnNew.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnNew.Image = My.Resources.Panel_Add;
+ this.btnNew.Image = Resources.Panel_Add;
this.btnNew.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnNew.Location = new System.Drawing.Point(10, 44);
this.btnNew.Name = "btnNew";
this.btnNew.Size = new System.Drawing.Size(57, 23);
this.btnNew.TabIndex = 40;
- this.btnNew.Text = My.Language.strButtonNew;
+ this.btnNew.Text = Language.strButtonNew;
this.btnNew.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.btnNew.UseVisualStyleBackColor = true;
//
@@ -89,7 +91,7 @@ namespace mRemoteNG
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(69, 23);
this.btnCancel.TabIndex = 30;
- this.btnCancel.Text = My.Language.strButtonCancel;
+ this.btnCancel.Text = Language.strButtonCancel;
this.btnCancel.UseVisualStyleBackColor = true;
//
//frmChoosePanel
@@ -105,13 +107,13 @@ namespace mRemoteNG
this.Controls.Add(this.btnOK);
this.Controls.Add(this.cbPanels);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
- this.Icon = My.Resources.Panels_Icon;
+ this.Icon = Resources.Panels_Icon;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "frmChoosePanel";
this.ShowInTaskbar = false;
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
- this.Text = My.Language.strTitleSelectPanel;
+ this.Text = Language.strTitleSelectPanel;
this.ResumeLayout(false);
}
diff --git a/mRemoteV1/UI/Forms/frmChoosePanel.cs b/mRemoteV1/UI/Forms/frmChoosePanel.cs
index fed26dc2d..f622711d0 100644
--- a/mRemoteV1/UI/Forms/frmChoosePanel.cs
+++ b/mRemoteV1/UI/Forms/frmChoosePanel.cs
@@ -1,5 +1,6 @@
using Microsoft.VisualBasic;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG
{
@@ -30,11 +31,11 @@ namespace mRemoteNG
private void ApplyLanguage()
{
- btnOK.Text = My.Language.strButtonOK;
- lblDescription.Text = My.Language.strLabelSelectPanel;
- btnNew.Text = My.Language.strButtonNew;
- btnCancel.Text = My.Language.strButtonCancel;
- Text = My.Language.strTitleSelectPanel;
+ btnOK.Text = Language.strButtonOK;
+ lblDescription.Text = Language.strLabelSelectPanel;
+ btnNew.Text = Language.strButtonNew;
+ btnCancel.Text = Language.strButtonCancel;
+ Text = Language.strTitleSelectPanel;
}
private void AddAvailablePanels()
@@ -61,7 +62,7 @@ namespace mRemoteNG
public void btnNew_Click(System.Object sender, System.EventArgs e)
{
- string pnlName = Interaction.InputBox(My.Language.strPanelName + ":", My.Language.strNewPanel, My.Language.strNewPanel);
+ string pnlName = Interaction.InputBox(Language.strPanelName + ":", Language.strNewPanel, Language.strNewPanel);
if (!string.IsNullOrEmpty(pnlName))
{
diff --git a/mRemoteV1/UI/Forms/frmMain.Designer.cs b/mRemoteV1/UI/Forms/frmMain.Designer.cs
index 5ab88a41b..af23689cb 100644
--- a/mRemoteV1/UI/Forms/frmMain.Designer.cs
+++ b/mRemoteV1/UI/Forms/frmMain.Designer.cs
@@ -1,3 +1,5 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Forms
{
public partial class frmMain : System.Windows.Forms.Form
@@ -273,7 +275,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileNewConnection
//
- this.mMenFileNewConnection.Image = My.Resources.Connection_Add;
+ this.mMenFileNewConnection.Image = Resources.Connection_Add;
this.mMenFileNewConnection.Name = "mMenFileNewConnection";
this.mMenFileNewConnection.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.N);
this.mMenFileNewConnection.Size = new System.Drawing.Size(281, 22);
@@ -281,7 +283,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileNewFolder
//
- this.mMenFileNewFolder.Image = My.Resources.Folder_Add;
+ this.mMenFileNewFolder.Image = Resources.Folder_Add;
this.mMenFileNewFolder.Name = "mMenFileNewFolder";
this.mMenFileNewFolder.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.N);
@@ -295,14 +297,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileNew
//
- this.mMenFileNew.Image = My.Resources.Connections_New;
+ this.mMenFileNew.Image = Resources.Connections_New;
this.mMenFileNew.Name = "mMenFileNew";
this.mMenFileNew.Size = new System.Drawing.Size(281, 22);
this.mMenFileNew.Text = "New Connection File";
//
//mMenFileLoad
//
- this.mMenFileLoad.Image = My.Resources.Connections_Load;
+ this.mMenFileLoad.Image = Resources.Connections_Load;
this.mMenFileLoad.Name = "mMenFileLoad";
this.mMenFileLoad.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O);
this.mMenFileLoad.Size = new System.Drawing.Size(281, 22);
@@ -310,7 +312,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileSave
//
- this.mMenFileSave.Image = My.Resources.Connections_Save;
+ this.mMenFileSave.Image = Resources.Connections_Save;
this.mMenFileSave.Name = "mMenFileSave";
this.mMenFileSave.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S);
this.mMenFileSave.Size = new System.Drawing.Size(281, 22);
@@ -318,7 +320,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileSaveAs
//
- this.mMenFileSaveAs.Image = My.Resources.Connections_SaveAs;
+ this.mMenFileSaveAs.Image = Resources.Connections_SaveAs;
this.mMenFileSaveAs.Name = "mMenFileSaveAs";
this.mMenFileSaveAs.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.S);
@@ -368,21 +370,21 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileDelete
//
- this.mMenFileDelete.Image = My.Resources.Delete;
+ this.mMenFileDelete.Image = Resources.Delete;
this.mMenFileDelete.Name = "mMenFileDelete";
this.mMenFileDelete.Size = new System.Drawing.Size(281, 22);
this.mMenFileDelete.Text = "Delete...";
//
//mMenFileRename
//
- this.mMenFileRename.Image = My.Resources.Rename;
+ this.mMenFileRename.Image = Resources.Rename;
this.mMenFileRename.Name = "mMenFileRename";
this.mMenFileRename.Size = new System.Drawing.Size(281, 22);
this.mMenFileRename.Text = "Rename";
//
//mMenFileDuplicate
//
- this.mMenFileDuplicate.Image = My.Resources.page_copy;
+ this.mMenFileDuplicate.Image = Resources.page_copy;
this.mMenFileDuplicate.Name = "mMenFileDuplicate";
this.mMenFileDuplicate.Size = new System.Drawing.Size(281, 22);
this.mMenFileDuplicate.Text = "Duplicate";
@@ -394,7 +396,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenFileExit
//
- this.mMenFileExit.Image = My.Resources.Quit;
+ this.mMenFileExit.Image = Resources.Quit;
this.mMenFileExit.Name = "mMenFileExit";
this.mMenFileExit.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Alt | System.Windows.Forms.Keys.F4);
this.mMenFileExit.Size = new System.Drawing.Size(281, 22);
@@ -409,14 +411,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenViewAddConnectionPanel
//
- this.mMenViewAddConnectionPanel.Image = My.Resources.Panel_Add;
+ this.mMenViewAddConnectionPanel.Image = Resources.Panel_Add;
this.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel";
this.mMenViewAddConnectionPanel.Size = new System.Drawing.Size(228, 22);
this.mMenViewAddConnectionPanel.Text = "Add Connection Panel";
//
//mMenViewConnectionPanels
//
- this.mMenViewConnectionPanels.Image = My.Resources.Panels;
+ this.mMenViewConnectionPanels.Image = Resources.Panels;
this.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels";
this.mMenViewConnectionPanels.Size = new System.Drawing.Size(228, 22);
this.mMenViewConnectionPanels.Text = "Connection Panels";
@@ -430,7 +432,7 @@ namespace mRemoteNG.UI.Forms
//
this.mMenViewConnections.Checked = true;
this.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked;
- this.mMenViewConnections.Image = My.Resources.Root;
+ this.mMenViewConnections.Image = Resources.Root;
this.mMenViewConnections.Name = "mMenViewConnections";
this.mMenViewConnections.Size = new System.Drawing.Size(228, 22);
this.mMenViewConnections.Text = "Connections";
@@ -439,7 +441,7 @@ namespace mRemoteNG.UI.Forms
//
this.mMenViewConfig.Checked = true;
this.mMenViewConfig.CheckState = System.Windows.Forms.CheckState.Checked;
- this.mMenViewConfig.Image = My.Resources.cog;
+ this.mMenViewConfig.Image = Resources.cog;
this.mMenViewConfig.Name = "mMenViewConfig";
this.mMenViewConfig.Size = new System.Drawing.Size(228, 22);
this.mMenViewConfig.Text = "Config";
@@ -448,7 +450,7 @@ namespace mRemoteNG.UI.Forms
//
this.mMenViewErrorsAndInfos.Checked = true;
this.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked;
- this.mMenViewErrorsAndInfos.Image = My.Resources.ErrorsAndInfos;
+ this.mMenViewErrorsAndInfos.Image = Resources.ErrorsAndInfos;
this.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos";
this.mMenViewErrorsAndInfos.Size = new System.Drawing.Size(228, 22);
this.mMenViewErrorsAndInfos.Text = "Errors and Infos";
@@ -468,14 +470,14 @@ namespace mRemoteNG.UI.Forms
//mMenViewJumpTo
//
this.mMenViewJumpTo.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.mMenViewJumpToConnectionsConfig, this.mMenViewJumpToErrorsInfos});
- this.mMenViewJumpTo.Image = My.Resources.JumpTo;
+ this.mMenViewJumpTo.Image = Resources.JumpTo;
this.mMenViewJumpTo.Name = "mMenViewJumpTo";
this.mMenViewJumpTo.Size = new System.Drawing.Size(228, 22);
this.mMenViewJumpTo.Text = "Jump To";
//
//mMenViewJumpToConnectionsConfig
//
- this.mMenViewJumpToConnectionsConfig.Image = My.Resources.Root;
+ this.mMenViewJumpToConnectionsConfig.Image = Resources.Root;
this.mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig";
this.mMenViewJumpToConnectionsConfig.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt)
| System.Windows.Forms.Keys.C);
@@ -484,7 +486,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenViewJumpToErrorsInfos
//
- this.mMenViewJumpToErrorsInfos.Image = My.Resources.InformationSmall;
+ this.mMenViewJumpToErrorsInfos.Image = Resources.InformationSmall;
this.mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos";
this.mMenViewJumpToErrorsInfos.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Alt)
| System.Windows.Forms.Keys.E);
@@ -493,7 +495,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenViewResetLayout
//
- this.mMenViewResetLayout.Image = My.Resources.application_side_tree;
+ this.mMenViewResetLayout.Image = Resources.application_side_tree;
this.mMenViewResetLayout.Name = "mMenViewResetLayout";
this.mMenViewResetLayout.Size = new System.Drawing.Size(228, 22);
this.mMenViewResetLayout.Text = "Reset Layout";
@@ -505,14 +507,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenViewQuickConnectToolbar
//
- this.mMenViewQuickConnectToolbar.Image = My.Resources.Play_Quick;
+ this.mMenViewQuickConnectToolbar.Image = Resources.Play_Quick;
this.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar";
this.mMenViewQuickConnectToolbar.Size = new System.Drawing.Size(228, 22);
this.mMenViewQuickConnectToolbar.Text = "Quick Connect Toolbar";
//
//mMenViewExtAppsToolbar
//
- this.mMenViewExtAppsToolbar.Image = My.Resources.ExtApp;
+ this.mMenViewExtAppsToolbar.Image = Resources.ExtApp;
this.mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar";
this.mMenViewExtAppsToolbar.Size = new System.Drawing.Size(228, 22);
this.mMenViewExtAppsToolbar.Text = "External Applications Toolbar";
@@ -524,7 +526,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenViewFullscreen
//
- this.mMenViewFullscreen.Image = My.Resources.arrow_out;
+ this.mMenViewFullscreen.Image = Resources.arrow_out;
this.mMenViewFullscreen.Name = "mMenViewFullscreen";
this.mMenViewFullscreen.ShortcutKeys = System.Windows.Forms.Keys.F11;
this.mMenViewFullscreen.Size = new System.Drawing.Size(228, 22);
@@ -539,14 +541,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenToolsSSHTransfer
//
- this.mMenToolsSSHTransfer.Image = My.Resources.SSHTransfer;
+ this.mMenToolsSSHTransfer.Image = Resources.SSHTransfer;
this.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer";
this.mMenToolsSSHTransfer.Size = new System.Drawing.Size(184, 22);
this.mMenToolsSSHTransfer.Text = "SSH File Transfer";
//
//mMenToolsUVNCSC
//
- this.mMenToolsUVNCSC.Image = My.Resources.UVNC_SC;
+ this.mMenToolsUVNCSC.Image = Resources.UVNC_SC;
this.mMenToolsUVNCSC.Name = "mMenToolsUVNCSC";
this.mMenToolsUVNCSC.Size = new System.Drawing.Size(184, 22);
this.mMenToolsUVNCSC.Text = "UltraVNC SingleClick";
@@ -554,14 +556,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenToolsExternalApps
//
- this.mMenToolsExternalApps.Image = My.Resources.ExtApp;
+ this.mMenToolsExternalApps.Image = Resources.ExtApp;
this.mMenToolsExternalApps.Name = "mMenToolsExternalApps";
this.mMenToolsExternalApps.Size = new System.Drawing.Size(184, 22);
this.mMenToolsExternalApps.Text = "External Applications";
//
//mMenToolsPortScan
//
- this.mMenToolsPortScan.Image = My.Resources.PortScan;
+ this.mMenToolsPortScan.Image = Resources.PortScan;
this.mMenToolsPortScan.Name = "mMenToolsPortScan";
this.mMenToolsPortScan.Size = new System.Drawing.Size(184, 22);
this.mMenToolsPortScan.Text = "Port Scan";
@@ -573,7 +575,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenToolsComponentsCheck
//
- this.mMenToolsComponentsCheck.Image = My.Resources.cog_error;
+ this.mMenToolsComponentsCheck.Image = Resources.cog_error;
this.mMenToolsComponentsCheck.Name = "mMenToolsComponentsCheck";
this.mMenToolsComponentsCheck.Size = new System.Drawing.Size(184, 22);
this.mMenToolsComponentsCheck.Text = "Components Check";
@@ -615,21 +617,21 @@ namespace mRemoteNG.UI.Forms
//
//mMenInfoDonate
//
- this.mMenInfoDonate.Image = My.Resources.Donate;
+ this.mMenInfoDonate.Image = Resources.Donate;
this.mMenInfoDonate.Name = "mMenInfoDonate";
this.mMenInfoDonate.Size = new System.Drawing.Size(190, 22);
this.mMenInfoDonate.Text = "Donate";
//
//mMenInfoForum
//
- this.mMenInfoForum.Image = My.Resources.user_comment;
+ this.mMenInfoForum.Image = Resources.user_comment;
this.mMenInfoForum.Name = "mMenInfoForum";
this.mMenInfoForum.Size = new System.Drawing.Size(190, 22);
this.mMenInfoForum.Text = "Support Forum";
//
//mMenInfoBugReport
//
- this.mMenInfoBugReport.Image = My.Resources.Bug;
+ this.mMenInfoBugReport.Image = Resources.Bug;
this.mMenInfoBugReport.Name = "mMenInfoBugReport";
this.mMenInfoBugReport.Size = new System.Drawing.Size(190, 22);
this.mMenInfoBugReport.Text = "Report a Bug";
@@ -641,14 +643,14 @@ namespace mRemoteNG.UI.Forms
//
//mMenInfoAnnouncements
//
- this.mMenInfoAnnouncements.Image = My.Resources.News;
+ this.mMenInfoAnnouncements.Image = Resources.News;
this.mMenInfoAnnouncements.Name = "mMenInfoAnnouncements";
this.mMenInfoAnnouncements.Size = new System.Drawing.Size(190, 22);
this.mMenInfoAnnouncements.Text = "Announcements";
//
//mMenToolsUpdate
//
- this.mMenToolsUpdate.Image = My.Resources.Update;
+ this.mMenToolsUpdate.Image = Resources.Update;
this.mMenToolsUpdate.Name = "mMenToolsUpdate";
this.mMenToolsUpdate.Size = new System.Drawing.Size(190, 22);
this.mMenToolsUpdate.Text = "Check for Updates";
@@ -660,7 +662,7 @@ namespace mRemoteNG.UI.Forms
//
//mMenInfoAbout
//
- this.mMenInfoAbout.Image = My.Resources.mRemote;
+ this.mMenInfoAbout.Image = Resources.mRemote;
this.mMenInfoAbout.Name = "mMenInfoAbout";
this.mMenInfoAbout.Size = new System.Drawing.Size(190, 22);
this.mMenInfoAbout.Text = "About mRemoteNG";
@@ -732,7 +734,7 @@ namespace mRemoteNG.UI.Forms
//btnQuickConnect
//
this.btnQuickConnect.DropDown = this.mnuQuickConnectProtocol;
- this.btnQuickConnect.Image = My.Resources.Play_Quick;
+ this.btnQuickConnect.Image = Resources.Play_Quick;
this.btnQuickConnect.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnQuickConnect.Margin = new System.Windows.Forms.Padding(0, 1, 3, 2);
this.btnQuickConnect.Name = "btnQuickConnect";
@@ -751,7 +753,7 @@ namespace mRemoteNG.UI.Forms
//
this.btnConnections.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btnConnections.DropDown = this.mnuConnections;
- this.btnConnections.Image = My.Resources.Root;
+ this.btnConnections.Image = Resources.Root;
this.btnConnections.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.btnConnections.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btnConnections.Name = "btnConnections";
@@ -801,7 +803,7 @@ namespace mRemoteNG.UI.Forms
//
//ToolStripButton1
//
- this.ToolStripButton1.Image = My.Resources.Play;
+ this.ToolStripButton1.Image = Resources.Play;
this.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripButton1.Name = "ToolStripButton1";
this.ToolStripButton1.Size = new System.Drawing.Size(72, 22);
@@ -809,7 +811,7 @@ namespace mRemoteNG.UI.Forms
//
//ToolStripButton2
//
- this.ToolStripButton2.Image = My.Resources.Screenshot;
+ this.ToolStripButton2.Image = Resources.Screenshot;
this.ToolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripButton2.Name = "ToolStripButton2";
this.ToolStripButton2.Size = new System.Drawing.Size(85, 22);
@@ -817,7 +819,7 @@ namespace mRemoteNG.UI.Forms
//
//ToolStripButton3
//
- this.ToolStripButton3.Image = My.Resources.Refresh;
+ this.ToolStripButton3.Image = Resources.Refresh;
this.ToolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripButton3.Name = "ToolStripButton3";
this.ToolStripButton3.Size = new System.Drawing.Size(66, 22);
@@ -827,7 +829,7 @@ namespace mRemoteNG.UI.Forms
//
this.ToolStripSplitButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.ToolStripSplitButton1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.ToolStripMenuItem1, this.ToolStripMenuItem2});
- this.ToolStripSplitButton1.Image = My.Resources.Keyboard;
+ this.ToolStripSplitButton1.Image = Resources.Keyboard;
this.ToolStripSplitButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.ToolStripSplitButton1.Name = "ToolStripSplitButton1";
this.ToolStripSplitButton1.Size = new System.Drawing.Size(29, 22);
@@ -855,7 +857,7 @@ namespace mRemoteNG.UI.Forms
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(842, 523);
this.Controls.Add(this.tsContainer);
- this.Icon = My.Resources.mRemote_Icon;
+ this.Icon = Resources.mRemote_Icon;
this.MainMenuStrip = this.msMain;
this.Name = "frmMain";
this.Opacity = 0.0D;
diff --git a/mRemoteV1/UI/Forms/frmMain.cs b/mRemoteV1/UI/Forms/frmMain.cs
index d7455bc5e..c8faaeec9 100644
--- a/mRemoteV1/UI/Forms/frmMain.cs
+++ b/mRemoteV1/UI/Forms/frmMain.cs
@@ -45,7 +45,7 @@ namespace mRemoteNG.UI.Forms
#region Constructors
public frmMain()
{
- _showFullPathInTitle = Settings.Default.ShowCompleteConsPathInTitle;
+ _showFullPathInTitle = mRemoteNG.Settings.Default.ShowCompleteConsPathInTitle;
InitializeComponent();
//Added to support default instance behavour in C#. This should be removed at the earliest opportunity.
if (_defaultInstance == null)
@@ -188,7 +188,7 @@ namespace mRemoteNG.UI.Forms
Windows.treePanel.Focus();
ConnectionTree.TreeView = Windows.treeForm.tvConnections;
- if (Settings.Default.FirstStart && !Settings.Default.LoadConsFromCustomLocation && !System.IO.File.Exists(Runtime.GetStartupConnectionFileName()))
+ if (mRemoteNG.Settings.Default.FirstStart && !mRemoteNG.Settings.Default.LoadConsFromCustomLocation && !System.IO.File.Exists(Runtime.GetStartupConnectionFileName()))
{
Runtime.NewConnections(Runtime.GetStartupConnectionFileName());
}
@@ -201,7 +201,7 @@ namespace mRemoteNG.UI.Forms
return ;
}
Config.Putty.Sessions.StartWatcher();
- if (Settings.Default.StartupComponentsCheck)
+ if (mRemoteNG.Settings.Default.StartupComponentsCheck)
{
Windows.Show(WindowType.ComponentsCheck);
}
@@ -332,13 +332,13 @@ namespace mRemoteNG.UI.Forms
#if PORTABLE
return ;
#endif
-// if (!My.Settings.Default.CheckForUpdatesAsked)
+// if (!mRemoteNG.Settings.Default.CheckForUpdatesAsked)
// {
-// string[] commandButtons = new string[] {My.Language.strAskUpdatesCommandRecommended, My.Language.strAskUpdatesCommandCustom, My.Language.strAskUpdatesCommandAskLater};
-// cTaskDialog.ShowTaskDialogBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, My.Language.strAskUpdatesMainInstruction, string.Format(My.Language.strAskUpdatesContent, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName), "", "", "", "", string.Join("|", commandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question);
+// string[] commandButtons = new string[] {Language.strAskUpdatesCommandRecommended, Language.strAskUpdatesCommandCustom, Language.strAskUpdatesCommandAskLater};
+// cTaskDialog.ShowTaskDialogBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, Language.strAskUpdatesMainInstruction, string.Format(Language.strAskUpdatesContent, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName), "", "", "", "", string.Join("|", commandButtons), eTaskDialogButtons.None, eSysIcons.Question, eSysIcons.Question);
// if (cTaskDialog.CommandButtonResult == 0 | cTaskDialog.CommandButtonResult == 1)
// {
-// My.Settings.Default.CheckForUpdatesAsked = true;
+// mRemoteNG.Settings.Default.CheckForUpdatesAsked = true;
// }
// if (cTaskDialog.CommandButtonResult == 1)
// {
@@ -347,13 +347,13 @@ namespace mRemoteNG.UI.Forms
// return ;
// }
-// if (!My.Settings.Default.CheckForUpdatesOnStartup)
+// if (!mRemoteNG.Settings.Default.CheckForUpdatesOnStartup)
// {
// return ;
// }
-// DateTime nextUpdateCheck = System.Convert.ToDateTime(My.Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(System.Convert.ToDouble(My.Settings.Default.CheckForUpdatesFrequencyDays))));
-// if (My.Settings.Default.UpdatePending || DateTime.UtcNow > nextUpdateCheck)
+// DateTime nextUpdateCheck = System.Convert.ToDateTime(mRemoteNG.Settings.Default.CheckForUpdatesLastCheck.Add(TimeSpan.FromDays(System.Convert.ToDouble(mRemoteNG.Settings.Default.CheckForUpdatesFrequencyDays))));
+// if (mRemoteNG.Settings.Default.UpdatePending || DateTime.UtcNow > nextUpdateCheck)
// {
// if (!IsHandleCreated)
// {
@@ -377,12 +377,12 @@ namespace mRemoteNG.UI.Forms
openConnections = openConnections + connectionWindow.TabController.TabPages.Count;
}
- if (openConnections > 0 && (Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All | (Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & openConnections > 1) || Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Exit))
+ if (openConnections > 0 && (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All | (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & openConnections > 1) || mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Exit))
{
DialogResult result = cTaskDialog.MessageBox(this, System.Windows.Forms.Application.ProductName, Language.strConfirmExitMainInstruction, "", "", "", Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, eSysIcons.Question);
if (cTaskDialog.VerificationChecked)
{
- Settings.Default.ConfirmCloseConnection--;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection--;
}
if (result == DialogResult.No)
{
@@ -857,10 +857,10 @@ namespace mRemoteNG.UI.Forms
if (!(fieldInfo.Name == "value__" || fieldInfo.Name == "IntApp"))
{
ToolStripMenuItem menuItem = new ToolStripMenuItem(fieldInfo.Name);
- if (fieldInfo.Name == Settings.Default.QuickConnectProtocol)
+ if (fieldInfo.Name == mRemoteNG.Settings.Default.QuickConnectProtocol)
{
menuItem.Checked = true;
- btnQuickConnect.Text = Settings.Default.QuickConnectProtocol;
+ btnQuickConnect.Text = mRemoteNG.Settings.Default.QuickConnectProtocol;
}
mnuQuickConnectProtocol.Items.Add(menuItem);
}
@@ -886,7 +886,7 @@ namespace mRemoteNG.UI.Forms
{
try
{
- ConnectionInfo connectionInfo = Runtime.CreateQuickConnect(cmbQuickConnect.Text.Trim(), Connection.Protocol.Converter.StringToProtocol(Settings.Default.QuickConnectProtocol));
+ ConnectionInfo connectionInfo = Runtime.CreateQuickConnect(cmbQuickConnect.Text.Trim(), Connection.Protocol.Converter.StringToProtocol(mRemoteNG.Settings.Default.QuickConnectProtocol));
if (connectionInfo == null)
{
cmbQuickConnect.Focus();
@@ -913,7 +913,7 @@ namespace mRemoteNG.UI.Forms
private void SetQuickConnectProtocol(string protocol)
{
- Settings.Default.QuickConnectProtocol = protocol;
+ mRemoteNG.Settings.Default.QuickConnectProtocol = protocol;
btnQuickConnect.Text = protocol;
foreach (ToolStripMenuItem menuItem in mnuQuickConnectProtocol.Items)
{
@@ -985,7 +985,7 @@ namespace mRemoteNG.UI.Forms
if (Tree.ConnectionTreeNode.GetNodeType(treeNode) == TreeNodeType.Container)
{
- menuItem.Image = My.Resources.Folder;
+ menuItem.Image = Resources.Folder;
menuItem.Tag = treeNode.Tag;
toolStripMenuItem.DropDownItems.Add(menuItem);
@@ -1030,7 +1030,7 @@ namespace mRemoteNG.UI.Forms
{
if (WindowState == FormWindowState.Minimized)
{
- if (Settings.Default.MinimizeToTray)
+ if (mRemoteNG.Settings.Default.MinimizeToTray)
{
if (Runtime.NotificationAreaIcon == null)
{
@@ -1203,7 +1203,7 @@ namespace mRemoteNG.UI.Forms
if (!string.IsNullOrEmpty(ConnectionsFileName))
{
titleBuilder.Append(separator);
- if (Settings.Default.ShowCompleteConsPathInTitle)
+ if (mRemoteNG.Settings.Default.ShowCompleteConsPathInTitle)
{
titleBuilder.Append(ConnectionsFileName);
}
@@ -1228,7 +1228,7 @@ namespace mRemoteNG.UI.Forms
{
DocumentStyle newDocumentStyle = pnlDock.DocumentStyle;
- if (Settings.Default.AlwaysShowPanelTabs)
+ if (mRemoteNG.Settings.Default.AlwaysShowPanelTabs)
{
newDocumentStyle = DocumentStyle.DockingWindow; // Show the panel tabs
}
diff --git a/mRemoteV1/UI/Forms/frmOptions.cs b/mRemoteV1/UI/Forms/frmOptions.cs
index 968b3b239..1884183c1 100644
--- a/mRemoteV1/UI/Forms/frmOptions.cs
+++ b/mRemoteV1/UI/Forms/frmOptions.cs
@@ -80,7 +80,7 @@ namespace mRemoteNG.UI.Forms
}
Debug.WriteLine(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile);
- Settings.Default.Save();
+ mRemoteNG.Settings.Default.Save();
}
diff --git a/mRemoteV1/UI/Window/AboutWindow.cs b/mRemoteV1/UI/Window/AboutWindow.cs
index b5486bf50..4920a9339 100644
--- a/mRemoteV1/UI/Window/AboutWindow.cs
+++ b/mRemoteV1/UI/Window/AboutWindow.cs
@@ -4,6 +4,7 @@ using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
using System.IO;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG.UI.Window
@@ -78,7 +79,7 @@ namespace mRemoteNG.UI.Window
//
//pbLogo
//
- this.pbLogo.Image = My.Resources.Logo;
+ this.pbLogo.Image = Resources.Logo;
this.pbLogo.Location = new System.Drawing.Point(8, 8);
this.pbLogo.Name = "pbLogo";
this.pbLogo.Size = new System.Drawing.Size(492, 128);
@@ -236,7 +237,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.pnlBottom);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, Convert.ToByte(0));
this.ForeColor = System.Drawing.SystemColors.ControlText;
- this.Icon = My.Resources.mRemote_Icon;
+ this.Icon = Resources.mRemote_Icon;
this.MaximumSize = new System.Drawing.Size(20000, 10000);
this.Name = "About";
this.TabText = "About";
@@ -264,16 +265,16 @@ namespace mRemoteNG.UI.Window
#region Private Methods
private void ApplyLanguage()
{
- lblLicense.Text = My.Language.strLabelReleasedUnderGPL;
- lblChangeLog.Text = My.Language.strLabelChangeLog;
- TabText = My.Language.strAbout;
- Text = My.Language.strAbout;
+ lblLicense.Text = Language.strLabelReleasedUnderGPL;
+ lblChangeLog.Text = Language.strLabelChangeLog;
+ TabText = Language.strAbout;
+ Text = Language.strAbout;
}
private void ApplyEditions()
{
#if PORTABLE
- lblEdition.Text = My.Language.strLabelPortableEdition;
+ lblEdition.Text = Language.strLabelPortableEdition;
lblEdition.Visible = true;
#endif
}
@@ -313,9 +314,9 @@ namespace mRemoteNG.UI.Window
this.lblVersion.Text = "Version " + (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.Version.ToString();
- FillLinkLabel(llblFAMFAMFAM, My.Language.strFAMFAMFAMAttribution, My.Language.strFAMFAMFAMAttributionURL);
- FillLinkLabel(llblMagicLibrary, My.Language.strMagicLibraryAttribution, My.Language.strMagicLibraryAttributionURL);
- FillLinkLabel(llblWeifenLuo, My.Language.strWeifenLuoAttribution, My.Language.strWeifenLuoAttributionURL);
+ FillLinkLabel(llblFAMFAMFAM, Language.strFAMFAMFAMAttribution, Language.strFAMFAMFAMAttributionURL);
+ FillLinkLabel(llblMagicLibrary, Language.strMagicLibraryAttribution, Language.strMagicLibraryAttributionURL);
+ FillLinkLabel(llblWeifenLuo, Language.strWeifenLuoAttribution, Language.strWeifenLuoAttributionURL);
if (File.Exists((new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\CHANGELOG.TXT"))
{
@@ -332,17 +333,17 @@ namespace mRemoteNG.UI.Window
private void llblFAMFAMFAM_LinkClicked(System.Object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
- App.Runtime.GoToURL(My.Language.strFAMFAMFAMAttributionURL);
+ App.Runtime.GoToURL(Language.strFAMFAMFAMAttributionURL);
}
private void llblMagicLibrary_LinkClicked(System.Object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
- App.Runtime.GoToURL(My.Language.strMagicLibraryAttributionURL);
+ App.Runtime.GoToURL(Language.strMagicLibraryAttributionURL);
}
private void llblWeifenLuo_LinkClicked(System.Object sender, System.Windows.Forms.LinkLabelLinkClickedEventArgs e)
{
- App.Runtime.GoToURL(My.Language.strWeifenLuoAttributionURL);
+ App.Runtime.GoToURL(Language.strWeifenLuoAttributionURL);
}
#endregion
}
diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
index cb8c00901..646c6fa3e 100644
--- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class ActiveDirectoryImportWindow : BaseWindow
@@ -81,7 +83,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.btnChangeDomain);
this.Controls.Add(this.btnImport);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0));
- this.Icon = My.Resources.ActiveDirectory_Icon;
+ this.Icon = Resources.ActiveDirectory_Icon;
this.Name = "ActiveDirectoryImport";
this.TabText = "Active Directory Import";
this.Text = "Active Directory Import";
diff --git a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
index 4d06ee4e7..b4091750e 100644
--- a/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
+++ b/mRemoteV1/UI/Window/ActiveDirectoryImportWindow.cs
@@ -2,6 +2,7 @@ using System;
using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
using mRemoteNG.App;
+using mRemoteNG.My;
namespace mRemoteNG.UI.Window
@@ -64,9 +65,9 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- btnImport.Text = My.Language.strButtonImport;
- lblDomain.Text = My.Language.strLabelDomain;
- btnChangeDomain.Text = My.Language.strButtonChange;
+ btnImport.Text = Language.strButtonImport;
+ lblDomain.Text = Language.strLabelDomain;
+ btnChangeDomain.Text = Language.strButtonChange;
}
private void ChangeDomain()
diff --git a/mRemoteV1/UI/Window/AnnouncementWindow.Designer.cs b/mRemoteV1/UI/Window/AnnouncementWindow.Designer.cs
index 1163255c7..314ecf9f7 100644
--- a/mRemoteV1/UI/Window/AnnouncementWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/AnnouncementWindow.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class AnnouncementWindow
@@ -27,7 +29,7 @@ namespace mRemoteNG.UI.Window
this.ClientSize = new System.Drawing.Size(549, 474);
this.Controls.Add(this.webBrowser);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0));
- this.Icon = My.Resources.News_Icon;
+ this.Icon = Resources.News_Icon;
this.Name = "Announcement";
this.TabText = "Announcement";
this.Text = "Announcement";
diff --git a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
index 57ce9191c..4032ab80c 100644
--- a/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
+++ b/mRemoteV1/UI/Window/ComponentsCheckWindow.cs
@@ -5,6 +5,7 @@ using System.IO;
using mRemoteNG.App;
using System.Threading;
using mRemoteNG.Connection.Protocol.RDP;
+using mRemoteNG.My;
namespace mRemoteNG.UI.Window
@@ -363,7 +364,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.pnlChecks);
this.Controls.Add(this.chkAlwaysShow);
this.Controls.Add(this.btnCheckAgain);
- this.Icon = My.Resources.ComponentsCheck_Icon;
+ this.Icon = Resources.ComponentsCheck_Icon;
this.Name = "ComponentsCheck";
this.TabText = "Components Check";
this.Text = "Components Check";
@@ -403,16 +404,16 @@ namespace mRemoteNG.UI.Window
{
ApplyLanguage();
- chkAlwaysShow.Checked = Convert.ToBoolean(My.Settings.Default.StartupComponentsCheck);
+ chkAlwaysShow.Checked = Convert.ToBoolean(mRemoteNG.Settings.Default.StartupComponentsCheck);
CheckComponents();
}
private void ApplyLanguage()
{
- TabText = My.Language.strComponentsCheck;
- Text = My.Language.strComponentsCheck;
- chkAlwaysShow.Text = My.Language.strCcAlwaysShowScreen;
- btnCheckAgain.Text = My.Language.strCcCheckAgain;
+ TabText = Language.strComponentsCheck;
+ Text = Language.strComponentsCheck;
+ chkAlwaysShow.Text = Language.strCcAlwaysShowScreen;
+ btnCheckAgain.Text = Language.strCcCheckAgain;
}
private void btnCheckAgain_Click(object sender, EventArgs e)
@@ -422,15 +423,15 @@ namespace mRemoteNG.UI.Window
private void chkAlwaysShow_CheckedChanged(object sender, EventArgs e)
{
- My.Settings.Default.StartupComponentsCheck = chkAlwaysShow.Checked;
- My.Settings.Default.Save();
+ mRemoteNG.Settings.Default.StartupComponentsCheck = chkAlwaysShow.Checked;
+ mRemoteNG.Settings.Default.Save();
}
#endregion
#region Private Methods
private void CheckComponents()
{
- string errorMsg = My.Language.strCcNotInstalledProperly;
+ string errorMsg = Language.strCcNotInstalledProperly;
pnlCheck1.Visible = true;
pnlCheck2.Visible = true;
@@ -456,17 +457,17 @@ namespace mRemoteNG.UI.Window
throw (new Exception(string.Format("Found RDC Client version {0} but version {1} or higher is required.", rdpClient.Version, ProtocolRDP.Versions.RDC80)));
}
- pbCheck1.Image = My.Resources.Good_Symbol;
+ pbCheck1.Image = Resources.Good_Symbol;
lblCheck1.ForeColor = Color.DarkOliveGreen;
- lblCheck1.Text = "RDP (Remote Desktop) " + My.Language.strCcCheckSucceeded;
- txtCheck1.Text = string.Format(My.Language.strCcRDPOK, rdpClient.Version);
+ lblCheck1.Text = "RDP (Remote Desktop) " + Language.strCcCheckSucceeded;
+ txtCheck1.Text = string.Format(Language.strCcRDPOK, rdpClient.Version);
}
catch (Exception ex)
{
- pbCheck1.Image = My.Resources.Bad_Symbol;
+ pbCheck1.Image = Resources.Bad_Symbol;
lblCheck1.ForeColor = Color.Firebrick;
- lblCheck1.Text = "RDP (Remote Desktop) " + My.Language.strCcCheckFailed;
- txtCheck1.Text = My.Language.strCcRDPFailed;
+ lblCheck1.Text = "RDP (Remote Desktop) " + Language.strCcCheckFailed;
+ txtCheck1.Text = Language.strCcRDPFailed;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "RDP " + errorMsg, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true);
@@ -491,17 +492,17 @@ namespace mRemoteNG.UI.Window
System.Windows.Forms.Application.DoEvents();
}
- pbCheck2.Image = My.Resources.Good_Symbol;
+ pbCheck2.Image = Resources.Good_Symbol;
lblCheck2.ForeColor = Color.DarkOliveGreen;
- lblCheck2.Text = "VNC (Virtual Network Computing) " + My.Language.strCcCheckSucceeded;
- txtCheck2.Text = string.Format(My.Language.strCcVNCOK, VNC.ProductVersion);
+ lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.strCcCheckSucceeded;
+ txtCheck2.Text = string.Format(Language.strCcVNCOK, VNC.ProductVersion);
}
catch (Exception)
{
- pbCheck2.Image = My.Resources.Bad_Symbol;
+ pbCheck2.Image = Resources.Bad_Symbol;
lblCheck2.ForeColor = Color.Firebrick;
- lblCheck2.Text = "VNC (Virtual Network Computing) " + My.Language.strCcCheckFailed;
- txtCheck2.Text = My.Language.strCcVNCFailed;
+ lblCheck2.Text = "VNC (Virtual Network Computing) " + Language.strCcCheckFailed;
+ txtCheck2.Text = Language.strCcVNCFailed;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "VNC " + errorMsg, true);
}
@@ -513,28 +514,28 @@ namespace mRemoteNG.UI.Window
string pPath = "";
- if (My.Settings.Default.UseCustomPuttyPath == false)
+ if (mRemoteNG.Settings.Default.UseCustomPuttyPath == false)
{
pPath = (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.DirectoryPath + "\\PuTTYNG.exe";
}
else
{
- pPath = Convert.ToString(My.Settings.Default.CustomPuttyPath);
+ pPath = Convert.ToString(mRemoteNG.Settings.Default.CustomPuttyPath);
}
if (File.Exists(pPath))
{
- pbCheck3.Image = My.Resources.Good_Symbol;
+ pbCheck3.Image = Resources.Good_Symbol;
lblCheck3.ForeColor = Color.DarkOliveGreen;
- lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + My.Language.strCcCheckSucceeded;
- txtCheck3.Text = My.Language.strCcPuttyOK;
+ lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.strCcCheckSucceeded;
+ txtCheck3.Text = Language.strCcPuttyOK;
}
else
{
- pbCheck3.Image = My.Resources.Bad_Symbol;
+ pbCheck3.Image = Resources.Bad_Symbol;
lblCheck3.ForeColor = Color.Firebrick;
- lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + My.Language.strCcCheckFailed;
- txtCheck3.Text = My.Language.strCcPuttyFailed;
+ lblCheck3.Text = "PuTTY (SSH/Telnet/Rlogin/RAW) " + Language.strCcCheckFailed;
+ txtCheck3.Text = Language.strCcPuttyFailed;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "PuTTY " + errorMsg, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "File " + pPath + " does not exist.", true);
@@ -555,17 +556,17 @@ namespace mRemoteNG.UI.Window
System.Windows.Forms.Application.DoEvents();
}
- pbCheck4.Image = My.Resources.Good_Symbol;
+ pbCheck4.Image = Resources.Good_Symbol;
lblCheck4.ForeColor = Color.DarkOliveGreen;
- lblCheck4.Text = "ICA (Citrix ICA) " + My.Language.strCcCheckSucceeded;
- txtCheck4.Text = string.Format(My.Language.strCcICAOK, ICA.Version);
+ lblCheck4.Text = "ICA (Citrix ICA) " + Language.strCcCheckSucceeded;
+ txtCheck4.Text = string.Format(Language.strCcICAOK, ICA.Version);
}
catch (Exception ex)
{
- pbCheck4.Image = My.Resources.Bad_Symbol;
+ pbCheck4.Image = Resources.Bad_Symbol;
lblCheck4.ForeColor = Color.Firebrick;
- lblCheck4.Text = "ICA (Citrix ICA) " + My.Language.strCcCheckFailed;
- txtCheck4.Text = My.Language.strCcICAFailed;
+ lblCheck4.Text = "ICA (Citrix ICA) " + Language.strCcCheckFailed;
+ txtCheck4.Text = Language.strCcICAFailed;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "ICA " + errorMsg, true);
Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, ex.Message, true);
@@ -579,14 +580,14 @@ namespace mRemoteNG.UI.Window
bool GeckoBad = false;
- if (My.Settings.Default.XULRunnerPath == "")
+ if (mRemoteNG.Settings.Default.XULRunnerPath == "")
{
GeckoBad = true;
}
- if (Directory.Exists(Convert.ToString(My.Settings.Default.XULRunnerPath)))
+ if (Directory.Exists(Convert.ToString(mRemoteNG.Settings.Default.XULRunnerPath)))
{
- if (File.Exists(Path.Combine(Convert.ToString(My.Settings.Default.XULRunnerPath), "xpcom.dll")) == false)
+ if (File.Exists(Path.Combine(Convert.ToString(mRemoteNG.Settings.Default.XULRunnerPath), "xpcom.dll")) == false)
{
GeckoBad = true;
}
@@ -598,20 +599,20 @@ namespace mRemoteNG.UI.Window
if (GeckoBad == false)
{
- pbCheck5.Image = My.Resources.Good_Symbol;
+ pbCheck5.Image = Resources.Good_Symbol;
lblCheck5.ForeColor = Color.DarkOliveGreen;
- lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " + My.Language.strCcCheckSucceeded;
- txtCheck5.Text = My.Language.strCcGeckoOK;
+ lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " + Language.strCcCheckSucceeded;
+ txtCheck5.Text = Language.strCcGeckoOK;
}
else
{
- pbCheck5.Image = My.Resources.Bad_Symbol;
+ pbCheck5.Image = Resources.Bad_Symbol;
lblCheck5.ForeColor = Color.Firebrick;
- lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " + My.Language.strCcCheckFailed;
- txtCheck5.Text = My.Language.strCcGeckoFailed;
+ lblCheck5.Text = "Gecko (Firefox) Rendering Engine (HTTP/S) " + Language.strCcCheckFailed;
+ txtCheck5.Text = Language.strCcGeckoFailed;
Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, "Gecko " + errorMsg, true);
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " + My.Settings.Default.XULRunnerPath, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, "XULrunner was not found in " + mRemoteNG.Settings.Default.XULRunnerPath, true);
}
}
diff --git a/mRemoteV1/UI/Window/ConfigWindow.cs b/mRemoteV1/UI/Window/ConfigWindow.cs
index 05b1bcdfe..76a2c041f 100644
--- a/mRemoteV1/UI/Window/ConfigWindow.cs
+++ b/mRemoteV1/UI/Window/ConfigWindow.cs
@@ -114,7 +114,7 @@ namespace mRemoteNG.UI.Window
//btnShowInheritance
//
btnShowInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image;
- btnShowInheritance.Image = My.Resources.Inheritance;
+ btnShowInheritance.Image = Resources.Inheritance;
btnShowInheritance.ImageTransparentColor = Color.Magenta;
btnShowInheritance.Name = "btnShowInheritance";
btnShowInheritance.Size = new Size(23, 22);
@@ -123,7 +123,7 @@ namespace mRemoteNG.UI.Window
//btnShowDefaultInheritance
//
btnShowDefaultInheritance.DisplayStyle = ToolStripItemDisplayStyle.Image;
- btnShowDefaultInheritance.Image = My.Resources.Inheritance_Default;
+ btnShowDefaultInheritance.Image = Resources.Inheritance_Default;
btnShowDefaultInheritance.ImageTransparentColor = Color.Magenta;
btnShowDefaultInheritance.Name = "btnShowDefaultInheritance";
btnShowDefaultInheritance.Size = new Size(23, 22);
@@ -134,7 +134,7 @@ namespace mRemoteNG.UI.Window
btnShowProperties.Checked = true;
btnShowProperties.CheckState = CheckState.Checked;
btnShowProperties.DisplayStyle = ToolStripItemDisplayStyle.Image;
- btnShowProperties.Image = My.Resources.Properties;
+ btnShowProperties.Image = Resources.Properties;
btnShowProperties.ImageTransparentColor = Color.Magenta;
btnShowProperties.Name = "btnShowProperties";
btnShowProperties.Size = new Size(23, 22);
@@ -143,7 +143,7 @@ namespace mRemoteNG.UI.Window
//btnShowDefaultProperties
//
btnShowDefaultProperties.DisplayStyle = ToolStripItemDisplayStyle.Image;
- btnShowDefaultProperties.Image = My.Resources.Properties_Default;
+ btnShowDefaultProperties.Image = Resources.Properties_Default;
btnShowDefaultProperties.ImageTransparentColor = Color.Magenta;
btnShowDefaultProperties.Name = "btnShowDefaultProperties";
btnShowDefaultProperties.Size = new Size(23, 22);
@@ -162,7 +162,7 @@ namespace mRemoteNG.UI.Window
//
btnHostStatus.Alignment = ToolStripItemAlignment.Right;
btnHostStatus.DisplayStyle = ToolStripItemDisplayStyle.Image;
- btnHostStatus.Image = My.Resources.HostStatus_Check;
+ btnHostStatus.Image = Resources.HostStatus_Check;
btnHostStatus.ImageTransparentColor = Color.Magenta;
btnHostStatus.Name = "btnHostStatus";
btnHostStatus.Size = new Size(23, 22);
@@ -180,7 +180,7 @@ namespace mRemoteNG.UI.Window
Controls.Add(pGrid);
Font = new Font("Microsoft Sans Serif", (float) (8.25F), FontStyle.Regular, GraphicsUnit.Point, Convert.ToByte(0));
HideOnClose = true;
- Icon = My.Resources.Config_Icon;
+ Icon = Resources.Config_Icon;
Name = "Config";
TabText = "Config";
Text = "Config";
@@ -744,7 +744,7 @@ namespace mRemoteNG.UI.Window
Themes.ThemeManager.ThemeChanged += ApplyTheme;
ApplyTheme();
AddToolStripItems();
- pGrid.HelpVisible = Settings.Default.ShowConfigHelpText;
+ pGrid.HelpVisible = mRemoteNG.Settings.Default.ShowConfigHelpText;
}
private void Config_SystemColorsChanged(object sender, EventArgs e)
@@ -779,7 +779,7 @@ namespace mRemoteNG.UI.Window
else if (e.ChangedItem.Label == Language.strPropertyNameName)
{
Windows.treeForm.tvConnections.SelectedNode.Text = Convert.ToString(((ConnectionInfo)pGrid.SelectedObject).Name);
- if (Settings.Default.SetHostnameLikeDisplayName && pGrid.SelectedObject is ConnectionInfo)
+ if (mRemoteNG.Settings.Default.SetHostnameLikeDisplayName && pGrid.SelectedObject is ConnectionInfo)
{
ConnectionInfo connectionInfo = (ConnectionInfo)pGrid.SelectedObject;
if (!string.IsNullOrEmpty(connectionInfo.Name))
@@ -813,7 +813,7 @@ namespace mRemoteNG.UI.Window
if (rootInfo.Password == true)
{
string passwordName = "";
- if (Settings.Default.UseSQLServer)
+ if (mRemoteNG.Settings.Default.UseSQLServer)
passwordName = Language.strSQLServer.TrimEnd(':');
else
passwordName = Path.GetFileName(Runtime.GetStartupConnectionFileName());
@@ -1764,14 +1764,14 @@ namespace mRemoteNG.UI.Window
{
if ((string)btnHostStatus.Tag == "checking")
{
- ShowStatusImage(My.Resources.HostStatus_On);
+ ShowStatusImage(Resources.HostStatus_On);
}
}
else
{
if ((string)btnHostStatus.Tag == "checking")
{
- ShowStatusImage(My.Resources.HostStatus_Off);
+ ShowStatusImage(Resources.HostStatus_Off);
}
}
}
@@ -1779,7 +1779,7 @@ namespace mRemoteNG.UI.Window
{
if ((string)btnHostStatus.Tag == "checking")
{
- ShowStatusImage(My.Resources.HostStatus_Off);
+ ShowStatusImage(Resources.HostStatus_Off);
}
}
}
@@ -1803,7 +1803,7 @@ namespace mRemoteNG.UI.Window
{
try
{
- btnHostStatus.Image = My.Resources.HostStatus_Check;
+ btnHostStatus.Image = Resources.HostStatus_Check;
// To check status, ConnectionInfo must be an mRemoteNG.Connection.Info that is not a container
if (ConnectionInfo is ConnectionInfo)
{
@@ -1836,7 +1836,7 @@ namespace mRemoteNG.UI.Window
{
try
{
- propertyGridContextMenuShowHelpText.Checked = Settings.Default.ShowConfigHelpText;
+ propertyGridContextMenuShowHelpText.Checked = mRemoteNG.Settings.Default.ShowConfigHelpText;
GridItem gridItem = pGrid.SelectedGridItem;
propertyGridContextMenuReset.Enabled = Convert.ToBoolean(pGrid.SelectedObject != null && gridItem != null && gridItem.PropertyDescriptor != null && gridItem.PropertyDescriptor.CanResetValue(pGrid.SelectedObject));
}
@@ -1869,7 +1869,7 @@ namespace mRemoteNG.UI.Window
private void propertyGridContextMenuShowHelpText_CheckedChanged(object sender, EventArgs e)
{
- Settings.Default.ShowConfigHelpText = propertyGridContextMenuShowHelpText.Checked;
+ mRemoteNG.Settings.Default.ShowConfigHelpText = propertyGridContextMenuShowHelpText.Checked;
pGrid.HelpVisible = propertyGridContextMenuShowHelpText.Checked;
}
#endregion
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs
index 652394fd9..970807569 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class ConnectionTreeWindow : BaseWindow
@@ -171,7 +173,7 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeConnect
//
- this.cMenTreeConnect.Image = My.Resources.Play;
+ this.cMenTreeConnect.Image = Resources.Play;
this.cMenTreeConnect.Name = "cMenTreeConnect";
this.cMenTreeConnect.ShortcutKeys = (System.Windows.Forms.Keys) ((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Shift)
| System.Windows.Forms.Keys.C);
@@ -187,14 +189,14 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeConnectWithOptionsConnectToConsoleSession
//
- this.cMenTreeConnectWithOptionsConnectToConsoleSession.Image = My.Resources.monitor_go;
+ this.cMenTreeConnectWithOptionsConnectToConsoleSession.Image = Resources.monitor_go;
this.cMenTreeConnectWithOptionsConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsConnectToConsoleSession";
this.cMenTreeConnectWithOptionsConnectToConsoleSession.Size = new System.Drawing.Size(231, 22);
this.cMenTreeConnectWithOptionsConnectToConsoleSession.Text = "Connect to console session";
//
//cMenTreeConnectWithOptionsDontConnectToConsoleSession
//
- this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = My.Resources.monitor_delete;
+ this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Image = Resources.monitor_delete;
this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Name = "cMenTreeConnectWithOptionsDontConnectToConsoleSession";
this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Size = new System.Drawing.Size(231, 22);
this.cMenTreeConnectWithOptionsDontConnectToConsoleSession.Text = "Don\'t connect to console session";
@@ -202,28 +204,28 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeConnectWithOptionsConnectInFullscreen
//
- this.cMenTreeConnectWithOptionsConnectInFullscreen.Image = My.Resources.arrow_out;
+ this.cMenTreeConnectWithOptionsConnectInFullscreen.Image = Resources.arrow_out;
this.cMenTreeConnectWithOptionsConnectInFullscreen.Name = "cMenTreeConnectWithOptionsConnectInFullscreen";
this.cMenTreeConnectWithOptionsConnectInFullscreen.Size = new System.Drawing.Size(231, 22);
this.cMenTreeConnectWithOptionsConnectInFullscreen.Text = "Connect in fullscreen";
//
//cMenTreeConnectWithOptionsNoCredentials
//
- this.cMenTreeConnectWithOptionsNoCredentials.Image = My.Resources.key_delete;
+ this.cMenTreeConnectWithOptionsNoCredentials.Image = Resources.key_delete;
this.cMenTreeConnectWithOptionsNoCredentials.Name = "cMenTreeConnectWithOptionsNoCredentials";
this.cMenTreeConnectWithOptionsNoCredentials.Size = new System.Drawing.Size(231, 22);
this.cMenTreeConnectWithOptionsNoCredentials.Text = "Connect without credentials";
//
//cMenTreeConnectWithOptionsChoosePanelBeforeConnecting
//
- this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = My.Resources.Panels;
+ this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Image = Resources.Panels;
this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Name = "cMenTreeConnectWithOptionsChoosePanelBeforeConnecting";
this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Size = new System.Drawing.Size(231, 22);
this.cMenTreeConnectWithOptionsChoosePanelBeforeConnecting.Text = "Choose panel before connecting";
//
//cMenTreeDisconnect
//
- this.cMenTreeDisconnect.Image = My.Resources.Pause;
+ this.cMenTreeDisconnect.Image = Resources.Pause;
this.cMenTreeDisconnect.Name = "cMenTreeDisconnect";
this.cMenTreeDisconnect.Size = new System.Drawing.Size(186, 22);
this.cMenTreeDisconnect.Text = "Disconnect";
@@ -235,14 +237,14 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeToolsExternalApps
//
- this.cMenTreeToolsExternalApps.Image = My.Resources.ExtApp;
+ this.cMenTreeToolsExternalApps.Image = Resources.ExtApp;
this.cMenTreeToolsExternalApps.Name = "cMenTreeToolsExternalApps";
this.cMenTreeToolsExternalApps.Size = new System.Drawing.Size(186, 22);
this.cMenTreeToolsExternalApps.Text = "External Applications";
//
//cMenTreeToolsTransferFile
//
- this.cMenTreeToolsTransferFile.Image = My.Resources.SSHTransfer;
+ this.cMenTreeToolsTransferFile.Image = Resources.SSHTransfer;
this.cMenTreeToolsTransferFile.Name = "cMenTreeToolsTransferFile";
this.cMenTreeToolsTransferFile.Size = new System.Drawing.Size(186, 22);
this.cMenTreeToolsTransferFile.Text = "Transfer File (SSH)";
@@ -254,7 +256,7 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeDuplicate
//
- this.cMenTreeDuplicate.Image = My.Resources.page_copy;
+ this.cMenTreeDuplicate.Image = Resources.page_copy;
this.cMenTreeDuplicate.Name = "cMenTreeDuplicate";
this.cMenTreeDuplicate.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D);
this.cMenTreeDuplicate.Size = new System.Drawing.Size(186, 22);
@@ -262,7 +264,7 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeRename
//
- this.cMenTreeRename.Image = My.Resources.Rename;
+ this.cMenTreeRename.Image = Resources.Rename;
this.cMenTreeRename.Name = "cMenTreeRename";
this.cMenTreeRename.ShortcutKeys = System.Windows.Forms.Keys.F2;
this.cMenTreeRename.Size = new System.Drawing.Size(186, 22);
@@ -270,7 +272,7 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeDelete
//
- this.cMenTreeDelete.Image = My.Resources.Delete;
+ this.cMenTreeDelete.Image = Resources.Delete;
this.cMenTreeDelete.Name = "cMenTreeDelete";
this.cMenTreeDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.cMenTreeDelete.Size = new System.Drawing.Size(186, 22);
@@ -319,14 +321,14 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeAddConnection
//
- this.cMenTreeAddConnection.Image = My.Resources.Connection_Add;
+ this.cMenTreeAddConnection.Image = Resources.Connection_Add;
this.cMenTreeAddConnection.Name = "cMenTreeAddConnection";
this.cMenTreeAddConnection.Size = new System.Drawing.Size(186, 22);
this.cMenTreeAddConnection.Text = "New Connection";
//
//cMenTreeAddFolder
//
- this.cMenTreeAddFolder.Image = My.Resources.Folder_Add;
+ this.cMenTreeAddFolder.Image = Resources.Folder_Add;
this.cMenTreeAddFolder.Name = "cMenTreeAddFolder";
this.cMenTreeAddFolder.Size = new System.Drawing.Size(186, 22);
this.cMenTreeAddFolder.Text = "New Folder";
@@ -345,21 +347,21 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeToolsSortAscending
//
- this.cMenTreeToolsSortAscending.Image = My.Resources.Sort_AZ;
+ this.cMenTreeToolsSortAscending.Image = Resources.Sort_AZ;
this.cMenTreeToolsSortAscending.Name = "cMenTreeToolsSortAscending";
this.cMenTreeToolsSortAscending.Size = new System.Drawing.Size(157, 22);
this.cMenTreeToolsSortAscending.Text = "Ascending (A-Z)";
//
//cMenTreeToolsSortDescending
//
- this.cMenTreeToolsSortDescending.Image = My.Resources.Sort_ZA;
+ this.cMenTreeToolsSortDescending.Image = Resources.Sort_ZA;
this.cMenTreeToolsSortDescending.Name = "cMenTreeToolsSortDescending";
this.cMenTreeToolsSortDescending.Size = new System.Drawing.Size(157, 22);
this.cMenTreeToolsSortDescending.Text = "Descending (Z-A)";
//
//cMenTreeMoveUp
//
- this.cMenTreeMoveUp.Image = My.Resources.Arrow_Up;
+ this.cMenTreeMoveUp.Image = Resources.Arrow_Up;
this.cMenTreeMoveUp.Name = "cMenTreeMoveUp";
this.cMenTreeMoveUp.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Up);
this.cMenTreeMoveUp.Size = new System.Drawing.Size(186, 22);
@@ -367,7 +369,7 @@ namespace mRemoteNG.UI.Window
//
//cMenTreeMoveDown
//
- this.cMenTreeMoveDown.Image = My.Resources.Arrow_Down;
+ this.cMenTreeMoveDown.Image = Resources.Arrow_Down;
this.cMenTreeMoveDown.Name = "cMenTreeMoveDown";
this.cMenTreeMoveDown.ShortcutKeys = (System.Windows.Forms.Keys) (System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Down);
this.cMenTreeMoveDown.Size = new System.Drawing.Size(186, 22);
@@ -395,7 +397,7 @@ namespace mRemoteNG.UI.Window
//PictureBox1
//
this.PictureBox1.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left);
- this.PictureBox1.Image = My.Resources.Search;
+ this.PictureBox1.Image = Resources.Search;
this.PictureBox1.Location = new System.Drawing.Point(2, 412);
this.PictureBox1.Name = "PictureBox1";
this.PictureBox1.Size = new System.Drawing.Size(16, 16);
@@ -431,14 +433,14 @@ namespace mRemoteNG.UI.Window
//mMenAddConnection
//
this.mMenAddConnection.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.mMenAddConnection.Image = My.Resources.Connection_Add;
+ this.mMenAddConnection.Image = Resources.Connection_Add;
this.mMenAddConnection.Name = "mMenAddConnection";
this.mMenAddConnection.Size = new System.Drawing.Size(28, 20);
//
//mMenAddFolder
//
this.mMenAddFolder.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.mMenAddFolder.Image = My.Resources.Folder_Add;
+ this.mMenAddFolder.Image = Resources.Folder_Add;
this.mMenAddFolder.Name = "mMenAddFolder";
this.mMenAddFolder.Size = new System.Drawing.Size(28, 20);
//
@@ -446,21 +448,21 @@ namespace mRemoteNG.UI.Window
//
this.mMenView.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.mMenView.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.mMenViewExpandAllFolders, this.mMenViewCollapseAllFolders});
- this.mMenView.Image = My.Resources.View;
+ this.mMenView.Image = Resources.View;
this.mMenView.Name = "mMenView";
this.mMenView.Size = new System.Drawing.Size(28, 20);
this.mMenView.Text = "&View";
//
//mMenViewExpandAllFolders
//
- this.mMenViewExpandAllFolders.Image = My.Resources.Expand;
+ this.mMenViewExpandAllFolders.Image = Resources.Expand;
this.mMenViewExpandAllFolders.Name = "mMenViewExpandAllFolders";
this.mMenViewExpandAllFolders.Size = new System.Drawing.Size(161, 22);
this.mMenViewExpandAllFolders.Text = "Expand all folders";
//
//mMenViewCollapseAllFolders
//
- this.mMenViewCollapseAllFolders.Image = My.Resources.Collapse;
+ this.mMenViewCollapseAllFolders.Image = Resources.Collapse;
this.mMenViewCollapseAllFolders.Name = "mMenViewCollapseAllFolders";
this.mMenViewCollapseAllFolders.Size = new System.Drawing.Size(161, 22);
this.mMenViewCollapseAllFolders.Text = "Collapse all folders";
@@ -468,7 +470,7 @@ namespace mRemoteNG.UI.Window
//mMenSortAscending
//
this.mMenSortAscending.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
- this.mMenSortAscending.Image = My.Resources.Sort_AZ;
+ this.mMenSortAscending.Image = Resources.Sort_AZ;
this.mMenSortAscending.Name = "mMenSortAscending";
this.mMenSortAscending.Size = new System.Drawing.Size(28, 20);
//
@@ -479,7 +481,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.pnlConnections);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0));
this.HideOnClose = true;
- this.Icon = My.Resources.Root_Icon;
+ this.Icon = Resources.Root_Icon;
this.Name = "Tree";
this.TabText = "Connections";
this.Text = "Connections";
diff --git a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
index 6d33a0ce7..e0e59ea6c 100644
--- a/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionTreeWindow.cs
@@ -191,14 +191,14 @@ namespace mRemoteNG.UI.Window
if (e.Button == MouseButtons.Left)
{
- if (Settings.Default.SingleClickOnConnectionOpensIt &&
+ if (mRemoteNG.Settings.Default.SingleClickOnConnectionOpensIt &&
(ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection |
ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.PuttySession))
{
Runtime.OpenConnection();
}
- if (Settings.Default.SingleClickSwitchesToOpenConnection && ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection)
+ if (mRemoteNG.Settings.Default.SingleClickSwitchesToOpenConnection && ConnectionTreeNode.GetNodeType(e.Node) == TreeNodeType.Connection)
{
Runtime.SwitchToOpenConnection((ConnectionInfo)e.Node.Tag);
}
diff --git a/mRemoteV1/UI/Window/ConnectionWindow.cs b/mRemoteV1/UI/Window/ConnectionWindow.cs
index 38b58ad4a..ff7953e4e 100644
--- a/mRemoteV1/UI/Window/ConnectionWindow.cs
+++ b/mRemoteV1/UI/Window/ConnectionWindow.cs
@@ -10,6 +10,7 @@ using mRemoteNG.Config;
using mRemoteNG.Connection.Protocol.VNC;
using mRemoteNG.Connection.Protocol.RDP;
using mRemoteNG.Connection.Protocol;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
namespace mRemoteNG.UI.Window
@@ -119,14 +120,14 @@ namespace mRemoteNG.UI.Window
//
//cmenTabFullscreen
//
- this.cmenTabFullscreen.Image = My.Resources.arrow_out;
+ this.cmenTabFullscreen.Image = Resources.arrow_out;
this.cmenTabFullscreen.Name = "cmenTabFullscreen";
this.cmenTabFullscreen.Size = new System.Drawing.Size(201, 22);
this.cmenTabFullscreen.Text = "Fullscreen (RDP)";
//
//cmenTabSmartSize
//
- this.cmenTabSmartSize.Image = My.Resources.SmartSize;
+ this.cmenTabSmartSize.Image = Resources.SmartSize;
this.cmenTabSmartSize.Name = "cmenTabSmartSize";
this.cmenTabSmartSize.Size = new System.Drawing.Size(201, 22);
this.cmenTabSmartSize.Text = "SmartSize (RDP/VNC)";
@@ -144,14 +145,14 @@ namespace mRemoteNG.UI.Window
//
//cmenTabScreenshot
//
- this.cmenTabScreenshot.Image = My.Resources.Screenshot_Add;
+ this.cmenTabScreenshot.Image = Resources.Screenshot_Add;
this.cmenTabScreenshot.Name = "cmenTabScreenshot";
this.cmenTabScreenshot.Size = new System.Drawing.Size(201, 22);
this.cmenTabScreenshot.Text = "Screenshot";
//
//cmenTabStartChat
//
- this.cmenTabStartChat.Image = My.Resources.Chat;
+ this.cmenTabStartChat.Image = Resources.Chat;
this.cmenTabStartChat.Name = "cmenTabStartChat";
this.cmenTabStartChat.Size = new System.Drawing.Size(201, 22);
this.cmenTabStartChat.Text = "Start Chat (VNC)";
@@ -159,14 +160,14 @@ namespace mRemoteNG.UI.Window
//
//cmenTabTransferFile
//
- this.cmenTabTransferFile.Image = My.Resources.SSHTransfer;
+ this.cmenTabTransferFile.Image = Resources.SSHTransfer;
this.cmenTabTransferFile.Name = "cmenTabTransferFile";
this.cmenTabTransferFile.Size = new System.Drawing.Size(201, 22);
this.cmenTabTransferFile.Text = "Transfer File (SSH)";
//
//cmenTabRefreshScreen
//
- this.cmenTabRefreshScreen.Image = My.Resources.Refresh;
+ this.cmenTabRefreshScreen.Image = Resources.Refresh;
this.cmenTabRefreshScreen.Name = "cmenTabRefreshScreen";
this.cmenTabRefreshScreen.Size = new System.Drawing.Size(201, 22);
this.cmenTabRefreshScreen.Text = "Refresh Screen (VNC)";
@@ -174,7 +175,7 @@ namespace mRemoteNG.UI.Window
//cmenTabSendSpecialKeys
//
this.cmenTabSendSpecialKeys.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.cmenTabSendSpecialKeysCtrlAltDel, this.cmenTabSendSpecialKeysCtrlEsc});
- this.cmenTabSendSpecialKeys.Image = My.Resources.Keyboard;
+ this.cmenTabSendSpecialKeys.Image = Resources.Keyboard;
this.cmenTabSendSpecialKeys.Name = "cmenTabSendSpecialKeys";
this.cmenTabSendSpecialKeys.Size = new System.Drawing.Size(201, 22);
this.cmenTabSendSpecialKeys.Text = "Send special Keys (VNC)";
@@ -205,7 +206,7 @@ namespace mRemoteNG.UI.Window
//
//cmenTabRenameTab
//
- this.cmenTabRenameTab.Image = My.Resources.Rename;
+ this.cmenTabRenameTab.Image = Resources.Rename;
this.cmenTabRenameTab.Name = "cmenTabRenameTab";
this.cmenTabRenameTab.Size = new System.Drawing.Size(201, 22);
this.cmenTabRenameTab.Text = "Rename Tab";
@@ -225,7 +226,7 @@ namespace mRemoteNG.UI.Window
//
//cmenTabDisconnect
//
- this.cmenTabDisconnect.Image = My.Resources.Pause;
+ this.cmenTabDisconnect.Image = Resources.Pause;
this.cmenTabDisconnect.Name = "cmenTabDisconnect";
this.cmenTabDisconnect.Size = new System.Drawing.Size(201, 22);
this.cmenTabDisconnect.Text = "Disconnect";
@@ -241,7 +242,7 @@ namespace mRemoteNG.UI.Window
this.ClientSize = new System.Drawing.Size(632, 453);
this.Controls.Add(this.TabController);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, Convert.ToByte(0));
- this.Icon = My.Resources.mRemote_Icon;
+ this.Icon = Resources.mRemote_Icon;
this.Name = "Connection";
this.TabText = "UI.Window.Connection";
this.Text = "UI.Window.Connection";
@@ -256,7 +257,7 @@ namespace mRemoteNG.UI.Window
{
if (FormText == "")
{
- FormText = My.Language.strNewPanel;
+ FormText = Language.strNewPanel;
}
this.WindowType = WindowType.Connection;
@@ -273,7 +274,7 @@ namespace mRemoteNG.UI.Window
Crownwood.Magic.Controls.TabPage nTab = new Crownwood.Magic.Controls.TabPage();
nTab.Anchor = (System.Windows.Forms.AnchorStyles) (AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Top);
- if (My.Settings.Default.ShowProtocolOnTabs)
+ if (mRemoteNG.Settings.Default.ShowProtocolOnTabs)
{
nTab.Title = conI.Protocol.ToString() + ": ";
}
@@ -284,7 +285,7 @@ namespace mRemoteNG.UI.Window
nTab.Title += conI.Name;
- if (My.Settings.Default.ShowLogonInfoOnTabs)
+ if (mRemoteNG.Settings.Default.ShowLogonInfoOnTabs)
{
nTab.Title += " (";
@@ -314,7 +315,7 @@ namespace mRemoteNG.UI.Window
nTab.Icon = conIcon;
}
- if (My.Settings.Default.OpenTabsRightOfSelected)
+ if (mRemoteNG.Settings.Default.OpenTabsRightOfSelected)
{
this.TabController.TabPages.Insert(this.TabController.SelectedIndex + 1, nTab);
}
@@ -397,34 +398,34 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- cmenTabFullscreen.Text = My.Language.strMenuFullScreenRDP;
- cmenTabSmartSize.Text = My.Language.strMenuSmartSize;
- cmenTabViewOnly.Text = My.Language.strMenuViewOnly;
- cmenTabScreenshot.Text = My.Language.strMenuScreenshot;
- cmenTabStartChat.Text = My.Language.strMenuStartChat;
- cmenTabTransferFile.Text = My.Language.strMenuTransferFile;
- cmenTabRefreshScreen.Text = My.Language.strMenuRefreshScreen;
- cmenTabSendSpecialKeys.Text = My.Language.strMenuSendSpecialKeys;
- cmenTabSendSpecialKeysCtrlAltDel.Text = My.Language.strMenuCtrlAltDel;
- cmenTabSendSpecialKeysCtrlEsc.Text = My.Language.strMenuCtrlEsc;
- cmenTabExternalApps.Text = My.Language.strMenuExternalTools;
- cmenTabRenameTab.Text = My.Language.strMenuRenameTab;
- cmenTabDuplicateTab.Text = My.Language.strMenuDuplicateTab;
- cmenTabReconnect.Text = My.Language.strMenuReconnect;
- cmenTabDisconnect.Text = My.Language.strMenuDisconnect;
- cmenTabPuttySettings.Text = My.Language.strPuttySettings;
+ cmenTabFullscreen.Text = Language.strMenuFullScreenRDP;
+ cmenTabSmartSize.Text = Language.strMenuSmartSize;
+ cmenTabViewOnly.Text = Language.strMenuViewOnly;
+ cmenTabScreenshot.Text = Language.strMenuScreenshot;
+ cmenTabStartChat.Text = Language.strMenuStartChat;
+ cmenTabTransferFile.Text = Language.strMenuTransferFile;
+ cmenTabRefreshScreen.Text = Language.strMenuRefreshScreen;
+ cmenTabSendSpecialKeys.Text = Language.strMenuSendSpecialKeys;
+ cmenTabSendSpecialKeysCtrlAltDel.Text = Language.strMenuCtrlAltDel;
+ cmenTabSendSpecialKeysCtrlEsc.Text = Language.strMenuCtrlEsc;
+ cmenTabExternalApps.Text = Language.strMenuExternalTools;
+ cmenTabRenameTab.Text = Language.strMenuRenameTab;
+ cmenTabDuplicateTab.Text = Language.strMenuDuplicateTab;
+ cmenTabReconnect.Text = Language.strMenuReconnect;
+ cmenTabDisconnect.Text = Language.strMenuDisconnect;
+ cmenTabPuttySettings.Text = Language.strPuttySettings;
}
private void Connection_FormClosing(object sender, FormClosingEventArgs e)
{
if (!frmMain.Default.IsClosing &&
- ((My.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All & TabController.TabPages.Count > 0) ||
- (My.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & TabController.TabPages.Count > 1)))
+ ((mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All & TabController.TabPages.Count > 0) ||
+ (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.Multiple & TabController.TabPages.Count > 1)))
{
- DialogResult result = cTaskDialog.MessageBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, string.Format(My.Language.strConfirmCloseConnectionPanelMainInstruction, this.Text), "", "", "", My.Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, eSysIcons.Question);
+ DialogResult result = cTaskDialog.MessageBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, string.Format(Language.strConfirmCloseConnectionPanelMainInstruction, this.Text), "", "", "", Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, eSysIcons.Question);
if (cTaskDialog.VerificationChecked)
{
- My.Settings.Default.ConfirmCloseConnection--;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection--;
}
if (result == DialogResult.No)
{
@@ -503,12 +504,12 @@ namespace mRemoteNG.UI.Window
private void CloseConnectionTab()
{
Crownwood.Magic.Controls.TabPage selectedTab = TabController.SelectedTab;
- if (My.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All)
+ if (mRemoteNG.Settings.Default.ConfirmCloseConnection == (int)ConfirmCloseEnum.All)
{
- DialogResult result = cTaskDialog.MessageBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, string.Format(My.Language.strConfirmCloseConnectionMainInstruction, selectedTab.Title), "", "", "", My.Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, eSysIcons.Question);
+ DialogResult result = cTaskDialog.MessageBox(this, (new Microsoft.VisualBasic.ApplicationServices.WindowsFormsApplicationBase()).Info.ProductName, string.Format(Language.strConfirmCloseConnectionMainInstruction, selectedTab.Title), "", "", "", Language.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, eSysIcons.Question);
if (cTaskDialog.VerificationChecked)
{
- My.Settings.Default.ConfirmCloseConnection--;
+ mRemoteNG.Settings.Default.ConfirmCloseConnection--;
}
if (result == DialogResult.No)
{
@@ -539,7 +540,7 @@ namespace mRemoteNG.UI.Window
private void TabController_DoubleClickTab(Crownwood.Magic.Controls.TabControl sender, Crownwood.Magic.Controls.TabPage page)
{
_firstClickTicks = 0;
- if (My.Settings.Default.DoubleClickOnTabClosesIt)
+ if (mRemoteNG.Settings.Default.DoubleClickOnTabClosesIt)
{
this.CloseConnectionTab();
}
@@ -1062,7 +1063,7 @@ namespace mRemoteNG.UI.Window
{
try
{
- string nTitle = Interaction.InputBox(Prompt: My.Language.strNewTitle + ":", DefaultResponse: this.TabController.SelectedTab.Title.Replace("&&", "&"));
+ string nTitle = Interaction.InputBox(Prompt: Language.strNewTitle + ":", DefaultResponse: this.TabController.SelectedTab.Title.Replace("&&", "&"));
if (!string.IsNullOrEmpty(nTitle))
{
diff --git a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
index bc8dc3897..2780f570f 100644
--- a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
+++ b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
@@ -6,6 +6,7 @@ using System.Windows.Forms;
using System.Text;
using WeifenLuo.WinFormsUI.Docking;
using mRemoteNG.App;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
@@ -119,7 +120,7 @@ namespace mRemoteNG.UI.Window
//
//clmMessage
//
- this.clmMessage.Text = global::mRemoteNG.My.Language.strColumnMessage;
+ this.clmMessage.Text = Language.strColumnMessage;
this.clmMessage.Width = 184;
//
//cMenMC
@@ -132,19 +133,19 @@ namespace mRemoteNG.UI.Window
//
//cMenMCCopy
//
- this.cMenMCCopy.Image = My.Resources.Copy;
+ this.cMenMCCopy.Image = 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(152, 22);
- this.cMenMCCopy.Text = global::mRemoteNG.My.Language.strMenuCopy;
+ this.cMenMCCopy.Text = Language.strMenuCopy;
//
//cMenMCDelete
//
- this.cMenMCDelete.Image = My.Resources.Delete;
+ this.cMenMCDelete.Image = Resources.Delete;
this.cMenMCDelete.Name = "cMenMCDelete";
this.cMenMCDelete.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.cMenMCDelete.Size = new System.Drawing.Size(152, 22);
- this.cMenMCDelete.Text = global::mRemoteNG.My.Language.strMenuDelete;
+ this.cMenMCDelete.Text = Language.strMenuDelete;
//
//imgListMC
//
@@ -159,9 +160,9 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.pnlErrorMsg);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, Convert.ToByte(0));
this.HideOnClose = true;
- this.Icon = My.Resources.Info_Icon;
+ this.Icon = Resources.Info_Icon;
this.Name = "ErrorsAndInfos";
- this.TabText = global::mRemoteNG.My.Language.strMenuNotifications;
+ this.TabText = Language.strMenuNotifications;
this.Text = "Notifications";
this.pnlErrorMsg.ResumeLayout(false);
this.pnlErrorMsg.PerformLayout();
@@ -195,11 +196,11 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- clmMessage.Text = My.Language.strColumnMessage;
- cMenMCCopy.Text = My.Language.strMenuNotificationsCopyAll;
- cMenMCDelete.Text = My.Language.strMenuNotificationsDeleteAll;
- TabText = My.Language.strMenuNotifications;
- Text = My.Language.strMenuNotifications;
+ clmMessage.Text = Language.strColumnMessage;
+ cMenMCCopy.Text = Language.strMenuNotificationsCopyAll;
+ cMenMCDelete.Text = Language.strMenuNotificationsDeleteAll;
+ TabText = Language.strMenuNotifications;
+ Text = Language.strMenuNotifications;
}
#endregion
@@ -217,9 +218,9 @@ namespace mRemoteNG.UI.Window
#region Private Methods
private void FillImageList()
{
- this.imgListMC.Images.Add(My.Resources.InformationSmall);
- this.imgListMC.Images.Add(My.Resources.WarningSmall);
- this.imgListMC.Images.Add(My.Resources.ErrorSmall);
+ this.imgListMC.Images.Add(Resources.InformationSmall);
+ this.imgListMC.Images.Add(Resources.WarningSmall);
+ this.imgListMC.Images.Add(Resources.ErrorSmall);
}
@@ -352,17 +353,17 @@ namespace mRemoteNG.UI.Window
switch (eMsg.MsgClass)
{
case Messages.MessageClass.InformationMsg:
- this.pbError.Image = My.Resources.Information;
+ this.pbError.Image = Resources.Information;
this.pnlErrorMsg.BackColor = Color.LightSteelBlue;
this.txtMsgText.BackColor = Color.LightSteelBlue;
break;
case Messages.MessageClass.WarningMsg:
- this.pbError.Image = My.Resources.Warning;
+ this.pbError.Image = Resources.Warning;
this.pnlErrorMsg.BackColor = Color.Gold;
this.txtMsgText.BackColor = Color.Gold;
break;
case Messages.MessageClass.ErrorMsg:
- this.pbError.Image = My.Resources._Error;
+ this.pbError.Image = Resources._Error;
this.pnlErrorMsg.BackColor = Color.IndianRed;
this.txtMsgText.BackColor = Color.IndianRed;
break;
@@ -392,13 +393,13 @@ namespace mRemoteNG.UI.Window
if (lvErrorCollector.SelectedItems.Count > 0)
{
- cMenMCCopy.Text = My.Language.strMenuCopy;
- cMenMCDelete.Text = My.Language.strMenuNotificationsDelete;
+ cMenMCCopy.Text = Language.strMenuCopy;
+ cMenMCDelete.Text = Language.strMenuNotificationsDelete;
}
else
{
- cMenMCCopy.Text = My.Language.strMenuNotificationsCopyAll;
- cMenMCDelete.Text = My.Language.strMenuNotificationsDeleteAll;
+ cMenMCCopy.Text = Language.strMenuNotificationsCopyAll;
+ cMenMCDelete.Text = Language.strMenuNotificationsDeleteAll;
}
}
diff --git a/mRemoteV1/UI/Window/ExternalToolsWindow.Designer.cs b/mRemoteV1/UI/Window/ExternalToolsWindow.Designer.cs
index 99b2877d9..a52d7dc3a 100644
--- a/mRemoteV1/UI/Window/ExternalToolsWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ExternalToolsWindow.Designer.cs
@@ -1,4 +1,6 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class ExternalToolsWindow : BaseWindow
@@ -140,7 +142,7 @@ namespace mRemoteNG.UI.Window
//
//NewToolMenuItem
//
- this.NewToolMenuItem.Image = My.Resources.ExtApp_Add;
+ this.NewToolMenuItem.Image = 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(220, 22);
@@ -148,7 +150,7 @@ namespace mRemoteNG.UI.Window
//
//DeleteToolMenuItem
//
- this.DeleteToolMenuItem.Image = My.Resources.ExtApp_Delete;
+ this.DeleteToolMenuItem.Image = Resources.ExtApp_Delete;
this.DeleteToolMenuItem.Name = "DeleteToolMenuItem";
this.DeleteToolMenuItem.ShortcutKeys = System.Windows.Forms.Keys.Delete;
this.DeleteToolMenuItem.Size = new System.Drawing.Size(220, 22);
@@ -161,7 +163,7 @@ namespace mRemoteNG.UI.Window
//
//LaunchToolMenuItem
//
- this.LaunchToolMenuItem.Image = My.Resources.ExtApp_Start;
+ this.LaunchToolMenuItem.Image = Resources.ExtApp_Start;
this.LaunchToolMenuItem.Name = "LaunchToolMenuItem";
this.LaunchToolMenuItem.Size = new System.Drawing.Size(220, 22);
this.LaunchToolMenuItem.Text = "Launch External Tool";
@@ -316,7 +318,7 @@ namespace mRemoteNG.UI.Window
//
//NewToolToolstripButton
//
- this.NewToolToolstripButton.Image = My.Resources.ExtApp_Add;
+ this.NewToolToolstripButton.Image = Resources.ExtApp_Add;
this.NewToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.NewToolToolstripButton.Name = "NewToolToolstripButton";
this.NewToolToolstripButton.Size = new System.Drawing.Size(51, 22);
@@ -324,7 +326,7 @@ namespace mRemoteNG.UI.Window
//
//DeleteToolToolstripButton
//
- this.DeleteToolToolstripButton.Image = My.Resources.ExtApp_Delete;
+ this.DeleteToolToolstripButton.Image = Resources.ExtApp_Delete;
this.DeleteToolToolstripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
this.DeleteToolToolstripButton.Name = "DeleteToolToolstripButton";
this.DeleteToolToolstripButton.Size = new System.Drawing.Size(60, 22);
@@ -337,7 +339,7 @@ namespace mRemoteNG.UI.Window
//
//LaunchToolToolstripButton
//
- this.LaunchToolToolstripButton.Image = My.Resources.ExtApp_Start;
+ this.LaunchToolToolstripButton.Image = 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/mRemoteV1/UI/Window/HelpWindow.cs b/mRemoteV1/UI/Window/HelpWindow.cs
index 9ec0ce264..d52eb1226 100644
--- a/mRemoteV1/UI/Window/HelpWindow.cs
+++ b/mRemoteV1/UI/Window/HelpWindow.cs
@@ -1,5 +1,6 @@
using System;
using System.Windows.Forms;
+using mRemoteNG.My;
using WeifenLuo.WinFormsUI.Docking;
@@ -202,7 +203,7 @@ namespace mRemoteNG.UI.Window
//
this.ClientSize = new System.Drawing.Size(542, 323);
this.Controls.Add(this.pnlSplitter);
- this.Icon = My.Resources.Help_Icon;
+ this.Icon = Resources.Help_Icon;
this.Name = "Help";
this.TabText = "Help";
this.Text = "Help";
@@ -260,9 +261,9 @@ namespace mRemoteNG.UI.Window
private void FillImageList()
{
- this.imgListHelp.Images.Add("File", My.Resources.Page);
- this.imgListHelp.Images.Add("Folder", My.Resources.Folder);
- this.imgListHelp.Images.Add("Help", My.Resources.Help);
+ this.imgListHelp.Images.Add("File", Resources.Page);
+ this.imgListHelp.Images.Add("Folder", Resources.Folder);
+ this.imgListHelp.Images.Add("Help", Resources.Help);
}
private void SetImages(TreeNode node)
diff --git a/mRemoteV1/UI/Window/PortScanWindow.Designer.cs b/mRemoteV1/UI/Window/PortScanWindow.Designer.cs
index 1d984338a..e3bf682a6 100644
--- a/mRemoteV1/UI/Window/PortScanWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/PortScanWindow.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class PortScanWindow : BaseWindow
@@ -109,7 +111,7 @@ namespace mRemoteNG.UI.Window
//btnScan
//
this.btnScan.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);
- this.btnScan.Image = My.Resources.Search;
+ this.btnScan.Image = Resources.Search;
this.btnScan.Location = new System.Drawing.Point(420, 9);
this.btnScan.Name = "btnScan";
this.btnScan.Size = new System.Drawing.Size(86, 58);
diff --git a/mRemoteV1/UI/Window/SSHTransferWindow.cs b/mRemoteV1/UI/Window/SSHTransferWindow.cs
index d8637dfaa..31b560106 100644
--- a/mRemoteV1/UI/Window/SSHTransferWindow.cs
+++ b/mRemoteV1/UI/Window/SSHTransferWindow.cs
@@ -4,6 +4,7 @@ using System;
using System.IO;
using System.Threading;
using System.Windows.Forms;
+using mRemoteNG.My;
using Tamir.SharpSsh;
using WeifenLuo.WinFormsUI.Docking;
@@ -268,7 +269,7 @@ namespace mRemoteNG.UI.Window
//
this.btnTransfer.Anchor = (System.Windows.Forms.AnchorStyles) (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);
this.btnTransfer.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnTransfer.Image = My.Resources.SSHTransfer;
+ this.btnTransfer.Image = Resources.SSHTransfer;
this.btnTransfer.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnTransfer.Location = new System.Drawing.Point(597, 382);
this.btnTransfer.Name = "btnTransfer";
@@ -371,19 +372,19 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- grpFiles.Text = My.Language.strGroupboxFiles;
- lblLocalFile.Text = My.Language.strLocalFile + ":";
- lblRemoteFile.Text = My.Language.strRemoteFile + ":";
- btnBrowse.Text = My.Language.strButtonBrowse;
- grpConnection.Text = My.Language.strGroupboxConnection;
- lblProtocol.Text = My.Language.strLabelProtocol;
- lblPassword.Text = My.Language.strLabelPassword;
- lblUser.Text = My.Language.strUser + ":";
- lblPort.Text = My.Language.strLabelPort;
- lblHost.Text = My.Language.strHost + ":";
- btnTransfer.Text = My.Language.strTransfer;
- TabText = My.Language.strMenuSSHFileTransfer;
- Text = My.Language.strMenuSSHFileTransfer;
+ grpFiles.Text = Language.strGroupboxFiles;
+ lblLocalFile.Text = Language.strLocalFile + ":";
+ lblRemoteFile.Text = Language.strRemoteFile + ":";
+ btnBrowse.Text = Language.strButtonBrowse;
+ grpConnection.Text = Language.strGroupboxConnection;
+ lblProtocol.Text = Language.strLabelProtocol;
+ lblPassword.Text = Language.strLabelPassword;
+ lblUser.Text = Language.strUser + ":";
+ lblPort.Text = Language.strLabelPort;
+ lblHost.Text = Language.strHost + ":";
+ btnTransfer.Text = Language.strTransfer;
+ TabText = Language.strMenuSSHFileTransfer;
+ Text = Language.strMenuSSHFileTransfer;
}
#endregion
@@ -392,13 +393,13 @@ namespace mRemoteNG.UI.Window
{
if (AllFieldsSet() == false)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strPleaseFillAllFields);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strPleaseFillAllFields);
return;
}
if (File.Exists(this.txtLocalFile.Text) == false)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, My.Language.strLocalFileDoesNotExist);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.WarningMsg, Language.strLocalFileDoesNotExist);
return;
}
@@ -429,7 +430,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferFailed + Environment.NewLine + ex.Message);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSSHTransferFailed + Environment.NewLine + ex.Message);
this.sshT.Close();
}
}
@@ -446,7 +447,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHStartTransferBG + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSSHStartTransferBG + Environment.NewLine + ex.Message, true);
}
}
@@ -456,7 +457,7 @@ namespace mRemoteNG.UI.Window
{
if (this.txtPassword.Text == "")
{
- if (Interaction.MsgBox(My.Language.strEmptyPasswordContinue, (Microsoft.VisualBasic.MsgBoxStyle) (MsgBoxStyle.Question | MsgBoxStyle.YesNo), null) == MsgBoxResult.No)
+ if (Interaction.MsgBox(Language.strEmptyPasswordContinue, (Microsoft.VisualBasic.MsgBoxStyle) (MsgBoxStyle.Question | MsgBoxStyle.YesNo), null) == MsgBoxResult.No)
{
return false;
}
@@ -548,7 +549,7 @@ namespace mRemoteNG.UI.Window
EnableButtons();
SetStatus();
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, My.Language.strSSHTransferFailed);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.InformationMsg, Language.strSSHTransferFailed);
if (this.sshT != null)
{
@@ -561,7 +562,7 @@ namespace mRemoteNG.UI.Window
}
catch (Exception ex)
{
- Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSSHTransferEndFailed + Environment.NewLine + ex.Message, true);
+ Runtime.MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, Language.strSSHTransferEndFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion
diff --git a/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs b/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs
index 7f3189f5d..98d2fb502 100644
--- a/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs
+++ b/mRemoteV1/UI/Window/ScreenshotManagerWindow.cs
@@ -5,6 +5,7 @@ using System.Windows.Forms;
using WeifenLuo.WinFormsUI.Docking;
using mRemoteNG.App;
using System.IO;
+using mRemoteNG.My;
using mRemoteNG.UI.Forms;
@@ -73,21 +74,21 @@ namespace mRemoteNG.UI.Window
//mMenFile
//
this.mMenFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {this.mMenFileSaveAll, this.mMenFileRemoveAll});
- this.mMenFile.Image = My.Resources.File;
+ this.mMenFile.Image = Resources.File;
this.mMenFile.Name = "mMenFile";
this.mMenFile.Size = new System.Drawing.Size(51, 20);
this.mMenFile.Text = "&File";
//
//mMenFileSaveAll
//
- this.mMenFileSaveAll.Image = My.Resources.Screenshot_Save;
+ this.mMenFileSaveAll.Image = Resources.Screenshot_Save;
this.mMenFileSaveAll.Name = "mMenFileSaveAll";
this.mMenFileSaveAll.Size = new System.Drawing.Size(128, 22);
this.mMenFileSaveAll.Text = "Save All";
//
//mMenFileRemoveAll
//
- this.mMenFileRemoveAll.Image = My.Resources.Screenshot_Delete;
+ this.mMenFileRemoveAll.Image = Resources.Screenshot_Delete;
this.mMenFileRemoveAll.Name = "mMenFileRemoveAll";
this.mMenFileRemoveAll.Size = new System.Drawing.Size(128, 22);
this.mMenFileRemoveAll.Text = "Remove All";
@@ -100,14 +101,14 @@ namespace mRemoteNG.UI.Window
//
//cMenScreenshotCopy
//
- this.cMenScreenshotCopy.Image = My.Resources.Screenshot_Copy;
+ this.cMenScreenshotCopy.Image = Resources.Screenshot_Copy;
this.cMenScreenshotCopy.Name = "cMenScreenshotCopy";
this.cMenScreenshotCopy.Size = new System.Drawing.Size(99, 22);
this.cMenScreenshotCopy.Text = "Copy";
//
//cMenScreenshotSave
//
- this.cMenScreenshotSave.Image = My.Resources.Screenshot_Save;
+ this.cMenScreenshotSave.Image = Resources.Screenshot_Save;
this.cMenScreenshotSave.Name = "cMenScreenshotSave";
this.cMenScreenshotSave.Size = new System.Drawing.Size(99, 22);
this.cMenScreenshotSave.Text = "Save";
@@ -125,7 +126,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.flpScreenshots);
this.Controls.Add(this.msMain);
this.HideOnClose = true;
- this.Icon = My.Resources.Screenshot_Icon;
+ this.Icon = Resources.Screenshot_Icon;
this.MainMenuStrip = this.msMain;
this.Name = "ScreenshotManager";
this.TabText = "Screenshots";
@@ -147,14 +148,14 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- mMenFile.Text = My.Language.strMenuFile;
- mMenFileSaveAll.Text = My.Language.strSaveAll;
- mMenFileRemoveAll.Text = My.Language.strRemoveAll;
- cMenScreenshotCopy.Text = My.Language.strMenuCopy;
- cMenScreenshotSave.Text = My.Language.strSave;
- dlgSaveSingleImage.Filter = My.Language.strSaveImageFilter;
- TabText = My.Language.strScreenshots;
- Text = My.Language.strScreenshots;
+ mMenFile.Text = Language.strMenuFile;
+ mMenFileSaveAll.Text = Language.strSaveAll;
+ mMenFileRemoveAll.Text = Language.strRemoveAll;
+ cMenScreenshotCopy.Text = Language.strMenuCopy;
+ cMenScreenshotSave.Text = Language.strSave;
+ dlgSaveSingleImage.Filter = Language.strSaveImageFilter;
+ TabText = Language.strScreenshots;
+ Text = Language.strScreenshots;
}
#endregion
diff --git a/mRemoteV1/UI/Window/UltraVNCWindow.cs b/mRemoteV1/UI/Window/UltraVNCWindow.cs
index 5a3186900..8e0e85aaa 100644
--- a/mRemoteV1/UI/Window/UltraVNCWindow.cs
+++ b/mRemoteV1/UI/Window/UltraVNCWindow.cs
@@ -1,6 +1,7 @@
using System;
using Microsoft.VisualBasic;
using mRemoteNG.App;
+using mRemoteNG.My;
using WeifenLuo.WinFormsUI.Docking;
@@ -58,7 +59,7 @@ namespace mRemoteNG.UI.Window
this.ClientSize = new System.Drawing.Size(446, 362);
this.Controls.Add(this.pnlContainer);
this.Controls.Add(this.tsMain);
- this.Icon = My.Resources.UVNC_SC_Icon;
+ this.Icon = Resources.UVNC_SC_Icon;
this.Name = "UltraVNCSC";
this.TabText = "UltraVNC SC";
this.Text = "UltraVNC SC";
@@ -93,7 +94,7 @@ namespace mRemoteNG.UI.Window
private void ApplyLanguage()
{
- btnDisconnect.Text = My.Language.strButtonDisconnect;
+ btnDisconnect.Text = Language.strButtonDisconnect;
}
private void StartListening()
@@ -113,9 +114,9 @@ namespace mRemoteNG.UI.Window
//vnc.Show()
//vnc.StretchMode = ViewerX.ScreenStretchMode.SSM_ASPECT
- //vnc.ListeningText = My.Language.strInheritListeningForIncomingVNCConnections & " " & My.Settings.UVNCSCPort
+ //vnc.ListeningText = Language.strInheritListeningForIncomingVNCConnections & " " & Settings.UVNCSCPort
- //vnc.ListenEx(My.Settings.UVNCSCPort)
+ //vnc.ListenEx(Settings.UVNCSCPort)
}
catch (Exception ex)
{
diff --git a/mRemoteV1/UI/Window/UpdateWindow.Designer.cs b/mRemoteV1/UI/Window/UpdateWindow.Designer.cs
index 5cb5423a4..87663730a 100644
--- a/mRemoteV1/UI/Window/UpdateWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/UpdateWindow.Designer.cs
@@ -1,5 +1,7 @@
+using mRemoteNG.My;
+
namespace mRemoteNG.UI.Window
{
public partial class UpdateWindow
@@ -184,7 +186,7 @@ namespace mRemoteNG.UI.Window
this.Controls.Add(this.pnlUpdate);
this.Controls.Add(this.lblStatus);
this.Font = new System.Drawing.Font("Microsoft Sans Serif", (float) (8.25F), System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, System.Convert.ToByte(0));
- this.Icon = My.Resources.Update_Icon;
+ this.Icon = Resources.Update_Icon;
this.Name = "Update";
this.TabText = "Update";
this.Text = "Update";
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index a14e23c2d..eeac1b9be 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -1,1750 +1,603 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Normal
-
-
- False
-
-
- True
-
-
-
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- noinfo
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
- 80
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- RDP
-
-
- Default Settings
-
-
- False
-
-
- FitToWindow
-
-
- Colors16Bit
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- DoNotPlay
-
-
- 2
-
-
- False
-
-
- False
-
-
- False
-
-
- 0
-
-
- False
-
-
- True
-
-
- 0, 0
-
-
- Bottom
-
-
- True
-
-
- 3, 24
-
-
- Top
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- EncrBasic
-
-
- False
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- AuthVNC
-
-
- ColNormal
-
-
- SmartSAspect
-
-
- False
-
-
- CompNone
-
-
- EncHextile
-
-
-
-
-
-
-
-
- 0
-
-
- ProxyNone
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- NoAuth
-
-
- False
-
-
- 5500
-
-
- False
-
-
-
-
-
- IE
-
-
- False
-
-
-
-
-
- False
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
- 7
-
-
- 1980-01-01
-
-
- False
-
-
- Never
-
-
- Yes
-
-
- mRemoteNG
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 4
-
-
- mRemoteNG
-
-
- 10
-
-
- {0}.{1:yyyyMMdd-HHmmssffff}.backup
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
-
-
-
-
-
-
- True
-
-
-
-
-
- True
-
-
- False
-
-
- False
-
-
- RDP
-
-
- 9/9, 33/8
-
-
- 9/8, 34/8
-
-
- False
-
-
-
-
- Normal
-
-
- False
-
-
- True
-
-
-
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- noinfo
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
- 80
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- RDP
-
-
- Default Settings
-
-
- False
-
-
- FitToWindow
-
-
- Colors16Bit
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- DoNotPlay
-
-
- 2
-
-
- False
-
-
- False
-
-
- False
-
-
- 0
-
-
- False
-
-
- True
-
-
- 0, 0
-
-
- Bottom
-
-
- True
-
-
- 3, 24
-
-
- Top
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- EncrBasic
-
-
- False
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- AuthVNC
-
-
- ColNormal
-
-
- SmartSAspect
-
-
- False
-
-
- CompNone
-
-
- EncHextile
-
-
-
-
-
-
-
-
- 0
-
-
- ProxyNone
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- NoAuth
-
-
- False
-
-
- 5500
-
-
- False
-
-
-
-
-
- IE
-
-
- False
-
-
-
-
-
- False
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
- 7
-
-
- 1980-01-01
-
-
- False
-
-
- Never
-
-
- Yes
-
-
- mRemoteNG
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 4
-
-
- mRemoteNG
-
-
- 10
-
-
- {0}.{1:yyyyMMdd-HHmmssffff}.backup
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
-
-
-
-
-
-
- True
-
-
- https://update.mremoteng.org/
-
-
-
-
-
- True
-
-
- False
-
-
- False
-
-
- RDP
-
-
- 9/9, 33/8
-
-
- 9/8, 34/8
-
-
-
-
- Normal
-
-
- False
-
-
- True
-
-
-
-
-
- True
-
-
- True
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
- True
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- noinfo
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
-
- 80
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- RDP
-
-
- Default Settings
-
-
- False
-
-
- FitToWindow
-
-
- Colors16Bit
-
-
- True
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- DoNotPlay
-
-
- 2
-
-
- False
-
-
- False
-
-
- False
-
-
- 0
-
-
- False
-
-
- True
-
-
- 0, 0
-
-
- Bottom
-
-
- True
-
-
- 3, 24
-
-
- Top
-
-
- False
-
-
- False
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- EncrBasic
-
-
- False
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
- AuthVNC
-
-
- ColNormal
-
-
- SmartSAspect
-
-
- False
-
-
- CompNone
-
-
- EncHextile
-
-
-
-
-
-
-
-
- 0
-
-
- ProxyNone
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- NoAuth
-
-
- False
-
-
- 5500
-
-
- False
-
-
-
-
-
- IE
-
-
- False
-
-
-
-
-
- False
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
-
-
-
- False
-
-
- 7
-
-
- 1980-01-01
-
-
- False
-
-
- Never
-
-
- Yes
-
-
- mRemoteNG
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 5
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
- 4
-
-
- mRemoteNG
-
-
- 10
-
-
- {0}.{1:yyyyMMdd-HHmmssffff}.backup
-
-
- False
-
-
- True
-
-
- False
-
-
- False
-
-
-
-
-
- True
-
-
-
-
-
-
-
-
- True
-
-
- https://update.mremoteng.org/
-
-
-
-
-
- True
-
-
- False
-
-
- False
-
-
- RDP
-
-
- 9/9, 33/8
-
-
- 9/8, 34/8
-
-
-
-
-
-
- de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW
-
-
- release
-
-
- https://update.mremoteng.org/announcement.txt
-
-
- https://update.mremoteng.org/
-
-
-
-
- de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW
-
-
- release
-
-
- https://update.mremoteng.org/announcement.txt
-
-
-
-
- de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW
-
-
- release
-
-
- https://update.mremoteng.org/announcement.txt
-
-
-
-
+
+
+
+
+
+
+ Normal
+
+
+ False
+
+
+ True
+
+
+
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+
+
+
+ True
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ noinfo
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+
+
+
+ 80
+
+
+ False
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RDP
+
+
+ Default Settings
+
+
+ False
+
+
+ FitToWindow
+
+
+ Colors16Bit
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ DoNotPlay
+
+
+ 2
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ 0
+
+
+ False
+
+
+ True
+
+
+ 0, 0
+
+
+ Bottom
+
+
+ True
+
+
+ 3, 24
+
+
+ Top
+
+
+ False
+
+
+ False
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ EncrBasic
+
+
+ False
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ AuthVNC
+
+
+ ColNormal
+
+
+ SmartSAspect
+
+
+ False
+
+
+ CompNone
+
+
+ EncHextile
+
+
+
+
+
+
+
+
+ 0
+
+
+ ProxyNone
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ NoAuth
+
+
+ False
+
+
+ 5500
+
+
+ False
+
+
+
+
+
+ IE
+
+
+ False
+
+
+
+
+
+ False
+
+
+ False
+
+
+
+
+
+ False
+
+
+
+
+
+ False
+
+
+
+
+
+ False
+
+
+ 7
+
+
+ 1980-01-01
+
+
+ False
+
+
+ Never
+
+
+ Yes
+
+
+ mRemoteNG
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ False
+
+
+ 4
+
+
+ mRemoteNG
+
+
+ 10
+
+
+ {0}.{1:yyyyMMdd-HHmmssffff}.backup
+
+
+ False
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+
+
+
+ True
+
+
+
+
+
+
+
+
+ True
+
+
+
+
+
+ True
+
+
+ False
+
+
+ False
+
+
+ RDP
+
+
+ 9/9, 33/8
+
+
+ 9/8, 34/8
+
+
+ False
+
+
+
+
+
+
+ de,el,en,en-US,es-AR,es,fr,hu,it,nb-NO,nl,pt,pt-BR,pl,ru,uk,zh-CN,zh-TW
+
+
+ release
+
+
+ https://update.mremoteng.org/announcement.txt
+
+
+ https://update.mremoteng.org/
+
+
+
+
\ No newline at end of file
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index d61eb6999..22f434e3a 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -7,7 +7,7 @@
2.0
{4934A491-40BC-4E5B-9166-EA1169A220F6}
WinExe
- mRemoteNG.App.ProgramRoot
+ mRemoteNG.Program
mRemoteNG
mRemoteNG
WindowsForms
@@ -220,6 +220,7 @@
+
@@ -572,7 +573,7 @@
ResXFileCodeGenerator
Language.Designer.cs
- mRemoteNG.My
+ mRemoteNG
Designer
@@ -596,7 +597,7 @@
ResXFileCodeGenerator
Resources.Designer.cs
- mRemoteNG.My
+ mRemoteNG
Designer
@@ -672,6 +673,7 @@
+
MyApplicationCodeGenerator
Application.Designer.cs
@@ -1068,11 +1070,11 @@
-
- mRemoteNG.My
+ mRemoteNG
SettingsSingleFileGenerator
Settings.Designer.cs
+ Designer