Unify dialog boxes on file loading errors into one place.

Author: tturocy

src/gui/app.cc

@@ -83,7 +83,7 @@ wxBEGIN_EVENT_TABLE(Application, wxApp) EVT_TIMER(wxID_ANY, Application::OnSplas
 
   // Process command line arguments, if any.
   for (int i = 1; i < argc; i++) {
-    const AppLoadResult result = LoadFile(argv[i]);
+    const AppLoadResult result = LoadFile(argv[i], nullptr);
     if (result == GBT_APP_OPEN_FAILED) {
       wxMessageBox(wxString::Format(_("Gambit could not open file for reading:\n%s"), argv[i]),
                    _("Unable to open file"), wxOK | wxICON_ERROR, nullptr);
@@ -131,10 +131,12 @@ void Application::DismissSplash()
   m_splash = nullptr;
 }
 
-AppLoadResult Application::LoadFile(const wxString &p_filename)
+AppLoadResult Application::LoadFile(const wxString &p_filename, wxWindow *p_parent)
 {
-  std::ifstream infile((const char *)p_filename.mb_str());
+  std::ifstream infile(p_filename.mb_str());
   if (!infile.good()) {
+    wxMessageBox(_("Gambit could not open file for reading:\n") + p_filename,
+                 _("Unable to open file"), wxOK | wxICON_ERROR, p_parent);
     return GBT_APP_OPEN_FAILED;
   }
 
@@ -146,21 +148,21 @@ AppLoadResult Application::LoadFile(const wxString &p_filename)
     (void)new GameFrame(nullptr, doc);
     return GBT_APP_FILE_OK;
   }
-  else {
-    delete doc;
-  }
+  delete doc;
 
   try {
     const Game nfg = ReadGame(infile);
 
     m_fileHistory.AddFileToHistory(p_filename);
     m_fileHistory.Save(*wxConfigBase::Get());
     doc = new GameDocument(nfg);
-    doc->SetFilename(wxT(""));
+    doc->SetFilename("");
     (void)new GameFrame(nullptr, doc);
     return GBT_APP_FILE_OK;
   }
   catch (InvalidFileException &) {
+    wxMessageBox(_("File is not in a format Gambit recognizes:\n") + p_filename,
+                 _("Unable to read file"), wxOK | wxICON_ERROR, p_parent);
     return GBT_APP_PARSE_FAILED;
   }
 }

src/gui/app.h

@@ -63,9 +63,10 @@ class Application final : public wxApp {
   }
   void RemoveMenu(wxMenu *p_menu) { m_fileHistory.RemoveMenu(p_menu); }
 
-  AppLoadResult LoadFile(const wxString &);
+  AppLoadResult LoadFile(const wxString &, wxWindow *);
+  ;
 #ifdef __WXMAC__
-  void MacOpenFile(const wxString &filename) override { LoadFile(filename); }
+  void MacOpenFile(const wxString &filename) override { LoadFile(filename, nullptr); }
 #endif // __WXMAC__
 
   //!

src/gui/gameframe.cc

@@ -649,20 +649,7 @@ void GameFrame::OnFileOpen(wxCommandEvent &)
   if (dialog.ShowModal() == wxID_OK) {
     const wxString filename = dialog.GetPath();
     wxGetApp().SetCurrentDir(wxPathOnly(filename));
-
-    const AppLoadResult result = wxGetApp().LoadFile(filename);
-    if (result == GBT_APP_OPEN_FAILED) {
-      wxMessageDialog msgdialog(
-          this, wxT("Gambit could not open file '") + filename + wxT("' for reading."),
-          wxT("Unable to open file"), wxOK | wxICON_ERROR);
-      msgdialog.ShowModal();
-    }
-    else if (result == GBT_APP_PARSE_FAILED) {
-      wxMessageDialog msgdialog(
-          this, wxT("File '") + filename + wxT("' is not in a format Gambit recognizes."),
-          wxT("Unable to read file"), wxOK | wxICON_ERROR);
-      msgdialog.ShowModal();
-    }
+    wxGetApp().LoadFile(filename, this);
   }
 }
 
@@ -903,20 +890,7 @@ void GameFrame::OnFileExit(wxCommandEvent &p_event)
 void GameFrame::OnFileMRUFile(wxCommandEvent &p_event)
 {
   const wxString filename = wxGetApp().GetHistoryFile(p_event.GetId() - wxID_FILE1);
-  const AppLoadResult result = wxGetApp().LoadFile(filename);
-
-  if (result == GBT_APP_OPEN_FAILED) {
-    wxMessageDialog dialog(this,
-                           wxT("Gambit could not open file '") + filename + wxT("' for reading."),
-                           wxT("Unable to open file"), wxOK | wxICON_ERROR);
-    dialog.ShowModal();
-  }
-  else if (result == GBT_APP_PARSE_FAILED) {
-    wxMessageDialog dialog(
-        this, wxT("File '") + filename + wxT("' is not in a format Gambit recognizes."),
-        wxT("Unable to read file"), wxOK | wxICON_ERROR);
-    dialog.ShowModal();
-  }
+  wxGetApp().LoadFile(filename, this);
 }
 
 //----------------------------------------------------------------------