Changeset 375

Timestamp:

09/11/11 18:31:44 (8 months ago)

Author:

Carsten

Message:

Revised the "Save Confirmation Alert" dialogs to follow the GNOME Human Interface Guidelines, see  http://developer.gnome.org/hig-book/ for details.

Location:

cafu/trunk/CaWE

Files:

• ChildFrame.cpp (modified) (2 diffs)
• GuiEditor/ChildFrame.cpp (modified) (2 diffs)
• ModelEditor/ChildFrame.cpp (modified) (2 diffs)

cafu/trunk/CaWE/ChildFrame.cpp

@@ -748 +748 @@
     }
 
-    const int Answer=wxMessageBox("The map has been modified since it was last saved.\n"
-        "Do you want to save it before closing?\n"
-        "Note that when you select 'No', all changes since the last save will be LOST.",
-        "Save map before closing?", wxYES_NO | wxCANCEL | wxICON_EXCLAMATION);
-
-    switch (Answer)
-    {
-        case wxYES:
+    // This "Save Confirmation Alert" essentially follows the GNOME Human Interface Guidelines,
+    // see http://developer.gnome.org/hig-book/ for details.
+    wxMessageDialog Msg(NULL, "Save changes to map \"" + m_Doc->GetFileName() + "\" before closing?", "CaWE Map Editor", wxYES_NO | wxCANCEL);
+
+    Msg.SetExtendedMessage("If you close without saving, your changes will be discarded.");
+    Msg.SetYesNoLabels("Save", "Close without Saving");
+
+    switch (Msg.ShowModal())
+    {
+        case wxID_YES:
             if (!m_Doc->Save())
             {
@@ -776 +778 @@
             return;
 
-        case wxNO:
+        case wxID_NO:
             Destroy();
             return;
 
-        default:    // Answer==wxCANCEL
+        default:    // wxID_CANCEL
             CE.Veto();
             return;

cafu/trunk/CaWE/GuiEditor/ChildFrame.cpp

@@ -624 +624 @@
     }
 
-    const int Answer=wxMessageBox("The GUI has been modified since it was last saved.\n"
-        "Do you want to save it before closing?\n"
-        "Note that when you select 'No', all changes since the last save will be LOST.",
-        "Save GUI before closing?", wxYES_NO | wxCANCEL | wxICON_EXCLAMATION);
-
-    switch (Answer)
-    {
-        case wxYES:
+    // This "Save Confirmation Alert" essentially follows the GNOME Human Interface Guidelines,
+    // see http://developer.gnome.org/hig-book/ for details.
+    wxMessageDialog Msg(NULL, "Save changes to GUI \"" + m_FileName + "\" before closing?", "CaWE GUI Editor", wxYES_NO | wxCANCEL);
+
+    Msg.SetExtendedMessage("If you close without saving, your changes will be discarded.");
+    Msg.SetYesNoLabels("Save", "Close without Saving");
+
+    switch (Msg.ShowModal())
+    {
+        case wxID_YES:
             if (!Save())
             {
@@ -643 +645 @@
             return;
 
-        case wxNO:
+        case wxID_NO:
             Destroy();
             return;
 
-        default:    // Answer==wxCANCEL
+        default:    // wxID_CANCEL
             CE.Veto();
             return;

cafu/trunk/CaWE/ModelEditor/ChildFrame.cpp

@@ -865 +865 @@
     }
 
-    const int Answer=wxMessageBox("The model has been modified since it was last saved.\n"
-        "Do you want to save it before closing?\n"
-        "Note that when you select 'No', all changes since the last save will be LOST.",
-        "Save model before closing?", wxYES_NO | wxCANCEL | wxICON_EXCLAMATION);
-
-    switch (Answer)
-    {
-        case wxYES:
+    // This "Save Confirmation Alert" essentially follows the GNOME Human Interface Guidelines,
+    // see http://developer.gnome.org/hig-book/ for details.
+    wxMessageDialog Msg(NULL, "Save changes to model \"" + m_FileName + "\" before closing?", "CaWE Model Editor", wxYES_NO | wxCANCEL);
+
+    Msg.SetExtendedMessage("If you close without saving, your changes will be discarded.");
+    Msg.SetYesNoLabels("Save", "Close without Saving");
+
+    switch (Msg.ShowModal())
+    {
+        case wxID_YES:
             if (!Save())
             {
@@ -884 +886 @@
             return;
 
-        case wxNO:
+        case wxID_NO:
             Destroy();
             return;
 
-        default:    // Answer==wxCANCEL
+        default:    // wxID_CANCEL
             CE.Veto();
             return;