Fixed flashing and red lines at bottom of the window on first run

Added View->Reset Layout menu item Added F11 shortcut key to View->Full Screen
mRemoteNG · Jan 27, 2010 · ef983b9 · ef983b9
1 parent 122945b
commit ef983b9
Show file tree

Hide file tree

Showing 9 changed files with 130 additions and 47 deletions.
diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
@@ -172,62 +172,59 @@ Namespace App
         End Class
 
         Public Class Startup
-            Public Shared Sub CreatePanels(Optional ByVal ShowDefault As Boolean = False)
+            Public Shared Sub CreatePanels()
                 Windows.configForm = New UI.Window.Config(Windows.configPanel)
                 Windows.configPanel = Windows.configForm
 
-                If ShowDefault Then
-                    Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                End If
-
                 Windows.treeForm = New UI.Window.Tree(Windows.treePanel)
                 Windows.treePanel = Windows.treeForm
                 Tree.Node.TreeView = Windows.treeForm.tvConnections
 
-                If ShowDefault Then
-                    Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                    Windows.treePanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Top, 0)
-                End If
-
                 Windows.errorsForm = New UI.Window.ErrorsAndInfos(Windows.errorsPanel)
                 Windows.errorsPanel = Windows.errorsForm
 
-                If ShowDefault Then
-                    Windows.errorsPanel.AutoHidePortion = 150
-                    Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                End If
-
                 Windows.sessionsForm = New UI.Window.Sessions(Windows.sessionsPanel)
                 Windows.sessionsPanel = Windows.sessionsForm
 
-                If ShowDefault Then
-                    Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.sessionsPanel.DockTo(frmMain.pnlDock.Panes(frmMain.pnlDock.Panes.Count - 1), DockStyle.Bottom, 0)
-                End If
-
                 Windows.screenshotForm = New UI.Window.ScreenshotManager(Windows.screenshotPanel)
                 Windows.screenshotPanel = Windows.screenshotForm
 
-                If ShowDefault Then
-                    Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.screenshotForm.Hide()
-                End If
-
                 Windows.quickyForm = New UI.Window.QuickConnect(Windows.quickyPanel)
                 Windows.quickyPanel = Windows.quickyForm
 
-                If ShowDefault Then
-                    Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                    Windows.quickyForm.Hide()
-                End If
-
                 Windows.updateForm = New UI.Window.Update(Windows.updatePanel)
                 Windows.updatePanel = Windows.updateForm
 
                 Windows.AnnouncementForm = New UI.Window.Announcement(Windows.AnnouncementPanel)
                 Windows.AnnouncementPanel = Windows.AnnouncementForm
             End Sub
 
+            Public Shared Sub SetDefaultLayout()
+                frmMain.pnlDock.Visible = False
+
+                Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
+
+                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.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.quickyForm.Hide()
+
+                frmMain.pnlDock.Visible = True
+            End Sub
+
             Public Shared Sub GetConnectionIcons()
                 Dim iPath As String = My.Application.Info.DirectoryPath & "\Icons\"
 

diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT
@@ -4,6 +4,9 @@
   Fixed PuTTY processes not closing on Vista and 7 with UAC enabled
   Updated DockPanel Suite from 2.2.0 to 2.3.1
   Fixed error if the mouse is clicked outside of the remote screen area of a VNC connection
+  Fixed flashing and red lines at bottom of the window on first run
+  Added View->Reset Layout menu item
+  Added F11 shortcut key to View->Full Screen
 
 1.62:
   Switched to VncSharp, an open source VNC component

diff --git a/mRemoteV1/Config/Config.Settings.Load.vb b/mRemoteV1/Config/Config.Settings.Load.vb
@@ -158,16 +158,12 @@ Namespace Config
                             dc.Close()
                         Loop
 
-                        .pnlDock.SuspendLayout(True)
-
+                        Startup.CreatePanels()
                         If File.Exists(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName) And My.Settings.ResetPanels = False Then
