X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=27fc75b1b39c649fd76b9890d1758e374f7af858;hb=8c7a308c03e4b4196b4e2379a26d432b100ae2b1;hp=06e2458321eb46850e3cc7e5aa981f2f4f4c450d;hpb=147cca5876dfbdf56e21289c3a36bec4b4850191;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 06e245832..27fc75b1b 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -22,74 +22,52 @@
 #include <boost/bind.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
+#include "lib/safe_stringstream.h"
 #include "properties_dialog.h"
 #include "wx_util.h"
 
 using std::string;
-using std::stringstream;
 using std::fixed;
 using std::setprecision;
 using boost::shared_ptr;
 using boost::lexical_cast;
 
 PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
-	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+	: TableDialog (parent, _("Film Properties"), 2, false)
 	, _film (film)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 3, 6);
+	add (_("Frames"), true);
+	_frames = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add_label_to_sizer (table, this, _("Frames"));
-	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	add (_("Disk space required"), true);
+	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add_label_to_sizer (table, this, _("Disk space required"));
-	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
+	add (_("Frames already encoded"), true);
+	_encoded = add (new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)));
+	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+	_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;
+	SafeStringStream s;
+	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
+	_disk->SetLabel (std_to_wx (s.str ()));
 
-	add_label_to_sizer (table, this, _("Frames already encoded"));
-	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
-	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
-
-#if 0	
-	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"));
-	}
-#endif	
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 0, wxALL, 6);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 string
 PropertiesDialog::frames_already_encoded () const
 {
-	stringstream u;
+	SafeStringStream u;
 	try {
 		u << _film->encoded_frames ();
 	} catch (boost::thread_interrupted &) {
 		return "";
 	}
-	
-//	if (_film->length()) {
-//		/* XXX: encoded_frames() should check which frames have been encoded */
-//		u << " (" << (_film->encoded_frames() * 100 / _film->length().get()) << "%)";
-//	}
+
+	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 / frames) << "%)";
+	}
 	return u.str ();
 }