X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdvdomatic.cc;h=ea93436beb49129ef2eb364934a687c01c221626;hb=d7fe5fa4178af87b5f1e5a571a78313fa00c3327;hp=131f0bd714e6d4fcebec80b3516aa427e3116406;hpb=a650e785467a9d7784d2ece4a477acd8cfa9181a;p=dcpomatic.git diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index 131f0bd71..ea93436be 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -27,9 +27,10 @@ #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,14 +38,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; -static Film* film = 0; +static shared_ptr film; static void set_menu_sensitivity (); @@ -91,8 +97,7 @@ maybe_save_then_delete_film () } } - delete film; - film = 0; + film.reset (); } enum Sensitivity { @@ -125,11 +130,11 @@ enum { ID_file_new = 1, ID_file_open, ID_file_save, + ID_file_properties, ID_file_quit, ID_edit_preferences, ID_jobs_make_dcp, ID_jobs_send_dcp_to_tms, - ID_jobs_copy_from_dvd, ID_jobs_examine_content, ID_jobs_make_dcp_from_existing_transcode, ID_help_about @@ -144,6 +149,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; @@ -152,7 +159,6 @@ 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); - add_item (jobs, "Copy from &DVD...", ID_jobs_copy_from_dvd, NEEDS_FILM); 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); @@ -186,11 +192,11 @@ 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)); Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms)); - Connect (ID_jobs_copy_from_dvd, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_copy_from_dvd)); Connect (ID_jobs_examine_content, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_examine_content)); 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)); @@ -219,7 +225,7 @@ public: film_editor->setup_visibility (); 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 { @@ -254,11 +260,11 @@ public: if (r == wxID_OK) { maybe_save_then_delete_film (); - film = new Film (d->get_path (), false); + film.reset (new Film (d->get_path (), false)); #if BOOST_FILESYSTEM_VERSION == 3 - film->set_name (filesystem::path (d->get_path()).filename().generic_string()); + film->set_name (boost::filesystem::path (d->get_path()).filename().generic_string()); #else - film->set_name (filesystem::path (d->get_path()).filename()); + film->set_name (boost::filesystem::path (d->get_path()).filename()); #endif set_film (); } @@ -268,21 +274,29 @@ public: void file_open (wxCommandEvent &) { - wxDirDialog* c = new wxDirDialog (this, wxT ("Open Film"), wxStandardPaths::Get().GetDocumentsDir(), 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.reset (new Film (wx_to_std (c->GetPath ()))); set_film (); } + + c->Destroy (); } void file_save (wxCommandEvent &) { film->write_metadata (); } + + void file_properties (wxCommandEvent &) + { + PropertiesDialog* d = new PropertiesDialog (this, film); + d->ShowModal (); + d->Destroy (); + } void file_quit (wxCommandEvent &) { @@ -308,19 +322,6 @@ public: JobWrapper::make_dcp (this, film, false); } - void jobs_copy_from_dvd (wxCommandEvent &) - { -// try { -// DVDTitleDialog d; -// if (d.run () != Gtk::RESPONSE_OK) { -// return; -// } -// film->copy_from_dvd (); -// } catch (DVDError& e) { -// error_dialog (e.what ()); -// } - } - void jobs_send_dcp_to_tms (wxCommandEvent &) { film->send_dcp_to_tms (); @@ -335,13 +336,14 @@ public: { wxAboutDialogInfo info; info.SetName (_("DVD-o-matic")); - info.SetVersion (wxT (DVDOMATIC_VERSION)); + 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")); + 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); @@ -352,20 +354,33 @@ class App : public wxApp { bool OnInit () { +#ifdef DVDOMATIC_POSIX + unsetenv ("UBUNTU_MENUPROXY"); +#endif + wxInitAllImageHandlers (); dvdomatic_setup (); if (argc == 2 && boost::filesystem::is_directory (wx_to_std (argv[1]))) { - film = new Film (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)