diff --git a/EduNetworkBuilder/Network.cs b/EduNetworkBuilder/Network.cs index 2b66326..e4907bb 100644 --- a/EduNetworkBuilder/Network.cs +++ b/EduNetworkBuilder/Network.cs @@ -1191,7 +1191,28 @@ namespace EduNetworkBuilder { if (!IsRandomNetwork) { - DialogResult answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"), NB.Translate("_Solved"), MessageBoxButtons.YesNo); + DialogResult answer; + NBSettings oursettings = NB.GetSettings(); + if(oursettings != null && oursettings.ReplayMode) + { + ActionCollection AC = oursettings.GetUserActionCollection(); + if(AC != null) + { + NetworkAction pastTry = AC.GetActionlistFromNet(this); + + //If we never had an action list + if(AC.CurrentNeedsStoring) + { + if(pastTry == null) + answer = MessageBox.Show(NB.Translate("N_StoreReplay"), NB.Translate("_Solved"), MessageBoxButtons.YesNo); + else + answer = MessageBox.Show(NB.Translate("N_StoreReplayAgain"), NB.Translate("_Solved"), MessageBoxButtons.YesNo); + if (answer == DialogResult.Yes) + AC.PushActionToList(); + } + } + } + answer = MessageBox.Show(NB.Translate("N_MarkAsSolvedDone"), NB.Translate("_Solved"), MessageBoxButtons.YesNo); if (answer == DialogResult.Yes) { diff --git a/EduNetworkBuilder/Resources/EduNetworkReplay.xml b/EduNetworkBuilder/Resources/EduNetworkReplay.xml index 382c90c..62868fb 100644 --- a/EduNetworkBuilder/Resources/EduNetworkReplay.xml +++ b/EduNetworkBuilder/Resources/EduNetworkReplay.xml @@ -213,6 +213,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -257,6 +263,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -301,6 +313,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -345,6 +363,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -389,6 +413,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -433,6 +463,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -477,6 +513,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -521,6 +563,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -565,6 +613,12 @@ <ID>1</ID> <Tag>Untagged</Tag> </VLANInfo> + <VLANInfo> + <_ID>1</_ID> + <_Tag>Untagged</_Tag> + <ID>1</ID> + <Tag>Untagged</Tag> + </VLANInfo> </VLANs> </NetworkInterface> </interfaces> @@ -641,6 +695,100 @@ </Actions> <HasBeenStored>true</HasBeenStored> </NetworkAction> + <NetworkAction> + <NetworkName>Level0_Ping</NetworkName> + <Actions> + <ActionClass> + <Action>ping</Action> + <SourceID>100</SourceID> + <Destination> + <_ip>3232235779</_ip> + <_mask>4294967040</_mask> + <_gw>0</_gw> + <myType>ip</myType> + </Destination> + <SourceNIC> + <HostID>0</HostID> + <NicID>0</NicID> + </SourceNIC> + <DestNic> + <HostID>0</HostID> + <NicID>0</NicID> + </DestNic> + <Location> + <X>0</X> + <Y>0</Y> + </Location> + <newItemType>none</newItemType> + </ActionClass> + <ActionClass> + <Action>ping</Action> + <SourceID>100</SourceID> + <Destination> + <_ip>3232236034</_ip> + <_mask>4294967040</_mask> + <_gw>0</_gw> + <myType>ip</myType> + </Destination> + <SourceNIC> + <HostID>0</HostID> + <NicID>0</NicID> + </SourceNIC> + <DestNic> + <HostID>0</HostID> + <NicID>0</NicID> + </DestNic> + <Location> + <X>0</X> + <Y>0</Y> + </Location> + <newItemType>none</newItemType> + </ActionClass> + </Actions> + <HasBeenStored>true</HasBeenStored> + </NetworkAction> + <NetworkAction> + <NetworkName>Level0_NeedsLink</NetworkName> + <Actions> + <ActionClass> + <Action>changecomponent</Action> + <SourceID>-1</SourceID> + <SourceNIC> + <HostID>0</HostID> + <NicID>0</NicID> + </SourceNIC> + <DestNic> + <HostID>0</HostID> + <NicID>0</NicID> + </DestNic> + <Location> + <X>0</X> + <Y>0</Y> + </Location> + <newItemType>none</newItemType> + <ChangedComponent xsi:type="NetworkLink"> + <IsDirty>false</IsDirty> + <UniqueIdentifier>117</UniqueIdentifier> + <hostname /> + <SrcNic> + <HostID>110</HostID> + <NicID>112</NicID> + <HostName>pc0</HostName> + <NicName>eth0</NicName> + </SrcNic> + <DstNic> + <HostID>100</HostID> + <NicID>104</NicID> + <HostName>net_switch0</HostName> + <NicName>port2</NicName> + </DstNic> + <theLinkType>normal</theLinkType> + <isVisibleLink>true</isVisibleLink> + </ChangedComponent> + </ActionClass> + </Actions> + <HasBeenStored>true</HasBeenStored> + </NetworkAction> </NetActions> <HasUnsavedChanges>true</HasUnsavedChanges> </ActionCollection> \ No newline at end of file diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx index 0eb57cb..0809f53 100644 --- a/EduNetworkBuilder/Resources/languages/edustrings.resx +++ b/EduNetworkBuilder/Resources/languages/edustrings.resx @@ -2117,4 +2117,12 @@ <value>Network Card sprays net when used</value> <comment>NT_TstDeviceNICSprays = Network Card sprays net when used</comment> </data> + <data name="N_StoreReplay" xml:space="preserve"> + <value>You are in replay mode. Would you like to store this replay?</value> + <comment>N_StoreReplay = You are in replay mode. Would you like to store this replay?</comment> + </data> + <data name="N_StoreReplayAgain" xml:space="preserve"> + <value>This network already had a replay. Would you like to replace the replay with this one?</value> + <comment>N_StoreReplayAgain = This network already had a replay. Would you like to replace the replay with this one?</comment> + </data> </root> \ No newline at end of file