Fix typo in previous commit.

BUILD.CMD

@@ -1,6 +1,6 @@
 @echo off
 
-SET VERSIONTAG=RC2
+SET VERSIONTAG=RC4
 
 SET VCVARSALL="%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat"
 SET DEVENV="devenv.exe"

CREDITS.TXT

@@ -3,6 +3,7 @@ Contributors
 
 Lionel Caignec
 Felix Deimel
+Holger Henke
 Tom Hiller
 Riley McArdle
 Apisitt Rattana

Installer/mRemote.nsi

@@ -6,7 +6,7 @@
 
 ; This will be passed in using the /D switch by BUILD.CMD
 !ifdef PRODUCT_VERSION_TAG
-	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT} ${PRODUCT_VERSION_TAG}"
+	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"
 	!define PRODUCT_VERSION_TAGGED "${PRODUCT_VERSION_SHORT}-${PRODUCT_VERSION_TAG}"
 !else
 	!define PRODUCT_VERSION_FRIENDLY "${PRODUCT_VERSION_SHORT}"

mRemoteV1/App/App.Runtime.vb

@@ -54,7 +54,7 @@ Namespace App
             Public Shared screenshotPanel As New DockContent
             Public Shared quickyForm As UI.Window.QuickConnect
             Public Shared quickyPanel As New DockContent
-            Public Shared optionsForm As UI.Window.Options
+            Public Shared optionsForm As frmOptions
             Public Shared optionsPanel As New DockContent
             Public Shared saveasForm As UI.Window.SaveAs
             Public Shared saveasPanel As New DockContent
@@ -93,9 +93,7 @@ Namespace App
 
                             Windows.adimportPanel.Show(frmMain.pnlDock)
                         Case UI.Window.Type.Options
-                            Windows.optionsForm = New UI.Window.Options(Windows.optionsPanel)
-                            Windows.optionsPanel = Windows.optionsForm
-
+                            Windows.optionsForm = New frmOptions(Windows.optionsPanel)
                             Windows.optionsForm.Show(frmMain.pnlDock)
                         Case UI.Window.Type.SaveAs
                             Windows.saveasForm = New UI.Window.SaveAs(Windows.saveasPanel)
@@ -147,6 +145,11 @@ Namespace App
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "Show (App.Runtime.Windows) failed" & vbNewLine & ex.Message, True)
                 End Try
             End Sub
+
+            Public Shared Sub ShowUpdatesTab()
+                Windows.optionsForm = New frmOptions(Windows.optionsPanel)
+                Windows.optionsForm.Show(frmMain.pnlDock, 4)
+            End Sub
         End Class
 
         Public Class Screens
@@ -203,24 +206,21 @@ Namespace App
             Public Shared Sub SetDefaultLayout()
                 frmMain.pnlDock.Visible = False
 
-                Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
+                frmMain.pnlDock.DockLeftPortion = 0.25
+                frmMain.pnlDock.DockRightPortion = 0.25
+                frmMain.pnlDock.DockTopPortion = 0.25
+                frmMain.pnlDock.DockBottomPortion = 0.25
 
                 Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                For Each pane As DockPane In frmMain.pnlDock.Panes
-                    If pane.DockState = DockState.DockLeft Then
-                        Windows.treePanel.DockTo(pane, DockStyle.Top, 0)
-                        Exit For
-                    End If
-                Next
-
-                Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-
-                Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-
-                Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                Windows.screenshotForm.Hide()
+                Windows.configPanel.Show(frmMain.pnlDock)
+                Windows.configPanel.DockTo(Windows.treePanel.Pane, DockStyle.Bottom, -1)
 
                 Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.screenshotPanel.Show(Windows.quickyPanel.Pane, Windows.quickyPanel)
+                Windows.sessionsPanel.Show(Windows.quickyPanel.Pane, Windows.screenshotPanel)
+                Windows.errorsPanel.Show(Windows.quickyPanel.Pane, Windows.sessionsPanel)
+
+                Windows.screenshotForm.Hide()
                 Windows.quickyForm.Hide()
 
                 frmMain.pnlDock.Visible = True
@@ -385,8 +385,10 @@ Namespace App
                 Try
                     LastSQLUpdate = Nothing
                     RemoveHandler Tools.Misc.SQLUpdateCheckFinished, AddressOf SQLUpdateCheckFinished
-                    tmrSqlWatcher.Stop()
-                    tmrSqlWatcher.Close()
+                    If tmrSqlWatcher IsNot Nothing Then
+                        tmrSqlWatcher.Stop()
+                        tmrSqlWatcher.Close()
+                    End If
                 Catch ex As Exception
                 End Try
             End Sub
@@ -584,11 +586,9 @@ Namespace App
 
                 pnlcForm.Show(frmMain.pnlDock, DockState.Document)
 
-                If NoTabber = True Then
+                If NoTabber Then
                     TryCast(cForm, UI.Window.Connection).TabController.Dispose()
-                End If
-
-                If NoTabber = False Then
+                Else
                     wL.Add(cForm)
                 End If
 
@@ -798,6 +798,7 @@ Namespace App
 
                 conL.UseSQL = My.Settings.UseSQLServer
                 conL.SQLHost = My.Settings.SQLHost
+                conL.SQLDatabaseName = My.Settings.SQLDatabaseName
                 conL.SQLUsername = My.Settings.SQLUser
                 conL.SQLPassword = Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey)
                 conL.SQLUpdate = Update
@@ -1112,6 +1113,7 @@ Namespace App
                 If My.Settings.UseSQLServer = True Then
                     conS.SaveFormat = Config.Connections.Save.Format.SQL
                     conS.SQLHost = My.Settings.SQLHost
+                    conS.SQLDatabaseName = My.Settings.SQLDatabaseName
                     conS.SQLUsername = My.Settings.SQLUser
                     conS.SQLPassword = Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey)
                 End If
@@ -1598,7 +1600,7 @@ Namespace App
 
         Public Shared Sub SetMainFormText(Optional ByVal ConnectionFileName As String = "")
             Try
-                Dim txt As String = "mRemoteNG"
+                Dim txt As String = My.Application.Info.ProductName
 
                 If App.Editions.Spanlink.Enabled Then
                     txt &= " | Spanlink Communications"

mRemoteV1/App/App.SupportedCultures.vb

@@ -7,7 +7,7 @@
             For Each CultureName As String In My.Settings.SupportedUICultures.Split(",")
                 Try
                     CultureInfo = New Globalization.CultureInfo(CultureName.Trim)
-                    Add(CultureInfo.Name, CultureInfo.NativeName)
+                    Add(CultureInfo.Name, CultureInfo.TextInfo.ToTitleCase(CultureInfo.NativeName))
                 Catch ex As Exception
                     Debug.Print(String.Format("An exception occurred while adding the culture '{0}' to the list of supported cultures. {1}", CultureName, ex.ToString))
                 End Try

mRemoteV1/CHANGELOG.TXT

@@ -1,4 +1,4 @@
-1.67 (2011-05-25):
+1.67 (2011-06-01):
   Fixed migration of external tools configuration and panel layout from Local to Roaming folder.
   Disable ICA Hotkeys for Citrix connections.  Fixes issue with international users.
   Added a language selection option so users can override the language if they don't want it automatically detected.
@@ -18,7 +18,14 @@
   Added Font Smoothing and Desktop Composition RDP settings.
   Improved error handling when loading XML connection files.
   Added the mRemoteNG icon to the list of selectable icons for connection entries.
+  Added confirmation before closing connection tabs.
+  Fixed bug 42 - Maximized location not remembered with multiple monitors.
+  Improved loading and saving of window location.
+  Removed flickering on start up.
+  Changed the Options page into a normal dialog.
+  Improved Reset Layout function.
   Changed to use full four part version numbers with major, minor, build, and revision.
+  Changed hard coded SQL database name into a user configurable setting.
 
 1.66 (2011-05-02):
   Fixed connections not working

mRemoteV1/Config/Config.Connections.Load.vb

@@ -18,8 +18,6 @@ Namespace Config
             Private sqlQuery As SqlCommand
             Private sqlRd As SqlDataReader
 
-            Private sqlDB As String = "mRemoteNG"
-
             Private selNode As TreeNode
 #End Region
 
@@ -44,6 +42,16 @@ Namespace Config
                 End Set
             End Property
 
