X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=edd04fd517a78cf105053f5192c1cf45c924e0ac;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=5f6a980751c0806f8596bb0e8715884f0b2b3b3c;hpb=7979aeb87a83de31c4cf25f88eef4fbca4b56553;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 5f6a98075..edd04fd51 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -73,8 +73,6 @@ using std::exception;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
-// #define DCPOMATIC_WINDOWS_CONSOLE 1
-
 class FilmChangedDialog
 {
 public:
@@ -128,7 +126,9 @@ enum {
 	ID_jobs_show_dcp,
 	ID_tools_hints,
 	ID_tools_encoding_servers,
-	ID_tools_check_for_updates
+	ID_tools_check_for_updates,
+	/* IDs for shortcuts (with no associated menu item) */
+	ID_add_file
 };
 
 class Frame : public wxFrame
@@ -144,20 +144,24 @@ public:
 		, _history_position (0)
 		, _history_separator (0)
 	{
-#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE)
-                AllocConsole();
-		
-		HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
-		int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
-		FILE* hf_out = _fdopen(hCrt, "w");
-		setvbuf(hf_out, NULL, _IONBF, 1);
-		*stdout = *hf_out;
-		
-		HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
-		hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
-		FILE* hf_in = _fdopen(hCrt, "r");
-		setvbuf(hf_in, NULL, _IONBF, 128);
-		*stdin = *hf_in;
+#if defined(DCPOMATIC_WINDOWS)
+		if (Config::instance()->win32_console ()) {
+			AllocConsole();
+			
+			HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
+			int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
+			FILE* hf_out = _fdopen(hCrt, "w");
+			setvbuf(hf_out, NULL, _IONBF, 1);
+			*stdout = *hf_out;
+			
+			HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
+			hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
+			FILE* hf_in = _fdopen(hCrt, "r");
+			setvbuf(hf_in, NULL, _IONBF, 128);
+			*stdin = *hf_in;
+
+			cout << "DCP-o-matic is starting." << "\n";
+		}
 #endif
 
 		wxMenuBar* bar = new wxMenuBar;
@@ -194,7 +198,7 @@ public:
 
 		_film_editor = new FilmEditor (overall_panel);
 		_film_viewer = new FilmViewer (overall_panel);
-		JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast<JobManagerView::Buttons> (0));
+		JobManagerView* job_manager_view = new JobManagerView (overall_panel);
 
 		wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
 		right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
@@ -212,6 +216,12 @@ public:
 		JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this));
 
 		overall_panel->SetSizer (main_sizer);
+
+		wxAcceleratorEntry accel[1];
+		accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
+		Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file);
+		wxAcceleratorTable accel_table (1, accel);
+		SetAcceleratorTable (accel_table);
 	}
 
 	void new_film (boost::filesystem::path path)
@@ -408,7 +418,7 @@ private:
 		} catch (exception& e) {
 			error_dialog (this, e.what ());
 		} catch (...) {
-			error_dialog (this, _("An unknown exeception occurred."));
+			error_dialog (this, _("An unknown exception occurred."));
 		}
 	
 		d->Destroy ();
@@ -590,10 +600,10 @@ private:
 	void setup_menu (wxMenuBar* m)
 	{
 		_file_menu = new wxMenu;
-		add_item (_file_menu, _("New..."), ID_file_new, ALWAYS);
-		add_item (_file_menu, _("&Open..."), ID_file_open, ALWAYS);
+		add_item (_file_menu, _("New...\tCtrl-N"), ID_file_new, ALWAYS);
+		add_item (_file_menu, _("&Open...\tCtrl-O"), ID_file_open, ALWAYS);
 		_file_menu->AppendSeparator ();
-		add_item (_file_menu, _("&Save"), ID_file_save, NEEDS_FILM);
+		add_item (_file_menu, _("&Save\tCtrl-S"), ID_file_save, NEEDS_FILM);
 		_file_menu->AppendSeparator ();
 		add_item (_file_menu, _("&Properties..."), ID_file_properties, NEEDS_FILM);
 
@@ -610,10 +620,10 @@ private:
 #endif	
 	
 #ifdef __WXOSX__	
-		add_item (_file_menu, _("&Preferences..."), wxID_PREFERENCES, ALWAYS);
+		add_item (_file_menu, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #else
 		wxMenu* edit = new wxMenu;
-		add_item (edit, _("&Preferences..."), wxID_PREFERENCES, ALWAYS);
+		add_item (edit, _("&Preferences...\tCtrl-P"), wxID_PREFERENCES, ALWAYS);
 #endif
 
 		wxMenu* content = new wxMenu;
@@ -621,13 +631,13 @@ private:
 		add_item (content, _("Scale to fit &height"), ID_content_scale_to_fit_height, NEEDS_FILM | NEEDS_SELECTED_VIDEO_CONTENT);
 		
 		wxMenu* jobs_menu = new wxMenu;
-		add_item (jobs_menu, _("&Make DCP"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
-		add_item (jobs_menu, _("Make &KDMs..."), ID_jobs_make_kdms, NEEDS_FILM);
+		add_item (jobs_menu, _("&Make DCP\tCtrl-M"), ID_jobs_make_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION);
+		add_item (jobs_menu, _("Make &KDMs...\tCtrl-K"), ID_jobs_make_kdms, NEEDS_FILM);
 		add_item (jobs_menu, _("&Send DCP to TMS"), ID_jobs_send_dcp_to_tms, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 		add_item (jobs_menu, _("S&how DCP"), ID_jobs_show_dcp, NEEDS_FILM | NOT_DURING_DCP_CREATION | NEEDS_CPL);
 
 		wxMenu* tools = new wxMenu;
-		add_item (tools, _("Hints..."), ID_tools_hints, 0);
+		add_item (tools, _("Hints...\tCtrl-H"), ID_tools_hints, 0);
 		add_item (tools, _("Encoding servers..."), ID_tools_encoding_servers, 0);
 		add_item (tools, _("Check for updates"), ID_tools_check_for_updates, 0);