X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_batch.cc;h=48ef8f798e1f413881032a9bd06b8ba7ea901799;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=234bfea5cda13905048caa8d4b01dc8757689a99;hpb=37a7cf86cdd25b8881c030cb62c68ecbe3b2efa3;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 234bfea5c..48ef8f798 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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
@@ -29,7 +29,7 @@
 #include "lib/job_manager.h"
 #include "wx/wx_util.h"
 #include "wx/about_dialog.h"
-#include "wx/wx_ui_signaller.h"
+#include "wx/wx_signal_manager.h"
 #include "wx/job_manager_view.h"
 
 using std::exception;
@@ -57,43 +57,49 @@ setup_menu (wxMenuBar* m)
 	m->Append (help, _("&Help"));
 }
 
-class Frame : public wxFrame
+class DOMFrame : public wxFrame
 {
 public:
-	Frame (wxString const & title)
+	DOMFrame (wxString const & title)
 		: wxFrame (NULL, -1, title)
+		, _sizer (new wxBoxSizer (wxVERTICAL))
 	{
 		wxMenuBar* bar = new wxMenuBar;
 		setup_menu (bar);
 		SetMenuBar (bar);
 
-		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_add_film, this), ID_file_add_film);
-		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::file_quit, this),     ID_file_quit);
-		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&Frame::help_about, this),    ID_help_about);
+		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_add_film, this), ID_file_add_film);
+		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::file_quit, this),     ID_file_quit);
+		Bind (wxEVT_COMMAND_MENU_SELECTED, boost::bind (&DOMFrame::help_about, this),    ID_help_about);
 
 		wxPanel* panel = new wxPanel (this);
 		wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
 		s->Add (panel, 1, wxEXPAND);
 		SetSizer (s);
 
-		wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
-
-		JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE);
-		sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
+		JobManagerView* job_manager_view = new JobManagerView (panel);
+		_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
 
 		wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
 		wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
-		add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Frame::add_film, this));
+		add->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DOMFrame::add_film, this));
 		buttons->Add (add, 1, wxALL, 6);
 
-		sizer->Add (buttons, 0, wxALL, 6);
+		_sizer->Add (buttons, 0, wxALL, 6);
 
-		panel->SetSizer (sizer);
+		panel->SetSizer (_sizer);
 
-		Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
+		Bind (wxEVT_CLOSE_WINDOW, boost::bind (&DOMFrame::close, this, _1));
+		Bind (wxEVT_SIZE, boost::bind (&DOMFrame::sized, this, _1));
 	}
 
 private:
+	void sized (wxSizeEvent& ev)
+	{
+		_sizer->Layout ();
+		ev.Skip ();
+	}
+
 	bool should_close ()
 	{
 		if (!JobManager::instance()->work_to_do ()) {
@@ -111,7 +117,7 @@ private:
 		d->Destroy ();
 		return r;
 	}
-		
+
 	void close (wxCloseEvent& ev)
 	{
 		if (!should_close ()) {
@@ -126,7 +132,7 @@ private:
 	{
 		add_film ();
 	}
-	
+
 	void file_quit ()
 	{
 		if (should_close ()) {
@@ -147,7 +153,7 @@ private:
 		if (_last_parent) {
 			c->SetPath (std_to_wx (_last_parent.get().string ()));
 		}
-		
+
 		int r;
 		while (true) {
 			r = c->ShowModal ();
@@ -157,7 +163,7 @@ private:
 				break;
 			}
 		}
-			
+
 		if (r == wxID_OK) {
 			try {
 				shared_ptr<Film> film (new Film (wx_to_std (c->GetPath ())));
@@ -176,6 +182,7 @@ private:
 	}
 
 	boost::optional<boost::filesystem::path> _last_parent;
+	wxSizer* _sizer;
 };
 
 static const wxCmdLineEntryDesc command_line_description[] = {
@@ -190,20 +197,20 @@ class App : public wxApp
 		if (!wxApp::OnInit()) {
 			return false;
 		}
-		
-#ifdef DCPOMATIC_LINUX		
+
+#ifdef DCPOMATIC_LINUX
 		unsetenv ("UBUNTU_MENUPROXY");
-#endif		
+#endif
 
 		/* Enable i18n; this will create a Config object
 		   to look for a force-configured language.  This Config
 		   object will be wrong, however, because dcpomatic_setup
-		   hasn't yet been called and there aren't any scalers, filters etc.
+		   hasn't yet been called and there aren't any filters etc.
 		   set up yet.
 		*/
 		dcpomatic_setup_i18n ();
 
-		/* Set things up, including scalers / filters etc.
+		/* Set things up, including filters etc.
 		   which will now be internationalised correctly.
 		*/
 		dcpomatic_setup ();
@@ -213,12 +220,12 @@ class App : public wxApp
 		*/
 		Config::drop ();
 
-		Frame* f = new Frame (_("DCP-o-matic Batch Converter"));
+		DOMFrame* f = new DOMFrame (_("DCP-o-matic Batch Converter"));
 		SetTopWindow (f);
 		f->Maximize ();
 		f->Show ();
 
-		ui_signaller = new wxUISignaller (this);
+		signal_manager = new wxSignalManager (this);
 		this->Bind (wxEVT_IDLE, boost::bind (&App::idle, this));
 
 		shared_ptr<Film> film;
@@ -237,7 +244,7 @@ class App : public wxApp
 
 	void idle ()
 	{
-		ui_signaller->ui_idle ();
+		signal_manager->ui_idle ();
 	}
 
 	void OnInitCmdLine (wxCmdLineParser& parser)