X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=8c976f53ae7df64c34df2d13dd55e132ae5ba250;hb=08d62727f7f1c813cbc7041027fe4a52518623da;hp=44a713dc34ce181bc9e857a878b93126815c3b33;hpb=a00ebbc68438e84076c65e99d0e70403afb4407d;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 44a713dc3..8c976f53a 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -36,35 +36,29 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 	, _film (film)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
+	_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
-	add_label_to_sizer (table, this, _("Frames"));
+	add_label_to_sizer (_table, this, _("Frames"), true);
 	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	_table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Disk space required"));
+	add_label_to_sizer (_table, this, _("Disk space required"), true);
 	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
+	_table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, _("Frames already encoded"));
+	add_label_to_sizer (_table, this, _("Frames already encoded"), true);
 	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
-	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
-
-	if (_film->length()) {
-		_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().get())));
-		FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
-		int const dcp_length = _film->length().get() * frc.factor();
-		double const disk = ((double) _film->j2k_bandwidth() / 8) * dcp_length / (_film->dcp_frame_rate() * 1073741824.0f);
-		stringstream s;
-		s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
-		_disk->SetLabel (std_to_wx (s.str ()));
-	} else {
-		_frames->SetLabel (_("unknown"));
-		_disk->SetLabel (_("unknown"));
-	}
+	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+	_table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
+
+	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().frames (_film->video_frame_rate ()))));
+	double const disk = double (_film->required_disk_space()) / 1073741824.0f;
+	stringstream s;
+	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
+	_disk->SetLabel (std_to_wx (s.str ()));
 
 	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 0, wxALL, 6);
+	overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -75,6 +69,13 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
 	overall_sizer->SetSizeHints (this);
 }
 
+void
+PropertiesDialog::layout ()
+{
+	_table->Layout ();
+	Fit ();
+}
+
 string
 PropertiesDialog::frames_already_encoded () const
 {
@@ -84,10 +85,11 @@ PropertiesDialog::frames_already_encoded () const
 	} catch (boost::thread_interrupted &) {
 		return "";
 	}
-	
-	if (_film->length()) {
+
+	uint64_t const frames = _film->length().frames (_film->video_frame_rate ());
+	if (frames) {
 		/* XXX: encoded_frames() should check which frames have been encoded */
-		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / frames) << "%)";
 	}
 	return u.str ();
 }