+            Private _SQLDatabaseName As String
+            Public Property SQLDatabaseName() As String
+                Get
+                    Return _SQLDatabaseName
+                End Get
+                Set(ByVal value As String)
+                    _SQLDatabaseName = value
+                End Set
+            End Property
+
             Private _SQLUsername As String
             Public Property SQLUsername() As String
                 Get
@@ -177,9 +185,9 @@ Namespace Config
                     App.Runtime.ConnectionsFileLoaded = False
 
                     If _SQLUsername <> "" Then
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
                     Else
-                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                        sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";Integrated Security=True")
                     End If
 
                     sqlCon.Open()

mRemoteV1/Config/Config.Connections.Save.vb

@@ -24,8 +24,6 @@ Namespace Config
             Private xW As XmlTextWriter
             Private pW As String = App.Info.General.EncryptionKey
 
-            Private sqlDB As String = "mRemote"
-
             Private sqlCon As SqlConnection
             Private sqlQuery As SqlCommand
             Private sqlWr As Integer
@@ -45,6 +43,16 @@ Namespace Config
                 End Set
             End Property
 
+            Private _SQLDatabaseName As String
+            Public Property SQLDatabaseName() As String
+                Get
+                    Return _SQLDatabaseName
+                End Get
+                Set(ByVal value As String)
+                    _SQLDatabaseName = value
+                End Set
+            End Property
+
             Private _SQLUsername As String
             Public Property SQLUsername() As String
                 Get
@@ -167,9 +175,9 @@ Namespace Config
 #Region "SQL"
             Private Sub SaveToSQL()
                 If _SQLUsername <> "" Then
-                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
+                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";User Id=" & _SQLUsername & ";Password=" & _SQLPassword)
                 Else
-                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                    sqlCon = New SqlConnection("Data Source=" & _SQLHost & ";Initial Catalog=" & _SQLDatabaseName & ";Integrated Security=True")
                 End If
 
                 sqlCon.Open()

mRemoteV1/Config/Config.Settings.Load.vb

@@ -38,28 +38,43 @@ Namespace Config
                             My.Settings.UpdatePending = False
                         End If
 
-                        If My.Settings.MainFormLocation <> New Point(999, 999) Then
-                            .Location = My.Settings.MainFormLocation
+                        App.SupportedCultures.InstantiateSingleton()
+                        If Not My.Settings.OverrideUICulture = "" And App.SupportedCultures.IsNameSupported(My.Settings.OverrideUICulture) Then
+                            Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo(My.Settings.OverrideUICulture)
                         End If
 
-                        If My.Settings.MainFormSize <> Nothing Then
-                            .Size = My.Settings.MainFormSize
-                        End If
-
-                        'check if form is visible
-                        Dim curScreen As Screen = Screen.FromHandle(.Handle)
-
-                        If .Right < curScreen.Bounds.Left Or .Left > curScreen.Bounds.Right _
-                            Or .Top * -1 > curScreen.Bounds.Top * -1 Or .Bottom > curScreen.Bounds.Bottom Then
-                            .Location = curScreen.Bounds.Location
-                        End If
-
-
-                        If My.Settings.MainFormState = Nothing Or My.Settings.MainFormState = FormWindowState.Minimized Then
-                            .WindowState = FormWindowState.Normal
+                        .WindowState = FormWindowState.Normal
+                        If My.Settings.MainFormState = FormWindowState.Normal Then
+                            If Not My.Settings.MainFormLocation.IsEmpty Then .Location = My.Settings.MainFormLocation
+                            If Not My.Settings.MainFormSize.IsEmpty Then .Size = My.Settings.MainFormSize
                         Else
-                            .WindowState = My.Settings.MainFormState
+                            If Not My.Settings.MainFormRestoreLocation.IsEmpty Then .Location = My.Settings.MainFormRestoreLocation
+                            If Not My.Settings.MainFormRestoreSize.IsEmpty Then .Size = My.Settings.MainFormRestoreSize
                         End If
+                        If My.Settings.MainFormState = FormWindowState.Maximized Then
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        ' Make sure the form is visible on the screen
+                        Const minHorizontal As Integer = 300
+                        Const minVertical As Integer = 150
+                        Dim screenBounds As Drawing.Rectangle = Screen.FromHandle(.Handle).Bounds
+                        Dim newBounds As Drawing.Rectangle = .Bounds
+
+                        If newBounds.Right < screenBounds.Left + minHorizontal Then
+                            newBounds.X = screenBounds.Left + minHorizontal - newBounds.Width
+                        End If
+                        If newBounds.Left > screenBounds.Right - minHorizontal Then
+                            newBounds.X = screenBounds.Right - minHorizontal
+                        End If
+                        If newBounds.Bottom < screenBounds.Top + minVertical Then
+                            newBounds.Y = screenBounds.Top + minVertical - newBounds.Height
+                        End If
+                        If newBounds.Top > screenBounds.Bottom - minVertical Then
+                            newBounds.Y = screenBounds.Bottom - minVertical
+                        End If
+
+                        .Location = newBounds.Location
 
                         If My.Settings.MainFormKiosk = True Then
                             Tools.Misc.Fullscreen.EnterFullscreen()

mRemoteV1/Config/Config.Settings.Save.vb

@@ -1,6 +1,7 @@
 Imports mRemoteNG.App.Runtime
 Imports System.Xml
 Imports System.IO
+Imports mRemoteNG.Tools.WindowPlacement
 
 Namespace Config
     Namespace Settings
@@ -25,12 +26,18 @@ Namespace Config
             Public Sub Save()
                 Try
                     With Me._MainForm
-                        If .WindowState = FormWindowState.Normal Then
-                            My.Settings.MainFormLocation = .Location
-                            My.Settings.MainFormSize = .Size
-                        Else
-                            My.Settings.MainFormLocation = .RestoreBounds.Location
-                            My.Settings.MainFormSize = .RestoreBounds.Size
+                        Dim windowPlacement As New Tools.WindowPlacement(_MainForm)
+                        If .WindowState = FormWindowState.Minimized And windowPlacement.RestoreToMaximized Then
+                            .Opacity = 0
+                            .WindowState = FormWindowState.Maximized
+                        End If
+
+                        My.Settings.MainFormLocation = .Location
+                        My.Settings.MainFormSize = .Size
+
+                        If Not .WindowState = FormWindowState.Normal Then
+                            My.Settings.MainFormRestoreLocation = .RestoreBounds.Location
+                            My.Settings.MainFormRestoreSize = .RestoreBounds.Size
                         End If
 
                         My.Settings.MainFormState = .WindowState

mRemoteV1/Forms/frmMain.Designer.vb

@@ -740,7 +740,7 @@ Partial Class frmMain
         Me.ToolStrip1.Name = "ToolStrip1"
         Me.ToolStrip1.Size = New System.Drawing.Size(264, 25)
         Me.ToolStrip1.TabIndex = 19
-		Me.ToolStrip1.Visible = False
+        Me.ToolStrip1.Visible = False
         '
         'ToolStripButton1
         '
@@ -806,6 +806,7 @@ Partial Class frmMain
         Me.Icon = Global.mRemoteNG.My.Resources.Resources.mRemote_Icon
         Me.MainMenuStrip = Me.msMain
         Me.Name = "frmMain"
+        Me.Opacity = 0
         Me.Text = "mRemoteNG"
         Me.msMain.ResumeLayout(False)
         Me.msMain.PerformLayout()

mRemoteV1/Forms/frmMain.vb

@@ -10,32 +10,37 @@ Public Class frmMain
     Public Shared Event clipboardchange()
     Private fpChainedWindowHandle As IntPtr
 
+#Region "Properties"
+    Private _IsClosing As Boolean = False
+    Public ReadOnly Property IsClosing() As Boolean
+        Get
+            Return _IsClosing
+        End Get
+    End Property
+#End Region
+
 #Region "Startup & Shutdown"
     Private Sub frmMain_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
         'insert enable edition code here
         App.Editions.Spanlink.Enabled = False
 
-        App.SupportedCultures.InstantiateSingleton()
-        If Not My.Settings.OverrideUICulture = "" And App.SupportedCultures.IsNameSupported(My.Settings.OverrideUICulture) Then
-            Threading.Thread.CurrentThread.CurrentUICulture = New Globalization.CultureInfo(My.Settings.OverrideUICulture)
-        End If
-
-        ApplyLanguage()
-
-        Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
-
-        Startup.ParseCommandLineArgs()
-        fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
+        Startup.CreateLogger()
 
         ' Create gui config load and save objects
         sL = New Config.Settings.Load(Me)
         sS = New Config.Settings.Save(Me)
 
