Add option to specify default film directory.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 711963a26068c78b9df207a987252932932283d2..50b5ae941f749c152642cccf23502628225a81af 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -68,6 +68,8 @@ Config::Config ()
 
                if (k == "num_local_encoding_threads") {
                        _num_local_encoding_threads = atoi (v.c_str ());
+               } else if (k == "default_directory") {
+                       _default_directory = v;
                } else if (k == "server_port") {
                        _server_port = atoi (v.c_str ());
                } else if (k == "colour_lut_index") {
@@ -125,6 +127,7 @@ Config::write () const
 {
        ofstream f (file().c_str ());
        f << "num_local_encoding_threads " << _num_local_encoding_threads << "\n"
+         << "default_directory " << _default_directory << "\n"
          << "server_port " << _server_port << "\n"
          << "colour_lut_index " << _colour_lut_index << "\n"
          << "j2k_bandwidth " << _j2k_bandwidth << "\n"
@@ -148,3 +151,13 @@ Config::write () const
        f << "tms_password " << _tms_password << "\n";
        f << "sound_processor " << _sound_processor->id ();
 }
+
+string
+Config::default_directory_or (string a) const
+{
+       if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) {
+               return a;
+       }
+
+       return _default_directory;
+}

diff --git a/src/lib/config.h b/src/lib/config.h
index 1ded015f286ab1cd2b04bc6ae9696c2d6f2db54a..59af8a07ab7164173708adb53ac27114e4f68aab 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -46,6 +46,12 @@ public:
                return _num_local_encoding_threads;
        }
 
+       std::string default_directory () const {
+               return _default_directory;
+       }
+
+       std::string default_directory_or (std::string a) const;
+
        /** @return port to use for J2K encoding servers */
        int server_port () const {
                return _server_port;
@@ -111,6 +117,11 @@ public:
                Changed ();
        }
 
+       void set_default_directory (std::string d) {
+               _default_directory = d;
+               Changed ();
+       }
+
        /** @param p New server port */
        void set_server_port (int p) {
                _server_port = p;
@@ -186,6 +197,8 @@ private:
 
        /** number of threads to use for J2K encoding on the local machine */
        int _num_local_encoding_threads;
+       /** default directory to put new films in */
+       std::string _default_directory;
        /** port to use for J2K encoding servers */
        int _server_port;
        /** index of colour LUT to use when converting RGB to XYZ

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index f505b4bdc55b8e8e219849292ac5c32c0676f698..8504989a50aa92ed79b1ca0ac64432103c4b090e 100644 (file)
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -23,6 +23,8 @@
 
 #include <iostream>
 #include <boost/lexical_cast.hpp>
+#include <boost/filesystem.hpp>
+#include <wx/stdpaths.h>
 #include "lib/config.h"
 #include "lib/server.h"
 #include "lib/screen.h"
@@ -68,6 +70,15 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
        table->Add (_num_local_encoding_threads, 1, wxEXPAND);
        table->AddSpacer (0);
 
+       add_label_to_sizer (table, this, "Default directory for new films");
+#ifdef __WXMSW__
+       _default_directory = new DirPickerCtrl (this);
+#else  
+       _default_directory = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
+#endif
+       table->Add (_default_directory, 1, wxEXPAND);
+       table->AddSpacer (0);
+
        add_label_to_sizer (table, this, "Colour look-up table");
        _colour_lut = new wxComboBox (this, wxID_ANY);
        for (int i = 0; i < 2; ++i) {
@@ -142,6 +153,9 @@ ConfigDialog::ConfigDialog (wxWindow* parent)
        _num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
        _num_local_encoding_threads->Connect (wxID_ANY, wxEVT_COMMAND_SPINCTRL_UPDATED, wxCommandEventHandler (ConfigDialog::num_local_encoding_threads_changed), 0, this);
 
+       _default_directory->SetPath (std_to_wx (config->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
+       _default_directory->Connect (wxID_ANY, wxEVT_COMMAND_DIRPICKER_CHANGED, wxCommandEventHandler (ConfigDialog::default_directory_changed), 0, this);
+
        _colour_lut->Connect (wxID_ANY, wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler (ConfigDialog::colour_lut_changed), 0, this);
        
        _j2k_bandwidth->SetRange (50, 250);
@@ -212,6 +226,12 @@ ConfigDialog::num_local_encoding_threads_changed (wxCommandEvent &)
        Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
 }
 
+void
+ConfigDialog::default_directory_changed (wxCommandEvent &)
+{
+       Config::instance()->set_default_directory (wx_to_std (_default_directory->GetPath ()));
+}
+
 void
 ConfigDialog::colour_lut_changed (wxCommandEvent &)
 {

diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index b1d3eb84d8f118d9eb4c12e8f5481ae6cd8d3fc5..8e85db653edda426b7de21d22d7395bd2e5fa2f0 100644 (file)
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -24,6 +24,9 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/listctrl.h>
+#include <wx/filepicker.h>
+
+class DirPickerCtrl;
 
 class Screen;
 class ServerDescription;
@@ -42,6 +45,7 @@ private:
        void tms_user_changed (wxCommandEvent &);
        void tms_password_changed (wxCommandEvent &);
        void num_local_encoding_threads_changed (wxCommandEvent &);
+       void default_directory_changed (wxCommandEvent &);
        void colour_lut_changed (wxCommandEvent &);
        void j2k_bandwidth_changed (wxCommandEvent &);
        void reference_scaler_changed (wxCommandEvent &);
@@ -59,6 +63,11 @@ private:
        wxTextCtrl* _tms_user;
        wxTextCtrl* _tms_password;
        wxSpinCtrl* _num_local_encoding_threads;
+#ifdef __WXMSW__       
+       DirPickerCtrl* _default_directory;
+#else
+       wxDirPickerCtrl* _default_directory;
+#endif 
        wxComboBox* _colour_lut;
        wxSpinCtrl* _j2k_bandwidth;
        wxComboBox* _reference_scaler;

diff --git a/src/wx/dir_picker_ctrl.cc b/src/wx/dir_picker_ctrl.cc
index 05b680288c248baaf0605f88d67eac45e71556d5..cb811fc1087a26839832a5b73f1bdb735d1d0ba3 100644 (file)
--- a/src/wx/dir_picker_ctrl.cc
+++ b/src/wx/dir_picker_ctrl.cc
@@ -40,9 +40,6 @@ DirPickerCtrl::DirPickerCtrl (wxWindow* parent)
        SetSizerAndFit (_sizer);
 
        _browse->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (DirPickerCtrl::browse_clicked), 0, this);
-
-       /* Do this after the fit so that our folder label stays long */
-       SetPath (wxStandardPaths::Get().GetDocumentsDir());
 }
 
 void

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index cc48c422a697bd9c99fc52a02e3279bd2443be94..eb6f2849b5cdd5ebc910b794bbff3ddcbb5bb6b9 100644 (file)
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -19,6 +19,7 @@
 
 #include <boost/filesystem.hpp>
 #include <wx/stdpaths.h>
+#include "lib/config.h"
 #include "new_film_dialog.h"
 #ifdef __WXMSW__
 #include "dir_picker_ctrl.h"
@@ -48,7 +49,7 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 #else  
        _folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
 #endif
-       _folder->SetPath (wxStandardPaths::Get().GetDocumentsDir());
+       _folder->SetPath (std_to_wx (Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()))));
        table->Add (_folder, 1, wxEXPAND);
 
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);