X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fproperties_dialog.cc;h=801996efa7bcb611111285a847c41848591f69b7;hp=1e0641ac4330d5ec576aa33c9135db7906977e10;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=237a0052c60af768f4d62b00321932918b7ba4d9

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 1e0641ac4..801996efa 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -1,7 +1,5 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
-    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
@@ -35,39 +33,25 @@ 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_label_to_sizer (table, this, _("Frames"));
-	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
-	table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
-
-	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"), true);
+	_frames = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	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);
+	add (_("Disk space required"), true);
+	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	_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);
+	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;
 	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);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 string
@@ -79,10 +63,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->time_to_video_frames (_film->length())) << "%)";
+		u << " (" << (_film->encoded_frames() * 100 / frames) << "%)";
 	}
 	return u.str ();
 }