Improve layout of properties window.

diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index a1ba81b3b5ae07838a23adb2f7d4a8d9477e169a..f3f841a43f84f210dee9e5f8961155abde4384ad 100644 (file)
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.cc
@@ -36,19 +36,20 @@ 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, 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 (""));
-       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 (""));
-       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));
-       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()))));
        double const disk = ((double) _film->j2k_bandwidth() / 8) * _film->length() / (TIME_HZ * 1073741824.0f);
@@ -57,7 +58,7 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
        _disk->SetLabel (std_to_wx (s.str ()));
 
        wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-       overall_sizer->Add (table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
+       overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
        
        wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
        if (buttons) {
@@ -68,6 +69,13 @@ PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
        overall_sizer->SetSizeHints (this);
 }
 
+void
+PropertiesDialog::layout ()
+{
+       _table->Layout ();
+       Fit ();
+}
+
 string
 PropertiesDialog::frames_already_encoded () const
 {

diff --git a/src/wx/properties_dialog.h b/src/wx/properties_dialog.h
index cae929e1894e19235dc84741a84ab6eab3adfda8..03e0f01aa796ed99a5a06bb588f79bc4162d91a0 100644 (file)
--- a/src/wx/properties_dialog.h
+++ b/src/wx/properties_dialog.h
@@ -29,8 +29,10 @@ public:
 
 private:
        std::string frames_already_encoded () const;
+       void layout ();
 
        boost::shared_ptr<Film> _film;
+       wxFlexGridSizer* _table;
        wxStaticText* _frames;
        wxStaticText* _disk;
        ThreadedStaticText* _encoded;

diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 20fd2df755f30240e93995ac9639386085c67d34..515550e5901b91327f49de0942df230bb7d10c55 100644 (file)
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -151,6 +151,7 @@ void
 ThreadedStaticText::thread_finished (wxCommandEvent& ev)
 {
        SetLabel (ev.GetString ());
+       Finished ();
 }
 
 string

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index d942d8fa83f22f7e07de20e0997c6b5c0eb2bae7..aefa75fca57749ef679371bb16ed04f223c8063a 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -24,6 +24,7 @@
 #include <wx/gbsizer.h>
 #include <boost/function.hpp>
 #include <boost/thread.hpp>
+#include <boost/signals2.hpp>
 #ifdef __WXGTK__
 #include <gtk/gtk.h>
 #endif
@@ -59,6 +60,9 @@ public:
        ThreadedStaticText (wxWindow* parent, wxString initial, boost::function<std::string ()> fn);
        ~ThreadedStaticText ();
 
+       /** Emitted in the UI thread when the text has been set up */
+       boost::signals2::signal<void()> Finished;
+
 private:
        void run (boost::function<std::string ()> fn);
        void thread_finished (wxCommandEvent& ev);