X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fdcp_panel.h;h=96786d8a1d93ef912881498e796fc2654b4c2501;hb=a85c82137ec26124ebefccb4aeebb96a3cdb8a4c;hp=88a9c4c51a1b1b869320a62e8a68778abc51132d;hpb=4ddf91dda7d84f169e4b905fd41cf747f4a0102c;p=dcpomatic.git

diff --git a/src/wx/dcp_panel.h b/src/wx/dcp_panel.h
index 88a9c4c51..96786d8a1 100644
--- a/src/wx/dcp_panel.h
+++ b/src/wx/dcp_panel.h
@@ -18,6 +18,7 @@
 */
 
 #include <boost/shared_ptr.hpp>
+#include <boost/noncopyable.hpp>
 
 class wxNotebook;
 class wxPanel;
@@ -32,7 +33,7 @@ class wxSizer;
 
 class Film;
 
-class DCPPanel
+class DCPPanel : public boost::noncopyable
 {
 public:
 	DCPPanel (wxNotebook *, boost::shared_ptr<Film>);
@@ -51,9 +52,9 @@ private:
 	void name_changed ();
 	void use_isdcf_name_toggled ();
 	void edit_isdcf_button_clicked ();
+	void copy_isdcf_name_button_clicked ();
 	void container_changed ();
 	void dcp_content_type_changed ();
-	void scaler_changed ();
 	void j2k_bandwidth_changed ();
 	void frame_rate_choice_changed ();
 	void frame_rate_spin_changed ();
@@ -66,6 +67,7 @@ private:
 	void signed_toggled ();
 	void burn_subtitles_toggled ();
 	void encrypted_toggled ();
+	void edit_key_clicked ();
 
 	void setup_frame_rate_widget ();
 	void setup_container ();
@@ -86,13 +88,13 @@ private:
 	wxCheckBox* _use_isdcf_name;
 	wxChoice* _container;
 	wxButton* _edit_isdcf_button;
-	wxChoice* _scaler;
+	wxButton* _copy_isdcf_name_button;
  	wxSpinCtrl* _j2k_bandwidth;
 	wxChoice* _dcp_content_type;
 	wxChoice* _frame_rate_choice;
 	wxSpinCtrl* _frame_rate_spin;
 	wxSizer* _frame_rate_sizer;
-	wxSpinCtrl* _audio_channels;
+	wxChoice* _audio_channels;
 	wxButton* _best_frame_rate;
 	wxCheckBox* _three_d;
 	wxChoice* _resolution;
@@ -100,6 +102,8 @@ private:
 	wxCheckBox* _signed;
 	wxCheckBox* _burn_subtitles;
 	wxCheckBox* _encrypted;
+	wxStaticText* _key;
+	wxButton* _edit_key;
 
 	boost::shared_ptr<Film> _film;
 	bool _generally_sensitive;