From 65ad595afc2de5eb64d4cdde3372c6f71c0756c6 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 13 May 2016 18:58:14 +0000 Subject: [PATCH] =?UTF-8?q?Enabled=20insert=20Next=20and=20Previous=20on?= =?UTF-8?q?=20the=20Figure=20substep=20type=20(B2016-111)=20Set=20the=20cu?= =?UTF-8?q?rsor=20focus=20to=20the=20Find=20Text=20box=20when=20Find/Repla?= =?UTF-8?q?ce=20is=20first=20started=20(B2016-107)=20Added=20a=20Cancel=20?= =?UTF-8?q?button=20to=20the=20=E2=80=9CReopen=20Last=20Database=E2=80=9D?= =?UTF-8?q?=20dialog,=20which=20will=20exit=20PROMS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PROMS/Formats/fmtall/BASEall.xml | Bin 78696 -> 78784 bytes PROMS/VEPROMS User Interface/frmVEPROMS.cs | 1 + .../Generated/Database.cs | 7 ++++++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PROMS/Formats/fmtall/BASEall.xml b/PROMS/Formats/fmtall/BASEall.xml index f729d4276e6d423e041e90c5cec6d13245f5f5cf..02f22123494343e645654722e5d2290c0d24400c 100644 GIT binary patch delta 26 kcmV+#0OkMa<^;g!1h7WPldhFMla6T?lkRDpv);&xYR4ZA!vFvP delta 21 dcmX@`oaMzcmJMzvCd+M-n7p9VYtzXCSpa_a3t|8O diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index d43134b5..304146a2 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -2922,6 +2922,7 @@ namespace VEPROMS dlgFindReplace.Mydocversion = _SelectedDVI; dlgFindReplace.Visible = true; dlgFindReplace.MyDisplayBookMarks = displayBookMarks; + dlgFindReplace.SetFocusToTextBox(); // bug fix: B2016-107, when Find/Replace is initially opened, set the cursor focus to the Find Text box } else if (args.PanelTabName == "SpellChecker") { diff --git a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs index ce5bfe3e..e716d232 100644 --- a/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs +++ b/PROMS/VEPROMS.CSLA.Library/Generated/Database.cs @@ -261,11 +261,16 @@ public static string DBServer { if (LastDatabase != "NoDefault" && LastDatabase != "") { - if (System.Windows.Forms.MessageBox.Show("Open " + LastDatabase, "Reopen Last Database", System.Windows.Forms.MessageBoxButtons.YesNo, System.Windows.Forms.MessageBoxIcon.Question) == System.Windows.Forms.DialogResult.Yes) + System.Windows.Forms.DialogResult dlgrslt = System.Windows.Forms.MessageBox.Show("Open " + LastDatabase, "Reopen Last Database", System.Windows.Forms.MessageBoxButtons.YesNoCancel, System.Windows.Forms.MessageBoxIcon.Question); + if (dlgrslt == System.Windows.Forms.DialogResult.Yes) { SelectedDatabase = LastDatabase; return constr.Replace("{MENU}", _SelectedDatabase); } + else if (dlgrslt == System.Windows.Forms.DialogResult.Cancel) + { + Process.GetCurrentProcess().Kill(); // exit PROMS + } } System.Windows.Forms.ContextMenuStrip cms = BuildDatabaseMenu(constr); while (_SelectedDatabase == null)