projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ubuntu 13.10 appears to have a broken GtkFileChooserButton in its GTK as well as...
[dcpomatic.git]
/
src
/
wx
/
properties_dialog.cc
diff --git
a/src/wx/properties_dialog.cc
b/src/wx/properties_dialog.cc
index b8d97cb59c795014ff2ecdd7d382b27365537b3c..f3f841a43f84f210dee9e5f8961155abde4384ad 100644
(file)
--- a/
src/wx/properties_dialog.cc
+++ b/
src/wx/properties_dialog.cc
@@
-36,28
+36,29
@@
PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
, _film (film)
{
: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
, _film (film)
{
-
wxFlexGridSizer*
table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+
_
table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
- add_label_to_sizer (table, this, _("Frames"), true);
+ add_label_to_sizer (
_
table, this, _("Frames"), true);
_frames = new wxStaticText (this, wxID_ANY, wxT (""));
_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"), true);
+ add_label_to_sizer (
_
table, this, _("Disk space required"), true);
_disk = new wxStaticText (this, wxID_ANY, wxT (""));
_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"), true);
+ add_label_to_sizer (
_
table, this, _("Frames already encoded"), true);
_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
- table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
+ _encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
+ _table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
- _frames->SetLabel (std_to_wx (lexical_cast<string> (_film->time_to_video_frames (_film->length
_with_loop
()))));
- double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length
_with_loop
() / (TIME_HZ * 1073741824.0f);
+ _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);
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) {
wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
if (buttons) {
@@
-68,6
+69,13
@@
PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
overall_sizer->SetSizeHints (this);
}
overall_sizer->SetSizeHints (this);
}
+void
+PropertiesDialog::layout ()
+{
+ _table->Layout ();
+ Fit ();
+}
+
string
PropertiesDialog::frames_already_encoded () const
{
string
PropertiesDialog::frames_already_encoded () const
{
@@
-78,9
+86,9
@@
PropertiesDialog::frames_already_encoded () const
return "";
}
return "";
}
- if (_film->length
_with_loop
()) {
+ if (_film->length()) {
/* XXX: encoded_frames() should check which frames have been encoded */
/* XXX: encoded_frames() should check which frames have been encoded */
- u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length
_with_loop
())) << "%)";
+ u << " (" << (_film->encoded_frames() * 100 / _film->time_to_video_frames (_film->length())) << "%)";
}
return u.str ();
}
}
return u.str ();
}