diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-25 18:32:54 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-25 18:32:54 +0100 |
| commit | 81e0ec64eccf10232628fdf89149b3a66f231312 (patch) | |
| tree | 1d845a4ea4c97109b6b2c2c78ff8c14ce7080119 /src/tools | |
| parent | f1a68da7de486525be2b4199288ee2e9b822668b (diff) | |
Various hacking.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 166b86580..35691f845 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -24,10 +24,10 @@ #ifndef DVDOMATIC_DISABLE_PLAYER #include "wx/film_player.h" #endif -//#include "gtk/job_manager_view.h" +#include "wx/job_manager_view.h" //#include "gtk/config_dialog.h" //#include "gtk/gpl.h" -//#include "gtk/job_wrapper.h" +#include "wx/job_wrapper.h" //#include "gtk/dvd_title_dialog.h" #include "wx/wx_util.h" #include "lib/film.h" @@ -256,12 +256,12 @@ public: void jobs_make_dcp (wxCommandEvent &) { -// JobWrapper::make_dcp (film, true); + JobWrapper::make_dcp (this, film, true); } void jobs_make_dcp_from_existing_transcode (wxCommandEvent &) { -// JobWrapper::make_dcp (film, false); + JobWrapper::make_dcp (this, film, false); } void jobs_copy_from_dvd (wxCommandEvent &) @@ -344,17 +344,23 @@ class App : public wxApp frame->Connect (ID_jobs_make_dcp_from_existing_transcode, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp_from_existing_transcode)); frame->Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about)); + wxPanel* rhs = new wxPanel (frame); + film_editor = new FilmEditor (film, frame); - film_editor->Show (true); - film_viewer = new FilmViewer (film, frame); - film_viewer->Show (true); + film_viewer = new FilmViewer (film, rhs); #ifndef DVDOMATIC_DISABLE_PLAYER film_player = new FilmPlayer (film, frame); -#endif +#endif + JobManagerView* job_manager_view = new JobManagerView (rhs); + + wxSizer* rhs_sizer = new wxBoxSizer (wxVERTICAL); + rhs_sizer->Add (film_viewer, 3, wxEXPAND | wxALL); + rhs_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL); + rhs->SetSizer (rhs_sizer); wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); main_sizer->Add (film_editor, 0, wxALL, 6); - main_sizer->Add (film_viewer, 1, wxEXPAND | wxALL, 6); + main_sizer->Add (rhs, 1, wxEXPAND | wxALL, 6); frame->SetSizer (main_sizer); SetTopWindow (frame); @@ -376,9 +382,6 @@ class App : public wxApp } #endif - /* XXX this should be in JobManagerView, shouldn't it? */ -//XXX Glib::signal_timeout().connect (sigc::bind_return (sigc::mem_fun (jobs_view, &JobManagerView::update), true), 1000); - return true; } }; |