X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=8c976f53ae7df64c34df2d13dd55e132ae5ba250;hb=e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160;hp=0a997bc41ce73fb1caf5bd3e1566558277e4fc39;hpb=0401db037ade0781849072329feb5eef73d5ca98;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 0a997bc41..8c976f53a 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -25,43 +25,40 @@
 #include "properties_dialog.h"
 #include "wx_util.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::fixed;
+using std::setprecision;
+using boost::shared_ptr;
+using boost::lexical_cast;
 
-PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
+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");
-	_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer (_table, this, _("Frames"), true);
+	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
+	_table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, "Disk space required for frames");
-	_disk_for_frames = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_disk_for_frames, 1, wxALIGN_CENTER_VERTICAL);
-	
-	add_label_to_sizer (table, this, "Total disk space required");
-	_total_disk = new wxStaticText (this, wxID_ANY, std_to_wx (""));
-	table->Add (_total_disk, 1, wxALIGN_CENTER_VERTICAL);
+	add_label_to_sizer (_table, this, _("Disk space required"), true);
+	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
+	_table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
 
-	add_label_to_sizer (table, this, "Frames already encoded");
-	_encoded = new ThreadedStaticText (this, "calculating...", boost::bind (&PropertiesDialog::frames_already_encoded, this));
-	table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
-	
-	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length ())));
-	double const disk = ((double) Config::instance()->j2k_bandwidth() / 8) * _film->length() / (_film->frames_per_second () * 1073741824);
-	stringstream s;
-	s << fixed << setprecision (1) << disk << "Gb";
-	_disk_for_frames->SetLabel (std_to_wx (s.str ()));
+	add_label_to_sizer (_table, this, _("Frames already encoded"), true);
+	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
+	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+	_table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
 
-	stringstream t;
-	t << fixed << setprecision (1) << (disk * 2) << "Gb";
-	_total_disk->SetLabel (std_to_wx (t.str ()));
+	_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, 8);
+	overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -72,13 +69,27 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
 	overall_sizer->SetSizeHints (this);
 }
 
+void
+PropertiesDialog::layout ()
+{
+	_table->Layout ();
+	Fit ();
+}
+
 string
 PropertiesDialog::frames_already_encoded () const
 {
 	stringstream u;
-	u << _film->encoded_frames();
-	if (_film->length()) {
-		u << " (" << (_film->encoded_frames() * 100 / _film->length()) << "%)";
+	try {
+		u << _film->encoded_frames ();
+	} catch (boost::thread_interrupted &) {
+		return "";
+	}
+
+	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 ();
 }