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

removed references to Windows.UpdatePanel

Browse Source
This commit is contained in:
David Sparer
2017-02-03 10:54:02 -07:00
parent 4ff8d7d68e
commit dee9e3c326
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mRemoteV1/App/Windows.cs
View File

@@ -29,8 +29,7 @@ namespace mRemoteNG.App
public static ConfigWindow ConfigForm { get; set; } = new ConfigWindow();
public static ErrorAndInfoWindow ErrorsForm { get; set; } = new ErrorAndInfoWindow();
public static ScreenshotManagerWindow ScreenshotForm { get; set; } = new ScreenshotManagerWindow();
public static UpdateWindow UpdateForm { get; set; }
public static DockContent UpdatePanel { get; set; } = new DockContent();
public static UpdateWindow UpdateForm { get; set; } = new UpdateWindow();
public static SSHTransferWindow SshtransferForm { get; set; }
@@ -73,8 +72,7 @@ namespace mRemoteNG.App
{
if (UpdateForm == null || UpdateForm.IsDisposed)
{
UpdateForm = new UpdateWindow(UpdatePanel);
UpdatePanel = UpdateForm;
UpdateForm = new UpdateWindow();
}
UpdateForm.Show(frmMain.Default.pnlDock);
}

8
mRemoteV1/Config/Settings/LayoutSettingsLoader.cs
View File

@@ -86,12 +86,8 @@ namespace mRemoteNG.Config.Settings
Windows.ConfigForm = new ConfigWindow();
Windows.TreeForm = new ConnectionTreeWindow();
Windows.ErrorsForm = new ErrorAndInfoWindow();
Windows.ScreenshotForm = new ScreenshotManagerWindow(Windows.ScreenshotForm);
Windows.ScreenshotForm = Windows.ScreenshotForm;
Windows.UpdateForm = new UpdateWindow(Windows.UpdatePanel);
Windows.UpdatePanel = Windows.UpdateForm;
Windows.ScreenshotForm = new ScreenshotManagerWindow();
Windows.UpdateForm = new UpdateWindow();
}
}
}

28
mRemoteV1/UI/Window/UpdateWindow.cs
View File

@@ -18,7 +18,14 @@ namespace mRemoteNG.UI.Window
{
public partial class UpdateWindow : BaseWindow
{
#region Public Methods
private AppUpdater _appUpdate;
private bool _isUpdateDownloadHandlerDeclared;
#region Public Methods
public UpdateWindow() : this(new DockContent())
{
}
public UpdateWindow(DockContent panel)
{
WindowType = WindowType.Update;
@@ -26,9 +33,9 @@ namespace mRemoteNG.UI.Window
InitializeComponent();
Runtime.FontOverride(this);
}
#endregion
#endregion
#region Form Stuff
#region Form Stuff
private void Update_Load(object sender, EventArgs e)
{
@@ -72,14 +79,9 @@ namespace mRemoteNG.UI.Window
}
Process.Start(linkUri.ToString());
}
#endregion
#endregion
#region Private Fields
private AppUpdater _appUpdate;
private bool _isUpdateDownloadHandlerDeclared;
#endregion
#region Private Methods
#region Private Methods
private void CheckForUpdate()
{
if (_appUpdate == null)
@@ -230,9 +232,9 @@ namespace mRemoteNG.UI.Window
Runtime.MessageCollector.AddExceptionStackTrace(Language.strUpdateDownloadFailed, ex);
}
}
#endregion
#endregion
#region Events
#region Events
private void DownloadUpdateProgressChanged(object sender, DownloadProgressChangedEventArgs e)
{
prgbDownload.Value = e.ProgressPercentage;
@@ -268,6 +270,6 @@ namespace mRemoteNG.UI.Window
Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, ex.Message);
}
}
#endregion
#endregion
}
}