From 9c04891e53ef3f0693a91ca6f50f0e6625c109eb Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 15 Mar 2014 19:34:27 +0000 Subject: Fix KDM dialog to initialise its time period to a week from now. --- src/wx/kdm_dialog.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/wx/kdm_dialog.cc') diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 5410f6cec..7d136955c 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -83,15 +83,20 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6); add_label_to_sizer (table, this, _("From"), true); - _from_date = new wxDatePickerCtrl (this, wxID_ANY); + wxDateTime from; + from.SetToCurrent (); + _from_date = new wxDatePickerCtrl (this, wxID_ANY, from); table->Add (_from_date, 1, wxEXPAND); - _from_time = new wxTimePickerCtrl (this, wxID_ANY); + _from_time = new wxTimePickerCtrl (this, wxID_ANY, from); table->Add (_from_time, 1, wxEXPAND); - + add_label_to_sizer (table, this, _("Until"), true); - _until_date = new wxDatePickerCtrl (this, wxID_ANY); + wxDateTime to = from; + /* 1 week from now */ + to.Add (wxDateSpan (0, 0, 1, 0)); + _until_date = new wxDatePickerCtrl (this, wxID_ANY, to); table->Add (_until_date, 1, wxEXPAND); - _until_time = new wxTimePickerCtrl (this, wxID_ANY); + _until_time = new wxTimePickerCtrl (this, wxID_ANY, to); table->Add (_until_time, 1, wxEXPAND); vertical->Add (table, 0, wxEXPAND | wxALL, 6); -- cgit v1.2.3 From 15fff8992c5c152c2ac195ab063fd02fbc89e025 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 15 Mar 2014 19:50:07 +0000 Subject: Default to write-to in KDM dialog. --- src/wx/kdm_dialog.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/wx/kdm_dialog.cc') diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 7d136955c..17d7bd2a1 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -149,6 +149,8 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) vertical->Add (buttons, wxSizerFlags().Expand().DoubleBorder()); } + _write_to->SetValue (true); + _targets->Bind (wxEVT_COMMAND_TREE_SEL_CHANGED, boost::bind (&KDMDialog::setup_sensitivity, this)); _add_cinema->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMDialog::add_cinema_clicked, this)); -- cgit v1.2.3 From 210e8007d4a4e66cccd0249a221daf0e5599f73d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 15 Mar 2014 20:39:10 +0000 Subject: Force size of wxDirPickerCtrl in a couple of places. --- ChangeLog | 2 ++ src/wx/kdm_dialog.cc | 5 ++--- src/wx/new_film_dialog.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/wx/kdm_dialog.cc') diff --git a/ChangeLog b/ChangeLog index f42277184..e9afa9302 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-03-15 Carl Hetherington + * Improve appearance of new film and KDM dialogs on OS X. + * Fix KDM dialog to predictably set up its initial range to a week from now. diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc index 17d7bd2a1..1f4d62bde 100644 --- a/src/wx/kdm_dialog.cc +++ b/src/wx/kdm_dialog.cc @@ -122,7 +122,7 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) } } - table = new wxFlexGridSizer (3, 2, 6); + table = new wxFlexGridSizer (2, 2, 6); _write_to = new wxRadioButton (this, wxID_ANY, _("Write to")); table->Add (_write_to, 1, wxEXPAND); @@ -130,13 +130,12 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr film) #ifdef DCPOMATIC_USE_OWN_DIR_PICKER _folder = new DirPickerCtrl (this); #else - _folder = new wxDirPickerCtrl (this, wxID_ANY); + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir()); table->Add (_folder, 1, wxEXPAND); - table->AddSpacer (0); _email = new wxRadioButton (this, wxID_ANY, _("Send by email")); table->Add (_email, 1, wxEXPAND); diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc index e0ad2c457..f6d910282 100644 --- a/src/wx/new_film_dialog.cc +++ b/src/wx/new_film_dialog.cc @@ -50,7 +50,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent) #ifdef DCPOMATIC_USE_OWN_DIR_PICKER _folder = new DirPickerCtrl (this); #else - _folder = new wxDirPickerCtrl (this, wxID_ANY); + _folder = new wxDirPickerCtrl (this, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1)); #endif if (!_directory) { -- cgit v1.2.3