*/
-#include <iostream>
-#include <fstream>
-#include <boost/filesystem.hpp>
-#ifdef __WXMSW__
-#include <shellapi.h>
-#endif
-#ifdef __WXOSX__
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-#include <wx/generic/aboutdlgg.h>
-#include <wx/stdpaths.h>
-#include <wx/cmdline.h>
-#include <wx/preferences.h>
-#include <dcp/exceptions.h>
-#include "wx/film_viewer.h"
-#include "wx/film_editor.h"
-#include "wx/job_manager_view.h"
-#include "wx/config_dialog.h"
-#include "wx/job_wrapper.h"
-#include "wx/wx_util.h"
-#include "wx/new_film_dialog.h"
-#include "wx/properties_dialog.h"
-#include "wx/wx_ui_signaller.h"
-#include "wx/about_dialog.h"
-#include "wx/kdm_dialog.h"
-#include "wx/servers_list_dialog.h"
-#include "wx/hints_dialog.h"
-#include "wx/update_dialog.h"
-#include "wx/content_panel.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/server_finder.h"
#include "lib/update.h"
#include "lib/content_factory.h"
+#include "wx/film_viewer.h"
+#include "wx/film_editor.h"
+#include "wx/job_manager_view.h"
+#include "wx/config_dialog.h"
+#include "wx/wx_util.h"
+#include "wx/new_film_dialog.h"
+#include "wx/properties_dialog.h"
+#include "wx/wx_ui_signaller.h"
+#include "wx/about_dialog.h"
+#include "wx/kdm_dialog.h"
+#include "wx/servers_list_dialog.h"
+#include "wx/hints_dialog.h"
+#include "wx/update_dialog.h"
+#include "wx/content_panel.h"
+#include "wx/report_problem_dialog.h"
+#include <dcp/exceptions.h>
+#include <wx/generic/aboutdlgg.h>
+#include <wx/stdpaths.h>
+#include <wx/cmdline.h>
+#include <wx/preferences.h>
+#ifdef __WXMSW__
+#include <shellapi.h>
+#endif
+#ifdef __WXOSX__
+#include <ApplicationServices/ApplicationServices.h>
+#endif
+#include <boost/filesystem.hpp>
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#ifdef check
+#undef check
+#endif
using std::cout;
+using std::wcout;
using std::string;
using std::vector;
using std::wstring;
+using std::wstringstream;
using std::map;
using std::make_pair;
using std::list;
_dialog = new wxMessageDialog (
0,
wxString::Format (_("Save changes to film \"%s\" before closing?"), std_to_wx (name).data()),
+ /* TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
+ project (Film) has been changed since it was last saved.
+ */
_("Film changed"),
wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
);
ID_tools_hints,
ID_tools_encoding_servers,
ID_tools_check_for_updates,
+ ID_help_report_a_problem,
/* IDs for shortcuts (with no associated menu item) */
ID_add_file
};
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_encoding_servers, this), ID_tools_encoding_servers);
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::tools_check_for_updates, this), ID_tools_check_for_updates);
Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this), wxID_ABOUT);
+ Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_report_a_problem, this), ID_help_report_a_problem);
Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
_film_editor = new FilmEditor (overall_panel);
_film_viewer = new FilmViewer (overall_panel);
- JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast<JobManagerView::Buttons> (0));
+ JobManagerView* job_manager_view = new JobManagerView (overall_panel);
wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
return;
}
}
-
- JobWrapper::make_dcp (this, _film);
+
+ try {
+ /* It seems to make sense to auto-save metadata here, since the make DCP may last
+ a long time, and crashes/power failures are moderately likely.
+ */
+ _film->write_metadata ();
+ _film->make_dcp ();
+ } catch (BadSettingError& e) {
+ error_dialog (this, wxString::Format (_("Bad setting for %s (%s)"), std_to_wx(e.setting()).data(), std_to_wx(e.what()).data()));
+ } catch (std::exception& e) {
+ error_dialog (this, wxString::Format (_("Could not make DCP: %s"), std_to_wx(e.what()).data()));
+ }
}
void jobs_make_kdms ()
} catch (exception& e) {
error_dialog (this, e.what ());
} catch (...) {
- error_dialog (this, _("An unknown exeception occurred."));
+ error_dialog (this, _("An unknown exception occurred."));
}
d->Destroy ();
void jobs_show_dcp ()
{
-#ifdef __WXMSW__
- string d = _film->directory().string ();
- wstring w;
- w.assign (d.begin(), d.end());
- ShellExecute (0, L"open", w.c_str(), 0, 0, SW_SHOWDEFAULT);
-#else
+#ifdef DCPOMATIC_WINDOWS
+ wstringstream args;
+ args << "/select," << _film->dir (_film->dcp_name(false));
+ ShellExecute (0, L"open", L"explorer.exe", args.str().c_str(), 0, SW_SHOWDEFAULT);
+#endif
+
+#ifdef DCPOMATIC_LINUX
int r = system ("which nautilus");
if (WEXITSTATUS (r) == 0) {
r = system (string ("nautilus " + _film->directory().string()).c_str ());
}
}
#endif
+
+#ifdef DCPOMATIC_OSX
+ int r = system (string ("open -R " + _film->dir (_film->dcp_name (false)).string ()).c_str ());
+ if (WEXITSTATUS (r)) {
+ error_dialog (this, _("Could not show DCP"));
+ }
+#endif
}
void tools_hints ()
d->Destroy ();
}
+ void help_report_a_problem ()
+ {
+ ReportProblemDialog* d = new ReportProblemDialog (this, _film);
+ if (d->ShowModal () == wxID_OK) {
+ d->report ();
+ }
+ d->Destroy ();
+ }
+
bool should_close ()
{
if (!JobManager::instance()->work_to_do ()) {
#else
add_item (help, _("About"), wxID_ABOUT, ALWAYS);
#endif
+ add_item (help, _("Report a problem..."), ID_help_report_a_problem, ALWAYS);
m->Append (_file_menu, _("&File"));
#ifndef __WXOSX__
if (!_film_to_create.empty ()) {
_frame->new_film (_film_to_create);
if (!_content_to_add.empty ()) {
- _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add));
+ _frame->film()->examine_and_add_content (content_factory (_frame->film(), _content_to_add), true);
}
}
{
try {
throw;
+ } catch (FileError& e) {
+ error_dialog (0, wxString::Format (_("An exception occurred: %s in %s.\n\n" + REPORT_PROBLEM), e.what(), e.file().string().c_str ()));
} catch (exception& e) {
- error_dialog (0, wxString::Format (_("An exception occurred (%s). Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."), e.what ()));
+ error_dialog (0, wxString::Format (_("An exception occurred: %s.\n\n"), e.what ()) + " " + REPORT_PROBLEM);
} catch (...) {
- error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+ error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
}
/* This will terminate the program */
void OnUnhandledException ()
{
- error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+ error_dialog (0, _("An unknown exception occurred.") + " " + REPORT_PROBLEM);
}
void idle ()
projects / dcpomatic.git / blobdiff