/*
- Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <wx/generic/aboutdlgg.h>
#include <wx/stdpaths.h>
#include <wx/cmdline.h>
+#include <wx/preferences.h>
#include "wx/film_viewer.h"
#include "wx/film_editor.h"
#include "wx/job_manager_view.h"
#include "wx/kdm_dialog.h"
#include "wx/servers_list_dialog.h"
#include "wx/hints_dialog.h"
+#include "wx/update_dialog.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
#include "lib/send_kdm_email_job.h"
#include "lib/server_finder.h"
#include "lib/update.h"
+#include "lib/content_factory.h"
using std::cout;
using std::string;
static FilmEditor* film_editor = 0;
static FilmViewer* film_viewer = 0;
static shared_ptr<Film> film;
-static std::string log_level;
+static std::string log_types = "general,log,warning";
static std::string film_to_load;
static std::string film_to_create;
+static std::string content_to_add;
static wxMenu* jobs_menu = 0;
static void set_menu_sensitivity ();
+// #define DCPOMATIC_WINDOWS_CONSOLE 1
+
class FilmChangedDialog
{
public:
};
-void
+static void
maybe_save_then_delete_film ()
{
if (!film) {
film.reset ();
}
+static void
+check_film_state_version (int v)
+{
+ if (v == 4) {
+ error_dialog (
+ 0,
+ _("This film was created with an old version of DVD-o-matic and may not load correctly "
+ "in this version. Please check the film's settings carefully.")
+ );
+ }
+}
+
+static void
+load_film (boost::filesystem::path file)
+{
+ film.reset (new Film (file));
+ list<string> const notes = film->read_metadata ();
+ check_film_state_version (film->state_version ());
+ for (list<string>::const_iterator i = notes.begin(); i != notes.end(); ++i) {
+ error_dialog (0, std_to_wx (*i));
+ }
+ film->log()->set_types (log_types);
+}
+
#define ALWAYS 0x0
#define NEEDS_FILM 0x1
#define NOT_DURING_DCP_CREATION 0x2
map<wxMenuItem*, int> menu_items;
-void
+static void
add_item (wxMenu* menu, wxString text, int id, int sens)
{
wxMenuItem* item = menu->Append (id, text);
menu_items.insert (make_pair (item, sens));
}
-void
+static void
set_menu_sensitivity ()
{
list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
ID_tools_check_for_updates
};
-void
+static void
setup_menu (wxMenuBar* m)
{
wxMenu* file = new wxMenu;
: wxFrame (NULL, -1, title)
, _hints_dialog (0)
, _servers_list_dialog (0)
+ , _config_dialog (0)
{
-#ifdef DCPOMATIC_WINDOWS_CONSOLE
+#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE)
AllocConsole();
HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
maybe_save_then_delete_film ();
film.reset (new Film (d->get_path ()));
film->write_metadata ();
- film->log()->set_level (log_level);
+ film->log()->set_types (log_types);
film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string());
set_film ();
}
if (r == wxID_OK) {
maybe_save_then_delete_film ();
try {
- film.reset (new Film (wx_to_std (c->GetPath ())));
- film->read_metadata ();
- film->log()->set_level (log_level);
+ load_film (wx_to_std (c->GetPath ()));
set_film ();
} catch (std::exception& e) {
wxString p = c->GetPath ();
void file_exit ()
{
- if (!should_close ()) {
- return;
- }
-
- maybe_save_then_delete_film ();
- Close (true);
+ /* false here allows the close handler to veto the close request */
+ Close (false);
}
void edit_preferences ()
{
- ConfigDialog* d = new ConfigDialog (this);
- d->ShowModal ();
- d->Destroy ();
- Config::instance()->write ();
+ if (!_config_dialog) {
+ _config_dialog = create_config_dialog ();
+ }
+ _config_dialog->Show (this);
}
void jobs_make_dcp ()
shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->dcp (), d->from (), d->until ()))
);
}
- } catch (KDMError& e) {
+ } catch (exception& e) {
error_dialog (this, e.what ());
+ } catch (...) {
+ error_dialog (this, _("An unknown exeception occurred."));
}
d->Destroy ();
void tools_check_for_updates ()
{
- UpdateChecker c;
- c.run ();
+ UpdateChecker::instance()->run ();
}
void help_about ()
HintsDialog* _hints_dialog;
ServersListDialog* _servers_list_dialog;
+ wxPreferencesEditor* _config_dialog;
};
static const wxCmdLineEntryDesc command_line_description[] = {
- { wxCMD_LINE_OPTION, "l", "log", "set log level (silent, verbose or timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_OPTION, "l", "log", "set message types to log (general,warning,error,timing)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_SWITCH, "n", "new", "create new film", wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
- { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_OPTION, "c", "content", "add content file", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
+ { wxCMD_LINE_PARAM, 0, 0, "film to load or create", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
try {
- film.reset (new Film (film_to_load));
- film->read_metadata ();
- film->log()->set_level (log_level);
+ load_film (film_to_load);
} catch (exception& e) {
error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
}
if (!film_to_create.empty ()) {
film.reset (new Film (film_to_create));
film->write_metadata ();
- film->log()->set_level (log_level);
+ film->log()->set_types (log_types);
film->set_name (boost::filesystem::path (film_to_create).filename().generic_string ());
}
- Frame* f = new Frame (_("DCP-o-matic"));
- SetTopWindow (f);
- f->Maximize ();
- f->Show ();
+ if (!content_to_add.empty ()) {
+ film->examine_and_add_content (content_factory (film, content_to_add));
+ }
+
+ _frame = new Frame (_("DCP-o-matic"));
+ SetTopWindow (_frame);
+ _frame->Maximize ();
+ _frame->Show ();
ui_signaller = new wxUISignaller (this);
Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
Bind (wxEVT_TIMER, boost::bind (&App::check, this));
_timer.reset (new wxTimer (this));
_timer->Start (1000);
-
+
+ if (film) {
+ check_film_state_version (film->state_version ());
+ }
+
+ UpdateChecker::instance()->StateChanged.connect (boost::bind (&App::update_checker_state_changed, this));
+ if (Config::instance()->check_for_updates ()) {
+ UpdateChecker::instance()->run ();
+ }
+
return true;
}
catch (exception& e)
if (parser.Found (wxT ("new"))) {
film_to_create = wx_to_std (parser.GetParam (0));
} else {
- film_to_load = wx_to_std (parser.GetParam(0));
+ film_to_load = wx_to_std (parser.GetParam (0));
}
}
+ wxString content;
+ if (parser.Found (wxT ("content"), &content)) {
+ content_to_add = wx_to_std (content);
+ }
+
wxString log;
if (parser.Found (wxT ("log"), &log)) {
- log_level = wx_to_std (log);
+ log_types = wx_to_std (log);
}
return true;
}
+ bool OnExceptionInMainLoop ()
+ {
+ error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+ return false;
+ }
+
+ void OnUnhandledException ()
+ {
+ error_dialog (0, _("An unknown exception occurred. Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+ }
+
void idle ()
{
ui_signaller->ui_idle ();
}
}
+ void update_checker_state_changed ()
+ {
+ switch (UpdateChecker::instance()->state ()) {
+ case UpdateChecker::YES:
+ {
+ string test;
+ if (Config::instance()->check_for_test_updates ()) {
+ test = UpdateChecker::instance()->test ();
+ }
+ UpdateDialog* dialog = new UpdateDialog (_frame, UpdateChecker::instance()->stable (), test);
+ dialog->ShowModal ();
+ dialog->Destroy ();
+ break;
+ }
+ case UpdateChecker::NO:
+ if (!UpdateChecker::instance()->last_emit_was_first ()) {
+ error_dialog (_frame, _("There are no new versions of DCP-o-matic available."));
+ }
+ break;
+ case UpdateChecker::FAILED:
+ if (!UpdateChecker::instance()->last_emit_was_first ()) {
+ error_dialog (_frame, _("The DCP-o-matic download server could not be contacted."));
+ }
+ default:
+ break;
+ }
+ }
+
+ Frame* _frame;
shared_ptr<wxTimer> _timer;
};
projects / dcpomatic.git / blobdiff