X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdvdomatic.cc;h=be61bf433abe435cf4344e18c8b6d4ba1f7fb995;hb=bc5df5cc9c2b11524938281f1b2043b185373020;hp=3281fc113ceaa1bc640d5ba99a3115f617512d89;hpb=1d938d62dae5a21a87b0f416302d51f154f89663;p=dcpomatic.git

diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 3281fc113..be61bf433 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -51,6 +51,7 @@ using std::wstring;
 using std::stringstream;
 using std::map;
 using std::make_pair;
+using std::exception;
 using boost::shared_ptr;
 
 static FilmEditor* film_editor = 0;
@@ -59,6 +60,7 @@ static shared_ptr<Film> film;
 static std::string log_level;
 static std::string film_to_load;
 static wxMenu* jobs_menu = 0;
+static wxLocale* locale = 0;
 
 static void set_menu_sensitivity ();
 
@@ -67,9 +69,12 @@ class FilmChangedDialog
 public:
 	FilmChangedDialog ()
 	{
-		stringstream s;
-		s << "Save changes to film \"" << film->name() << "\" before closing?";
-		_dialog = new wxMessageDialog (0, std_to_wx (s.str()), _("Film changed"), wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION);
+		_dialog = new wxMessageDialog (
+			0,
+			std_to_wx (String::compose ("Save changes to film \"%1\" before closing?", film->name())),
+			_("Film changed"),
+			wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
+			);
 	}
 
 	~FilmChangedDialog ()
@@ -116,9 +121,9 @@ enum Sensitivity {
 map<wxMenuItem*, Sensitivity> menu_items;
 	
 void
-add_item (wxMenu* menu, std::string text, int id, Sensitivity sens)
+add_item (wxMenu* menu, wxString text, int id, Sensitivity sens)
 {
-	wxMenuItem* item = menu->Append (id, std_to_wx (text));
+	wxMenuItem* item = menu->Append (id, text);
 	menu_items.insert (make_pair (item, sens));
 }
 
@@ -145,7 +150,6 @@ enum {
 	ID_jobs_send_dcp_to_tms,
 	ID_jobs_show_dcp,
 	ID_jobs_examine_content,
-	ID_jobs_make_dcp_from_existing_transcode,
 	ID_help_about
 };
 
@@ -153,33 +157,32 @@ void
 setup_menu (wxMenuBar* m)
 {
 	wxMenu* file = new wxMenu;
-	add_item (file, "New...", ID_file_new, ALWAYS);
-	add_item (file, "&Open...", ID_file_open, ALWAYS);
+	add_item (file, _("New..."), ID_file_new, ALWAYS);
+	add_item (file, _("&Open..."), ID_file_open, ALWAYS);
 	file->AppendSeparator ();
-	add_item (file, "&Save", ID_file_save, NEEDS_FILM);
+	add_item (file, _("&Save"), ID_file_save, NEEDS_FILM);
 	file->AppendSeparator ();
-	add_item (file, "&Properties...", ID_file_properties, NEEDS_FILM);
+	add_item (file, _("&Properties..."), ID_file_properties, NEEDS_FILM);
 	file->AppendSeparator ();
-	add_item (file, "&Quit", ID_file_quit, ALWAYS);
+	add_item (file, _("&Quit"), ID_file_quit, ALWAYS);
 
 	wxMenu* edit = new wxMenu;
-	add_item (edit, "&Preferences...", ID_edit_preferences, ALWAYS);
+	add_item (edit, _("&Preferences..."), ID_edit_preferences, ALWAYS);
 
 	jobs_menu = new wxMenu;
-	add_item (jobs_menu, "&Make DCP", ID_jobs_make_dcp, NEEDS_FILM);
-	add_item (jobs_menu, "&Send DCP to TMS", ID_jobs_send_dcp_to_tms, NEEDS_FILM);
-	add_item (jobs_menu, "S&how DCP", ID_jobs_show_dcp, NEEDS_FILM);
+	add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM);
+	add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM);
+	add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM);
 	jobs_menu->AppendSeparator ();
-	add_item (jobs_menu, "&Examine content", ID_jobs_examine_content, NEEDS_FILM);
-	add_item (jobs_menu, "Make DCP from existing &transcode", ID_jobs_make_dcp_from_existing_transcode, NEEDS_FILM);
+	add_item (jobs_menu, _("&Examine content"), ID_jobs_examine_content, NEEDS_FILM);
 
 	wxMenu* help = new wxMenu;
-	add_item (help, "About", ID_help_about, ALWAYS);
+	add_item (help, _("About"), ID_help_about, ALWAYS);
 
-	m->Append (file, _("&File"));
-	m->Append (edit, _("&Edit"));
-	m->Append (jobs_menu, _("&Jobs"));
-	m->Append (help, _("&Help"));
+	m->Append (file, _(_("&File")));
+	m->Append (edit, _(_("&Edit")));
+	m->Append (jobs_menu, _(_("&Jobs")));
+	m->Append (help, _(_("&Help")));
 }
 
 bool
