projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
properties_dialog.h
diff --git
a/src/wx/properties_dialog.h
b/src/wx/properties_dialog.h
index 25c11e8d0025f8a206df1dbb799170ab751ba3a2..03e0f01aa796ed99a5a06bb588f79bc4162d91a0 100644
(file)
--- a/
src/wx/properties_dialog.h
+++ b/
src/wx/properties_dialog.h
@@
-20,16
+20,21
@@
#include <wx/wx.h>
class Film;
#include <wx/wx.h>
class Film;
+class ThreadedStaticText;
class PropertiesDialog : public wxDialog
{
public:
class PropertiesDialog : public wxDialog
{
public:
- PropertiesDialog (wxWindow *,
Film *
);
+ PropertiesDialog (wxWindow *,
boost::shared_ptr<Film>
);
private:
private:
+ std::string frames_already_encoded () const;
+ void layout ();
+
+ boost::shared_ptr<Film> _film;
+ wxFlexGridSizer* _table;
wxStaticText* _frames;
wxStaticText* _frames;
- wxStaticText* _disk_for_frames;
- wxStaticText* _total_disk;
- wxStaticText* _encoded;
+ wxStaticText* _disk;
+ ThreadedStaticText* _encoded;
};
};