From 3a7a3f42990e5b1a9102bd89a9dc8eff8531f58e Mon Sep 17 00:00:00 2001 From: Tim Young Date: Mon, 31 Jul 2017 19:14:05 -0500 Subject: [PATCH] stop displaying spurious help messages & pop open help when we launch a network --- EduNetworkBuilder/Network.cs | 21 +++++++++++++-------- EduNetworkBuilder/NetworkBuilder.cs | 1 + EduNetworkBuilder/SchoolworkClass.cs | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs index 045d856..d137578 100644 --- a/EduNetworkBuilder/Network.cs +++ b/EduNetworkBuilder/Network.cs @@ -96,6 +96,7 @@ namespace EduNetworkBuilder public static void Clone(Network source, Network dest) { + dest.AlreadyDisplayedMessage = false; dest.DefaultTimeout = source.DefaultTimeout; dest.HintsToDisplay = source.HintsToDisplay; dest.itemsize = source.itemsize; @@ -161,7 +162,7 @@ namespace EduNetworkBuilder } } - public void Load(XmlNode TheNode, string Name, bool FromResource=false) + public void Load(XmlNode TheNode, string Name, bool FromResource=false, bool skipOpeningWindows = false) { _isDirty = true; NetworkDevice newND; @@ -277,7 +278,17 @@ namespace EduNetworkBuilder } DoAllVerifyLinks(); DoAllAutoJoin(); - if (NetMessage.GetText() != "" && !AlreadyDisplayedMessage) + OpenHelpIfNeeded(skipOpeningWindows); + if (NetTests.Count > 0) + PuzzleIsSolved = false; //When we load the puzzle. + + if (newUnique != -1) + UniqueIdentifier = newUnique; + } + + public void OpenHelpIfNeeded(bool skipOpeningWindows) + { + if (NetMessage.GetText() != "" && !AlreadyDisplayedMessage & !skipOpeningWindows) { //We have a message loaded on this network. Display it BuilderWindow myWin = (BuilderWindow)Application.OpenForms["BuilderWindow"]; @@ -291,14 +302,8 @@ namespace EduNetworkBuilder } AlreadyDisplayedMessage = true; } - if(NetTests.Count > 0) - PuzzleIsSolved = false; //When we load the puzzle. - - if (newUnique != -1) - UniqueIdentifier = newUnique; } - public void Save() { Save(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "Test.enbx")); diff --git a/EduNetworkBuilder/NetworkBuilder.cs b/EduNetworkBuilder/NetworkBuilder.cs index 0ffd0de..ce84be9 100644 --- a/EduNetworkBuilder/NetworkBuilder.cs +++ b/EduNetworkBuilder/NetworkBuilder.cs @@ -1585,6 +1585,7 @@ namespace EduNetworkBuilder { PrepForLoad(); Network.Clone(NewNet, myNetwork); //Push the settings + myNetwork.OpenHelpIfNeeded(false); UpdateMenu(); UpdateForm(); } diff --git a/EduNetworkBuilder/SchoolworkClass.cs b/EduNetworkBuilder/SchoolworkClass.cs index 6e63c82..15d2409 100644 --- a/EduNetworkBuilder/SchoolworkClass.cs +++ b/EduNetworkBuilder/SchoolworkClass.cs @@ -103,7 +103,7 @@ namespace EduNetworkBuilder break; case "network": theProject = new Network(); - theProject.Load(Individual, ""); + theProject.Load(Individual, "",false,true); break; } }