/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#include "wx/about_dialog.h"
#include "wx/wx_signal_manager.h"
#include "wx/job_manager_view.h"
-#include "wx/config_dialog.h"
+#include "wx/full_config_dialog.h"
#include "wx/servers_list_dialog.h"
#include "lib/version.h"
#include "lib/compose.hpp"
#include <wx/aboutdlg.h>
#include <wx/stdpaths.h>
#include <wx/cmdline.h>
+#include <wx/splash.h>
#include <wx/preferences.h>
#include <wx/wx.h>
#include <boost/foreach.hpp>
setup_menu (wxMenuBar* m)
{
wxMenu* file = new wxMenu;
- file->Append (ID_file_add_film, _("&Add Film..."));
+ file->Append (ID_file_add_film, _("&Add Film...\tCtrl-A"));
#ifdef DCPOMATIC_OSX
file->Append (wxID_EXIT, _("&Exit"));
#else
class DOMFrame : public wxFrame
{
public:
- DOMFrame (wxString const & title)
+ explicit DOMFrame (wxString const & title)
: wxFrame (NULL, -1, title)
, _sizer (new wxBoxSizer (wxVERTICAL))
, _config_dialog (0)
setup_menu (bar);
SetMenuBar (bar);
+ Config::instance()->Changed.connect (boost::bind (&DOMFrame::config_changed, this, _1));
+
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT);
Bind (wxEVT_MENU, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
} catch (std::exception& e) {
wxString p = std_to_wx (path.string ());
wxCharBuffer b = p.ToUTF8 ();
- error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
+ error_dialog (this, wxString::Format (_("Could not open film at %s"), p.data()), std_to_wx(e.what()));
}
}
void edit_preferences ()
{
if (!_config_dialog) {
- _config_dialog = create_config_dialog ();
+ _config_dialog = create_full_config_dialog ();
}
_config_dialog->Show (this);
}
c->Destroy ();
}
+ void config_changed (Config::Property what)
+ {
+ /* Instantly save any config changes when using the DCP-o-matic GUI */
+ if (what == Config::CINEMAS) {
+ try {
+ Config::instance()->write_cinemas();
+ } catch (exception& e) {
+ error_dialog (
+ this,
+ wxString::Format (
+ _("Could not write to cinemas file at %s. Your changes have not been saved."),
+ std_to_wx (Config::instance()->cinemas_file().string()).data()
+ )
+ );
+ }
+ } else {
+ try {
+ Config::instance()->write_config();
+ } catch (exception& e) {
+ error_dialog (
+ this,
+ wxString::Format (
+ _("Could not write to config file at %s. Your changes have not been saved."),
+ std_to_wx (Config::instance()->cinemas_file().string()).data()
+ )
+ );
+ }
+ }
+ }
+
boost::optional<boost::filesystem::path> _last_parent;
wxSizer* _sizer;
wxPreferencesEditor* _config_dialog;
class JobServer : public Server
{
public:
- JobServer (DOMFrame* frame)
- : Server (Config::instance()->server_port_base() + 2)
+ explicit JobServer (DOMFrame* frame)
+ : Server (BATCH_JOB_PORT)
, _frame (frame)
{}
bool OnInit ()
{
SetAppName (_("DCP-o-matic Batch Converter"));
+ is_batch_converter = true;
+
+ Config::FailedToLoad.connect (boost::bind (&App::config_failed_to_load, this));
+ Config::Warning.connect (boost::bind (&App::config_warning, this, _1));
+
+ wxSplashScreen* splash = maybe_show_splash ();
if (!wxApp::OnInit()) {
return false;
*/
Config::drop ();
- DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
- SetTopWindow (f);
- f->Maximize ();
- f->Show ();
+ _frame = new DOMFrame (_("DCP-o-matic Batch Converter"));
+ SetTopWindow (_frame);
+ _frame->Maximize ();
+ if (splash) {
+ splash->Destroy ();
+ }
+ _frame->Show ();
- JobServer* server = new JobServer (f);
+ JobServer* server = new JobServer (_frame);
new thread (boost::bind (&JobServer::run, server));
signal_manager = new wxSignalManager (this);
film->make_dcp ();
} catch (exception& e) {
error_dialog (
- 0, std_to_wx (
- String::compose (
- wx_to_std (_("Could not load film %1 (%2)")), i.string(),
- e.what()
- )
- )
+ 0,
+ std_to_wx (String::compose (wx_to_std (_("Could not load film %1")), i.string())),
+ std_to_wx(e.what())
);
}
}
return true;
}
+
+ void config_failed_to_load ()
+ {
+ message_dialog (_frame, _("The existing configuration failed to load. Default values will be used instead. These may take a short time to create."));
+ }
+
+ void config_warning (string m)
+ {
+ message_dialog (_frame, std_to_wx (m));
+ }
+
+ DOMFrame* _frame;
};
IMPLEMENT_APP (App)