X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_disk.cc;h=1a3c3d5fe78d4f71f0099aa6b9a1d151850e2ace;hb=bed96d486f85a9fa5171e2cdaa3858581d631b3a;hp=92429aa53238c43a75a57bae33328750c895696a;hpb=1a7c50245309bb0b99001940b2203a267de942ca;p=dcpomatic.git

diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 92429aa53..1a3c3d5fe 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -58,6 +58,13 @@ using namespace boost::placeholders;
 #endif
 
 
+#ifdef DCPOMATIC_OSX
+enum {
+	ID_tools_uninstall = 1,
+};
+#endif
+
+
 class DOMFrame : public wxFrame
 {
 public:
@@ -66,6 +73,15 @@ public:
 		, _nanomsg (true)
 		, _sizer (new wxBoxSizer(wxVERTICAL))
 	{
+#ifdef DCPOMATIC_OSX
+		wxMenuBar* bar = new wxMenuBar;
+		wxMenu* tools = new wxMenu;
+		tools->Append(ID_tools_uninstall, _("Uninstall..."));
+		bar->Append(tools, _("Tools"));
+		SetMenuBar (bar);
+		Bind (wxEVT_MENU, boost::bind(&DOMFrame::uninstall, this), ID_tools_uninstall);
+#endif
+
 		/* Use a panel as the only child of the Frame so that we avoid
 		   the dark-grey background on Windows.
 		*/
@@ -163,6 +179,14 @@ private:
 	}
 
 
+#ifdef DCPOMATIC_OSX
+	void uninstall()
+	{
+		system(String::compose("osascript \"%1/uninstall_disk.applescript\"", resources_path().string()).c_str());
+	}
+#endif
+
+
 	bool should_close ()
 	{
 		if (!JobManager::instance()->work_to_do()) {
@@ -349,6 +373,7 @@ public:
 #endif
 
 #ifdef DCPOMATIC_OSX
+			dcpomatic_sleep_seconds (1);
 			make_foreground_application ();
 #endif