timy/EduNetworkBuilder
timy/EduNetworkBuilder
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added ctrl-s to save, and removed wireless ports showing mac addresses

Browse Source
This commit is contained in:
Tim Young 2015-08-09 20:09:17 -06:00
parent 33e9a61efd
commit 4b0b06fb65
5 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EduNetworkBuilder/Network.cs
View File

@ -202,7 +202,7 @@ namespace EduNetworkBuilder
public void Save()
{
Save(@"C:\Users\tyoung\Desktop\Test.enbx");
Save(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Desktop), "Test.enbx"));
}
public void Save(string filename)

47
EduNetworkBuilder/NetworkBuilder.cs
View File

@ -163,6 +163,10 @@ namespace EduNetworkBuilder
pbNetworkView_Delete_Click(sender, e);
ItemClickedOn = null;
}
if(e.KeyCode == Keys.S && e.Modifiers == Keys.Control)
{
doSave(true);
}
//MessageBox.Show(e.KeyCode.ToString());
}
@ -882,24 +886,37 @@ namespace EduNetworkBuilder
UpdateForm();
}
public void doSave(bool TrySkipPrompt = false)
{
if (TrySkipPrompt && myNetwork.NetworkFilename != null && File.Exists(myNetwork.NetworkFilename))
{
//Just save over it
myNetwork.Save(myNetwork.NetworkFilename);
}
else
{
SaveFileDialog mydialog = new SaveFileDialog();
mydialog.AddExtension = true;
mydialog.Filter = "EduNet File (*.enbx)|*.enbx";
mydialog.FileName = myNetwork.NetworkFilename;
string initialfolder = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
if (myNetwork.NetworkFilename != "")
initialfolder = Path.GetDirectoryName(myNetwork.NetworkFilename);
mydialog.CreatePrompt = true;
mydialog.OverwritePrompt = true;
mydialog.InitialDirectory = initialfolder;
DialogResult result = mydialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel) return;
LastPath = mydialog.FileName;
myNetwork.Save(mydialog.FileName);
}
lblStatus.Text = NB.Translate("_Saved");
}
private void saveToolStripMenuItem_Click(object sender, EventArgs e)
{
SaveFileDialog mydialog = new SaveFileDialog();
mydialog.AddExtension = true;
mydialog.Filter = "EduNet File (*.enbx)|*.enbx";
mydialog.FileName = myNetwork.NetworkFilename;
string initialfolder = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
if (myNetwork.NetworkFilename != "")
initialfolder = Path.GetDirectoryName(myNetwork.NetworkFilename);
mydialog.CreatePrompt = true;
mydialog.OverwritePrompt = true;
mydialog.InitialDirectory = initialfolder;
DialogResult result = mydialog.ShowDialog();
if (result == System.Windows.Forms.DialogResult.Cancel) return;
LastPath = mydialog.FileName;
myNetwork.Save(mydialog.FileName);
doSave(false);
}
private void BuilderWindow_Resize(object sender, EventArgs e)

2
EduNetworkBuilder/NetworkCard.cs
View File

@ -152,7 +152,7 @@ namespace EduNetworkBuilder
{
string connected = " ";
if (isConnected(true)) connected = "*";
if (myNicType == NicType.port)
if (myNicType == NicType.port || myNicType == NicType.wport)
return NicName() + connected;
return NicName() + connected + " " + MAC;
}

1
EduNetworkBuilder/Resources/ReleaseNotes.rtf
View File

@ -2,6 +2,7 @@
{\*\generator Riched20 6.3.9600}\viewkind4\uc1
\pard\sa200\sl276\slmult1\f0\fs22\lang9 Version 1.0.20\par
* wports do not display on tooltips or when printing the device info\par
* Added ctrl-s to quick-save a network we are working on\par
Version 1.0.19 08/08/2015\par
*Updated context help for most puzzles that introduce new ideas.\par
* Sorted Help topics when adding them in net-tests.\par

4
EduNetworkBuilder/Resources/languages/edustrings.resx
View File

@ -705,4 +705,8 @@
<value>Router</value>
<comment>Text used in the program on buttons and the like</comment>
</data>
<data name="_Saved" xml:space="preserve">
<value>Saved</value>
<comment>String used when we have successfully saved the network.</comment>
</data>
</root>