@@ -209,7 +212,6 @@ public:
 		Connect (ID_jobs_send_dcp_to_tms, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_send_dcp_to_tms));
 		Connect (ID_jobs_show_dcp, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::jobs_show_dcp));
 		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));
 
 		Connect (wxID_ANY, wxEVT_MENU_OPEN, wxMenuEventHandler (Frame::menu_opened));
@@ -223,13 +225,13 @@ public:
 		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);
-		rhs_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL);
+		_top_sizer = new wxBoxSizer (wxHORIZONTAL);
+		_top_sizer->Add (film_editor, 0, wxALL, 6);
+		_top_sizer->Add (film_viewer, 1, wxEXPAND | wxALL, 6);
 
-		wxBoxSizer* main_sizer = new wxBoxSizer (wxHORIZONTAL);
-		main_sizer->Add (film_editor, 0, wxALL, 6);
-		main_sizer->Add (rhs_sizer, 1, wxEXPAND | wxALL, 6);
+		wxBoxSizer* main_sizer = new wxBoxSizer (wxVERTICAL);
+		main_sizer->Add (_top_sizer, 2, wxEXPAND | wxALL, 6);
+		main_sizer->Add (job_manager_view, 1, wxEXPAND | wxALL, 6);
 		panel->SetSizer (main_sizer);
 
 		set_menu_sensitivity ();
@@ -243,12 +245,24 @@ public:
 		} else {
 			file_changed ("");
 		}
-		
+
 		set_film ();
+
+		film_editor->Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Frame::film_editor_sized), 0, this);
 	}
 
 private:
 
+	void film_editor_sized (wxSizeEvent &)
+	{
+		static bool in_layout = false;
+		if (!in_layout) {
+			in_layout = true;
+			_top_sizer->Layout ();
+			in_layout = false;
+		}
+	}
+
 	void menu_opened (wxMenuEvent& ev)
 	{
 		if (ev.GetMenu() != jobs_menu) {
@@ -270,7 +284,7 @@ private:
 	void file_changed (string f)
 	{
 		stringstream s;
-		s << "DVD-o-matic";
+		s << _("DVD-o-matic");
 		if (!f.empty ()) {
 			s << " - " << f;
 		}
@@ -286,7 +300,7 @@ private:
 		if (r == wxID_OK) {
 
 			if (boost::filesystem::exists (d->get_path())) {
-				error_dialog (this, wxString::Format (_("The directory %s already exists"), d->get_path().c_str()));
+				error_dialog (this, wxString::Format (_("The directory %s already exists."), d->get_path().c_str()));
 				return;
 			}
 			
@@ -349,12 +363,7 @@ private:
 
 	void jobs_make_dcp (wxCommandEvent &)
 	{
-		JobWrapper::make_dcp (this, film, true);
-	}
-	
-	void jobs_make_dcp_from_existing_transcode (wxCommandEvent &)
-	{
-		JobWrapper::make_dcp (this, film, false);
+		JobWrapper::make_dcp (this, film);
 	}
 	
 	void jobs_send_dcp_to_tms (wxCommandEvent &)
@@ -407,6 +416,8 @@ private:
 		info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
 		wxAboutBox (info);
 	}
+
+	wxSizer* _top_sizer;
 };
 
 #if wxMINOR_VERSION == 9
@@ -423,6 +434,32 @@ static const wxCmdLineEntryDesc command_line_description[] = {
 };
 #endif
 
+void
+setup_i18n ()
+{
+	int language = wxLANGUAGE_DEFAULT;
+ 
+	if (wxLocale::IsAvailable (language)) {
+		locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
+		
+#ifdef __WXGTK__
+		locale->AddCatalogLookupPathPrefix (wxT ("/usr"));
+		locale->AddCatalogLookupPathPrefix (wxT ("/usr/local"));
+		locale->AddCatalogLookupPathPrefix (wxT ("build/src/wx/mo"));
+		locale->AddCatalogLookupPathPrefix (wxT ("build/src/tools/mo"));
+		wxStandardPaths* paths = (wxStandardPaths*) &wxStandardPaths::Get();
+		wxString prefix = paths->GetInstallPrefix();
+		locale->AddCatalogLookupPathPrefix (prefix);
+#endif
+		
+		if (!locale->IsOk()) {
+			delete locale;
+			locale = new wxLocale (wxLANGUAGE_ENGLISH);
+			language = wxLANGUAGE_ENGLISH;
+		}
+	}
+}
+
 class App : public wxApp
 {
 	bool OnInit ()
@@ -436,12 +473,17 @@ class App : public wxApp
 #endif		
 		
 		wxInitAllImageHandlers ();
+		setup_i18n ();
 		
 		dvdomatic_setup ();
 
 		if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) {
-			film.reset (new Film (film_to_load));
-			film->log()->set_level (log_level);
+			try {
+				film.reset (new Film (film_to_load));
+				film->log()->set_level (log_level);
+			} catch (exception& e) {
+				error_dialog (0, std_to_wx (String::compose (wx_to_std (_("Could not load film %1 (%2)")), film_to_load, e.what())));
+			}
 		}
 
 		Frame* f = new Frame (_("DVD-o-matic"));