From f05fa30729ac177f28f108dadb8f116be00db6a8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Jun 2014 11:11:08 +0100 Subject: Updates to de_DE translation from Carsten Kurz Signed-off-by: Carsten Kurz --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 22e314e46..c9bd5e4c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-20 Carl Hetherington + + * Updates to de_DE translation from Carsten Kurz. + 2014-06-18 Carl Hetherington * Version 1.69.29 released. -- cgit v1.2.3 From 0d412e1897aa1d379aabaf4f14f997c0b80db653 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 20 Jun 2014 11:12:54 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index c9bd5e4c4..b088c7b4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-20 Carl Hetherington + + * Version 1.69.30 released. + 2014-06-20 Carl Hetherington * Updates to de_DE translation from Carsten Kurz. diff --git a/debian/changelog b/debian/changelog index fdd0cc20d..5bdbcbb00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.29-1) UNRELEASED; urgency=low +dcpomatic (1.69.30-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -153,8 +153,9 @@ dcpomatic (1.69.29-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Wed, 18 Jun 2014 13:31:03 +0100 + -- Carl Hetherington Fri, 20 Jun 2014 11:12:54 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 167921fbe..6bd0eac22 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.29devel' +VERSION = '1.69.30' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6ddc0b04df78dd5d26210b626f2df04f7920ba50 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 00:43:44 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index b088c7b4c..624923c55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.31 released. + 2014-06-20 Carl Hetherington * Version 1.69.30 released. diff --git a/debian/changelog b/debian/changelog index 5bdbcbb00..ce33f5681 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.30-1) UNRELEASED; urgency=low +dcpomatic (1.69.31-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -154,8 +154,9 @@ dcpomatic (1.69.30-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Fri, 20 Jun 2014 11:12:54 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 00:43:44 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index bf861df83..9bf53858d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.30devel' +VERSION = '1.69.31' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8a06ce0402779cd89e27386567438c3ed0100e80 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 14:59:59 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 624923c55..fc70460d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.32 released. + 2014-06-21 Carl Hetherington * Version 1.69.31 released. diff --git a/debian/changelog b/debian/changelog index ce33f5681..fdf912c83 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.31-1) UNRELEASED; urgency=low +dcpomatic (1.69.32-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -155,8 +155,9 @@ dcpomatic (1.69.31-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 00:43:44 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 14:59:59 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 8babe333a..f59af5858 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.31devel' +VERSION = '1.69.32' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a7665d9eb579a59110b58d55e331146215ea982b Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 19:09:15 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index fc70460d2..3cc95f69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.33 released. + 2014-06-21 Carl Hetherington * Version 1.69.32 released. diff --git a/debian/changelog b/debian/changelog index fdf912c83..3a10749c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.32-1) UNRELEASED; urgency=low +dcpomatic (1.69.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -156,8 +156,9 @@ dcpomatic (1.69.32-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 14:59:59 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 19:09:14 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 78bcf6776..476aaf763 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.32devel' +VERSION = '1.69.33' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 7cf18dbd1bd05cbf0f4e9bce82c5605b67e683d6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 22:26:16 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 3cc95f69a..1c8fc930b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-06-21 Carl Hetherington + + * Version 1.69.34 released. + 2014-06-21 Carl Hetherington * Version 1.69.33 released. diff --git a/debian/changelog b/debian/changelog index 3a10749c2..34067724a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.69.33-1) UNRELEASED; urgency=low +dcpomatic (1.69.34-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -157,8 +157,9 @@ dcpomatic (1.69.33-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington Sat, 21 Jun 2014 19:09:14 +0100 + -- Carl Hetherington Sat, 21 Jun 2014 22:26:15 +0100 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index d35d03758..b513225fa 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.69.33devel' +VERSION = '1.69.34' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 24dfe7021e95273cd38c6a173abb2195d7ffc651 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 21 Jun 2014 22:46:47 +0100 Subject: Move email config into the KDM email page. Suggested-by: Carsten Kurz --- ChangeLog | 2 + src/wx/config_dialog.cc | 122 +++++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 58 deletions(-) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 3cc95f69a..22813ba55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-06-21 Carl Hetherington + * Move email config into the KDM email page. + * Version 1.69.33 released. 2014-06-21 Carl Hetherington diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc index 0f3f6e61f..1a9585b08 100644 --- a/src/wx/config_dialog.cc +++ b/src/wx/config_dialog.cc @@ -106,25 +106,6 @@ public: _num_local_encoding_threads = new wxSpinCtrl (panel); table->Add (_num_local_encoding_threads, 1); - add_label_to_sizer (table, panel, _("Outgoing mail server"), true); - _mail_server = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_server, 1, wxEXPAND | wxALL); - - add_label_to_sizer (table, panel, _("Mail user name"), true); - _mail_user = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_user, 1, wxEXPAND | wxALL); - - add_label_to_sizer (table, panel, _("Mail password"), true); - _mail_password = new wxTextCtrl (panel, wxID_ANY); - table->Add (_mail_password, 1, wxEXPAND | wxALL); - - wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); - plain->SetFont (font); - table->AddSpacer (0); - - add_label_to_sizer (table, panel, _("From address for KDM emails"), true); - _kdm_from = new wxTextCtrl (panel, wxID_ANY); - table->Add (_kdm_from, 1, wxEXPAND | wxALL); _check_for_updates = new wxCheckBox (panel, wxID_ANY, _("Check for updates on startup")); table->Add (_check_for_updates, 1, wxEXPAND | wxALL); @@ -163,14 +144,6 @@ public: _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ()); _num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this)); - _mail_server->SetValue (std_to_wx (config->mail_server ())); - _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_server_changed, this)); - _mail_user->SetValue (std_to_wx (config->mail_user ())); - _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_user_changed, this)); - _mail_password->SetValue (std_to_wx (config->mail_password ())); - _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_password_changed, this)); - _kdm_from->SetValue (std_to_wx (config->kdm_from ())); - _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::kdm_from_changed, this)); _check_for_updates->SetValue (config->check_for_updates ()); _check_for_updates->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&GeneralPage::check_for_updates_changed, this)); _check_for_test_updates->SetValue (config->check_for_test_updates ()); @@ -222,26 +195,6 @@ private: } } - void mail_server_changed () - { - Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); - } - - void mail_user_changed () - { - Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); - } - - void mail_password_changed () - { - Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); - } - - void kdm_from_changed () - { - Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); - } - void check_for_updates_changed () { Config::instance()->set_check_for_updates (_check_for_updates->GetValue ()); @@ -260,10 +213,6 @@ private: wxCheckBox* _set_language; wxChoice* _language; wxSpinCtrl* _num_local_encoding_threads; - wxTextCtrl* _mail_server; - wxTextCtrl* _mail_user; - wxTextCtrl* _mail_password; - wxTextCtrl* _kdm_from; wxCheckBox* _check_for_updates; wxCheckBox* _check_for_test_updates; }; @@ -697,22 +646,82 @@ public: #endif wxBoxSizer* s = new wxBoxSizer (wxVERTICAL); panel->SetSizer (s); + + wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + table->AddGrowableCol (1, 1); + s->Add (table, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border); + + add_label_to_sizer (table, panel, _("Outgoing mail server"), true); + _mail_server = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_server, 1, wxEXPAND | wxALL); - _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); - s->Add (_kdm_email, 1, wxEXPAND | wxALL, _border); + add_label_to_sizer (table, panel, _("Mail user name"), true); + _mail_user = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_user, 1, wxEXPAND | wxALL); + + add_label_to_sizer (table, panel, _("Mail password"), true); + _mail_password = new wxTextCtrl (panel, wxID_ANY); + table->Add (_mail_password, 1, wxEXPAND | wxALL); + + wxStaticText* plain = add_label_to_sizer (table, panel, _("(password will be stored on disk in plaintext)"), false); + wxFont font = plain->GetFont(); + font.SetStyle (wxFONTSTYLE_ITALIC); + font.SetPointSize (font.GetPointSize() - 1); + plain->SetFont (font); + table->AddSpacer (0); + add_label_to_sizer (table, panel, _("From address"), true); + _kdm_from = new wxTextCtrl (panel, wxID_ANY); + table->Add (_kdm_from, 1, wxEXPAND | wxALL); + + _kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE); + s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border); + + Config* config = Config::instance (); + _mail_server->SetValue (std_to_wx (config->mail_server ())); + _mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_server_changed, this)); + _mail_user->SetValue (std_to_wx (config->mail_user ())); + _mail_user->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_user_changed, this)); + _mail_password->SetValue (std_to_wx (config->mail_password ())); + _mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this)); + _kdm_from->SetValue (std_to_wx (config->kdm_from ())); + _kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this)); _kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this)); _kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ())); return panel; } -private: +private: + void mail_server_changed () + { + Config::instance()->set_mail_server (wx_to_std (_mail_server->GetValue ())); + } + + void mail_user_changed () + { + Config::instance()->set_mail_user (wx_to_std (_mail_user->GetValue ())); + } + + void mail_password_changed () + { + Config::instance()->set_mail_password (wx_to_std (_mail_password->GetValue ())); + } + + void kdm_from_changed () + { + Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ())); + } + void kdm_email_changed () { Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ())); } + wxTextCtrl* _mail_server; + wxTextCtrl* _mail_user; + wxTextCtrl* _mail_password; + wxTextCtrl* _kdm_from; wxTextCtrl* _kdm_email; }; @@ -827,10 +836,7 @@ create_config_dialog () wxSize ps = wxSize (480, -1); int const border = 16; #else - /* We seem to need to specify height here, otherwise the general panel - is too short (at least on Linux). - */ - wxSize ps = wxSize (-1, 400); + wxSize ps = wxSize (-1, -1); int const border = 8; #endif -- cgit v1.2.3