- _from_date = new wxDatePickerCtrl (this, wxID_ANY, from);
- table->Add (_from_date, 1, wxEXPAND);
- _from_time = new TimePicker (this, from);
- table->Add (_from_time, 0);
-
- 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 TimePicker (this, to);
- table->Add (_until_time, 0);
-
- overall_sizer->Add (table);
-
- _warning = new wxStaticText (this, wxID_ANY, wxT (""));
+ _from_date = new wxDatePickerCtrl (this, wxID_ANY, from, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+ /* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+ table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
+ table->Add (_from_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
+
+#ifdef __WXGTK3__
+ _from_time = new TimePickerText (this, from);
+#else
+ _from_time = new TimePickerSpin (this, from);
+#endif
+
+ table->Add (_from_time, 0, wxALIGN_CENTER_VERTICAL);
+
+ add_label_to_sizer (table, this, _("until"), false, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
+ auto to = from;
+
+ auto const duration = Config::instance()->default_kdm_duration();
+ switch (duration.unit) {
+ case RoughDuration::Unit::DAYS:
+ to.Add(wxDateSpan(0, 0, 0, duration.duration));
+ break;
+ case RoughDuration::Unit::WEEKS:
+ to.Add(wxDateSpan(0, 0, duration.duration, 0));
+ break;
+ case RoughDuration::Unit::MONTHS:
+ to.Add(wxDateSpan(0, duration.duration, 0, 0));
+ break;
+ case RoughDuration::Unit::YEARS:
+ to.Add(wxDateSpan(duration.duration, 0, 0, 0));
+ break;
+ }
+
+ _until_date = new wxDatePickerCtrl (this, wxID_ANY, to, wxDefaultPosition, size);
+#ifdef DCPOMATIC_OSX
+ /* Hack to tweak alignment, which I can't get right by "proper" means for some reason */
+ table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL | wxBOTTOM, 4);
+#else
+ table->Add (_until_date, 0, wxALIGN_CENTER_VERTICAL);
+#endif
+
+#ifdef __WXGTK3__
+ _until_time = new TimePickerText (this, to);
+#else
+ _until_time = new TimePickerSpin (this, to);
+#endif
+
+ table->Add (_until_time, 0, wxALIGN_CENTER_VERTICAL);
+
+ overall_sizer->Add (table, 0, wxTOP, DCPOMATIC_SIZER_GAP);
+
+ _warning = new StaticText (this, wxT(""));