-        Startup.CreateLogger()
-
         ' Load GUI Configuration
         sL.Load()
 
+        Debug.Print("---------------------------" & vbNewLine & "[START] - " & Now)
+
+        Startup.ParseCommandLineArgs()
+
+        ApplyLanguage()
+
+        fpChainedWindowHandle = SetClipboardViewer(Me.Handle)
+
         mC = New Messages.Collector(Windows.errorsForm)
 
         Connection.Protocol.RDP.Resolutions.AddResolutions()
@@ -67,8 +72,7 @@ Public Class frmMain
                 My.Settings.CheckForUpdatesAsked = True
             End If
             If cTaskDialog.CommandButtonResult = 1 Then
-                Windows.Show(UI.Window.Type.Options)
-                Windows.optionsForm.ShowUpdatesTab()
+                Windows.ShowUpdatesTab()
             End If
         End If
 
@@ -78,6 +82,8 @@ Public Class frmMain
 
         AddSysMenuItems()
         AddHandler Microsoft.Win32.SystemEvents.DisplaySettingsChanged, AddressOf DisplayChanged
+
+        Me.Opacity = 1
     End Sub
 
     Private Sub ApplyLanguage()
@@ -157,6 +163,8 @@ Public Class frmMain
             End If
         End If
 
+        _IsClosing = True
+
         For Each Window As UI.Window.Base In wL
             Window.Close()
         Next

