From 4b98c5298abafd8edcd6a243ee22efb6c56a47f7 Mon Sep 17 00:00:00 2001 From: Tim Young Date: Fri, 28 Jul 2017 19:35:27 -0500 Subject: [PATCH] Have double-click on item working now with msi file. --- EduNetworkBuilder/NetworkBuilder.cs | 22 +++++++++++++++++++--- EduNetworkBuilder/Program.cs | 7 +++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index dc59285..0a18c99 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -51,12 +51,16 @@ namespace EduNetworkBuilder private List ItemsSelected = new List(); private Point OrigClickPoint = new Point(-1, -1); + private string InitialFileLoad = ""; + private PersonClass CurrentUser; - public BuilderWindow() + public BuilderWindow(string FirstArg="") { InitializeComponent(); + InitialFileLoad = FirstArg; + LastPath = OurSettings.LastPath; if(!OurSettings.LanguageHasBeenChosen) @@ -1638,7 +1642,6 @@ namespace EduNetworkBuilder private void BuilderWindow_Load(object sender, EventArgs e) { - if (OurSettings.MainWindowX != -1 && OurSettings.MainWindowY != -1) { Location = new Point(OurSettings.MainWindowX, OurSettings.MainWindowY); @@ -1648,8 +1651,11 @@ namespace EduNetworkBuilder Height = OurSettings.MainWindowHeight; Width = OurSettings.MainWindowWidth; } + //If we started by clicking on a file, load that file - if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData != null && AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Any()) + if (AppDomain.CurrentDomain.SetupInformation.ActivationArguments != null && + AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData != null && + AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData.Any()) { string[] activationData = AppDomain.CurrentDomain.SetupInformation.ActivationArguments.ActivationData; var uri = new Uri(activationData[0]); @@ -1665,6 +1671,16 @@ namespace EduNetworkBuilder UpdateForm(); } } + if (InitialFileLoad != "") + { + if (File.Exists(InitialFileLoad)) + { + PrepForLoad(); + myNetwork.Load(InitialFileLoad); + UpdateMenu(); + UpdateForm(); + } + } else { if (OurSettings.AutoStartPuzzles) diff --git a/EduNetworkBuilder/Program.cs b/EduNetworkBuilder/Program.cs index 7c20a4b..af0ad34 100644 --- a/EduNetworkBuilder/Program.cs +++ b/EduNetworkBuilder/Program.cs @@ -12,11 +12,14 @@ namespace EduNetworkBuilder /// The main entry point for the application. /// [STAThread] - static void Main() + static void Main(string[] args) { + string InitialFile = ""; + if(args.Count() > 0) + InitialFile = args[0]; Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new BuilderWindow()); + Application.Run(new BuilderWindow(InitialFile)); } } }