KDM path fixes.

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

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index d94c130575ab270a478d54971640f01bf328d37b..f2fc537119850e2b9de8f282c836f72d50ff22d8 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -20,13 +20,14 @@
 #include <wx/treectrl.h>
 #include <wx/datectrl.h>
 #include <wx/timectrl.h>
+#include <wx/stdpaths.h>
 #include "lib/cinema.h"
 #include "lib/config.h"
 #include "kdm_dialog.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
-#ifdef __WXMSW__
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 #include "dir_picker_ctrl.h"
 #else
 #include <wx/filepicker.h>
@@ -43,9 +44,6 @@ KDMDialog::KDMDialog (wxWindow* parent)
        : wxDialog (parent, wxID_ANY, _("Make KDMs"))
 {
        wxBoxSizer* vertical = new wxBoxSizer (wxVERTICAL);
-
-       add_label_to_sizer (vertical, this, "Make KDMs for");
-
        wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
        
        _targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS);
@@ -63,49 +61,51 @@ KDMDialog::KDMDialog (wxWindow* parent)
        wxBoxSizer* target_buttons = new wxBoxSizer (wxVERTICAL);
 
        _add_cinema = new wxButton (this, wxID_ANY, _("Add Cinema..."));
-       target_buttons->Add (_add_cinema, 1, 0, 6);
+       target_buttons->Add (_add_cinema, 1, wxEXPAND, 6);
        _edit_cinema = new wxButton (this, wxID_ANY, _("Edit Cinema..."));
-       target_buttons->Add (_edit_cinema, 1, 0, 6);
+       target_buttons->Add (_edit_cinema, 1, wxEXPAND, 6);
        _remove_cinema = new wxButton (this, wxID_ANY, _("Remove Cinema"));
-       target_buttons->Add (_remove_cinema, 1, 0, 6);
+       target_buttons->Add (_remove_cinema, 1, wxEXPAND, 6);
        
        _add_screen = new wxButton (this, wxID_ANY, _("Add Screen..."));
-       target_buttons->Add (_add_screen, 1, 0, 6);
+       target_buttons->Add (_add_screen, 1, wxEXPAND, 6);
        _edit_screen = new wxButton (this, wxID_ANY, _("Edit Screen..."));
-       target_buttons->Add (_edit_screen, 1, 0, 6);
+       target_buttons->Add (_edit_screen, 1, wxEXPAND, 6);
        _remove_screen = new wxButton (this, wxID_ANY, _("Remove Screen"));
-       target_buttons->Add (_remove_screen, 1, 0, 6);
+       target_buttons->Add (_remove_screen, 1, wxEXPAND, 6);
 
        targets->Add (target_buttons, 0, 0, 6);
 
        vertical->Add (targets, 1, wxEXPAND | wxALL, 6);
 
        wxFlexGridSizer* table = new wxFlexGridSizer (3, 2, 6);
-       add_label_to_sizer (table, this, "From");
+       add_label_to_sizer (table, this, "From", true);
        _from_date = new wxDatePickerCtrl (this, wxID_ANY);
        table->Add (_from_date, 1, wxEXPAND);
        _from_time = new wxTimePickerCtrl (this, wxID_ANY);
        table->Add (_from_time, 1, wxEXPAND);
        
-       add_label_to_sizer (table, this, "Until");
+       add_label_to_sizer (table, this, "Until", true);
        _until_date = new wxDatePickerCtrl (this, wxID_ANY);
        table->Add (_until_date, 1, wxEXPAND);
        _until_time = new wxTimePickerCtrl (this, wxID_ANY);
        table->Add (_until_time, 1, wxEXPAND);
 
-       add_label_to_sizer (table, this, "Write to");
+       add_label_to_sizer (table, this, "Write to", true);
 
-#ifdef __WXMSW__
-       _folder = new DirPickerCtrl (this);
+#ifdef DCPOMATIC_USE_OWN_DIR_PICKER
+       _folder = new DirPickerCtrl (this); 
 #else  
-       _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+       _folder = new wxDirPickerCtrl (this, wxID_ANY);
 #endif
 
+       _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
+       
        table->Add (_folder, 1, wxEXPAND);
        
        vertical->Add (table, 0, wxEXPAND | wxALL, 6);
 
-       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
+       wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
        if (buttons) {
                vertical->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
        }
@@ -179,6 +179,9 @@ KDMDialog::setup_sensitivity ()
        _add_screen->Enable (sc);
        _edit_screen->Enable (ss);
        _remove_screen->Enable (ss);
+
+       wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK));
+       ok->Enable (sc || sc);
 }
 
 void
@@ -186,7 +189,8 @@ KDMDialog::add_cinema (shared_ptr<Cinema> c)
 {
        _cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
 
-       for (list<shared_ptr<Screen> >::iterator i = c->screens.begin(); i != c->screens.end(); ++i) {
+       list<shared_ptr<Screen> > sc = c->screens ();
+       for (list<shared_ptr<Screen> >::iterator i = sc.begin(); i != sc.end(); ++i) {
                add_screen (c, *i);
        }
 }
@@ -270,7 +274,7 @@ KDMDialog::add_screen_clicked (wxCommandEvent &)
        d->ShowModal ();
 
        shared_ptr<Screen> s (new Screen (d->name(), d->certificate()));
-       c->screens.push_back (s);
+       c->add_screen (s);
        add_screen (c, s);
 
        Config::instance()->write ();
@@ -309,7 +313,8 @@ KDMDialog::remove_screen_clicked (wxCommandEvent &)
        pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
 
        map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
-       while (i != _cinemas.end() && find (i->second->screens.begin(), i->second->screens.end(), s.second) == i->second->screens.end()) {
+       list<shared_ptr<Screen> > sc = i->second->screens ();
+       while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) {
                ++i;
        }
 
@@ -317,7 +322,7 @@ KDMDialog::remove_screen_clicked (wxCommandEvent &)
                return;
        }
 
-       i->second->screens.remove (s.second);
+       i->second->remove_screen (s.second);
        _targets->Delete (s.first);
 
        Config::instance()->write ();
@@ -330,7 +335,8 @@ KDMDialog::screens () const
 
        list<pair<wxTreeItemId, shared_ptr<Cinema> > > cinemas = selected_cinemas ();
        for (list<pair<wxTreeItemId, shared_ptr<Cinema> > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
-               for (list<shared_ptr<Screen> >::iterator j = i->second->screens.begin(); j != i->second->screens.end(); ++j) {
+               list<shared_ptr<Screen> > sc = i->second->screens ();
+               for (list<shared_ptr<Screen> >::const_iterator j = sc.begin(); j != sc.end(); ++j) {
                        s.push_back (*j);
                }
        }