mRemoteV1/Forms/frmOptions.resx

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="imgListPages.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imgListPages.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAB0
+        IgAAAk1TRnQBSQFMAgEBBwEAAcgBAAHIAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABIAMAAQEBAAEgBgABIB4AAeIB7wH0Af8BqAHJAdcB/wF4AaQBtgH/AVsBhgGcAf8BRgFtAYoB/wFB
+        AWgBhwH/AUEBcgGVAf8BVAGOAasB/wGPAbcBzQH/Ad0B6gHxAf8MAANXAbcDnwH/A5oB/wOWAf8DkQH/
+        A40B/wOJAf8DhAH/A4AB/wNjAf8DXwH/A1sB/wNYAf8DVAH/A1EB/wNXAbcYAAMNARIDVgG2A1YBtgMN
+        ARFgAAGtAc8B3wH/AVMBkQGtAf8BWAGjAb8B/wF0AcAB1AH/AZUB2QHmAf8BgQHbAfAB/wFMAcYB7AH/
+        ASABqgHdAf8BEgGSAccB/wEeAYABrAH/ATUBbQGSAf8BnQG/AdEB/wgAA6gB/wPpAf8D0wH/A9IB/wPR
+        Af8D0AH/A84B/wPNAf8DzQH/A8sB/wPLAf8DygH/A8kB/wPIAf8D4gH/A1EB/xgAA14B2QPkAf8D4wH/
+        A1gBwWAAAVYBhAGbAf8BQAG9AecB/wFjAdMB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHw
+        Af8BGgG2Ae0B/wEAAacB6AH/AQABoQHhAf8BBQGWAdIB/wE5AVoBdgH/CAADrQH/A9YB/wO6Af8DuAH/
+        A7UB/wOzAf8DsQH/A7AB/wOtAf8DqwH/A6oB/wOoAf8DpwH/A6YB/wPIAf8DVQH/CAADCwEPA1QBrQM6
+        AWEDPwFuA3wB+AHiAeEB3wH/AeEB4AHfAf8DbAHzAzwBZwM8AWYDUwGtAwsBD1AAAVkBhwGeAf8BPwHE
+        AfAB/wFlAdQB8QH/AYwB4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGgG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE6AVsBeAH/CAADsQH/A9kB/wO9Af8DugH/A7gB/wO2Af8DtQH/A7MB/wOw
+        Af8DrwH/A60B/wOrAf8DqQH/A6gB/wPKAf8DWQH/CAADWgHFBP8CtwG2Af4CtgG1Af4C5wHmAf8B1gHV
+        AdMB/wHXAdYB1AH/AeMB4gHgAf8BqwGqAagB/gKyAbEB/QHpAegB5gH/A1gBwVAAAVsBiQGgAf8BPwHE
+        Ae8B/wFkAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGCAd8B8wH/AU0BygHwAf8BGgG2Ae0B/wEAAagB6AH/
+        AQABoQHhAf8BAAGcAdoB/wE8AV4BegH/CAADtgH/A90B/wPBAf8DvQH/A7wB/wO6Af8DuAH/A7UB/wO0
+        Af8DsgH/A7AB/wOtAf8DrAH/A6wB/wPPAf8DXQH/CAADZAHnAvkB9wH/Au8B7gH/AtsB2gH/AcoCyQH/
+        AckByAHGAf8ByQHIAccB/wHJAcgBxwH/AssByQH/AeYB5QHkAf8B5QHkAeIB/wNlAeVQAAFdAYwBogH/
+        AUEBxgHwAf8BZgHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BggHfAfQB/wFNAcoB8AH/ARoBtgHtAf8BAAGo
+        AegB/wEAAaIB4gH/AQABmwHbAf8BPgFhAYAB/wgAA1oBvQPaAf8DyAH/A8AB/wO/Af8DvQH/A7oB/wO4
+        Af8DtwH/A7UB/wOzAf8DsAH/A68B/wOzAf8DwgH/A1oBvQgAA04BlQH2AfUB9AH/AeYB5QHkAf8BvwG+
+        Ab0B/wLrAeoB/wHUAdMB0gH/AdYB1QHUAf8B4gLhAf8CtAGzAf8B1wHWAdQB/wHiAeEB3wH/A0oBjVAA
+        AWABjwGlAf8BQgHGAfAB/wFmAdQB8gH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AUwBygHwAf8BGgG2
+        Ae0B/wEAAacB6AH/AQABoQHiAf8BAAGcAdsB/wFAAWQBgwH/CAADWgG9A+MB/wPnAf8D4QH/A+AB/wPg
+        Af8D3wH/A98B/wPeAf8D3QH/A90B/wPcAf8D2wH/A+AB/wPQAf8DWgG9AwsBDwNVAbUDZAHnAeQB4wHi
+        Af8B0QHQAc8B/wLwAe8B/wOuAf8DZAHxA2cB8gKsAasB/wLoAecB/wLLAcoB/wHgAd8B3QH/A2EB5ANV
+        AbUDCwEPSAABYQGSAagB/wFCAcUB8AH/AWcB1AHyAf8BjQHjAfQB/wGiAesB9gH/AYIB3wH0Af8BTAHK
+        AfAB/wEaAbYB7QH/AQABpwHoAf8BAAGhAeEB/wEAAZwB2wH/AUIBZwGGAf8IAAMpAT8DzgH/A+wB/wPe
+        Af8D2AH/A9IB/wPMAf8DyAH/A8cB/wPIAf8DywH/A9AB/wPdAf8D6AH/A6QB/wMrAUIDPwFtAuQB4wH/
+        AdgB1gHVAf8B0gHRAdAB/wHFAcQBwwH/Ae0B7AHrAf8DVwG6CAADXAHNAegB5wHmAf8BtgG1AbQB/wHW
+        AdUB0wH/AeIB4QHgAf8C4AHfAf8DPAFmSAABZAGVAasB/wFCAcUB8AH/AWcB1AHyAf8BjQHjAfQB/wGi
+        AesB9gH/AYMB3wH0Af8BTQHLAfAB/wEaAbUB7QH/AQABpwHoAf8BAAGhAeIB/wEAAZwB2gH/AUUBagGI
+        Af8MAANaAb0D4wH/A9sB/wPiAf8BtwHQAbgB/wFLAa0BTwH/AV0BqgFLAf8BVwGvAU8B/wE9AaUBSQH/
+        AawBxQGsAf8DwgH/A9EB/wPTAf8DWgG9BAADQgF2AewB6wHoAf8B2gHZAdcB/wHUAdMB0QH/AcYBxQHE
+        Af8B3gLcAf8DRgF+CAADUAGaAd0B3AHbAf8ByAHGAcUB/wLiAeEB/wLhAd8B/wHuAe0B7AH/Az8Bb0gA
+        AWYBmAGuAf8BQgHFAfAB/wFnAdQB8QH/AY0B4wH0Af8BogHrAfYB/wGDAd8B9AH/AU0BygHwAf8BGgG2
+        Ae0B/wEAAagB6QH/AQABoQHhAf8BAAGcAdoB/wFHAWwBigH/DAADKQE/A9EB/wPzAf8BxwHeAcoB/wFL
+        AckBhQH/AbMB3AGkAf8B5wHHAWMB/wHcAb8BWgH/AV0BzAGPAf8BNgGtAU8B/wG4AdABuAH/A/EB/wOv
+        Af8DKwFCBAADLwFKA2AB6wORAfwB3gHdAdwB/wHLAsoB/wHmAuUB/wNhAeEDMgFQAzgBXANgAesC7gHs
+        Af8BzALLAf8B5wHmAeUB/wKSAZEB/ANgAesDLAFDSAABaQGbAbAB/wFBAcYB8AH/AWcB1AHyAf8BjQHj
+        AfQB/wGiAesB9gH/AYMB3wH0Af8BTQHKAfAB/wEaAbYB7QH/AQABqAHoAf8BAAGhAeEB/wEAAZwB2gH/
+        AUoBcAGOAf8QAANaAb0DxAH/AV0BzgGLAf8BmQHkAasB/wGwAcUBRAH/AeoBtQEvAf8B4QGiASAB/wGl
+        AZ0BJwH/AYIBxQGPAf8BMAGaAT0B/wOgAf8DWgG9EAADXgHOAeEB4AHeAf8B2QHXAdYB/wG4ArcB/wHh
+        AeAB3wH/A60B/QOyAf0C9gH1Af8CwAG/Af8B6gHpAegB/wLzAfIB/wNcAclQAAFsAZ8BswH/AUEBxgHw
+        Af8BZQHUAfEB/wGMAeMB9AH/AaIB6wH2Af8BgwHfAfQB/wFNAcoB8AH/ARoBtgHtAf8BAAGnAegB/wEA
+        AaEB4QH/AQABmwHaAf8BTAFzAZAB/xgAAWkBmQF0AfwBogHpAZUB/wHWAc8BUAH/AeIBswEuAf8B0QG7
+        ATYB/wHCAa4BKQH/AYIBvQFTAf8BMwF6AV8B/BgAA0wBkQHjAeIB4AH/At4B3AH/AeEB4AHfAf8BzALL
+        Af8BxAHDAcIB/wLPAc4B/wLeAd0B/wLwAe8B/wLwAe8B/wL2AfUB/wNIAYdQAAFtAaEBtQH/AWcB1QH0
+        Af8BmgHoAfcB/wG1AfMB+gH/AcIB+AH8Af8BwwH4Af0B/wHBAfcB/QH/Aa8B8AH7Af8BjwHiAfcB/wFm
+        AdAB8AH/AToBuAHlAf8BTwF2AZMB/xgAAWsBmQF1AfwBogHwAZ8B/wHYAe0BrwH/Ad4BxQFPAf8BtAHi
+        AUwB/wFHAecBIAH/AVIB1wFSAf8BQwF8AWYB/BQAAwEBAgNfAeMB5QHkAeEB/wLuAe0B/wLuAe0B/wLr
+        AeoB/wHjAeIB4QH/AugB5wH/AuoB6QH/AvMB8gH/AvUB9AH/AfoB+QH4Af8DXAHfUAABcAGjAbgB/wHF
+        AfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9Af8BxQH5Af0B/wHFAfkB/QH/AcUB+QH9
+        Af8BxQH5Af0B/wHFAfkB/QH/AVEBeQGVAf8YAANhAdwByAH3AdQB/wHYAfYBygH/AecB4wGpAf8B2wHP
+        AVMB/wGvAdwBTwH/AZ0B6gGrAf8DXwHgGAADQAFvA38B/gNkAecDYQHzAegB5wHmAf8B5wHmAeUB/wLt
+        AewB/wL7AfoB/wNnAfIDZAHnA4cB/gM9AWhQAAG3AdcB4QH/AYwBvQHMAf8BnQHPAdsB/wGtAd8B6AH/
+        AbkB7AHzAf8BwgH1AfoB/wHCAfUB+gH/AbgB6wHxAf8BqQHaAeMB/wGUAcQB0QH/AXcBqAG4Af8BqQHF
+        AdEB/xgAAy0BRQFsAYkBeAH6AdsB+AHpAf8B5wHyAdgB/wHtAeUBswH/Ad8B2QGmAf8BXwGQAWAB+wMy
+        AVAgAAMPARQDCgEOA1MBqgHvAe4B7QH/AvQB8wH/A1IBpAMIAQsDEQEXWAAC/gL/AeMB8QH0Af8BuQHX
+        AeEB/wGVAb4BzAH/AXcBqAG7Af8BagGbAbAB/wFmAZgBrQH/AW8BoQGzAf8BjAGyAcIB/wGxAc0B1wH/
+        Ad8B6wHvAf8D/gH/HAADLgFHA14B2QFvAZkBcwH8AW8BlQFvAfwDXgHdAzIBUCwAAy8BSgNdAfADYgHv
+        AywBQ2QAAxEBFwNWAbMBUwFUAVMBrLQAAwQBBQMQARUDHwEtAykBPwMvAUkDLgFIAygBPQMeASsDDwEU
+        AwMBBBAAA7cB/wGcAagBngH/AQABXgE5Af8BIwGSAVsB/wEAAWIBOQH/AQsBTwGgAf8BCAFNAZ4B/wEE
+        AUoBmwH/AQEBSAGZAf8BAAFGAZcB/wEAAUMBlAH/AQABQgGTAf8DUwH/A1MB/xwAA0EBcgFMAl8B8wFZ
+        AlwBzwFLAkwBkAMjATNcAAMFAQcDHwEsAj4BPQFqAlIBUAGjAVsCWQHEAV0CWgHTAV0CWgHTAVsCWQHD
+        AVICUQGhAzwBZgMcASgDBAEGDAADFQEdA1EBogEoAZUBXwH/AYIBvgGqAf8BNwGlAYIB/wEYAZcBUQH/
+        ARsBmQFWAf8BHwGZAVoB/wEjAZ0BXwH/AV0BqgHSAf8BWwGoAdEB/wEAAUQBlQH/IAADIQEwASsBSQFz
+        AfwBhgGtAeEB/wFlAagB3AH/AUYBkgHJAf8BFwFZAasB/wFVAlYBsQMfAS1TAAEBAxIBGAM+AWsBXQJZ
+        AdcBYQErASgB/AGsATQBCwH/AeEBVAEoAf8B5AFmATwB/wHTAVIBIAH/AaMBQAEvAf0BYQJeAdoCPgE9
+        AWoDDwEUCAADGAEiAVABUgFQAaQDVgGzAVQBrAGfAf8BWwG3AZ4B/wFlAbsBrAH/AWUBuwGuAf8BZgG7
+        AbAB/wGAAbwBswH/AR4BmgFiAf8BOwGVAccB/wFeAasB0wH/AQABRwGYAf8gAAFUAlYBqwFUAZ0B0QH/
+        AZkBvAHrAf8BWAGgAeMB/wGWAbkB6gH/AZQBuAHqAf8BRwGTAcoB/wErATYBbwH8A0MBeFAAAxsBJgNZ
+        AdIBJAEOAQAB/wGKAUMBKwH/AcoBhgFNAf8B9gG8AZwB/wH5AcwBtwH/AeMBoAFfAf8BsQFeAUQB/wFg
+        AToBGwH/AV4CWAHdAxwBKAgAAVUBVgFVAbEDVgGzA1YBswFDAaQBkQH/AVYBtgGbAf8BTwGyAZsB/wFR
+        AbIBngH/AVMBswGhAf8BhQG/AbYB/wElAZ4BggH/AUABmQHJAf8BYgGtAdQB/wEFAUsBnAH/HAADHwEt
+        ASsBWgF3AfwBnQG/AewB/wFQAZwB4gH/AUIBkwHfAf8BPwGRAd8B/wFGAZQB4AH/AZUBuAHqAf8BhgGt
+        AeEB/wEwAYMBuwH/AUsCTAGQBAADnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wOdAf8DnQH/CAABUwJPAaUBOwEgAQgB/wFgAUsBNgH/AY8BXQFIAf8BrAGI
+        AVIB/wHCAaMBiAH/AcEBpQGOAf8BswGYAYEB/wGRAV0BRwH/AVsBQgEtAf8BSgEjAQAB/wFWAlUBsQgA
+        AwgBCwNVAbIDVgGzAV0BsgGoAf8BZAG9AacB/wGHAcEBtQH/AYYBwQG2Af8BhwHBAbcB/wGIAcEBuQH/
+        ASsBogGIAf8BRQGcAcsB/wFmAbAB1QH/AQoBTgGfAf8QAAMrAUIDSAGEAVUCVwG3AUwBXwFkAfMBXQGk
+        AdcB/wGhAcIB7QH/AZ8BwAHtAf8BnQG/Ae0B/wFbAaMB5AH/AUEBkgHfAf8BPwGQAd4B/wFiAacB5gH/
+        AZIBtgHoAf8BKgFmAbcB/wM3AVoDnQH/AboCvQH/AeYC7AH/AeYC7QH/AecC7QH/AegC7gH/AekC7wH/
+        AekC7wH/AeoC7wH/AeoC8AH/AesC8AH/AesC8QH/AewC8QH/AewC8QH/Ab0CvwH/A50B/wQAAzkBXwFc
+        ATwBIQH/AcMBsQGiAf8BtgGcAYMB/wGmAWABMwH/AagBXgEwAf8BwwGkAYcB/wHYAcYBsAH/Ab0BqQGL
+        Af8BZgFGASYB/wFDASMBBAH/ATkBFQEAAf8BQAEZAQAB/wMzAVMIAAMGAQgDVQGyATYBoAGKAf8BkwHJ
+        AboB/wFGAa8BlwH/ASsBogGDAf8BLAGjAYcB/wEuAaQBiwH/AS0BqgGSAf8BOwHCAe0B/wGBAbQB1wH/
+        AQ8BUgGjAf8MAANMAZMBSwGXAc8B/wFiAagB2QH/AY0BtAHiAf8BowHEAe0B/wGnAccB7gH/AUsBlwHN
+        Af8BGwFcAbIB/wFGAZMByQH/AZ8BwAHtAf8BXwGWAaMB/wGeAZYBLwH/AWMBlAGRAf8BjQGzAekB/wFg
+        AaUB2AH/AVoCXgHYBAADXAHqAdsC4gH/Ac0CzwH/A8sB/wPMAf8DzgH/A88B/wPQAf8D0gH/A9MB/wPV
+        Af8B1wLYAf8B5wLsAf8DbQH3BAADIgExAVYCVQGxAU4BIgEAAf8BqgGFAUYB/wGyAVkBFwH/Aa0BNgEA
+        Af8BugFTAQsB/wHqAdUBvwH/Af0B/AH6Af8B1gG+AaYB/wGQAUYBEwH/AUkBFwEAAf8BSgEnAQYB/wFD
+        ASMBBQH/A1cBxQMcAScIAAMEAQYBHAGUAV4B/wFVAbkBngH/ATABpgGJAf8BYAGxAdUB/wFcAa0B1AH/
+        AVgBqwHSAf8BRgG6AeQB/wEAAZkBUAH/AQ4BjgE/Af8BEQFXAZoB/wwAAUgCYgH2Aa4BzQHwAf8BsAHP
+        AfAB/wGYAb8B7AH/AWUBrgHnAf8BqgHKAe8B/wEkAWIBuAH/BAABHAFdAbMB/wGiAcMB7QH/AagBlwEY
+        Af8BxAG1AUEB/wGsAZcBDQH/AUIBkwHfAf8BmAG7AesB/wEDAUsBnwH/BAADXAHqAdkC4QH/AcsCzAH/
+        A8cB/wPIAf8DygH/A8sB/wPNAf8DzgH/A9AB/wPRAf8B0wLUAf8B5QLrAf8DbQH3BAADLgFHA1kB7AFJ
+        ARcBAAH/AZkBNgEAAf8BuAFOAQAB/wHCAUoBAAH/AckBXAEKAf8B5gG/AZQB/wHsAdQBtgH/Ac0BnAFJ
+        Af8BqAFTARMB/wGZAVQBKAH/AaMBjAFZAf8BZgFNATYB/wJRAT8B9wE1AjQBVQwAAT8BjgHEAf8BOQGs
+        AYsB/wE2AaoBjwH/AWUBtQHYAf8BYQGyAdYB/wFeAa8B1QH/AVoBrAHTAf8BCwGQAUkB/wFAAagBhAH/
+        AQABXwE6Af8DFAEbCAABWgJgAd4BqAHJAe0B/wGEAacB7QH/AT8BUQHtAf8BUQGOAekB/wGtAc0B8AH/
+        AVQBnQHSAf8BJQFjAbkB/wFOAZkBzgH/AaUBxQHuAf8BlQGaAVAB/wGtAZcBDQH/AZ0BlwE0Af8BTQGb
+        AeIB/wGYAbsB6gH/AUgCYgH2BAADXAHqAdcC3wH/AccCyQH/A8IB/wPEAf8DxQH/A8gB/wPJAf8DygH/
+        A8wB/wPNAf8B0ALRAf8B4wLqAf8DbQH3BAADOQFfAUEBQAEcAf0BWwEiAQAB/wGuAUABAAH/AcABSAEA
+        Af8B5wGWAS0B/wHoAbIBYQH/AeQBsQFhAf8B0gGJASAB/wG9AU0BAAH/AagBOwEAAf8BuAGNAUQB/wHU
+        AcMBsgH/AZgBhAFVAf8BQgEkAQYB/wE+Aj0BagwAAUUBkQHJAf8BpAHMAeQB/wGHAbsB2wH/ASYBoQFh
+        Af8BIAGcAVsB/wEbAZoBVwH/ARYBlgFRAf8BMgGjAYEB/wGEAcABqwH/ASkBlgFgAf8DUQGiAxUBHQQA
+        A1EBnAGSAbkB5QH/AVUBWwH2Af8BgQGEAfUB/wInAfAB/wGQAbsB6wH/Aa4BzQHwAf8BrAHMAfAB/wGq
+        AcoB8AH/AYUBsgHpAf8BRQGpAcEB/wErAbMBjQH/AT0BqAG2Af8BVwGhAeQB/wGXAboB6AH/A10B7QQA
+        A1wB6gHWAt8B/wHDAsUB/wPAAf8DwAH/A8IB/wPDAf8DxAH/A8UB/wPIAf8DyQH/A80B/wHgAugB/wNt
+        AfcEAAM3AVoBYAFNASgB+gGDAS0BAAH/AcsBVwECAf8B5QGLASQB/wH+AbYBWQL/AeMBwgH/AfQBvAGF
+        Af8B1gFeARAB/wHFAVUBAAH/AboBSgEAAf8BrwFeASAB/wGuAYgBRAH/AZQBXQFEAf8BQwElAQkB/wM8
+        AWYMAAFKAZUBzQH/AagBzwHlAf8BjAG/Ad0B/wEsAaUBgQH/AY0BxQG4Af8BiQHDAbQB/wGGAcEBsQH/
+        AYQBvwGvAf8BXgG5AZ8B/wFVAa0BoAH/A1YBswFQAVIBUAGkAxgBIgMjATMBMgFsAYsB/AGSAaQB9QH/
+        AUABQQH2Af8BOAGGAfQB/wEiAaYB+wH/AUMBqwHyAf8BZQGvAecB/wFiAa0B5wH/AV8BqgHmAf8BJgG2
+        AYAB/wFHAcgBlwH/ASIBtwFhAf8BZAGsAecB/wGPAbUB4wH/AVoCXgHVBAADYAHWAccCzQH/AdsC5AH/
+        AdsC5AH/AdsC5QH/AdwC5QH/AdwC5QH/Ad0C5gH/Ad0C5gH/Ad4C5wH/Ad8C6AH/AeAC6AH/Ac0C0wH/
+        A18B4wQAAyYBOQFgAloB3gGOATUBAAH/AewBngE6Af8B/gG/AYUC/wHMAaEC/wHfAbsB/wH+AcIBZgH/
+        AeIBjgEwAf8B0wGEASEB/wHKAWABEwH/AbUBVwERAf8BlwFIAQ4B/wGBAUUBIAH/A1kB7AMuAUgMAAFO
+        AZgB0AH/AasB0QHnAf8BkAHCAd8B/wEzAakBiAH/AZEByQG7Af8BXQG6AaUB/wFZAbgBoQH/AVUBtgGe
+        Af8BWQG4AZ0B/wFEAaUBkgH/A1YBswNWAbMBVQFWAVUBsQQAA0kBhwGGAa8B4QH/AbkB1wHzAf8BGQGm
+        Af4B/wFTAb8C/wESAaMC/wFNAb4B8AH/ASEBzgH7Af8BQQG+AfEB/wE5AbMBoAH/ASIBtwFgAf8BLgGz
+        AZAB/wGnAcgB7gH/AV4BpQHWAf8BTwJRAZwEAAMsAUMDWwHIA50B/wOdAf8DnQH/A50B/wOdAf8DnQH/
+        A50B/wOdAf8DnQH/A50B/wNeAd0DMQFOBAADCQEMA0sBjgHAAVUBFAL/AbwBZgH/AfoBzgGnAf8B+AHb
+        Ab4C/wHiAcYC/wG+AYYB/wH0AawBXAH/AewBwgGaAf8B4gG1AYsB/wG4AVwBGgH/AZ0BSwETAf8BiAFL
+        AScB/wNPAaUDEAEVDAABUgGbAdMB/wGuAdQB6AH/AasB0wHoAf8BQAGxAZAB/wGbAc4BwAH/AZkBzQG9
+        Af8BlgHLAbsB/wGVAcoBuQH/AYABvwGoAf8BXgGzAakB/wNWAbMDVQGyAwgBCwQAAwQBBgNRAZ8BhQGu
+        AeEB/wFBAbIB+QH/ARIBowL/AScBqQH7Af8BFwHTAf4B/wFTAeIC/wESAdUC/wFmAbAB6AH/AWMBrQHn
+        Af8BqQHKAe8B/wGlAcUB7QH/ASsBXgF5AfwDIQEwRAADEwEaAWcBZAFTAfEB2AGeAVkB/wHnAdMBwAH/
+        AfwB9QHuAv8B+AHrAv8B5QHCAf8B9gG5AYIB/wHyAdIBuAH/Ae4B0gG2Af8BwgGGATUB/wGnAV0BLgH/
+        Ak0BKQH6Ax0BKRAAAVUBnQHVAf8BUwGbAdMB/wFQAZoB0gH/ATABoQGMAf8BKwGfAYoB/wEoAZ0BhQH/
+        ASQBmQGAAf8BPQGlAZIB/wFmAbgBsQH/ATcBoQGLAf8DVQGyAwYBCBAAA0IBdQFfAWIBZQH2AY4BtgHj
+        Af8BuQHXAfMB/wFEAdUB+wH/AREB1QL/ASgB0QH7Af8BswHSAfIB/wGxAdAB8QH/AZIBuAHiAf8BSQGV
+        AcwB/wNKAYpMAAM1AVcBqQFJARsB/wHKAbgBqAb/Af4B/AL/AfYB4gH/AfsBxQGgAf8B5AG5AZUB/wHb
+        AawBZAH/AcMBjgFDAf8BkwFLAR8B/wE+Aj0BajAAAVMCVAGsA1YBswNWAbMDBAEGGAADFgEeA1QBrgFd
+        AaMB3AH/AZEBuAHkAf8BqAHKAewB/wGlAccB7AH/AY0BtQHiAf8BTwGaAdIB/wFaAl8B2wMxAU5UAAMy
+        AVECZAFZAewB0AGyAZUB/wHsAeAB2QH/AeYB1QHEAf8B0wGwAZQB/wHTAaYBXgH/AcsBjwE8Af8BZwFl
+        AVkB8gE6AjkBYDQAAVMCVAGsA1YBswMEAQYkAAMrAUIDTAGQAVsCXQHSAVkCXAHPA04BmQMtAUVgAAMR
+        ARcDRAF6AloBVwHFAmUBXgHlAmEBWAHmAlwBWQHJAkgBRwGDAxUBHRAAAUIBTQE+BwABPgMAASgDAAFA
+        AwABIAMAAQEBAAEBBgABARYAA/8BAAHgAQcCAAH8AT8CAAHAAQMCAAH8AT8CAAHAAQMCAAHAAQMCAAHA
+        AQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMCAAHAAQMGAAHAAQMCAAEBAYACAAHAAQMBgAIB
+        AYACAAHAAQMBgAEBBAABwAEDAcABAwHAAQMCAAHAAQMB8AEPAcABAwIAAcABAwHwAQ8BgAEDAgABwAED
+        AfABDwHAAQMCAAHAAQMB8AEPAfABDwIAAcABAwH4AR8B/AE/AgAB4wX/AeABBwGAAQEB/AEfAv8BwAED
+        AYABBwH4AQcC/wGAAQMBAAEHAfgBAwL/AcABAwEAAQcB8AEBAgABwAEDAQABBwGAAwABgAEBAYABBwIA
+        AYABAQIAAcABBwEBAQABgAEBAgAB4AEDAgABgAEBAgAB4AEBAgABgAEBAgAB4AMAAYABAQIAAeABAAGA
+        AQABgAEBAgAB4AEAAYABAAL/AYABAQHgAQEB4AEBAv8BwAEDAf8BwwHwAQMC/wHgAQcB/wHHAfwBDwL/
+        AfABDws=
+</value>
+  </data>
+</root>