-                            Startup.CreatePanels()
                             .pnlDock.LoadFromXml(App.Info.Settings.SettingsPath & "\" & App.Info.Settings.LayoutFileName, AddressOf GetContentFromPersistString)
                         Else
-                            Startup.CreatePanels(True)
+                            Startup.SetDefaultLayout()
                         End If
-
-                        .pnlDock.ResumeLayout(True, True)
                     End With
                 Catch ex As Exception
                     App.Runtime.log.Error("LoadPanelsFromXML failed" & vbNewLine & ex.Message)

diff --git a/mRemoteV1/Forms/frmMain.Designer.vb b/mRemoteV1/Forms/frmMain.Designer.vb
diff --git a/mRemoteV1/Forms/frmMain.resx b/mRemoteV1/Forms/frmMain.resx
@@ -124,8 +124,8 @@
   <data name="mMenViewConfig.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
-        CwMBSY6M0gAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
+        CwIBm8luNgAAArhJREFUOE91U91LU3EYnt0GjUYSgv+EoDeCgXkhiuBAL7swoTWUEryYF2JXQlebTIlK
         pA1bmfODND+DpqUzt5Vfm7NtZx9n52xnui9zm/m5p9/vlINcHnjhnPf83ud5n/d9fhIAkv9FQ0NDrU6n
         29fr9cnS0tKqq87lFQ8MDNxqaWm5oVKpjPFEEql0Gp2dnYb29vbrGo3m9mWgHIDBYGh7PzmZ1en1gtE4
         kgoLEYTCAmLxOE5OTzExMXHw2mAQTCZT9vmLF8oLIBFAJpNde/N2iGP5EOKJhBh70SjYIAchEsHu3h4O
@@ -143,8 +143,8 @@
   <data name="mMenViewSessions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAwAA
-        CwMBSY6M0gAAA4RJREFUOE9lk21MU3cUh/9L5pxabCoz2YsmLiwbDp0TddMU1sLo7e3LtZTSQim2ILft
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlwSFlzAAALAgAA
+        CwIBm8luNgAAA4RJREFUOE9lk21MU3cUh/9L5pxabCoz2YsmLiwbDp0TddMU1sLo7e3LtZTSQim2ILft
         ENoKtIVSXksEKRStwwoVDSZGCGPIyDbYCG5s02TZFudCtiDIjNFszjiWrFmZWf3tln2Z8uHJOV/Oc345
         ySEAyP9hd24gcUo4zKmJrzRlJk6HVIJol4IfrcsQ3M1LfaaUShE8KdnKJ3EeGY6LatIEy7iFG/i+DP6V
         EPMUAsrVCKr5aFcKYN2bEMnf94KqlE4mVurllYJgFo/EOZ6xZkso+zl80KDExVoanqxE2IU8FO5YjSbd

diff --git a/mRemoteV1/Forms/frmMain.vb b/mRemoteV1/Forms/frmMain.vb
@@ -339,6 +339,12 @@ Public Class frmMain
         Windows.errorsForm.Activate()
     End Sub
 
+    Private Sub mMenViewResetLayout_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewResetLayout.Click
+        If MsgBox(My.Resources.strConfirmResetLayout, MsgBoxStyle.Question Or MsgBoxStyle.YesNo) = MsgBoxResult.Yes Then
+            App.Runtime.Startup.SetDefaultLayout()
+        End If
+    End Sub
+
     Private Sub mMenViewAddConnectionPanel_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles mMenViewAddConnectionPanel.Click
         AddPanel()
     End Sub

diff --git a/mRemoteV1/Language/Language.EN.vb b/mRemoteV1/Language/Language.EN.vb
@@ -117,7 +117,7 @@
         Public Const Menu_ExternalApplications As String = "External Applications"
         Public Const Menu_ExternalApplicationsToolbar As String = "External Applications Toolbar"
         Public Const Menu_File As String = "&File"
-        Public Const Menu_FullScreenKioskMode As String = "Fullscreen (Kiosk Mode)"
+        Public Const Menu_FullScreenKioskMode As String = "Full Screen"
         Public Const Menu_Help As String = "mRemoteNG Help"
         Public Const Menu_Info As String = "&Help"
         Public Const Menu_JumpTo As String = "Jump To"

diff --git a/mRemoteV1/My Project/Resources.Designer.vb b/mRemoteV1/My Project/Resources.Designer.vb
diff --git a/mRemoteV1/My Project/Resources.resx b/mRemoteV1/My Project/Resources.resx
@@ -478,4 +478,7 @@
   <data name="strReleasedUnderGPL" xml:space="preserve">
     <value>Released under the GNU General Public License (GPL)</value>
   </data>
+  <data name="strConfirmResetLayout" xml:space="preserve">
+    <value>Are you sure you want to reset the panels to their default layout?</value>
+  </data>
 </root>