Move sound output driver selection into new preferences tab.

[dcpomatic.git] / src / wx / kdm_timing_panel.cc

diff --git a/src/wx/kdm_timing_panel.cc b/src/wx/kdm_timing_panel.cc
index dfd9d6b6ebd23f6581d48472195e4db4f164e6bc..bad900d2768c5e5c3c29c4b4a88316596b19d341 100644 (file)
--- a/src/wx/kdm_timing_panel.cc
+++ b/src/wx/kdm_timing_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -20,10 +20,12 @@
 
 #include "kdm_timing_panel.h"
 #include "wx_util.h"
+#include "time_picker.h"
+#include "static_text.h"
 #include <wx/datectrl.h>
-#include <wx/timectrl.h>
 #include <wx/dateevt.h>
 
+using std::cout;
 using boost::bind;
 
 KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
@@ -31,27 +33,36 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 {
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
 
-       wxFlexGridSizer* table = new wxFlexGridSizer (6, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+       wxSizer* table = new wxBoxSizer (wxHORIZONTAL);
        add_label_to_sizer (table, this, _("From"), true);
        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);
-       table->Add (_from_time, 1, wxEXPAND);
+       table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
+       _from_time = new TimePicker (this, from);
+#ifdef DCPOMATIC_OSX
+       /* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+       table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+#else
+       table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
        add_label_to_sizer (table, this, _("until"), true);
        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, to);
-       table->Add (_until_time, 1, wxEXPAND);
+       table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
+       _until_time = new TimePicker (this, to);
+#ifdef DCPOMATIC_OSX
+       table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL | wxTOP, 4);
+#else
+       table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL);
+#endif
 
        overall_sizer->Add (table);
 
-       _warning = new wxStaticText (this, wxID_ANY, wxT (""));
+       _warning = new StaticText (this, wxT(""));
        overall_sizer->Add (_warning, 0, wxTOP, DCPOMATIC_SIZER_GAP);
        wxFont font = _warning->GetFont();
        font.SetStyle(wxFONTSTYLE_ITALIC);
@@ -61,8 +72,8 @@ KDMTimingPanel::KDMTimingPanel (wxWindow* parent)
 
        _from_date->Bind (wxEVT_DATE_CHANGED, bind (&KDMTimingPanel::changed, this));
        _until_date->Bind (wxEVT_DATE_CHANGED, bind (&KDMTimingPanel::changed, this));
-       _from_time->Bind (wxEVT_TIME_CHANGED, bind (&KDMTimingPanel::changed, this));
-       _until_time->Bind (wxEVT_TIME_CHANGED, bind (&KDMTimingPanel::changed, this));
+       _from_time->Changed.connect (bind (&KDMTimingPanel::changed, this));
+       _until_time->Changed.connect (bind (&KDMTimingPanel::changed, this));
 
        SetSizer (overall_sizer);
 }
@@ -74,13 +85,12 @@ KDMTimingPanel::from () const
 }
 
 boost::posix_time::ptime
-KDMTimingPanel::posix_time (wxDatePickerCtrl* date_picker, wxTimePickerCtrl* time_picker)
+KDMTimingPanel::posix_time (wxDatePickerCtrl* date_picker, TimePicker* time_picker)
 {
        wxDateTime const date = date_picker->GetValue ();
-       wxDateTime const time = time_picker->GetValue ();
        return boost::posix_time::ptime (
                boost::gregorian::date (date.GetYear(), date.GetMonth() + 1, date.GetDay()),
-               boost::posix_time::time_duration (time.GetHour(), time.GetMinute(), time.GetSecond())
+               boost::posix_time::time_duration (time_picker->hours(), time_picker->minutes(), 0)
                );
 }