X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=f3f841a43f84f210dee9e5f8961155abde4384ad;hb=4916ca4fa78402d8f589320b78750672ce0d8c93;hp=a447091c3874f6d8fec39e41a61287336a93899c;hpb=d7135bda7b1db2ee2728c90ff4570c350834338f;p=dcpomatic.git

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a447091c3..f3f841a43 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -19,43 +19,46 @@
 
 #include <iomanip>
 #include <boost/lexical_cast.hpp>
+#include <boost/bind.hpp>
 #include "lib/film.h"
 #include "lib/config.h"
 #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, 6, 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 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");
-	_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);
 
-	_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->time_to_video_frames (_film->length()))));
+	double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 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);
+	overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
 	
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
 	if (buttons) {
@@ -65,3 +68,27 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, Film* film)
 	SetSizer (overall_sizer);
 	overall_sizer->SetSizeHints (this);
 }
+
+void
+PropertiesDialog::layout ()
+{
+	_table->Layout ();
+	Fit ();
+}
+
+string
+PropertiesDialog::frames_already_encoded () const
+{
+	stringstream 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->time_to_video_frames (_film->length())) << "%)";
+	}
+	return u.str ();
+}