From: Carl Hetherington Date: Mon, 14 Jan 2019 00:20:07 +0000 (+0000) Subject: Some label copy-editing and more manual work. X-Git-Tag: v2.13.99~1 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8433b9097fb44a965b47f8a8f40bc49fc8d2913e Some label copy-editing and more manual work. --- diff --git a/doc/manual/Makefile b/doc/manual/Makefile index 9e74b4dff..cb8c9bc01 100644 --- a/doc/manual/Makefile +++ b/doc/manual/Makefile @@ -9,7 +9,7 @@ DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg timecode.svg SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \ still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \ calculate-audio-gain.png add-file.png dcp-tab.png colour-conversion.png \ - prefs-kdm-email.png prefs-colour-conversions.png prefs-metadata.png prefs-general.png prefs-tms.png \ + prefs-kdm-email.png prefs-general.png prefs-tms.png \ prefs-advanced.png prefs-defaults.png prefs-servers.png prefs-keys.png \ making-dcp.png filters.png video-tab.png audio-tab.png subtitles-tab.png timing-tab.png \ audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png \ diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml index 1b9418c78..1ee817b5d 100644 --- a/doc/manual/dcpomatic.xml +++ b/doc/manual/dcpomatic.xml @@ -2767,12 +2767,39 @@ Note that for this to work on Doremi servers you will need to set the + +
+Email + + +The Email tab is shown in . + + +
+ Email preferences + + + + + +
+ + +These settings are used when DCP-o-matic sends emails. + + + + Outgoing mail server should be the host name of a mail (SMTP) server that DCP-o-matic can use. You can also specify the port that DCP-o-matic should use. User name and Password are the credentials that are required to send email through the server you have specified. + + +
+
KDM email -The KDM email is shown in . +The KDM email tab is shown in .
@@ -2821,6 +2848,68 @@ The Reset to default text will replace the current KDM emai
+ +
+Accounts + + +The Accounts tab is shown in . + + +
+ Accounts preferences + + + + + +
+ + +DCP-o-matic can download projector certificates from the Barco and +Christie websites if you have the appropriate credentials. Enter your +usernames and passwords. + + +
+ + + +
+Notifications + + +The Notifications tab is shown in . + + +
+ Notifications preferences + + + + + +
+ + +DCP-o-matic can notify the user when jobs have completed. These +notifications can be either or both of a message box on-screen (if +Message box is ticked) and email (if +Email is ticked). If you enable email +notifications you can fill in the details of the emails you want to +send. + + + +The bottom box in the tab is the contents of the email that should +be sent. DCP-o-matic will replace the ‘magic’ strings +$JOB_NAME and $JOB_STATUS in the with the +details of the job that has completed. + + +
+ +
Cover sheet diff --git a/doc/manual/screenshots/prefs-accounts.png b/doc/manual/screenshots/prefs-accounts.png index e9ab53780..e919e6abf 100644 Binary files a/doc/manual/screenshots/prefs-accounts.png and b/doc/manual/screenshots/prefs-accounts.png differ diff --git a/doc/manual/screenshots/prefs-advanced.png b/doc/manual/screenshots/prefs-advanced.png index 538dfc1c0..2bc76a24e 100644 Binary files a/doc/manual/screenshots/prefs-advanced.png and b/doc/manual/screenshots/prefs-advanced.png differ diff --git a/doc/manual/screenshots/prefs-colour-conversions.png b/doc/manual/screenshots/prefs-colour-conversions.png deleted file mode 100644 index 93b0dcf76..000000000 Binary files a/doc/manual/screenshots/prefs-colour-conversions.png and /dev/null differ diff --git a/doc/manual/screenshots/prefs-cover-sheet.png b/doc/manual/screenshots/prefs-cover-sheet.png index c1103a5c5..b6daa26e0 100644 Binary files a/doc/manual/screenshots/prefs-cover-sheet.png and b/doc/manual/screenshots/prefs-cover-sheet.png differ diff --git a/doc/manual/screenshots/prefs-defaults.png b/doc/manual/screenshots/prefs-defaults.png index 476db859b..a1e95594b 100644 Binary files a/doc/manual/screenshots/prefs-defaults.png and b/doc/manual/screenshots/prefs-defaults.png differ diff --git a/doc/manual/screenshots/prefs-email.png b/doc/manual/screenshots/prefs-email.png index 122540f98..5fd7f5c80 100644 Binary files a/doc/manual/screenshots/prefs-email.png and b/doc/manual/screenshots/prefs-email.png differ diff --git a/doc/manual/screenshots/prefs-general.png b/doc/manual/screenshots/prefs-general.png index b726df1b7..211c4ce5e 100644 Binary files a/doc/manual/screenshots/prefs-general.png and b/doc/manual/screenshots/prefs-general.png differ diff --git a/doc/manual/screenshots/prefs-kdm-email.png b/doc/manual/screenshots/prefs-kdm-email.png index 6627c2ee4..b23d7971b 100644 Binary files a/doc/manual/screenshots/prefs-kdm-email.png and b/doc/manual/screenshots/prefs-kdm-email.png differ diff --git a/doc/manual/screenshots/prefs-keys.png b/doc/manual/screenshots/prefs-keys.png index d9b1387a4..2cb66446d 100644 Binary files a/doc/manual/screenshots/prefs-keys.png and b/doc/manual/screenshots/prefs-keys.png differ diff --git a/doc/manual/screenshots/prefs-metadata.png b/doc/manual/screenshots/prefs-metadata.png deleted file mode 100644 index c2492c7f3..000000000 Binary files a/doc/manual/screenshots/prefs-metadata.png and /dev/null differ diff --git a/doc/manual/screenshots/prefs-notifications.png b/doc/manual/screenshots/prefs-notifications.png index 79b45f55e..3988a33c7 100644 Binary files a/doc/manual/screenshots/prefs-notifications.png and b/doc/manual/screenshots/prefs-notifications.png differ diff --git a/doc/manual/screenshots/prefs-servers.png b/doc/manual/screenshots/prefs-servers.png index f50227c99..15bab4f4f 100644 Binary files a/doc/manual/screenshots/prefs-servers.png and b/doc/manual/screenshots/prefs-servers.png differ diff --git a/doc/manual/screenshots/prefs-tms.png b/doc/manual/screenshots/prefs-tms.png index 4e0ba556e..2ebb22d10 100644 Binary files a/doc/manual/screenshots/prefs-tms.png and b/doc/manual/screenshots/prefs-tms.png differ diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc index 2f1db11c2..4a1561b85 100644 --- a/src/wx/full_config_dialog.cc +++ b/src/wx/full_config_dialog.cc @@ -769,11 +769,11 @@ private: table->Add (s, 1, wxEXPAND | wxALL); } - add_label_to_sizer (table, _panel, _("Mail user name"), true); + add_label_to_sizer (table, _panel, _("User name"), true); _user = new wxTextCtrl (_panel, wxID_ANY); table->Add (_user, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("Mail password"), true); + add_label_to_sizer (table, _panel, _("Password"), true); _password = new wxTextCtrl (_panel, wxID_ANY); table->Add (_password, 1, wxEXPAND | wxALL); @@ -965,7 +965,7 @@ public: table->AddGrowableCol (1, 1); _panel->GetSizer()->Add (table, 1, wxEXPAND | wxALL, _border); - add_label_to_sizer (table, _panel, _("certificates.barco.com username"), true); + add_label_to_sizer (table, _panel, _("certificates.barco.com user name"), true); _barco_username = new wxTextCtrl (_panel, wxID_ANY); table->Add (_barco_username, 1, wxEXPAND | wxALL); @@ -973,7 +973,7 @@ public: _barco_password = new wxTextCtrl (_panel, wxID_ANY); table->Add (_barco_password, 1, wxEXPAND | wxALL); - add_label_to_sizer (table, _panel, _("certificates.christiedigital.com username"), true); + add_label_to_sizer (table, _panel, _("certificates.christiedigital.com user name"), true); _christie_username = new wxTextCtrl (_panel, wxID_ANY); table->Add (_christie_username, 1, wxEXPAND | wxALL);