Merge branch 'develop' into release/0.9.4

starsadmin · Mar 28, 2016 · b9765bf · b9765bf
2 parents e473de2 + d512ee8
commit b9765bf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/ssdumpGUI/ssdumpGUI.Designer.cs b/ssdumpGUI/ssdumpGUI.Designer.cs
diff --git a/ssdumpGUI/ssdumpGUI.cs b/ssdumpGUI/ssdumpGUI.cs
@@ -42,9 +42,22 @@ private void exitToolStripMenuItem_Click(object sender, EventArgs e)
 
         private void btnExecute_Click(object sender, EventArgs e)
         {
+            string NewHostName = cboHostList.Text;
+
+            if (!Properties.Settings.Default.Hosts.Contains(NewHostName))
+            {
+                int NewSelectionIndex = Properties.Settings.Default.Hosts.Count;
+                Properties.Settings.Default.Hosts.Add(NewHostName);
+                Properties.Settings.Default.Save();
+                cboHostList.DataSource = null;
+                cboHostList.DataSource = Properties.Settings.Default.Hosts;
+                cboHostList.SelectedIndex = NewSelectionIndex;
+            }
+
             saveFileDialog1.Filter = "sql files (*.sql)|*.sql|All files(*.*)|*.*";
             saveFileDialog1.FilterIndex = 1;
             saveFileDialog1.RestoreDirectory = true;
+            saveFileDialog1.FileName = txtDatabase.Text + "_" + DateTime.Now.ToString("yyyyMMdd_HHmmss");
 
             if (saveFileDialog1.ShowDialog() == DialogResult.OK)
             {
@@ -57,7 +70,7 @@ private void btnExecute_Click(object sender, EventArgs e)
                 {
                     processor.Execute();
                     processing.Close();
-                    MessageBox.Show("SQL Server Dump Complete", "Complete", MessageBoxButtons.OK, MessageBoxIcon.Exclamation, MessageBoxDefaultButton.Button1);
+                    MessageBox.Show("SQL Server Dump Complete", "Complete", MessageBoxButtons.OK, MessageBoxIcon.None, MessageBoxDefaultButton.Button1);
                 }
                 catch (Exception ex)
                 {

diff --git a/ssdumpGUI/ssdumpGUI.resx b/ssdumpGUI/ssdumpGUI.resx
@@ -127,6 +127,6 @@
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>48</value>
+    <value>113</value>
   </metadata>
 </root>