From 9d998772ed87bf4a7cd9b42d421fda283bc3c040 Mon Sep 17 00:00:00 2001 From: Shawn Date: Sat, 18 Mar 2023 11:02:14 +0800 Subject: [PATCH 1/5] fix: restore RDP window if RDP is opened with minimized #381 --- Shawn.Utils | 2 +- Ui/Service/SessionControlService.cs | 30 ++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Shawn.Utils b/Shawn.Utils index 09f13fd2..cf5974a0 160000 --- a/Shawn.Utils +++ b/Shawn.Utils @@ -1 +1 @@ -Subproject commit 09f13fd2151d4cf55792132e92cc6900509473e9 +Subproject commit cf5974a013d11c4137795b465d41231e4e6168fe diff --git a/Ui/Service/SessionControlService.cs b/Ui/Service/SessionControlService.cs index b5b81094..cbaffeca 100644 --- a/Ui/Service/SessionControlService.cs +++ b/Ui/Service/SessionControlService.cs @@ -20,6 +20,7 @@ using PRM.View.Host.ProtocolHosts; using Shawn.Utils; using Shawn.Utils.Wpf; +using Shawn.Utils.WpfResources.Theme.Styles; using Stylet; using ProtocolHostStatus = PRM.View.Host.ProtocolHosts.ProtocolHostStatus; using Screen = System.Windows.Forms.Screen; @@ -73,13 +74,16 @@ private bool ActivateOrReConnIfServerSessionIsOpened(ProtocolBase server) if (server.IsOnlyOneInstance() && _connectionId2Hosts.ContainsKey(serverId.ToString())) { SimpleLogHelper.Debug($"_connectionId2Hosts ContainsKey {serverId.ToString()}"); - if (_connectionId2Hosts[serverId.ToString()].ParentWindow is TabWindowBase t) + if (_connectionId2Hosts[serverId.ToString()].ParentWindow is { } win) { - var s = t.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId); - if (s != null) - t.GetViewModel().SelectedItem = s; + if (win is TabWindowBase tab) + { + var s = tab.GetViewModel().Items.FirstOrDefault(x => x.Content?.ProtocolServer?.Id == serverId); + if (s != null) + tab.GetViewModel().SelectedItem = s; + } - if (t.IsClosed) + if (win.IsClosed) { MarkProtocolHostToClose(new string[] { serverId.ToString() }); CleanupProtocolsAndWindows(); @@ -88,8 +92,15 @@ private bool ActivateOrReConnIfServerSessionIsOpened(ProtocolBase server) try { - if (t.IsClosing == false) t.Show(); - if (t.IsClosing == false) t.Activate(); + Execute.OnUIThreadSync(() => + { + if (win.IsClosing == false) + { + win.WindowState = win.WindowState == WindowState.Minimized ? WindowState.Normal : win.WindowState; + win.Show(); + win.Activate(); + } + }); } catch (Exception e) { @@ -290,10 +301,7 @@ private void ConnectWithTab(ProtocolBase server, Runner runner, string assignTab tab.AddItem(new TabItemViewModel(host, server.DisplayName)); _connectionId2Hosts.TryAdd(host.ConnectionId, host); host.Conn(); - if (tab.WindowState == WindowState.Minimized) - { - tab.WindowState = WindowState.Normal; - } + tab.WindowState = tab.WindowState == WindowState.Minimized ? WindowState.Normal : tab.WindowState; tab.Activate(); }); } From f772ace2e44f926124cd32079063da4869cabaf0 Mon Sep 17 00:00:00 2001 From: Shawn Date: Mon, 20 Mar 2023 19:47:02 +0800 Subject: [PATCH 2/5] chore: Modify most of the links to 1remote.github.io --- Ui/AppVersion.cs | 3 +-- Ui/Service/TaskTrayService.cs | 6 +++--- Ui/View/AboutPageView.xaml | 20 ++----------------- Ui/View/Editor/Forms/RdpAppForm.xaml | 2 +- Ui/View/Editor/Forms/RdpForm.xaml | 6 +++--- Ui/View/Editor/Forms/VncForm.xaml | 2 +- Ui/View/ErrorReport/ErrorReportWindow.xaml | 2 +- Ui/View/ErrorReport/ErrorReportWindow.xaml.cs | 2 +- Ui/View/Guidance/GuidanceWindow.xaml | 2 +- Ui/View/Guidance/Intro.xaml | 2 +- Ui/View/RequestRatingView.xaml | 4 ++-- .../ExternalRunnerSettings.xaml | 2 +- .../ExternalRunnerSettingsViewModel.cs | 2 +- .../ExternalSshRunnerSettings.xaml | 4 ++-- Ui/View/Settings/SettingsPageView.xaml | 2 +- 15 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Ui/AppVersion.cs b/Ui/AppVersion.cs index 95810dba..c28cb33e 100644 --- a/Ui/AppVersion.cs +++ b/Ui/AppVersion.cs @@ -7,7 +7,7 @@ public static class AppVersion public const uint Major = 0; public const uint Minor = 7; public const uint Patch = 2; - public const uint Build = 7; + public const uint Build = 8; public const string PreRelease = ""; // e.g. "alpha" "beta.2" public static readonly VersionHelper.Version VersionData = new VersionHelper.Version(Major, Minor, Patch, Build, PreRelease); @@ -17,7 +17,6 @@ public static class AppVersion public static readonly string[] UpdateUrls = { "https://github.com/1Remote/1Remote", - "https://github.com/1Remote/PRemoteM", }; } } \ No newline at end of file diff --git a/Ui/Service/TaskTrayService.cs b/Ui/Service/TaskTrayService.cs index 903a4987..2dde29f9 100644 --- a/Ui/Service/TaskTrayService.cs +++ b/Ui/Service/TaskTrayService.cs @@ -103,19 +103,19 @@ private void ReloadTaskTrayContextMenu() var about = new System.Windows.Forms.ToolStripMenuItem(IoC.Get().Translate("About") + $" {Assert.APP_DISPLAY_NAME}"); about.Click += (sender, args) => { - //HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM"); + //HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote"); IoC.Get().ShowMe(true); IoC.Get().CmdGoAboutPage.Execute(); }; var linkHowToUse = new System.Windows.Forms.ToolStripMenuItem(IoC.Get().Translate("about_page_how_to_use")); linkHowToUse.Click += (sender, args) => { - HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/wiki"); + HyperlinkHelper.OpenUriBySystem("https://1remote.github.io/usage/quick-start/"); }; var linkFeedback = new System.Windows.Forms.ToolStripMenuItem(IoC.Get().Translate("about_page_feedback")); linkFeedback.Click += (sender, args) => { - HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/PRemoteM/issues"); + HyperlinkHelper.OpenUriBySystem("https://github.com/1Remote/1Remote/issues"); }; var exit = new System.Windows.Forms.ToolStripMenuItem(IoC.Get().Translate("Exit")); exit.Click += (sender, args) => diff --git a/Ui/View/AboutPageView.xaml b/Ui/View/AboutPageView.xaml index 92e52029..7a148953 100644 --- a/Ui/View/AboutPageView.xaml +++ b/Ui/View/AboutPageView.xaml @@ -150,7 +150,7 @@ - + How to use @@ -191,7 +191,7 @@ - + @@ -217,22 +217,6 @@ - diff --git a/Ui/View/Editor/Forms/RdpAppForm.xaml b/Ui/View/Editor/Forms/RdpAppForm.xaml index 8ccade64..999990ab 100644 --- a/Ui/View/Editor/Forms/RdpAppForm.xaml +++ b/Ui/View/Editor/Forms/RdpAppForm.xaml @@ -80,7 +80,7 @@ - + check how to config. diff --git a/Ui/View/Editor/Forms/RdpForm.xaml b/Ui/View/Editor/Forms/RdpForm.xaml index 69fde9d7..10415cbd 100644 --- a/Ui/View/Editor/Forms/RdpForm.xaml +++ b/Ui/View/Editor/Forms/RdpForm.xaml @@ -112,7 +112,7 @@ - (?) @@ -338,7 +338,7 @@ - (?) @@ -440,7 +440,7 @@ - (?) diff --git a/Ui/View/Editor/Forms/VncForm.xaml b/Ui/View/Editor/Forms/VncForm.xaml index 230decc9..ca228725 100644 --- a/Ui/View/Editor/Forms/VncForm.xaml +++ b/Ui/View/Editor/Forms/VncForm.xaml @@ -68,7 +68,7 @@ Caution: RFB protocol over 3.8 are proprietary. If you would like using RFB 3.8+, you have to try your own VNC runner: - + [More details] diff --git a/Ui/View/ErrorReport/ErrorReportWindow.xaml b/Ui/View/ErrorReport/ErrorReportWindow.xaml index 2d2744ef..5c3c8113 100644 --- a/Ui/View/ErrorReport/ErrorReportWindow.xaml +++ b/Ui/View/ErrorReport/ErrorReportWindow.xaml @@ -131,7 +131,7 @@