From eb8e5ea35325608f0c58ae0b79bca615c203680d Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Wed, 8 Aug 2018 16:25:06 -0400 Subject: [PATCH] SPARK-1410 Fix shell browser window --- src/client/spark/Daemons/AboutDaemon.cs | 8 +- src/client/spark/Images/Icons.cs | 4 +- src/client/spark/Images/Vector/Icons.xaml | 13 ++ .../Modules/Support/Browser/BrowserWindow.cs | 106 ++++++++++ .../Support/Browser/BrowserWindowFactory.cs | 37 ++++ .../Modules/Support/SupportShellModule.cs | 15 +- src/client/spark/ShellBootstrapper.cs | 20 -- src/client/spark/core/Bus/SparkCommands.cs | 3 + .../ShellInterface/IShellWindowFactory.cs | 2 +- .../core/ShellInterface/IWindowManager.cs | 5 - .../view/Controls/Browser/BrowserWindow.cs | 188 ------------------ src/client/spark/view/Controls/HelpButton.cs | 24 +-- src/client/spark/view/Shell/ShellBrowser.cs | 112 ----------- .../spark/view/Shell/ShellLaunchMenu.xaml | 34 ---- .../spark/view/Shell/ShellLaunchMenu.xaml.cs | 71 ------- .../spark/view/Shell/ViewModels/LauncherVM.cs | 8 +- .../Workspaces/WorkspacesDialogView.xaml | 1 - 17 files changed, 182 insertions(+), 469 deletions(-) create mode 100644 src/client/spark/Modules/Support/Browser/BrowserWindow.cs create mode 100644 src/client/spark/Modules/Support/Browser/BrowserWindowFactory.cs delete mode 100644 src/client/spark/view/Controls/Browser/BrowserWindow.cs delete mode 100644 src/client/spark/view/Shell/ShellBrowser.cs delete mode 100644 src/client/spark/view/Shell/ShellLaunchMenu.xaml delete mode 100644 src/client/spark/view/Shell/ShellLaunchMenu.xaml.cs diff --git a/src/client/spark/Daemons/AboutDaemon.cs b/src/client/spark/Daemons/AboutDaemon.cs index 627cd8440..8abe6cc66 100644 --- a/src/client/spark/Daemons/AboutDaemon.cs +++ b/src/client/spark/Daemons/AboutDaemon.cs @@ -18,13 +18,13 @@ namespace bts.ui { [Export, Export(typeof(IShellDaemon))] class AboutDaemon : IShellDaemon, IDisposable { readonly string _user; - readonly IBrowserWindowManager _browser; + readonly IBus _bus; IDisposable _dispose; [ImportingConstructor] - public AboutDaemon(IBus bus, [Import("username")]string username, IBrowserWindowManager browser) { + public AboutDaemon(IBus bus, [Import("username")]string username) { _user = username; - _browser = browser; + _bus = bus; _dispose = bus.subscribe(SparkTags.About).OnDispatcher().Subscribe(_ => show_about()); } @@ -50,7 +50,7 @@ namespace bts.ui { } else if (!string.IsNullOrEmpty(param)) { Uri address = new Uri("bts://" + param); - _browser.Pages.Add(address); + _bus.post(SparkTags.ShowUri, address); } } })); diff --git a/src/client/spark/Images/Icons.cs b/src/client/spark/Images/Icons.cs index 49359e894..8f4d8f20f 100644 --- a/src/client/spark/Images/Icons.cs +++ b/src/client/spark/Images/Icons.cs @@ -44,7 +44,9 @@ namespace mbts.ui public static ImageSource DataCopy { get { return load_image("DataCopy.ico"); } } public static ImageSource Refresh { get { return load_image("Refresh.png"); } } public static ImageSource FavoriteWindow { get { return load_image("FavoriteWindow.png"); } } - //public static ImageSource Ticket { get { return load_image("Ticket.png"); } } // replaced with AddOrders + + public static ImageSource Browser => (DrawingImage)_resources["Browser"]; + public static ImageSource Date { get { return load_image("Date.png"); } } public static ImageSource Cube3d { get { return (DrawingImage)_resources["Cube"]; } } diff --git a/src/client/spark/Images/Vector/Icons.xaml b/src/client/spark/Images/Vector/Icons.xaml index 4ea28281e..41de02ec7 100644 --- a/src/client/spark/Images/Vector/Icons.xaml +++ b/src/client/spark/Images/Vector/Icons.xaml @@ -753,6 +753,19 @@ M0,0L63.999001,0 63.999001,48.792999 0,48.792999z"> + + + + + + + + + +