diff --git a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
index fd60ecc57..2c0784294 100644
--- a/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
+++ b/mRemoteV1/Connection/Protocol/Http/Connection.Protocol.HTTPBase.cs
@@ -1,5 +1,6 @@
using System;
using System.Windows.Forms;
+using Gecko;
using mRemoteNG.Tools;
using mRemoteNG.App;
using TabPage = Crownwood.Magic.Controls.TabPage;
@@ -24,8 +25,8 @@ namespace mRemoteNG.Connection.Protocol.Http
{
if (RenderingEngine == RenderingEngine.Gecko)
{
- Control = new MiniGeckoBrowser.MiniGeckoBrowser();
- ((MiniGeckoBrowser.MiniGeckoBrowser)Control).XULrunnerPath = Convert.ToString(Settings.Default.XULRunnerPath);
+ Xpcom.Initialize("Firefox");
+ Control = new GeckoWebBrowser();
}
else
{
@@ -64,14 +65,14 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
- MiniGeckoBrowser.MiniGeckoBrowser objMiniGeckoBrowser = wBrowser as MiniGeckoBrowser.MiniGeckoBrowser;
- if (objMiniGeckoBrowser != null)
- {
- objMiniGeckoBrowser.TitleChanged += geckoBrowser_DocumentTitleChanged;
- objMiniGeckoBrowser.LastTabRemoved += wBrowser_LastTabRemoved;
- }
- }
- else
+ GeckoWebBrowser GeckoBrowser = (GeckoWebBrowser) wBrowser;
+ if (GeckoBrowser != null)
+ {
+ GeckoBrowser.DocumentTitleChanged += geckoBrowser_DocumentTitleChanged;
+ //GeckoBrowser.Tab.LastTabRemoved += wBrowser_LastTabRemoved;
+ }
+ }
+ else
{
WebBrowser objWebBrowser = (WebBrowser)wBrowser;
//SHDocVw.WebBrowserClass objAxWebBrowser = (SHDocVw.WebBrowserClass)objWebBrowser.ActiveXInstance;
@@ -121,7 +122,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
- ((MiniGeckoBrowser.MiniGeckoBrowser)wBrowser).Navigate(strHost + ":" + InterfaceControl.Info.Port);
+ ((GeckoWebBrowser)wBrowser).Navigate(strHost + ":" + InterfaceControl.Info.Port);
}
else
{
@@ -137,7 +138,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
- ((MiniGeckoBrowser.MiniGeckoBrowser)wBrowser).Navigate(strHost);
+ ((GeckoWebBrowser)wBrowser).Navigate(strHost);
}
else
{
@@ -203,13 +204,13 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
- if (((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title.Length >= 30)
+ if (((GeckoWebBrowser) wBrowser).DocumentTitle.Length >= 30)
{
- shortTitle = ((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title.Substring(0, 29) + " ...";
+ shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 29) + " ...";
}
else
{
- shortTitle = ((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title;
+ shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
}
else
@@ -226,7 +227,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (!string.IsNullOrEmpty(tabTitle))
{
- tabP.Title = tabTitle + " - " + shortTitle;
+ tabP.Title = tabTitle + @" - " + shortTitle;
}
else
{
@@ -241,7 +242,7 @@ namespace mRemoteNG.Connection.Protocol.Http
}
- private void geckoBrowser_DocumentTitleChanged(object sender, string e)
+ private void geckoBrowser_DocumentTitleChanged(object sender, EventArgs e)
{
try
{
@@ -253,13 +254,13 @@ namespace mRemoteNG.Connection.Protocol.Http
if (InterfaceControl.Info.RenderingEngine == RenderingEngine.Gecko)
{
- if (((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title.Length >= 30)
+ if (((GeckoWebBrowser)wBrowser).DocumentTitle.Length >= 30)
{
- shortTitle = ((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title.Substring(0, 29) + " ...";
+ shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle.Substring(0, 29) + " ...";
}
else
{
- shortTitle = ((MiniGeckoBrowser.MiniGeckoBrowser) wBrowser).Title;
+ shortTitle = ((GeckoWebBrowser) wBrowser).DocumentTitle;
}
}
else
@@ -276,7 +277,7 @@ namespace mRemoteNG.Connection.Protocol.Http
if (!string.IsNullOrEmpty(tabTitle))
{
- tabP.Title = tabTitle + " - " + shortTitle;
+ tabP.Title = tabTitle + @" - " + shortTitle;
}
else
{
diff --git a/mRemoteV1/Firefox/AccessibleMarshal.dll b/mRemoteV1/Firefox/AccessibleMarshal.dll
new file mode 100644
index 000000000..2eb2de761
Binary files /dev/null and b/mRemoteV1/Firefox/AccessibleMarshal.dll differ
diff --git a/mRemoteV1/Firefox/D3DCompiler_43.dll b/mRemoteV1/Firefox/D3DCompiler_43.dll
new file mode 100644
index 000000000..ab9616191
Binary files /dev/null and b/mRemoteV1/Firefox/D3DCompiler_43.dll differ
diff --git a/mRemoteV1/Firefox/breakpadinjector.dll b/mRemoteV1/Firefox/breakpadinjector.dll
new file mode 100644
index 000000000..2e6204d81
Binary files /dev/null and b/mRemoteV1/Firefox/breakpadinjector.dll differ
diff --git a/mRemoteV1/Firefox/d3dcompiler_47.dll b/mRemoteV1/Firefox/d3dcompiler_47.dll
new file mode 100644
index 000000000..e5bf5cf5b
Binary files /dev/null and b/mRemoteV1/Firefox/d3dcompiler_47.dll differ
diff --git a/mRemoteV1/Firefox/freebl3.dll b/mRemoteV1/Firefox/freebl3.dll
new file mode 100644
index 000000000..791e2a097
Binary files /dev/null and b/mRemoteV1/Firefox/freebl3.dll differ
diff --git a/mRemoteV1/Firefox/icudt56.dll b/mRemoteV1/Firefox/icudt56.dll
new file mode 100644
index 000000000..913a6923f
Binary files /dev/null and b/mRemoteV1/Firefox/icudt56.dll differ
diff --git a/mRemoteV1/Firefox/icuin56.dll b/mRemoteV1/Firefox/icuin56.dll
new file mode 100644
index 000000000..8d53bba18
Binary files /dev/null and b/mRemoteV1/Firefox/icuin56.dll differ
diff --git a/mRemoteV1/Firefox/icuuc56.dll b/mRemoteV1/Firefox/icuuc56.dll
new file mode 100644
index 000000000..98a6b018d
Binary files /dev/null and b/mRemoteV1/Firefox/icuuc56.dll differ
diff --git a/mRemoteV1/Firefox/lgpllibs.dll b/mRemoteV1/Firefox/lgpllibs.dll
new file mode 100644
index 000000000..74e0c4242
Binary files /dev/null and b/mRemoteV1/Firefox/lgpllibs.dll differ
diff --git a/mRemoteV1/Firefox/libEGL.dll b/mRemoteV1/Firefox/libEGL.dll
new file mode 100644
index 000000000..8328285ec
Binary files /dev/null and b/mRemoteV1/Firefox/libEGL.dll differ
diff --git a/mRemoteV1/Firefox/libGLESv2.dll b/mRemoteV1/Firefox/libGLESv2.dll
new file mode 100644
index 000000000..bf7b6f05a
Binary files /dev/null and b/mRemoteV1/Firefox/libGLESv2.dll differ
diff --git a/mRemoteV1/Firefox/mozglue.dll b/mRemoteV1/Firefox/mozglue.dll
new file mode 100644
index 000000000..286ca4173
Binary files /dev/null and b/mRemoteV1/Firefox/mozglue.dll differ
diff --git a/mRemoteV1/Firefox/msvcp120.dll b/mRemoteV1/Firefox/msvcp120.dll
new file mode 100644
index 000000000..a237d2d77
Binary files /dev/null and b/mRemoteV1/Firefox/msvcp120.dll differ
diff --git a/mRemoteV1/Firefox/msvcr120.dll b/mRemoteV1/Firefox/msvcr120.dll
new file mode 100644
index 000000000..8c36149a6
Binary files /dev/null and b/mRemoteV1/Firefox/msvcr120.dll differ
diff --git a/mRemoteV1/Firefox/nss3.dll b/mRemoteV1/Firefox/nss3.dll
new file mode 100644
index 000000000..235cda519
Binary files /dev/null and b/mRemoteV1/Firefox/nss3.dll differ
diff --git a/mRemoteV1/Firefox/nssckbi.dll b/mRemoteV1/Firefox/nssckbi.dll
new file mode 100644
index 000000000..b72fdf37d
Binary files /dev/null and b/mRemoteV1/Firefox/nssckbi.dll differ
diff --git a/mRemoteV1/Firefox/nssdbm3.dll b/mRemoteV1/Firefox/nssdbm3.dll
new file mode 100644
index 000000000..4916b9be1
Binary files /dev/null and b/mRemoteV1/Firefox/nssdbm3.dll differ
diff --git a/mRemoteV1/Firefox/omni.ja b/mRemoteV1/Firefox/omni.ja
new file mode 100644
index 000000000..df0d5e4a4
Binary files /dev/null and b/mRemoteV1/Firefox/omni.ja differ
diff --git a/mRemoteV1/Firefox/plugin-container.exe b/mRemoteV1/Firefox/plugin-container.exe
new file mode 100644
index 000000000..e2c0300e1
Binary files /dev/null and b/mRemoteV1/Firefox/plugin-container.exe differ
diff --git a/mRemoteV1/Firefox/plugin-hang-ui.exe b/mRemoteV1/Firefox/plugin-hang-ui.exe
new file mode 100644
index 000000000..258530846
Binary files /dev/null and b/mRemoteV1/Firefox/plugin-hang-ui.exe differ
diff --git a/mRemoteV1/Firefox/sandboxbroker.dll b/mRemoteV1/Firefox/sandboxbroker.dll
new file mode 100644
index 000000000..c20b7a0a7
Binary files /dev/null and b/mRemoteV1/Firefox/sandboxbroker.dll differ
diff --git a/mRemoteV1/Firefox/softokn3.dll b/mRemoteV1/Firefox/softokn3.dll
new file mode 100644
index 000000000..2afd93aa5
Binary files /dev/null and b/mRemoteV1/Firefox/softokn3.dll differ
diff --git a/mRemoteV1/Firefox/xul.dll b/mRemoteV1/Firefox/xul.dll
new file mode 100644
index 000000000..16f9a2947
Binary files /dev/null and b/mRemoteV1/Firefox/xul.dll differ
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index 10b902e2c..b836cd496 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -42,6 +42,8 @@
false
true
true
+
+
true
@@ -96,6 +98,14 @@
false
+
+ ..\packages\Geckofx45.45.0.19.0\lib\net40\Geckofx-Core.dll
+ True
+
+
+ ..\packages\Geckofx45.45.0.19.0\lib\net40\Geckofx-Winforms.dll
+ True
+
False
@@ -114,18 +124,10 @@
References\MagicLibrary.dll
True
-
- False
- References\MiniGeckoBrowser.dll
-
False
References\Org.Mentalis.Security.dll
-
- False
- References\Skybound.Gecko.dll
-
@@ -677,12 +679,36 @@
+
+
MyApplicationCodeGenerator
Application.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
PreserveNewest
@@ -1226,4 +1252,11 @@ editbin /largeaddressaware $(TargetPath)
-->
+
+
+
+ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
+
+
+
\ No newline at end of file
diff --git a/mRemoteV1/packages.config b/mRemoteV1/packages.config
new file mode 100644
index 000000000..cfe525828
--- /dev/null
+++ b/mRemoteV1/packages.config
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file