mRemoteV1/Language/Resources.de.resx

@@ -1850,15 +1850,6 @@ Starte mit neuer Datei.</value>
   <data name="strErrorCode" xml:space="preserve">
     <value>Fehler Nummer {0}.</value>
   </data>
-  <data name="strConnenctionEventDisconnected" xml:space="preserve">
-    <value>Protokoll Ereignis Verbindung getrennt.
-Nachricht:
-{0}</value>
-  </data>
-  <data name="strConnenctionEventDisconnectFailed" xml:space="preserve">
-    <value>Protokoll Ereignis Trennen der Verbindung fehlgeschlagen!
-{0}</value>
-  </data>
   <data name="strConnenctionClosedByUserDetail" xml:space="preserve">
     <value>Verbindung zu {0} mit {1} wurde vom Benutzer {2} getrennt.  (Beschreibung: "{3}"; Benutzer Feld: "{4}")</value>
   </data>
@@ -1957,4 +1948,42 @@ Fehler Beschreibung: {1}</value>
   <data name="strRDP32768Colors" xml:space="preserve">
     <value>32768 Farben (15Bit)</value>
   </data>
+  <data name="strNoUpdateAvailable" xml:space="preserve">
+    <value>Keine Updates verfügbar</value>
+  </data>
+  <data name="strTransferFailed" xml:space="preserve">
+    <value>Übertragung fehlgeschlagen!</value>
+  </data>
+  <data name="strProtocolEventDisconnected" xml:space="preserve">
+    <value>Protokollereignis Verbindung getrennnt.
+{0}</value>
+  </data>
+  <data name="strProtocolEventDisconnectFailed" xml:space="preserve">
+    <value>Protokollereignis Verbindung trennen fehlgeschlagen.
+{0}</value>
+  </data>
+  <data name="strLanguage" xml:space="preserve">
+    <value>Sprache</value>
+  </data>
+  <data name="strLanguageDefault" xml:space="preserve">
+    <value>(Automatisch erkannt)</value>
+  </data>
+  <data name="strLanguageRestartRequired" xml:space="preserve">
+    <value>{0} muss neu gestartet werden, bevor die Sprache aktiv wird.</value>
+  </data>
+  <data name="strAskUpdatesCommandAskLater" xml:space="preserve">
+    <value>Später nochmal fragen</value>
+  </data>
+  <data name="strAskUpdatesCommandCustom" xml:space="preserve">
+    <value>Einstellungen jetzt anpassen</value>
+  </data>
+  <data name="strAskUpdatesCommandRecommended" xml:space="preserve">
+    <value>Verwende die empflohlenen Einstellungen</value>
+  </data>
+  <data name="strAskUpdatesContent" xml:space="preserve">
+    <value>{0} kann automatisch nach Updates suchen die neue Funktionen und Bug Fixes enthalten können. Es wird empfohlen, dass Sie {0} erlauben wöchentlich nach Updates zu suchen.</value>
+  </data>
+  <data name="strAskUpdatesMainInstruction" xml:space="preserve">
+    <value>Automatische Update Einstellungen</value>
+  </data>
 </root>

