Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rmcardle/mRemoteNG
...
head fork: rmcardle/mRemoteNG
  • 2 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
1  CHANGELOG.TXT
@@ -4,6 +4,7 @@
Fixed an exception or crash when choosing unnamed colors for themes.
Fixed possible error "Control does not support transparent background colors" when modifying themes.
Fixed changes to the active theme not being saved reliably.
+ Changed Internet Explorer to no longer force IE7 compatibility mode.
1.71 Beta 3 (2013-03-20):
Fixed issue MR-397 - Putty disappears from the screen
View
2  mRemoteV1/App/App.Runtime.vb
@@ -700,6 +700,8 @@ Namespace App
Dim SettingsSave As New Config.Settings.Save()
SettingsSave.Save()
+
+ IeBrowserEmulation.Unregister()
Catch ex As Exception
MessageCollector.AddMessage(Messages.MessageClass.ErrorMsg, My.Language.strSettingsCouldNotBeSavedOrTrayDispose & vbNewLine & ex.Message, True)
End Try
View
12 mRemoteV1/Connection/Connection.Protocol.PuttyBase.vb
@@ -73,18 +73,6 @@ Namespace Connection
End Set
End Property
- 'Private borderWidth As Integer = frmMain.Size.Width - frmMain.ClientSize.Width
- 'Private borderHeight As Integer = frmMain.Size.Height - frmMain.ClientSize.Height
- Private Shared _BorderSize As Size
- Public Shared Property BorderSize() As Size
- Get
- Return _BorderSize
- End Get
- Set(ByVal value As Size)
- _BorderSize = value
- End Set
- End Property
-
Public ReadOnly Property Focused() As Boolean
Get
If GetForegroundWindow() = PuttyHandle Then
View
5 mRemoteV1/Forms/frmMain.vb
@@ -57,12 +57,13 @@ Public Class frmMain
MessageCollector = New Messages.Collector(Windows.errorsForm)
Connection.Protocol.RDP.Resolutions.AddResolutions()
- Connection.Protocol.PuttyBase.BorderSize = New Size(SystemInformation.FrameBorderSize.Width, SystemInformation.CaptionHeight + SystemInformation.FrameBorderSize.Height) 'Size.Subtract(Me.Size, Me.ClientSize)
WindowList = New UI.Window.List
+ Tools.IeBrowserEmulation.Register()
+
Startup.GetConnectionIcons()
- App.Runtime.GetExtApps()
+ GetExtApps()
Windows.treePanel.Focus()
Tree.Node.TreeView = Windows.treeForm.tvConnections
View
39 mRemoteV1/Tools/IeBrowserEmulation.vb
@@ -0,0 +1,39 @@
+Imports System.IO
+Imports Microsoft.Win32
+
+Namespace Tools
+ Public Class IeBrowserEmulation
+ Private Const BrowserEmulationKey As String = "Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION"
+ Private Shared _previousIeBrowserEmulationValue As Integer = 0
+ Public Shared Sub Register()
+ Dim registryKey As RegistryKey = Registry.CurrentUser.OpenSubKey(BrowserEmulationKey, True)
+ If registryKey Is Nothing Then
+ Registry.CurrentUser.CreateSubKey(BrowserEmulationKey)
+ registryKey = Registry.CurrentUser.OpenSubKey(BrowserEmulationKey, True)
+ If registryKey Is Nothing Then Return
+ End If
+ Dim exeName As String = Path.GetFileName(Process.GetCurrentProcess().MainModule.FileName)
+ _previousIeBrowserEmulationValue = registryKey.GetValue(exeName, 0)
+ registryKey.SetValue(exeName, 11000, RegistryValueKind.DWord)
+ End Sub
+
+ Public Shared Sub Unregister()
+#If Not PORTABLE Then
+ Return
+#Else
+ Try
+ Dim registryKey As RegistryKey = Registry.CurrentUser.OpenSubKey(BrowserEmulationKey, True)
+ If registryKey Is Nothing Then Return
+ Dim exeName As String = Path.GetFileName(Process.GetCurrentProcess().MainModule.FileName)
+ If _previousIeBrowserEmulationValue = 0 Then
+ registryKey.DeleteValue(exeName)
+ Else
+ registryKey.SetValue(exeName, _previousIeBrowserEmulationValue, RegistryValueKind.DWord)
+ End If
+ Catch
+ End Try
+#End If
+ End Sub
+ End Class
+End Namespace
+
View
1  mRemoteV1/mRemoteV1.vbproj
@@ -270,6 +270,7 @@
<Compile Include="Security\Security.Crypt.vb" />
<Compile Include="Security\Security.Impersonator.vb" />
<Compile Include="Security\Security.Save.vb" />
+ <Compile Include="Tools\IeBrowserEmulation.vb" />
<Compile Include="Tools\ReconnectGroup.Designer.vb">
<DependentUpon>ReconnectGroup.vb</DependentUpon>
</Compile>

No commit comments for this range

Something went wrong with that request. Please try again.