From c0a35cebbdd2b2504011ebce1c9885479f78d1d1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 29 May 2018 00:39:24 +0100 Subject: Save config changes made through the batch converter. --- src/tools/dcpomatic_batch.cc | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'src/tools') diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc index f6197b1e2..6d4490ad7 100644 --- a/src/tools/dcpomatic_batch.cc +++ b/src/tools/dcpomatic_batch.cc @@ -101,6 +101,8 @@ public: 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); @@ -238,6 +240,36 @@ private: 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 _last_parent; wxSizer* _sizer; wxPreferencesEditor* _config_dialog; -- cgit v1.2.3 From 3adf7f85df698aafc372a8b80822ee4a1f86e3b2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 29 May 2018 23:33:23 +0100 Subject: Updated fr_FR translation from Thierry Journet. --- ChangeLog | 4 ++++ src/lib/po/fr_FR.po | 14 ++++++-------- src/tools/po/fr_FR.po | 2 +- src/wx/po/fr_FR.po | 16 +++++++--------- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/tools') diff --git a/ChangeLog b/ChangeLog index 8c75157b7..aff3175a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2018-05-29 Carl Hetherington + + * Updated fr_FR translation from Thierry Journet. + 2018-05-27 Carl Hetherington * Updated it_IT translation from Felice D'Andrea. diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index e2de8ab54..535f6bab7 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-05-20 20:14+0100\n" -"PO-Revision-Date: 2018-04-24 22:27+0100\n" +"PO-Revision-Date: 2018-05-29 23:36+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" "Language: fr_FR\n" @@ -259,7 +259,7 @@ msgstr "BT2020 luminance non-constante" #: src/lib/ffmpeg_content.cc:578 msgid "BT2100" -msgstr "" +msgstr "BT2100" #: src/lib/ffmpeg_content.cc:515 msgid "BT470BG" @@ -323,14 +323,12 @@ msgid "Checking existing image data" msgstr "Recherche de données images existantes" #: src/lib/ffmpeg_content.cc:577 -#, fuzzy msgid "Chroma-derived constant luminance" -msgstr "BT2020 luminance constante" +msgstr "Luminance constante dérivée de la chrominance" #: src/lib/ffmpeg_content.cc:576 -#, fuzzy msgid "Chroma-derived non-constant luminance" -msgstr "BT2020 luminance non-constante" +msgstr "Luminance non constante dérivée de la chrominance" #: src/lib/ffmpeg_content.cc:536 msgid "Colour primaries" @@ -792,7 +790,7 @@ msgstr "Erreur indéterminée." #: src/lib/ffmpeg_content.cc:532 msgid "JEDEC P22" -msgstr "" +msgstr "JEDEC P22" #: src/lib/config.cc:308 src/lib/config.cc:821 msgid "KDM delivery: $CPL_NAME" @@ -1163,7 +1161,7 @@ msgstr "" #: src/lib/dcp_content.cc:521 msgid "There is no video in this DCP" -msgstr "" +msgstr "Il n'y a aucune vidéo dans ce DCP" #: src/lib/job.cc:173 msgid "" diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index 063c51226..1923b39a7 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-05-20 20:14+0100\n" -"PO-Revision-Date: 2018-04-24 22:31+0100\n" +"PO-Revision-Date: 2018-05-29 23:42+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" "Language: fr_FR\n" diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index 8aa1d0bee..16062bda7 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -3,14 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/wx/audio_panel.cc:56 src/wx/subtitle_panel.cc:56 -#: src/wx/video_panel.cc:82 msgid "" msgstr "" "Project-Id-Version: DCP-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-05-20 20:14+0100\n" -"PO-Revision-Date: 2018-04-24 22:35+0100\n" +"PO-Revision-Date: 2018-05-29 23:41+0100\n" "Last-Translator: Grégoire AUSINA \n" "Language-Team: \n" "Language: fr_FR\n" @@ -28,7 +26,7 @@ msgstr "%" #: src/wx/film_name_location_dialog.cc:130 msgid "%1 already exists as a file, so you cannot use it for a film." msgstr "" -"%1 existe déjà comme nom de fichier. VOus ne pouvez pas l'utiliser pour un " +"%1 existe déjà comme nom de fichier. Vous ne pouvez pas l'utiliser pour un " "projet." #: src/wx/kdm_dialog.cc:153 @@ -290,7 +288,7 @@ msgstr "Audio" #: src/wx/isdcf_metadata_dialog.cc:40 msgid "Audio Language (e.g. EN)" -msgstr "Langue audio (ex. FR)" +msgstr "Langue audio (par ex. : FR)" #: src/wx/player_information.cc:132 #, c-format @@ -323,7 +321,7 @@ msgstr "B" #: src/wx/full_config_dialog.cc:760 msgid "BCC address" -msgstr "Adresse BCC" +msgstr "Adresse CCI" #: src/wx/colour_conversion_editor.cc:144 msgid "Blue chromaticity" @@ -1206,9 +1204,8 @@ msgid "MOV files (*.mov)|*.mov" msgstr "FIchiers MOV (*.mov)|*.mov" #: src/wx/export_dialog.cc:33 -#, fuzzy msgid "MP4 / H.264" -msgstr "H.264" +msgstr "MP4 / H.264" #: src/wx/export_dialog.cc:38 msgid "MP4 files (*.mp4)|*.mp4" @@ -1307,7 +1304,8 @@ msgstr "DEMANDE de KDM:" msgid "NEEDS OV: " msgstr "OV Nécessaire:" -#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 src/wx/screen_dialog.cc:68 +#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 +#: src/wx/screen_dialog.cc:68 msgid "Name" msgstr "Nom" -- cgit v1.2.3