Some work on DCI naming. Clean up compacted / aligned image handling somewhat.

2 files changed, 8 insertions, 0 deletions

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 143b058b1..7fd2eb9fc 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -60,6 +60,11 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent)
 	_name = new wxTextCtrl (this, wxID_ANY);
 	_sizer->Add (_name, 1, wxEXPAND);
 
+	_use_dci_name = new wxCheckBox (this, wxID_ANY, wxT ("Use DCI name"));
+	_sizer->Add (_use_dci_name, 1, wxEXPAND);
+	_edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Edit..."));
+	_sizer->Add (_edit_dci_button, 0);
+
 	add_label_to_sizer (_sizer, this, "Content");
 	_content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*"));
 	_sizer->Add (_content, 1, wxEXPAND);
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 31d8ad39b..2a3be6d0c 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -24,6 +24,7 @@
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
 #include <wx/filepicker.h>
+#include <wx/collpane.h>
 #include "lib/trim_action.h"
 #include "lib/film.h"
 
@@ -83,6 +84,8 @@ private:
 	Film* _film;
 	/** The Film's name */
 	wxTextCtrl* _name;
+	wxCheckBox* _use_dci_name;
+	wxButton* _edit_dci_button;
 	/** The Film's format */
 	wxComboBox* _format;
 	/** The Film's content file */