Learning/mRemoteNG
1
0
Fork 0
mirror of https://github.com/mRemoteNG/mRemoteNG.git synced 2026-02-17 22:11:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

manual merge from Filippo125:add_winbox - Improve log

Browse Source
This commit is contained in:
Dimitrij
2022-01-18 12:19:49 +00:00
parent 629515b81a
commit 2f3a03eab7
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
mRemoteNG/Connection/Protocol/Winbox/Connection.Protocol.Winbox.cs
View File

@@ -125,12 +125,12 @@ namespace mRemoteNG.Connection.Protocol.Winbox
Console.WriteLine(line);
if (line.Contains("startServices done"))
{
Console.WriteLine("Find connection done");
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Winbox - Find connection done");
break;
}
else if (line.Contains("disconnect"))
{
Console.WriteLine("Cannot connect");
Runtime.MessageCollector.AddMessage(MessageClass.DebugMsg, "Winbox - Cannot Connect");
break;
}
}
@@ -149,21 +149,13 @@ namespace mRemoteNG.Connection.Protocol.Winbox
NativeMethods.SetParent(WinboxHandle, InterfaceControl.Handle);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, Language.PuttyStuff, true);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PuttyHandle, WinboxHandle), true);
Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PuttyTitle, WinboxProcess.MainWindowTitle), true);
//::TODO not found putty parent handle
//Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, string.Format(Language.PuttyParentHandle, InterfaceControl.Parent.Handle), true);
Resize(this, new EventArgs());
base.Connect();
return true;
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg,
Language.ConnectionFailed + Environment.NewLine +
ex.Message);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.ConnectionFailed + Environment.NewLine + ex.Message);
return false;
}
}
@@ -216,7 +208,7 @@ namespace mRemoteNG.Connection.Protocol.Winbox
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.PuttyKillFailed + Environment.NewLine + ex.Message, true);
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, "Winbox - Kill process failed" + Environment.NewLine + ex.Message, true);
}
try
@@ -233,15 +225,7 @@ namespace mRemoteNG.Connection.Protocol.Winbox
public void ShowSettingsDialog()
{
try
{
NativeMethods.PostMessage(WinboxHandle, NativeMethods.WM_SYSCOMMAND, (IntPtr)IDM_RECONF, (IntPtr)0);
NativeMethods.SetForegroundWindow(WinboxHandle);
}
catch (Exception ex)
{
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, Language.PuttyShowSettingsDialogFailed + Environment.NewLine + ex.Message, true);
}
}
#endregion