diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index a23ec303..2c43730a 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -1191,7 +1191,7 @@ Namespace App
Next
If qHost <> "" Then
- nCi.Name = "Quicky: " & qHost
+ nCi.Name = "Quick: " & qHost
nCi.Hostname = qHost
nCi.Port = qPort
nCi.IsQuicky = True
@@ -1209,7 +1209,7 @@ Namespace App
'--------
End If
Catch ex As Exception
- mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating quicky failed" & vbNewLine & ex.Message)
+ mC.AddMessage(Messages.MessageClass.ErrorMsg, "Creating quick connect failed" & vbNewLine & ex.Message)
End Try
Return Nothing
diff --git a/mRemoteV1/ChangeLog.txt b/mRemoteV1/ChangeLog.txt
index 6c64f2d1..33a42ee9 100644
--- a/mRemoteV1/ChangeLog.txt
+++ b/mRemoteV1/ChangeLog.txt
@@ -9,6 +9,8 @@
Added option to change how often updates are checked
Open Updates options tab before connecting for the first time
No longer show About page on first run
+ Renamed Quicky toolbar to Quick Connect toolbar
+ Changed back to allowing toolbars to dock to the left or right of the menu bar and added gripper to move it around
1.61:
Removed unlicensed SmartCode Solutions ViewerX VNC Viewer ActiveX
diff --git a/mRemoteV1/Forms/frmMain.Designer.vb b/mRemoteV1/Forms/frmMain.Designer.vb
index 0688c6be..81c194ba 100644
--- a/mRemoteV1/Forms/frmMain.Designer.vb
+++ b/mRemoteV1/Forms/frmMain.Designer.vb
@@ -64,11 +64,14 @@ Partial Class frmMain
Me.mMenInfo = New System.Windows.Forms.ToolStripMenuItem
Me.mMenInfoHelp = New System.Windows.Forms.ToolStripMenuItem
Me.mMenInfoSep1 = New System.Windows.Forms.ToolStripSeparator
- Me.mMenInfoBugReport = New System.Windows.Forms.ToolStripMenuItem
- Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
Me.mMenInfoWebsite = New System.Windows.Forms.ToolStripMenuItem
- Me.mMenInfoSep2 = New System.Windows.Forms.ToolStripSeparator
+ Me.mMenInfoDonate = New System.Windows.Forms.ToolStripMenuItem
+ Me.mMenInfoForum = New System.Windows.Forms.ToolStripMenuItem
+ Me.mMenInfoBugReport = New System.Windows.Forms.ToolStripMenuItem
+ Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator
Me.mMenInfoAnnouncements = New System.Windows.Forms.ToolStripMenuItem
+ Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
+ Me.mMenInfoSep2 = New System.Windows.Forms.ToolStripSeparator
Me.mMenInfoAbout = New System.Windows.Forms.ToolStripMenuItem
Me.mMenSep3 = New System.Windows.Forms.ToolStripSeparator
Me.lblQuickConnect = New System.Windows.Forms.ToolStripLabel
@@ -82,9 +85,6 @@ Partial Class frmMain
Me.cMenToolbarShowText = New System.Windows.Forms.ToolStripMenuItem
Me.tmrShowUpdate = New System.Windows.Forms.Timer(Me.components)
Me.tmrAutoSave = New System.Windows.Forms.Timer(Me.components)
- Me.mMenToolsUpdate = New System.Windows.Forms.ToolStripMenuItem
- Me.mMenInfoForum = New System.Windows.Forms.ToolStripMenuItem
- Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator
Me.msMain.SuspendLayout()
Me.tsContainer.ContentPanel.SuspendLayout()
Me.tsContainer.TopToolStripPanel.SuspendLayout()
@@ -102,18 +102,20 @@ Partial Class frmMain
Me.pnlDock.DocumentStyle = WeifenLuo.WinFormsUI.Docking.DocumentStyle.DockingWindow
Me.pnlDock.Location = New System.Drawing.Point(0, 0)
Me.pnlDock.Name = "pnlDock"
- Me.pnlDock.Size = New System.Drawing.Size(842, 499)
+ Me.pnlDock.Size = New System.Drawing.Size(842, 474)
Me.pnlDock.TabIndex = 13
'
'msMain
'
Me.msMain.Dock = System.Windows.Forms.DockStyle.None
- Me.msMain.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
- Me.msMain.GripMargin = New System.Windows.Forms.Padding(2, 0, 0, 0)
+ Me.msMain.GripMargin = New System.Windows.Forms.Padding(0)
+ Me.msMain.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible
Me.msMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFile, Me.mMenView, Me.mMenTools, Me.mMenInfo})
- Me.msMain.Location = New System.Drawing.Point(0, 0)
+ Me.msMain.Location = New System.Drawing.Point(3, 0)
Me.msMain.Name = "msMain"
- Me.msMain.Size = New System.Drawing.Size(842, 24)
+ Me.msMain.Padding = New System.Windows.Forms.Padding(2, 2, 0, 2)
+ Me.msMain.Size = New System.Drawing.Size(182, 24)
+ Me.msMain.Stretch = False
Me.msMain.TabIndex = 16
Me.msMain.Text = "Main Toolbar"
'
@@ -121,7 +123,7 @@ Partial Class frmMain
'
Me.mMenFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenFileNew, Me.mMenFileLoad, Me.mMenFileSep1, Me.mMenFileSave, Me.mMenFileSaveAs, Me.mMenFileSep2, Me.mMenFileExit})
Me.mMenFile.Name = "mMenFile"
- Me.mMenFile.Size = New System.Drawing.Size(35, 20)
+ Me.mMenFile.Size = New System.Drawing.Size(37, 20)
Me.mMenFile.Text = "&File"
'
'mMenFileNew
@@ -129,7 +131,7 @@ Partial Class frmMain
Me.mMenFileNew.Image = Global.mRemote.My.Resources.Resources.Connections_New
Me.mMenFileNew.Name = "mMenFileNew"
Me.mMenFileNew.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys)
- Me.mMenFileNew.Size = New System.Drawing.Size(238, 22)
+ Me.mMenFileNew.Size = New System.Drawing.Size(256, 22)
Me.mMenFileNew.Text = "New Connections"
'
'mMenFileLoad
@@ -137,20 +139,20 @@ Partial Class frmMain
Me.mMenFileLoad.Image = Global.mRemote.My.Resources.Resources.Connections_Load
Me.mMenFileLoad.Name = "mMenFileLoad"
Me.mMenFileLoad.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys)
- Me.mMenFileLoad.Size = New System.Drawing.Size(238, 22)
+ Me.mMenFileLoad.Size = New System.Drawing.Size(256, 22)
Me.mMenFileLoad.Text = "Open Connections"
'
'mMenFileSep1
'
Me.mMenFileSep1.Name = "mMenFileSep1"
- Me.mMenFileSep1.Size = New System.Drawing.Size(235, 6)
+ Me.mMenFileSep1.Size = New System.Drawing.Size(253, 6)
'
'mMenFileSave
'
Me.mMenFileSave.Image = Global.mRemote.My.Resources.Resources.Connections_Save
Me.mMenFileSave.Name = "mMenFileSave"
Me.mMenFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
- Me.mMenFileSave.Size = New System.Drawing.Size(238, 22)
+ Me.mMenFileSave.Size = New System.Drawing.Size(256, 22)
Me.mMenFileSave.Text = "Save Connections"
'
'mMenFileSaveAs
@@ -159,47 +161,47 @@ Partial Class frmMain
Me.mMenFileSaveAs.Name = "mMenFileSaveAs"
Me.mMenFileSaveAs.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _
Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
- Me.mMenFileSaveAs.Size = New System.Drawing.Size(238, 22)
+ Me.mMenFileSaveAs.Size = New System.Drawing.Size(256, 22)
Me.mMenFileSaveAs.Text = "Save Connections As"
'
'mMenFileSep2
'
Me.mMenFileSep2.Name = "mMenFileSep2"
- Me.mMenFileSep2.Size = New System.Drawing.Size(235, 6)
+ Me.mMenFileSep2.Size = New System.Drawing.Size(253, 6)
'
'mMenFileExit
'
Me.mMenFileExit.Image = Global.mRemote.My.Resources.Resources.Quit
Me.mMenFileExit.Name = "mMenFileExit"
Me.mMenFileExit.ShortcutKeys = CType((System.Windows.Forms.Keys.Alt Or System.Windows.Forms.Keys.F4), System.Windows.Forms.Keys)
- Me.mMenFileExit.Size = New System.Drawing.Size(238, 22)
+ Me.mMenFileExit.Size = New System.Drawing.Size(256, 22)
Me.mMenFileExit.Text = "Exit"
'
'mMenView
'
Me.mMenView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewAddConnectionPanel, Me.mMenViewConnectionPanels, Me.mMenViewSep1, Me.mMenViewConnections, Me.mMenViewConfig, Me.mMenViewSessions, Me.mMenViewErrorsAndInfos, Me.mMenViewScreenshotManager, Me.ToolStripSeparator1, Me.mMenViewJumpTo, Me.mMenViewSep2, Me.mMenViewQuickConnectToolbar, Me.mMenViewExtAppsToolbar, Me.mMenViewSep3, Me.mMenViewFullscreen})
Me.mMenView.Name = "mMenView"
- Me.mMenView.Size = New System.Drawing.Size(42, 20)
+ Me.mMenView.Size = New System.Drawing.Size(44, 20)
Me.mMenView.Text = "&View"
'
'mMenViewAddConnectionPanel
'
Me.mMenViewAddConnectionPanel.Image = Global.mRemote.My.Resources.Resources.Panel_Add
Me.mMenViewAddConnectionPanel.Name = "mMenViewAddConnectionPanel"
- Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewAddConnectionPanel.Size = New System.Drawing.Size(228, 22)
Me.mMenViewAddConnectionPanel.Text = "Add Connection Panel"
'
'mMenViewConnectionPanels
'
Me.mMenViewConnectionPanels.Image = Global.mRemote.My.Resources.Resources.Panels
Me.mMenViewConnectionPanels.Name = "mMenViewConnectionPanels"
- Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewConnectionPanels.Size = New System.Drawing.Size(228, 22)
Me.mMenViewConnectionPanels.Text = "Connection Panels"
'
'mMenViewSep1
'
Me.mMenViewSep1.Name = "mMenViewSep1"
- Me.mMenViewSep1.Size = New System.Drawing.Size(208, 6)
+ Me.mMenViewSep1.Size = New System.Drawing.Size(225, 6)
'
'mMenViewConnections
'
@@ -207,7 +209,7 @@ Partial Class frmMain
Me.mMenViewConnections.CheckState = System.Windows.Forms.CheckState.Checked
Me.mMenViewConnections.Image = Global.mRemote.My.Resources.Resources.Root
Me.mMenViewConnections.Name = "mMenViewConnections"
- Me.mMenViewConnections.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewConnections.Size = New System.Drawing.Size(228, 22)
Me.mMenViewConnections.Text = "Connections"
'
'mMenViewConfig
@@ -216,7 +218,7 @@ Partial Class frmMain
Me.mMenViewConfig.CheckState = System.Windows.Forms.CheckState.Checked
Me.mMenViewConfig.Image = CType(resources.GetObject("mMenViewConfig.Image"), System.Drawing.Image)
Me.mMenViewConfig.Name = "mMenViewConfig"
- Me.mMenViewConfig.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewConfig.Size = New System.Drawing.Size(228, 22)
Me.mMenViewConfig.Text = "Config"
'
'mMenViewSessions
@@ -225,7 +227,7 @@ Partial Class frmMain
Me.mMenViewSessions.CheckState = System.Windows.Forms.CheckState.Checked
Me.mMenViewSessions.Image = CType(resources.GetObject("mMenViewSessions.Image"), System.Drawing.Image)
Me.mMenViewSessions.Name = "mMenViewSessions"
- Me.mMenViewSessions.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewSessions.Size = New System.Drawing.Size(228, 22)
Me.mMenViewSessions.Text = "Sessions"
'
'mMenViewErrorsAndInfos
@@ -234,27 +236,27 @@ Partial Class frmMain
Me.mMenViewErrorsAndInfos.CheckState = System.Windows.Forms.CheckState.Checked
Me.mMenViewErrorsAndInfos.Image = Global.mRemote.My.Resources.Resources.ErrorsAndInfos
Me.mMenViewErrorsAndInfos.Name = "mMenViewErrorsAndInfos"
- Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewErrorsAndInfos.Size = New System.Drawing.Size(228, 22)
Me.mMenViewErrorsAndInfos.Text = "Errors and Infos"
'
'mMenViewScreenshotManager
'
Me.mMenViewScreenshotManager.Image = CType(resources.GetObject("mMenViewScreenshotManager.Image"), System.Drawing.Image)
Me.mMenViewScreenshotManager.Name = "mMenViewScreenshotManager"
- Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewScreenshotManager.Size = New System.Drawing.Size(228, 22)
Me.mMenViewScreenshotManager.Text = "Screenshot Manager"
'
'ToolStripSeparator1
'
Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
- Me.ToolStripSeparator1.Size = New System.Drawing.Size(208, 6)
+ Me.ToolStripSeparator1.Size = New System.Drawing.Size(225, 6)
'
'mMenViewJumpTo
'
Me.mMenViewJumpTo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenViewJumpToConnectionsConfig, Me.mMenViewJumpToSessionsScreenshots, Me.mMenViewJumpToErrorsInfos})
Me.mMenViewJumpTo.Image = Global.mRemote.My.Resources.Resources.JumpTo
Me.mMenViewJumpTo.Name = "mMenViewJumpTo"
- Me.mMenViewJumpTo.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewJumpTo.Size = New System.Drawing.Size(228, 22)
Me.mMenViewJumpTo.Text = "Jump To"
'
'mMenViewJumpToConnectionsConfig
@@ -262,7 +264,7 @@ Partial Class frmMain
Me.mMenViewJumpToConnectionsConfig.Name = "mMenViewJumpToConnectionsConfig"
Me.mMenViewJumpToConnectionsConfig.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys)
- Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(240, 22)
+ Me.mMenViewJumpToConnectionsConfig.Size = New System.Drawing.Size(260, 22)
Me.mMenViewJumpToConnectionsConfig.Text = "Connections && Config"
'
'mMenViewJumpToSessionsScreenshots
@@ -270,7 +272,7 @@ Partial Class frmMain
Me.mMenViewJumpToSessionsScreenshots.Name = "mMenViewJumpToSessionsScreenshots"
Me.mMenViewJumpToSessionsScreenshots.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys)
- Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(240, 22)
+ Me.mMenViewJumpToSessionsScreenshots.Size = New System.Drawing.Size(260, 22)
Me.mMenViewJumpToSessionsScreenshots.Text = "Sessions && Screenshots"
'
'mMenViewJumpToErrorsInfos
@@ -278,99 +280,99 @@ Partial Class frmMain
Me.mMenViewJumpToErrorsInfos.Name = "mMenViewJumpToErrorsInfos"
Me.mMenViewJumpToErrorsInfos.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Alt) _
Or System.Windows.Forms.Keys.E), System.Windows.Forms.Keys)
- Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(240, 22)
+ Me.mMenViewJumpToErrorsInfos.Size = New System.Drawing.Size(260, 22)
Me.mMenViewJumpToErrorsInfos.Text = "Errors && Infos"
'
'mMenViewSep2
'
Me.mMenViewSep2.Name = "mMenViewSep2"
- Me.mMenViewSep2.Size = New System.Drawing.Size(208, 6)
+ Me.mMenViewSep2.Size = New System.Drawing.Size(225, 6)
'
'mMenViewQuickConnectToolbar
'
Me.mMenViewQuickConnectToolbar.Image = Global.mRemote.My.Resources.Resources.Play_Quick
Me.mMenViewQuickConnectToolbar.Name = "mMenViewQuickConnectToolbar"
- Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(211, 22)
- Me.mMenViewQuickConnectToolbar.Text = "Quicky Toolbar"
+ Me.mMenViewQuickConnectToolbar.Size = New System.Drawing.Size(228, 22)
+ Me.mMenViewQuickConnectToolbar.Text = "Quick Connect Toolbar"
'
'mMenViewExtAppsToolbar
'
Me.mMenViewExtAppsToolbar.Image = CType(resources.GetObject("mMenViewExtAppsToolbar.Image"), System.Drawing.Image)
Me.mMenViewExtAppsToolbar.Name = "mMenViewExtAppsToolbar"
- Me.mMenViewExtAppsToolbar.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewExtAppsToolbar.Size = New System.Drawing.Size(228, 22)
Me.mMenViewExtAppsToolbar.Text = "External Applications Toolbar"
'
'mMenViewSep3
'
Me.mMenViewSep3.Name = "mMenViewSep3"
- Me.mMenViewSep3.Size = New System.Drawing.Size(208, 6)
+ Me.mMenViewSep3.Size = New System.Drawing.Size(225, 6)
'
'mMenViewFullscreen
'
Me.mMenViewFullscreen.Image = Global.mRemote.My.Resources.Resources.Fullscreen
Me.mMenViewFullscreen.Name = "mMenViewFullscreen"
- Me.mMenViewFullscreen.Size = New System.Drawing.Size(211, 22)
+ Me.mMenViewFullscreen.Size = New System.Drawing.Size(228, 22)
Me.mMenViewFullscreen.Text = "Fullscreen (Kiosk Mode)"
'
'mMenTools
'
Me.mMenTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenToolsSSHTransfer, Me.mMenToolsUVNCSC, Me.mMenToolsExternalApps, Me.mMenToolsPortScan, Me.mMenToolsSep1, Me.mMenToolsComponentsCheck, Me.mMenToolsOptions})
Me.mMenTools.Name = "mMenTools"
- Me.mMenTools.Size = New System.Drawing.Size(45, 20)
+ Me.mMenTools.Size = New System.Drawing.Size(48, 20)
Me.mMenTools.Text = "&Tools"
'
'mMenToolsSSHTransfer
'
Me.mMenToolsSSHTransfer.Image = Global.mRemote.My.Resources.Resources.SSHTransfer
Me.mMenToolsSSHTransfer.Name = "mMenToolsSSHTransfer"
- Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsSSHTransfer.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsSSHTransfer.Text = "SSH File Transfer"
'
'mMenToolsUVNCSC
'
Me.mMenToolsUVNCSC.Image = Global.mRemote.My.Resources.Resources.UVNC_SC
Me.mMenToolsUVNCSC.Name = "mMenToolsUVNCSC"
- Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsUVNCSC.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsUVNCSC.Text = "UltraVNC SingleClick"
'
'mMenToolsExternalApps
'
Me.mMenToolsExternalApps.Image = CType(resources.GetObject("mMenToolsExternalApps.Image"), System.Drawing.Image)
Me.mMenToolsExternalApps.Name = "mMenToolsExternalApps"
- Me.mMenToolsExternalApps.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsExternalApps.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsExternalApps.Text = "External Applications"
'
'mMenToolsPortScan
'
Me.mMenToolsPortScan.Image = Global.mRemote.My.Resources.Resources.PortScan
Me.mMenToolsPortScan.Name = "mMenToolsPortScan"
- Me.mMenToolsPortScan.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsPortScan.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsPortScan.Text = "Port Scan"
'
'mMenToolsSep1
'
Me.mMenToolsSep1.Name = "mMenToolsSep1"
- Me.mMenToolsSep1.Size = New System.Drawing.Size(170, 6)
+ Me.mMenToolsSep1.Size = New System.Drawing.Size(181, 6)
'
'mMenToolsComponentsCheck
'
Me.mMenToolsComponentsCheck.Image = Global.mRemote.My.Resources.Resources.ComponentsCheck
Me.mMenToolsComponentsCheck.Name = "mMenToolsComponentsCheck"
- Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsComponentsCheck.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsComponentsCheck.Text = "Components Check"
'
'mMenToolsOptions
'
Me.mMenToolsOptions.Image = CType(resources.GetObject("mMenToolsOptions.Image"), System.Drawing.Image)
Me.mMenToolsOptions.Name = "mMenToolsOptions"
- Me.mMenToolsOptions.Size = New System.Drawing.Size(173, 22)
+ Me.mMenToolsOptions.Size = New System.Drawing.Size(184, 22)
Me.mMenToolsOptions.Text = "Options"
'
'mMenInfo
'
Me.mMenInfo.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mMenInfoHelp, Me.mMenInfoSep1, Me.mMenInfoWebsite, Me.mMenInfoDonate, Me.mMenInfoForum, Me.mMenInfoBugReport, Me.ToolStripSeparator2, Me.mMenInfoAnnouncements, Me.mMenToolsUpdate, Me.mMenInfoSep2, Me.mMenInfoAbout})
Me.mMenInfo.Name = "mMenInfo"
- Me.mMenInfo.Size = New System.Drawing.Size(41, 20)
+ Me.mMenInfo.Size = New System.Drawing.Size(44, 20)
Me.mMenInfo.Text = "&Help"
Me.mMenInfo.TextDirection = System.Windows.Forms.ToolStripTextDirection.Horizontal
'
@@ -379,52 +381,70 @@ Partial Class frmMain
Me.mMenInfoHelp.Image = CType(resources.GetObject("mMenInfoHelp.Image"), System.Drawing.Image)
Me.mMenInfoHelp.Name = "mMenInfoHelp"
Me.mMenInfoHelp.ShortcutKeys = System.Windows.Forms.Keys.F1
- Me.mMenInfoHelp.Size = New System.Drawing.Size(179, 22)
+ Me.mMenInfoHelp.Size = New System.Drawing.Size(190, 22)
Me.mMenInfoHelp.Text = "mRemoteNG Help"
'
'mMenInfoSep1
'
Me.mMenInfoSep1.Name = "mMenInfoSep1"
- Me.mMenInfoSep1.Size = New System.Drawing.Size(176, 6)
- '
- 'mMenInfoBugReport
- '
- Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
- Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
- Me.mMenInfoBugReport.Size = New System.Drawing.Size(179, 22)
- Me.mMenInfoBugReport.Text = "Report a Bug"
- '
- 'mMenInfoDonate
- '
- Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
- Me.mMenInfoDonate.Name = "mMenInfoDonate"
- Me.mMenInfoDonate.Size = New System.Drawing.Size(179, 22)
- Me.mMenInfoDonate.Text = "Donate"
+ Me.mMenInfoSep1.Size = New System.Drawing.Size(187, 6)
'
'mMenInfoWebsite
'
Me.mMenInfoWebsite.Image = CType(resources.GetObject("mMenInfoWebsite.Image"), System.Drawing.Image)
Me.mMenInfoWebsite.Name = "mMenInfoWebsite"
- Me.mMenInfoWebsite.Size = New System.Drawing.Size(179, 22)
+ Me.mMenInfoWebsite.Size = New System.Drawing.Size(190, 22)
Me.mMenInfoWebsite.Text = "Website"
'
- 'mMenInfoSep2
+ 'mMenInfoDonate
'
- Me.mMenInfoSep2.Name = "mMenInfoSep2"
- Me.mMenInfoSep2.Size = New System.Drawing.Size(176, 6)
+ Me.mMenInfoDonate.Image = Global.mRemote.My.Resources.Resources.Donate
+ Me.mMenInfoDonate.Name = "mMenInfoDonate"
+ Me.mMenInfoDonate.Size = New System.Drawing.Size(190, 22)
+ Me.mMenInfoDonate.Text = "Donate"
+ '
+ 'mMenInfoForum
+ '
+ Me.mMenInfoForum.Name = "mMenInfoForum"
+ Me.mMenInfoForum.Size = New System.Drawing.Size(190, 22)
+ Me.mMenInfoForum.Text = "Support Forum"
+ '
+ 'mMenInfoBugReport
+ '
+ Me.mMenInfoBugReport.Image = Global.mRemote.My.Resources.Resources.Bug
+ Me.mMenInfoBugReport.Name = "mMenInfoBugReport"
+ Me.mMenInfoBugReport.Size = New System.Drawing.Size(190, 22)
+ Me.mMenInfoBugReport.Text = "Report a Bug"
+ '
+ 'ToolStripSeparator2
+ '
+ Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+ Me.ToolStripSeparator2.Size = New System.Drawing.Size(187, 6)
'
'mMenInfoAnnouncements
'
Me.mMenInfoAnnouncements.Image = Global.mRemote.My.Resources.Resources.News
Me.mMenInfoAnnouncements.Name = "mMenInfoAnnouncements"
- Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(179, 22)
+ Me.mMenInfoAnnouncements.Size = New System.Drawing.Size(190, 22)
Me.mMenInfoAnnouncements.Text = "Announcements"
'
+ 'mMenToolsUpdate
+ '
+ Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
+ Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
+ Me.mMenToolsUpdate.Size = New System.Drawing.Size(190, 22)
+ Me.mMenToolsUpdate.Text = "Check for Updates"
+ '
+ 'mMenInfoSep2
+ '
+ Me.mMenInfoSep2.Name = "mMenInfoSep2"
+ Me.mMenInfoSep2.Size = New System.Drawing.Size(187, 6)
+ '
'mMenInfoAbout
'
Me.mMenInfoAbout.Image = Global.mRemote.My.Resources.Resources.mRemote
Me.mMenInfoAbout.Name = "mMenInfoAbout"
- Me.mMenInfoAbout.Size = New System.Drawing.Size(179, 22)
+ Me.mMenInfoAbout.Size = New System.Drawing.Size(190, 22)
Me.mMenInfoAbout.Text = "About mRemoteNG"
'
'mMenSep3
@@ -435,15 +455,15 @@ Partial Class frmMain
'lblQuickConnect
'
Me.lblQuickConnect.Name = "lblQuickConnect"
- Me.lblQuickConnect.Size = New System.Drawing.Size(43, 22)
- Me.lblQuickConnect.Text = "&Quicky:"
+ Me.lblQuickConnect.Size = New System.Drawing.Size(55, 22)
+ Me.lblQuickConnect.Text = "&Connect:"
'
'cmbQuickConnect
'
Me.cmbQuickConnect.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend
Me.cmbQuickConnect.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems
Me.cmbQuickConnect.Name = "cmbQuickConnect"
- Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 21)
+ Me.cmbQuickConnect.Size = New System.Drawing.Size(120, 25)
'
'tsContainer
'
@@ -455,7 +475,8 @@ Partial Class frmMain
'tsContainer.ContentPanel
'
Me.tsContainer.ContentPanel.Controls.Add(Me.pnlDock)
- Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 499)
+ Me.tsContainer.ContentPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
+ Me.tsContainer.ContentPanel.Size = New System.Drawing.Size(842, 474)
Me.tsContainer.Dock = System.Windows.Forms.DockStyle.Fill
'
'tsContainer.LeftToolStripPanel
@@ -474,16 +495,17 @@ Partial Class frmMain
'tsContainer.TopToolStripPanel
'
Me.tsContainer.TopToolStripPanel.Controls.Add(Me.msMain)
+ Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsQuickConnect)
+ Me.tsContainer.TopToolStripPanel.Controls.Add(Me.tsExtAppsToolbar)
Me.tsContainer.TopToolStripPanel.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
'
'tsQuickConnect
'
Me.tsQuickConnect.Dock = System.Windows.Forms.DockStyle.None
Me.tsQuickConnect.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.lblQuickConnect, Me.cmbQuickConnect, Me.btnQuickyPlay, Me.mMenQuickyCon})
- Me.tsQuickConnect.Location = New System.Drawing.Point(3, 0)
+ Me.tsQuickConnect.Location = New System.Drawing.Point(3, 24)
Me.tsQuickConnect.Name = "tsQuickConnect"
- Me.tsQuickConnect.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
- Me.tsQuickConnect.Size = New System.Drawing.Size(207, 25)
+ Me.tsQuickConnect.Size = New System.Drawing.Size(251, 25)
Me.tsQuickConnect.TabIndex = 18
'
'btnQuickyPlay
@@ -492,8 +514,8 @@ Partial Class frmMain
Me.btnQuickyPlay.Image = Global.mRemote.My.Resources.Resources.Play_Quick
Me.btnQuickyPlay.ImageTransparentColor = System.Drawing.Color.Magenta
Me.btnQuickyPlay.Name = "btnQuickyPlay"
- Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 20)
- Me.btnQuickyPlay.Text = "Play"
+ Me.btnQuickyPlay.Size = New System.Drawing.Size(32, 22)
+ Me.btnQuickyPlay.Text = "Connect"
'
'mMenQuickyCon
'
@@ -510,25 +532,23 @@ Partial Class frmMain
'
Me.tsExtAppsToolbar.ContextMenuStrip = Me.cMenExtAppsToolbar
Me.tsExtAppsToolbar.Dock = System.Windows.Forms.DockStyle.None
- Me.tsExtAppsToolbar.Location = New System.Drawing.Point(300, 0)
+ Me.tsExtAppsToolbar.Location = New System.Drawing.Point(254, 24)
Me.tsExtAppsToolbar.Name = "tsExtAppsToolbar"
- Me.tsExtAppsToolbar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
- Me.tsExtAppsToolbar.Size = New System.Drawing.Size(109, 25)
+ Me.tsExtAppsToolbar.Size = New System.Drawing.Size(111, 25)
Me.tsExtAppsToolbar.TabIndex = 17
'
'cMenExtAppsToolbar
'
Me.cMenExtAppsToolbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.cMenToolbarShowText})
Me.cMenExtAppsToolbar.Name = "cMenToolbar"
- Me.cMenExtAppsToolbar.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional
- Me.cMenExtAppsToolbar.Size = New System.Drawing.Size(126, 26)
+ Me.cMenExtAppsToolbar.Size = New System.Drawing.Size(129, 26)
'
'cMenToolbarShowText
'
Me.cMenToolbarShowText.Checked = True
Me.cMenToolbarShowText.CheckState = System.Windows.Forms.CheckState.Checked
Me.cMenToolbarShowText.Name = "cMenToolbarShowText"
- Me.cMenToolbarShowText.Size = New System.Drawing.Size(125, 22)
+ Me.cMenToolbarShowText.Size = New System.Drawing.Size(128, 22)
Me.cMenToolbarShowText.Text = "Show Text"
'
'tmrShowUpdate
@@ -540,24 +560,6 @@ Partial Class frmMain
'
Me.tmrAutoSave.Interval = 10000
'
- 'mMenToolsUpdate
- '
- Me.mMenToolsUpdate.Image = Global.mRemote.My.Resources.Resources.Update
- Me.mMenToolsUpdate.Name = "mMenToolsUpdate"
- Me.mMenToolsUpdate.Size = New System.Drawing.Size(179, 22)
- Me.mMenToolsUpdate.Text = "Check for Updates"
- '
- 'mMenInfoForum
- '
- Me.mMenInfoForum.Name = "mMenInfoForum"
- Me.mMenInfoForum.Size = New System.Drawing.Size(179, 22)
- Me.mMenInfoForum.Text = "Support Forum"
- '
- 'ToolStripSeparator2
- '
- Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
- Me.ToolStripSeparator2.Size = New System.Drawing.Size(176, 6)
- '
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -566,9 +568,8 @@ Partial Class frmMain
Me.Controls.Add(Me.tsContainer)
Me.Icon = Global.mRemote.My.Resources.Resources.mRemote_Icon
Me.MainMenuStrip = Me.msMain
- Me.MaximumSize = New System.Drawing.Size(20000, 10000)
Me.Name = "frmMain"
- Me.Text = "mRemote"
+ Me.Text = "mRemoteNG"
Me.msMain.ResumeLayout(False)
Me.msMain.PerformLayout()
Me.tsContainer.ContentPanel.ResumeLayout(False)
diff --git a/mRemoteV1/Forms/frmMain.resx b/mRemoteV1/Forms/frmMain.resx
index 3562970f..835e50c6 100644
--- a/mRemoteV1/Forms/frmMain.resx
+++ b/mRemoteV1/Forms/frmMain.resx
@@ -118,14 +118,14 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
- 13, 8
+ 17, 17
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALBwAA
- CwcBtnMLwAAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
+ CwMBSY6M0gAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
@@ -143,145 +143,145 @@
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
- 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
+ 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
- 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
+ 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
- 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
- 0O+8E/wCTNYVG3agVjIAAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
+ k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
+ 7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
+ M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
+ vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
+ 6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
+ oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
+ ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
+ Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
+ uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
+ DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
+ rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmhJREFUOE+lU9tL
- 01EcP/0VvbqxiQ6dOp2b25xzzgspRrvpNkeMTBqiszSzGgrSKlIYtV9RZJl0UdOJjbSctFUrsKcxg3oo
- /GF0ocCHpHrwoU87B04UBAke+Dx+vp8bZxcAsqN3/ebdK8vJ1Fby2QoST1cQf/wcC/EnuLf4CDOxJdye
- XcD45Dwu35jBhat3MHJxAqHwGIJnhK3O3sFukiX/fLl3D95Fd8M8b8SrN+v/xeu36/j0ZQPdJ0ciJJl6
- ga/LD/HjvYD7H2L4+HljW9j89h3+Y6cFQi2XlJRApVKhtLQUZWVlUKvVKC8vh0ajQUVFBfR6PQwGAyor
- K1FVVYXq6mrU1NSgvWdIIEuJFCPl5ORAIpFAKpVCJpNBLpcjNzcXeXl5UCgUKCgoQGFhIYqKiphgXV0d
- eofCAqGF8QPpdBpTU1PbPpDtQCCxBwlmkyuura2hr6/vn6o0Jo/Y2NiIQ/0hgczG4ixbfn4+MpkMotEo
- lErlb6ucxDvRarXQ6XRobm7GgcCgQCbnFmE2mxmhuLiY5eNlUhIFJ9EyqRiF1WrF/s4BgUxMx1BfX/8X
- ibdPlfgCRqORLWAymdgKDocDno5egYzdmgPNQ1VoF5T052R8NuqSwmKxoLa2Fi0tLXD6ugVyaXya5eHW
- uBJVoQS6NyfR6SgaGhrgdrth8/oFci5ybZPmsdlssNvtzJrT6WQKFK2trXC5XIzg8XjQ1tbG4PV60eT0
- jZLAwHAgGDq/GgxFxP7hsHhkcFTsOn5W9B89JR7sGRJ9XSdEr79fdLcfFrOWxayquM/dITY5fKuWJoeJ
- 0O+8E/wCTNYVG3agVjIAAAAASUVORK5CYII=
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAmlJREFUOE+lVN1L
+ k1EcPv9Ft06mzOF0m27qdHOb040cRpubc3PEyKQhTktbVuJAWkUKUr5FkWXSh5pObKTmJK1WYFdjBnVR
+ 7MXogwIvkurCi552DpwoCBK8eC6f3/PFOQQA2Q3IjVv3ri6vJrdXn61h5ekaEo+fYz7xBPcXHmE6voQ7
+ M/MYm5jDlZvTuHjtLgYvjSM6PIq+s8J2e3d/iGTJP1/u24t3sT0wzxnw6s3Gf/H67QY+fdlE6NTgCFlN
+ vsDX5Yf48V7Agw9xfPy8uSNsffuO4PEzAqGWVSoV1Go1SkpKUFpaCo1GA61Wi7KyMlRUVKCyshJVVVXQ
+ 6/Worq6GyWRCTU0NWrsiAllaSTJSTk4OJBIJcnNzIZVKkZeXh/z8fMhkMsjlchQWFkKhUKC4uJgJ1tXV
+ oTsyLBBaGD+QSqUwOTm54wPZDgQSX1xhNrliJpNBT0/PP1VpTB6xvr4eh8NRgczEEyxbQUEB0uk0YrEY
+ ioqKflvlJN5JeXk5dDodGhoacLCzXyATswswm82MoFQqWT5eJiVRcBItk4pROBwOHGjvFcj4VBxWq/Uv
+ Em+fKvEFDAYDW8BoNLIVXC4XfG3dAhm9PQuah6rQLijpz8n4bNQlhcViQW1tLZqamuAOhARyeWyK5eHW
+ uBJVoQS6NyfR6ShsNhu8Xi+c/qBAzo9c36J5nE4nGhsbmTW3280UKDweD5qbmxnB5/OhpaWFwe/3w+4O
+ DJHO3oHOvuiF9b7oiBgeGBaP9g+JHSfOicFjp8VDXREx0HFS9AfDorf1iJi1LGZVxf3eNtHuCqxb7C7j
+ rp4y/QZ+AXhAQe1Sf9VzAAAAAElFTkSuQmCC
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
- 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
+ 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
- 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
+ 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
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAA3FJREFUOE9Vkt9P
- W3UYxmucdy5e+S9wPWO4wMAayuxGoTLEDFnkp7QNtIemNBbKYjcPNVSwSJs5lCnbYIUVKIWtZb9aoF1Z
- V6GnrW1poVAmmwpV7JwCxhkev+fEGT3JJ3nOm/N+3nPxvACA999HudBQQN4pQi7hVcIhwq+EAA5wwVxw
- 6db/FlgBS4uv/hDhKuGPu99ZsJS5g9mHC3CsLmAq4cZEYgRNs9XPpHdOzzTMVL78fO/58ktk0TeU/BRb
- u0Gs7sQQ3WFg3wjBmV7GUCyGK2EGY2EfTIEuVNsrIlVjZa9wf//PdcvlRBfST+ex/NSPeDaO0HYYI6k4
- xtNr6Aum0PMggV5PAPa4GyZ/ByqGRTOcgFzOJ/y5+ds8HFknJp44cXPHg5uPYvgquYLPo6ugnEFQN/zQ
- LzoxsHEewR/tEF8U/lV8QVDGCmzO9BdY+smJ0ew0rL8EEMhEYAzF0bO4AqkjCJnLBdXyANRpGqq1DgyH
- Tbj6wICizwpus4LNb3++gaHNizBmvibXY/Bnwmi5HYJ0egkfBBYhS2kgXpFCnJCgOqqA7q4a3pQFRw15
- P7CC3bUns+hMfgQq1YaB7+cwurGE6mvfQOH2omf1FuqSI+BH2iAMN+OkqwqK8ffBPL6OPDp3j0fdq9tb
- z87iw4gaikgfBh+6UDPqR81UFBVf3keL6z46InZQPgdqrXZUWs9ANnwazKNp5Ope2+c1z9U8Dm1PoS/W
- ie61OZxdcKPWcAm0oQeDg4PQnPsYpedsOE5PkaznZvquTvSPGPB625FtHinGdXvCDEf6MpT3aDR+ooHJ
- ZMLW1hbW19fh8XjQoe+G8mw34okkN/P5SB/IN4Kawk1eveOUkBTjWTTjRJ3pXajb1GCiUVRR7SgpFUMi
- kcBsNkOr1XK5pLQEGl0LJ2lVt+5yRaq89ta0cV4DSlcPWk9zgiaLB4XHhHC73WAYBl6vFzabDUVvCqC1
- SDkBTdP7nODtK8WHSTEi9bp3QCnlnKCWaoWg6BiEQiHKy8s52CwoEkD0XvEuK5DJZFlOwHL8fOHhAm2e
- t+SU6KDX1AvrxDgmJyfR398PlUqF9vZ2LrMz65g1azQas2KxOPGvgJXk5OS8mC97o/VE2Ym9BknDQZO8
- Cc3yZhQq+NmjynyG5H25XL7f2Nj4u0gk2uDz+Uf+BlXgloy7HfxbAAAAAElFTkSuQmCC
+ YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAA2ZJREFUOE9dk91P
+ k2cYxptsO5vZf8GxZvEAAzYUV6HQMcSImPEpbQPtCynNCmWx6ksXKlhGiRsTJypYsEApYItfLdBarBX6
+ trUtLRRah26DbqzGCSxz8fLpm2imB7/kyp37/j0n18MBwPk/Da7qbMIIIUF4SfiHsEmYopxVeR/uvzsm
+ Cx8TrqcP7v1iwGLyLmaezMOyMo+JiB1jkSHUzZS/Et89MV0zXfrpWxErIEefEFwD0fPY2PZiZSuE4BYD
+ c8IHa3wJA6EQrvkZjPhd0HvaUW4uCZSNFH2Wvn0rMFyNtCP+Yg5LL9wIp8LwbfoxFAtjNL6Kbm8MnQ8j
+ 6HJ4YA7boXe3omRQMM0KyMtZhH/X/56DJWXF2HMrbm05cOtpCD9Hl/FDcAWU1QvqphuaBSv6Ehfg/d0M
+ 4SX+f/k/8orSApM1/hMW/7BiODUJ418eeJIB6HxhdC4sQ2zxQmKzQb7UB0Wchny1FYN+Pa4/1CL3++w7
+ acH64z9vYmD9EnTJy+T1ENxJPxru+CCeXMQ3ngVIYkoIl8UQRkQoD8qgvqeAM2bAQW3mb2nB9urzGbRF
+ z4KKNaPv11kMJxZRfuMRZHYnOlduoyo6BG6gGXx/Pb6ylUE2ehLMsylk0vt3ONT9qp211AxOBRSQBbrR
+ /8SGimE3KiaCKLn4AA22B2gNmEG5LKg0mlFq/BaSwRNgnk5iv3rfLqd+tuKZb3MC3aE2dKzO4vS8HZXa
+ K6C1nejv74fyzHcoPGPCYXqCZA0707S3oXdIi8+b925ySDGmzJEeWOJX0XifRu05JfR6PTY2NrC2tgaH
+ w4FWTQcaT3cgHImyM5eL9IHs8Cpy1jnVlmN8UoxXwaQVVfrjUDQrwASDKKNaUFAohEgkQk9PD1QqFZsL
+ CgugVDewkiZF0zZbpNIbX07q5pSg1NWgNTQrqDM4kHOID7vdDoZh4HQ6YTKZkPsFDyqDmBXQNL3LCo5c
+ y99DihGoVh8F1ShlBZVUE3i5h8Dn81FcXMySzrxcHgRf52+nBRKJJPXuMx2+kLMnW5XpLDgmeN2l74Jx
+ bBTj4+Po7e2FXC5HS0sLm9Mz44gxpdPpUkKhMPLeV87IyPgoS3KgKa8ob6dGVPO6TlqHemk9cmTc1MHG
+ LIbkXalUultbW/tSIBAkuFzu3jfA3LOfi8khbAAAAABJRU5ErkJggg==
- 651, 5
+ 521, 17
- 348, 8
+ 374, 17
- 482, 8
+ 17, 56
- 102, 8
+ 112, 17
- 233, 8
+ 252, 17
- 37
+ 155
\ No newline at end of file
diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb
index 9015666e..199b2526 100644
--- a/mRemoteV1/Forms/frmMain.vb
+++ b/mRemoteV1/Forms/frmMain.vb
@@ -562,29 +562,33 @@ Public Class frmMain
End Sub
#Region "Window Overrides and DockPanel Stuff"
- Private Msg13 As Boolean = False
- Private Msg71 As Boolean = False
+ Private Const WM_GETTEXT As Integer = &HD
+ Private Const WM_ACTIVATEAPP As Integer = &H1C
+ Private Const WM_WINDOWPOSCHANGED As Integer = &H47
+
+ Private bWmGetTextFlag As Boolean = False
+ Private bWmWindowPosChangedFlag As Boolean = False
Protected Overloads Overrides Sub WndProc(ByRef m As Message)
Try
'Debug.Print(m.Msg)
- If m.Msg = 13 Then
- Msg13 = True
- ElseIf m.Msg = 71 Then
- If Msg13 Then
+ If m.Msg = WM_GETTEXT Then
+ bWmGetTextFlag = True
+ ElseIf m.Msg = WM_WINDOWPOSCHANGED Then
+ If bWmGetTextFlag Then
ActivateConnection()
End If
- Msg13 = False
- Msg71 = True
- ElseIf m.Msg = 28 Then
- If Msg71 Then
+ bWmGetTextFlag = False
+ bWmWindowPosChangedFlag = True
+ ElseIf m.Msg = WM_ACTIVATEAPP Then
+ If bWmWindowPosChangedFlag Then
ActivateConnection()
End If
Else
- Msg13 = False
- Msg71 = False
+ bWmGetTextFlag = False
+ bWmWindowPosChangedFlag = False
End If
If m.Msg = Tools.SystemMenu.Flags.WM_SYSCOMMAND Then
diff --git a/mRemoteV1/Language/Language.EN.vb b/mRemoteV1/Language/Language.EN.vb
index 2e584329..2cb83cc5 100644
--- a/mRemoteV1/Language/Language.EN.vb
+++ b/mRemoteV1/Language/Language.EN.vb
@@ -123,7 +123,7 @@
Public Const Menu_OpenConnections As String = "Open Connections"
Public Const Menu_Options As String = "Options"
Public Const Menu_PortScan As String = "Port Scan"
- Public Const Menu_QuickyToolbar As String = "Quicky Toolbar"
+ Public Const Menu_QuickyToolbar As String = "Quick Connect Toolbar"
Public Const Menu_SaveConnections As String = "Save Connections"
Public Const Menu_SaveConnectionsAs As String = "Save Connections As"
Public Const Menu_ScreenshotManager As String = "Screenshot Manager"
@@ -135,8 +135,8 @@
Public Const Menu_View As String = "&View"
Public Const Menu_Website As String = "Website"
- Public Const Toolbar_Play As String = "Play"
- Public Const Toolbar_Quicky As String = "&Quicky:"
+ Public Const Toolbar_Play As String = "Connect"
+ Public Const Toolbar_Quicky As String = "&Connect:"
Public Const Toolbar_ShowText As String = "Show Text"
Public Const Password As String = "Password:"