X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdvdomatic.cc;h=b5c81da07f2ba8cbcb42318532704264c7f45884;hb=110d7d4e111c2db31489296587d855328c5d8b34;hp=d42ec62cfedc97a433638baa0a0959d4099a2e41;hpb=56ab6a6c907c385f571fce2966c18f203d95abb5;p=dcpomatic.git diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index d42ec62cf..b5c81da07 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -20,16 +20,18 @@ #include #include #include +#include +#include #include "wx/film_viewer.h" #include "wx/film_editor.h" -#ifndef DVDOMATIC_DISABLE_PLAYER -#include "wx/film_player.h" -#endif #include "wx/job_manager_view.h" #include "wx/config_dialog.h" #include "wx/job_wrapper.h" //#include "gtk/dvd_title_dialog.h" #include "wx/wx_util.h" +#include "wx/new_film_dialog.h" +#include "wx/properties_dialog.h" +#include "wx/wx_ui_signaller.h" #include "lib/film.h" #include "lib/format.h" #include "lib/config.h" @@ -37,17 +39,19 @@ #include "lib/util.h" #include "lib/scaler.h" #include "lib/exceptions.h" +#include "lib/version.h" +#include "lib/ui_signaller.h" -using namespace std; -using namespace boost; +using std::string; +using std::stringstream; +using std::map; +using std::make_pair; +using boost::shared_ptr; static FilmEditor* film_editor = 0; static FilmViewer* film_viewer = 0; -#ifndef DVDOMATIC_DISABLE_PLAYER -static FilmPlayer* film_player = 0; -#endif -static Film* film = 0; +static shared_ptr film; static void set_menu_sensitivity (); @@ -94,8 +98,7 @@ maybe_save_then_delete_film () } } - delete film; - film = 0; + film.reset (); } enum Sensitivity { @@ -128,6 +131,7 @@ enum { ID_file_new = 1, ID_file_open, ID_file_save, + ID_file_properties, ID_file_quit, ID_edit_preferences, ID_jobs_make_dcp, @@ -147,6 +151,8 @@ setup_menu (wxMenuBar* m) file->AppendSeparator (); add_item (file, "&Save", ID_file_save, NEEDS_FILM); file->AppendSeparator (); + add_item (file, "&Properties...", ID_file_properties, NEEDS_FILM); + file->AppendSeparator (); add_item (file, "&Quit", ID_file_quit, ALWAYS); wxMenu* edit = new wxMenu; @@ -155,7 +161,9 @@ setup_menu (wxMenuBar* m) wxMenu* jobs = new wxMenu; add_item (jobs, "&Make DCP", ID_jobs_make_dcp, NEEDS_FILM); add_item (jobs, "&Send DCP to TMS", ID_jobs_send_dcp_to_tms, NEEDS_FILM); +#ifdef DVDOMATIC_POSIX add_item (jobs, "Copy from &DVD...", ID_jobs_copy_from_dvd, NEEDS_FILM); +#endif jobs->AppendSeparator (); add_item (jobs, "&Examine content", ID_jobs_examine_content, NEEDS_FILM); add_item (jobs, "Make DCP from existing &transcode", ID_jobs_make_dcp_from_existing_transcode, NEEDS_FILM); @@ -189,6 +197,7 @@ public: Connect (ID_file_new, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_new)); Connect (ID_file_open, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_open)); Connect (ID_file_save, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_save)); + Connect (ID_file_properties, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_properties)); Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit)); Connect (ID_edit_preferences, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::edit_preferences)); Connect (ID_jobs_make_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp)); @@ -198,12 +207,14 @@ public: Connect (ID_jobs_make_dcp_from_existing_transcode, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_make_dcp_from_existing_transcode)); Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about)); - film_editor = new FilmEditor (film, this); - film_viewer = new FilmViewer (film, this); -#ifndef DVDOMATIC_DISABLE_PLAYER - film_player = new FilmPlayer (film, this); -#endif - JobManagerView* job_manager_view = new JobManagerView (this); + wxPanel* panel = new wxPanel (this); + wxSizer* s = new wxBoxSizer (wxHORIZONTAL); + s->Add (panel, 1, wxEXPAND); + SetSizer (s); + + film_editor = new FilmEditor (film, panel); + film_viewer = new FilmViewer (film, panel); + JobManagerView* job_manager_view = new JobManagerView (panel); wxSizer* rhs_sizer = new wxBoxSizer (wxVERTICAL); rhs_sizer->Add (film_viewer, 3, wxEXPAND | wxALL); @@ -212,27 +223,32 @@ public: wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL); main_sizer->Add (film_editor, 0, wxALL, 6); main_sizer->Add (rhs_sizer, 1, wxEXPAND | wxALL, 6); - SetSizer (main_sizer); + panel->SetSizer (main_sizer); set_menu_sensitivity (); /* XXX: calling these here is a bit of a hack */ film_editor->setup_visibility (); -#ifndef DVDOMATIC_DISABLE_PLAYER - film_player->setup_visibility (); -#endif film_viewer->setup_visibility (); - film_editor->FileChanged.connect (sigc::mem_fun (*this, &Frame::file_changed)); + film_editor->FileChanged.connect (bind (&Frame::file_changed, this, _1)); if (film) { file_changed (film->directory ()); } else { file_changed (""); } + + set_film (); } - void - file_changed (string f) + void set_film () + { + film_viewer->set_film (film); + film_editor->set_film (film); + set_menu_sensitivity (); + } + + void file_changed (string f) { stringstream s; s << "DVD-o-matic"; @@ -245,36 +261,33 @@ public: void file_new (wxCommandEvent &) { - wxDirDialog* c = new wxDirDialog (this, wxT ("New Film")); - int const r = c->ShowModal (); - c->Destroy (); + NewFilmDialog* d = new NewFilmDialog (this); + int const r = d->ShowModal (); if (r == wxID_OK) { maybe_save_then_delete_film (); - film = new Film (wx_to_std (c->GetPath ())); + film.reset (new Film (d->get_path (), false)); #if BOOST_FILESYSTEM_VERSION == 3 - film->set_name (filesystem::path (wx_to_std (c->GetPath())).filename().generic_string()); + film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string()); #else - film->set_name (filesystem::path (wx_to_std (c->GetPath())).filename()); -#endif - film_viewer->set_film (film); - film_editor->set_film (film); - set_menu_sensitivity (); + film->set_name (boost::filesystem::path (d->get_path()).filename()); +#endif + set_film (); } + + d->Destroy (); } void file_open (wxCommandEvent &) { - wxDirDialog* c = new wxDirDialog (this, wxT ("Open Film"), wxT (""), wxDD_DIR_MUST_EXIST); + wxDirDialog* c = new wxDirDialog (this, wxT ("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST); int const r = c->ShowModal (); c->Destroy (); if (r == wxID_OK) { maybe_save_then_delete_film (); - film = new Film (wx_to_std (c->GetPath ())); - film_viewer->set_film (film); - film_editor->set_film (film); - set_menu_sensitivity (); + film.reset (new Film (wx_to_std (c->GetPath ()))); + set_film (); } } @@ -282,6 +295,13 @@ public: { film->write_metadata (); } + + void file_properties (wxCommandEvent &) + { + PropertiesDialog* d = new PropertiesDialog (this, film); + d->ShowModal (); + d->Destroy (); + } void file_quit (wxCommandEvent &) { @@ -309,15 +329,16 @@ public: void jobs_copy_from_dvd (wxCommandEvent &) { -// try { + try { + // DVDTitleDialog d; // if (d.run () != Gtk::RESPONSE_OK) { // return; // } -// film->copy_from_dvd (); -// } catch (DVDError& e) { -// error_dialog (e.what ()); -// } + film->copy_from_dvd (); + } catch (DVDError& e) { + error_dialog (this, e.what ()); + } } void jobs_send_dcp_to_tms (wxCommandEvent &) @@ -334,13 +355,14 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (wxT (DVDOMATIC_VERSION)); - info.SetDescription (_("DCP generation from arbitrary formats")); - info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis")); + info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit))); + info.SetDescription (_("Free, open-source DCP generation from almost anything.")); + info.SetCopyright (_("(C) Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen")); wxArrayString authors; authors.Add (wxT ("Carl Hetherington")); authors.Add (wxT ("Terrence Meiczinger")); authors.Add (wxT ("Paul Davis")); + authors.Add (wxT ("Ole Laursen")); info.SetDevelopers (authors); info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic")); wxAboutBox (info); @@ -351,24 +373,29 @@ class App : public wxApp { bool OnInit () { - if (!wxApp::OnInit ()) { - return false; - } - wxInitAllImageHandlers (); dvdomatic_setup (); -// if (argc == 2 && boost::filesystem::is_directory (argv[1])) { -// film = new Film (argv[1]); -// } + if (argc == 2 && boost::filesystem::is_directory (wx_to_std (argv[1]))) { + film.reset (new Film (wx_to_std (argv[1]))); + } Frame* f = new Frame (_("DVD-o-matic")); SetTopWindow (f); f->Maximize (); f->Show (); + + ui_signaller = new wxUISignaller (this); + this->Connect (-1, wxEVT_IDLE, wxIdleEventHandler (App::idle)); + return true; } + + void idle (wxIdleEvent &) + { + ui_signaller->ui_idle (); + } }; IMPLEMENT_APP (App)