/*
- 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>
#include <iostream>
using std::exception;
using std::string;
using std::cout;
+using std::list;
using boost::shared_ptr;
using boost::thread;
using boost::scoped_array;
-static boost::optional<boost::filesystem::path> film_to_load;
+static list<boost::filesystem::path> films_to_load;
enum {
ID_file_add_film = 1,
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);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this), wxID_EXIT);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::edit_preferences, this), wxID_PREFERENCES);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
- Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this), ID_help_about);
+ 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);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::tools_encoding_servers, this), ID_tools_encoding_servers);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::help_about, this), ID_help_about);
wxPanel* panel = new wxPanel (this);
wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
s->Add (panel, 1, wxEXPAND);
SetSizer (s);
- JobManagerView* job_manager_view = new JobManagerView (panel, false);
+ JobManagerView* job_manager_view = new JobManagerView (panel, true);
_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
- add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this));
+ add->Bind (wxEVT_BUTTON, boost::bind (&DOMFrame::add_film, this));
buttons->Add (add, 1, wxALL, 6);
_sizer->Add (buttons, 0, wxALL, 6);
} 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);
}
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);
this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
shared_ptr<Film> film;
- if (film_to_load && boost::filesystem::is_directory (film_to_load.get())) {
- try {
- film.reset (new Film (film_to_load.get()));
- film->read_metadata ();
- film->make_dcp ();
- } catch (exception& e) {
- error_dialog (
- 0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load->string(), e.what()))
- );
+ BOOST_FOREACH (boost::filesystem::path i, films_to_load) {
+ if (boost::filesystem::is_directory (i)) {
+ try {
+ film.reset (new Film (i));
+ film->read_metadata ();
+ film->make_dcp ();
+ } catch (exception& e) {
+ error_dialog (
+ 0,
+ std_to_wx (String::compose (wx_to_std (_("Could not load film %1")), i.string())),
+ std_to_wx(e.what())
+ );
+ }
}
}
bool OnCmdLineParsed (wxCmdLineParser& parser)
{
- if (parser.GetParamCount() > 0) {
- film_to_load = wx_to_std (parser.GetParam(0));
+ for (size_t i = 0; i < parser.GetParamCount(); ++i) {
+ films_to_load.push_back (wx_to_std (parser.GetParam(i)));
}
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)
projects / dcpomatic.git / blobdiff