X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fdcpomatic_batch.cc;h=32e8dec084656bae1dd118b070b894e341d08455;hb=a3fcbb3a76e079a5485a0552ea5d35b8d6739116;hp=1e383b39a5ecdafc516532308c85fc0638f4acf0;hpb=137f4b5b6ccf7545d0499f57150b005bdfdf5768;p=dcpomatic.git diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index 1e383b39a..32e8dec08 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -28,6 +28,7 @@ #include "wx/wx_ptr.h" #include "wx/wx_signal_manager.h" #include "wx/wx_util.h" +#include "wx/wx_variant.h" #include "lib/compose.hpp" #include "lib/config.h" #include "lib/dcpomatic_socket.h" @@ -357,36 +358,24 @@ private: 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() - ) - ); - } + 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() + ) + ); } #ifdef DCPOMATIC_GROK if (what == Config::GROK) { setup_grok_library_path(); } +#else + LIBDCP_UNUSED(what); #endif } @@ -436,7 +425,7 @@ class App : public wxApp { wxInitAllImageHandlers (); - SetAppName (_("DCP-o-matic Batch Converter")); + SetAppName(variant::wx::dcpomatic_batch_converter()); is_batch_converter = true; Config::FailedToLoad.connect(boost::bind(&App::config_failed_to_load, this, _1)); @@ -472,7 +461,7 @@ class App : public wxApp */ Config::drop (); - _frame = new DOMFrame (_("DCP-o-matic Batch Converter")); + _frame = new DOMFrame(variant::wx::dcpomatic_batch_converter()); SetTopWindow (_frame); _frame->Maximize (); if (splash) { @@ -485,7 +474,11 @@ class App : public wxApp server->StartJob.connect(bind(&DOMFrame::start_job, _frame, _1)); new thread (boost::bind (&JobServer::run, server)); } catch (boost::system::system_error& e) { - error_dialog(_frame, _("Could not listen for new batch jobs. Perhaps another instance of the DCP-o-matic Batch Converter is running.")); + error_dialog( + _frame, + variant::wx::insert_dcpomatic_batch_converter( + _("Could not listen for new batch jobs. Perhaps another instance of the %s is running.") + )); } signal_manager = new wxSignalManager (this);