mRemoteV1/My Project/Resources.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.5444
+'     Runtime Version:2.0.50727.4959
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -1679,6 +1679,33 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Confirm closing connection tabs.
+        '''</summary>
+        Friend ReadOnly Property strConfirmCloseConnection() As String
+            Get
+                Return ResourceManager.GetString("strConfirmCloseConnection", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Do you want to close the connection, &quot;{0}&quot;?.
+        '''</summary>
+        Friend ReadOnly Property strConfirmCloseConnectionMainInstruction() As String
+            Get
+                Return ResourceManager.GetString("strConfirmCloseConnectionMainInstruction", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Are you sure you want to close the panel, &quot;{0}&quot;? Any connections that it contains will also be closed..
+        '''</summary>
+        Friend ReadOnly Property strConfirmCloseConnectionPanelMainInstruction() As String
+            Get
+                Return ResourceManager.GetString("strConfirmCloseConnectionPanelMainInstruction", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Are you sure you want to delete the external tool, &quot;{0}&quot;?.
         '''</summary>
@@ -2834,6 +2861,24 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Database:.
+        '''</summary>
+        Friend ReadOnly Property strLabelSQLDatabaseName() As String
+            Get
+                Return ResourceManager.GetString("strLabelSQLDatabaseName", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Database:.
+        '''</summary>
+        Friend ReadOnly Property strLabelSQLServerDatabaseName() As String
+            Get
+                Return ResourceManager.GetString("strLabelSQLServerDatabaseName", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Username:.
         '''</summary>
@@ -5862,6 +5907,15 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Looks up a localized string similar to Updates.
+        '''</summary>
+        Friend ReadOnly Property strTabUpdates() As String
+            Get
+                Return ResourceManager.GetString("strTabUpdates", resourceCulture)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Looks up a localized string similar to Telnet.
         '''</summary>

mRemoteV1/My Project/Resources.resx

@@ -2319,4 +2319,22 @@ Error Description: {1}</value>
   <data name="strPropertyNameEnableDesktopComposition" xml:space="preserve">
     <value>Desktop Composition</value>
   </data>
+  <data name="strConfirmCloseConnection" xml:space="preserve">
+    <value>Confirm closing connection tabs</value>
+  </data>
+  <data name="strConfirmCloseConnectionMainInstruction" xml:space="preserve">
+    <value>Do you want to close the connection, "{0}"?</value>
+  </data>
+  <data name="strConfirmCloseConnectionPanelMainInstruction" xml:space="preserve">
+    <value>Are you sure you want to close the panel, "{0}"? Any connections that it contains will also be closed.</value>
+  </data>
+  <data name="strTabUpdates" xml:space="preserve">
+    <value>Updates</value>
+  </data>
+  <data name="strLabelSQLDatabaseName" xml:space="preserve">
+    <value>Database:</value>
+  </data>
+  <data name="strLabelSQLServerDatabaseName" xml:space="preserve">
+    <value>Database:</value>
+  </data>
 </root>

mRemoteV1/My Project/Settings.Designer.vb

@@ -1,7 +1,7 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
 '     This code was generated by a tool.
-'     Runtime Version:2.0.50727.5444
+'     Runtime Version:2.0.50727.4959
 '
 '     Changes to this file may cause incorrect behavior and will be lost if
 '     the code is regenerated.
@@ -56,8 +56,7 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("999, 999")>  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _
         Public Property MainFormLocation() As Global.System.Drawing.Point
             Get
                 Return CType(Me("MainFormLocation"),Global.System.Drawing.Point)
@@ -69,8 +68,7 @@ Namespace My
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("900, 600")>  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _
         Public Property MainFormSize() As Global.System.Drawing.Size
             Get
                 Return CType(Me("MainFormSize"),Global.System.Drawing.Size)
@@ -2205,6 +2203,56 @@ Namespace My
                 Me("InhDefaultEnableDesktopComposition") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+        Public Property ConfirmCloseConnection() As Boolean
+            Get
+                Return CType(Me("ConfirmCloseConnection"),Boolean)
+            End Get
+            Set
+                Me("ConfirmCloseConnection") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _
+        Public Property MainFormRestoreSize() As Global.System.Drawing.Size
+            Get
+                Return CType(Me("MainFormRestoreSize"),Global.System.Drawing.Size)
+            End Get
+            Set
+                Me("MainFormRestoreSize") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute()>  _
+        Public Property MainFormRestoreLocation() As Global.System.Drawing.Point
+            Get
+                Return CType(Me("MainFormRestoreLocation"),Global.System.Drawing.Point)
+            End Get
+            Set
+                Me("MainFormRestoreLocation") = value
+            End Set
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("mRemoteNG")>  _
+        Public Property SQLDatabaseName() As String
+            Get
+                Return CType(Me("SQLDatabaseName"),String)
+            End Get
+            Set
+                Me("SQLDatabaseName") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

mRemoteV1/My Project/Settings.settings

@@ -3,10 +3,10 @@
   <Profiles />
   <Settings>
     <Setting Name="MainFormLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
-      <Value Profile="(Default)">999, 999</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MainFormSize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Size" Scope="User">
-      <Value Profile="(Default)">900, 600</Value>
+      <Value Profile="(Default)" />
     </Setting>
     <Setting Name="MainFormState" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Windows.Forms.FormWindowState" Scope="User">
       <Value Profile="(Default)">Normal</Value>
@@ -500,5 +500,17 @@
     <Setting Name="InhDefaultEnableDesktopComposition" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="ConfirmCloseConnection" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
+    <Setting Name="MainFormRestoreSize" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Size" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="MainFormRestoreLocation" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.Drawing.Point" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
+    <Setting Name="SQLDatabaseName" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="User">
+      <Value Profile="(Default)">mRemoteNG</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

mRemoteV1/Tools/Tools.Misc.vb

@@ -71,13 +71,12 @@ Namespace Tools
                 Dim sqlQuery As SqlCommand
                 Dim sqlRd As SqlDataReader
 
-                Dim sqlDB As String = "mRemote"
                 Dim LastUpdateInDB As Date
 
                 If My.Settings.SQLUser <> "" Then
-                    sqlCon = New SqlConnection("Data Source=" & My.Settings.SQLHost & ";Initial Catalog=" & sqlDB & ";User Id=" & My.Settings.SQLUser & ";Password=" & Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey))
+                    sqlCon = New SqlConnection("Data Source=" & My.Settings.SQLHost & ";Initial Catalog=" & My.Settings.SQLDatabaseName & ";User Id=" & My.Settings.SQLUser & ";Password=" & Security.Crypt.Decrypt(My.Settings.SQLPass, App.Info.General.EncryptionKey))
                 Else
-                    sqlCon = New SqlConnection("Data Source=" & My.Settings.SQLHost & ";Initial Catalog=" & sqlDB & ";Integrated Security=True")
+                    sqlCon = New SqlConnection("Data Source=" & My.Settings.SQLHost & ";Initial Catalog=" & My.Settings.SQLDatabaseName & ";Integrated Security=True")
                 End If
 
                 sqlCon.Open()

mRemoteV1/Tools/Tools.WindowPlacement.vb

@@ -0,0 +1,120 @@
+Imports System.Runtime.InteropServices
+
+Namespace Tools
+    Public Class WindowPlacement
+#Region "Windows API"
+#Region "Functions"
+        Private Declare Function GetWindowPlacement Lib "user32" (ByVal hWnd As System.IntPtr, ByRef lpwndpl As WINDOWPLACEMENT) As Boolean
+        Private Declare Function SetWindowPlacement Lib "user32" (ByVal hWnd As System.IntPtr, ByRef lpwndpl As WINDOWPLACEMENT) As Boolean
+#End Region
+
+#Region "Structures"
+        Private Structure WINDOWPLACEMENT
+            Public length As UInteger
+            Public flags As UInteger
+            Public showCmd As UInteger
+            Public ptMinPosition As POINT
+            Public ptMaxPosition As POINT
+            Public rcNormalPosition As RECT
+        End Structure
+
+        Private Structure POINT
+            Public x As Long
+            Public y As Long
+        End Structure
+
+        Private Structure RECT
+            Public left As Long
+            Public top As Long
+            Public right As Long
+            Public bottom As Long
+        End Structure
+#End Region
+
+#Region "Constants"
+        ' WINDOWPLACEMENT.flags values
+        Private Const WPF_SETMINPOSITION As UInteger = &H1
+        Private Const WPF_RESTORETOMAXIMIZED As UInteger = &H2
+        Private Const WPF_ASYNCWINDOWPLACEMENT As UInteger = &H4
+
+        ' WINDOWPLACEMENT.showCmd values
+        Private Const SW_HIDE As UInteger = 0
+        Private Const SW_SHOWNORMAL As UInteger = 1
+        Private Const SW_SHOWMINIMIZED As UInteger = 2
+        Private Const SW_SHOWMAXIMIZED As UInteger = 3
+        Private Const SW_MAXIMIZE As UInteger = 3
+        Private Const SW_SHOWNOACTIVATE As UInteger = 4
+        Private Const SW_SHOW As UInteger = 5
+        Private Const SW_MINIMIZE As UInteger = 6
+        Private Const SW_SHOWMINNOACTIVE As UInteger = 7
+        Private Const SW_SHOWNA As UInteger = 8
+        Private Const SW_RESTORE As UInteger = 9
+#End Region
+#End Region
+
+#Region "Private Variables"
+        Private _form As Windows.Forms.Form
+#End Region
+
+#Region "Constructors/Destructors"
+        Public Sub New(ByRef form As Windows.Forms.Form)
+            _form = form
+        End Sub
+#End Region
+
+#Region "Public Properties"
+        Public Property Form() As Windows.Forms.Form
+            Get
+                Return _form
+            End Get
+            Set(ByVal value As Windows.Forms.Form)
+                _form = value
+            End Set
+        End Property
+
+        Public Property RestoreToMaximized() As Boolean
+            Get
+                Dim windowPlacement As WINDOWPLACEMENT = GetWindowPlacement()
+                Return windowPlacement.flags And WPF_RESTORETOMAXIMIZED
+            End Get
+            Set(ByVal value As Boolean)
+                Dim windowPlacement As WINDOWPLACEMENT = GetWindowPlacement()
+                If value Then
+                    windowPlacement.flags = windowPlacement.flags Or WPF_RESTORETOMAXIMIZED
+                Else
+                    windowPlacement.flags = windowPlacement.flags And Not WPF_RESTORETOMAXIMIZED
+                End If
+                SetWindowPlacement(windowPlacement)
+            End Set
+        End Property
+#End Region
+
+#Region "Private Functions"
+        Private Function GetWindowPlacement() As WINDOWPLACEMENT
+            If _form Is Nothing Then
+                Throw New System.NullReferenceException("WindowPlacement.Form is not set.")
+            End If
+            Dim windowPlacement As WINDOWPLACEMENT
+            windowPlacement.length = Marshal.SizeOf(windowPlacement)
+            Try
+                GetWindowPlacement(_form.Handle, windowPlacement)
+                Return windowPlacement
+            Catch ex As Exception
+                Throw ex
+            End Try
+        End Function
+
+        Private Function SetWindowPlacement(ByVal windowPlacement As WINDOWPLACEMENT) As Boolean
+            If _form Is Nothing Then
+                Throw New System.NullReferenceException("WindowPlacement.Form is not set.")
+            End If
+            windowPlacement.length = Marshal.SizeOf(windowPlacement)
+            Try
+                Return SetWindowPlacement(_form.Handle, windowPlacement)
+            Catch ex As Exception
+                Throw ex
+            End Try
+        End Function
+#End Region
+    End Class
+End Namespace

mRemoteV1/Tree/Tree.Node.vb

@@ -489,7 +489,6 @@ Namespace Tree
 
                 _TreeView.TreeViewNodeSorter = ns
                 _TreeView.Sort()
-                _TreeView.Sorted = False
 
                 For Each childNode As TreeNode In treeNode.Nodes
                     If GetNodeType(childNode) = Type.Container Then Sort(childNode, sortType)

mRemoteV1/UI/UI.Window.Connection.vb

@@ -3,6 +3,7 @@ Imports System.Windows
 Imports System.Windows.Forms
 Imports Crownwood
 Imports WeifenLuo.WinFormsUI.Docking
+Imports PSTaskDialog
 Imports mRemoteNG.App.Runtime
 
 Namespace UI
@@ -306,6 +307,17 @@ Namespace UI
             End Sub
 
             Private Sub Connection_FormClosing(ByVal sender As Object, ByVal e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
+                If Not frmMain.IsClosing And My.Settings.ConfirmCloseConnection And TabController.TabPages.Count > 0 Then
+                    Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, String.Format(My.Resources.strConfirmCloseConnectionPanelMainInstruction, Me.Text), "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
+                    If cTaskDialog.VerificationChecked Then
+                        My.Settings.ConfirmCloseConnection = False
+                    End If
+                    If Result = DialogResult.No Then
+                        e.Cancel = True
+                        Exit Sub
+                    End If
+                End If
+
                 Try
                     For Each tabP As Magic.Controls.TabPage In Me.TabController.TabPages
                         If tabP.Tag IsNot Nothing Then
@@ -344,12 +356,23 @@ Namespace UI
             End Sub
 
             Private Sub CloseConnectionTab()
+                Dim SelectedTab As Crownwood.Magic.Controls.TabPage = Me.TabController.SelectedTab
+                If My.Settings.ConfirmCloseConnection Then
+                    Dim Result As DialogResult = cTaskDialog.MessageBox(Me, My.Application.Info.ProductName, String.Format(My.Resources.strConfirmCloseConnectionMainInstruction, SelectedTab.Title), "", "", "", My.Resources.strCheckboxDoNotShowThisMessageAgain, eTaskDialogButtons.YesNo, eSysIcons.Question, Nothing)
+                    If cTaskDialog.VerificationChecked Then
+                        My.Settings.ConfirmCloseConnection = False
+                    End If
+                    If Result = DialogResult.No Then
+                        Exit Sub
+                    End If
+                End If
+
                 Try
-                    If Me.TabController.SelectedTab.Tag IsNot Nothing Then
-                        Dim IC As mRemoteNG.Connection.InterfaceControl = Me.TabController.SelectedTab.Tag
+                    If SelectedTab.Tag IsNot Nothing Then
+                        Dim IC As mRemoteNG.Connection.InterfaceControl = SelectedTab.Tag
                         IC.Protocol.Close()
                     Else
-                        Me.CloseTab(Me.TabController.SelectedTab)
+                        Me.CloseTab(SelectedTab)
                     End If
                 Catch ex As Exception
                     mC.AddMessage(Messages.MessageClass.ErrorMsg, "CloseConnectionTab (UI.Window.Connections) failed" & vbNewLine & ex.Message, True)

mRemoteV1/UI/UI.Window.Options.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="TabController.DrawGrid" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-</root>

mRemoteV1/app.config

@@ -59,12 +59,6 @@
     </system.diagnostics>
     <userSettings>
         <mRemoteNG.My.MySettings>
-            <setting name="MainFormLocation" serializeAs="String">
-                <value>999, 999</value>
-            </setting>
-            <setting name="MainFormSize" serializeAs="String">
-                <value>900, 600</value>
-            </setting>
             <setting name="MainFormState" serializeAs="String">
                 <value>Normal</value>
             </setting>
@@ -554,6 +548,12 @@
             <setting name="InhDefaultEnableDesktopComposition" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="ConfirmCloseConnection" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="SQLDatabaseName" serializeAs="String">
+                <value>mRemoteNG</value>
+            </setting>
         </mRemoteNG.My.MySettings>
     </userSettings>
     <applicationSettings>

mRemoteV1/mRemoteV1.vbproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{4934A491-40BC-4E5B-9166-EA1169A220F6}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -263,6 +263,7 @@
     <Compile Include="Tools\Tools.Misc.vb" />
     <Compile Include="Tools\Tools.PortScan.vb" />
     <Compile Include="Tools\Tools.SystemMenu.vb" />
+    <Compile Include="Tools\Tools.WindowPlacement.vb" />
     <Compile Include="Tree\Tree.Node.vb" />
     <Compile Include="UI\UI.Window.About.vb">
       <SubType>Form</SubType>
@@ -295,7 +296,7 @@
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\UI.Window.List.vb" />
-    <Compile Include="UI\UI.Window.Options.vb">
+    <Compile Include="Forms\frmOptions.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\UI.Window.PortScan.vb">
@@ -395,8 +396,8 @@
       <DependentUpon>UI.Window.Help.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="UI\UI.Window.Options.resx">
-      <DependentUpon>UI.Window.Options.vb</DependentUpon>
+    <EmbeddedResource Include="Forms\frmOptions.resx">
+      <DependentUpon>frmOptions.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="UI\UI.Window.PortScan.resx">
@@ -813,6 +814,7 @@
     <Content Include="Icons\Workstation.ico">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Resources\Images\database.bmp" />
     <None Include="Resources\Images\Copy.png" />
     <None Include="Resources\Icons\mRemote_Icon.ico" />
     <None Include="Resources\Icons\Sessions_Icon.ico" />