From eb78e6e2c04ceee1d7cff25cd0b5f3486b38a7a5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 8 Oct 2015 21:19:45 +0100
Subject: [PATCH] More OS X tweaks.

---
 platform/osx/make_dmg.sh     | 10 ++++++----
 src/tools/dcpomatic_batch.cc |  2 ++
 src/tools/dcpomatic_kdm.cc   |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6e1382fef..068fe4110 100644
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -262,8 +262,10 @@ echo '
            set arrangement of theViewOptions to not arranged
            set icon size of theViewOptions to 64
            set position of item "DCP-o-matic 2.app" of container window to {90, 80}
-           set position of item "DCP-o-matic 2 KDM Creator.app" of container window to {310, 80}
-           set position of item "Applications" of container window to {530, 80}
+           set position of item "DCP-o-matic 2 KDM Creator.app" of container window to {270, 80}
+           set position of item "DCP-o-matic 2 Server.app" of container window to {90, 200}
+           set position of item "DCP-o-matic 2 Batch Converter.app" of container window to {270, 200}
+           set position of item "Applications" of container window to {450, 80}
            close
            open
            update without registering applications
@@ -277,7 +279,7 @@ sync
 
 hdiutil eject $device
 hdiutil convert -format UDZO $tmp_dmg -imagekey zlib-level=9 -o "$dmg"
-sips -i "$WORK/$resources/DCP-o-matic.icns"
-DeRez -only icns "$WORK/$resources/DCP-o-matic.icns" > "$WORK/$resources/DCP-o-matic.rsrc"
+sips -i "$WORK/$resources/dcpomatic2.icns"
+DeRez -only icns "$WORK/$resources/dcpomatic2.icns" > "$WORK/$resources/DCP-o-matic.rsrc"
 Rez -append "$WORK/$resources/DCP-o-matic.rsrc" -o "$dmg"
 SetFile -a C "$dmg"
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 8d787dd50..a5c498e0b 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -194,6 +194,8 @@ class App : public wxApp
 {
 	bool OnInit ()
 	{
+		SetAppName (_("DCP-o-matic Batch Converter"));
+
 		if (!wxApp::OnInit()) {
 			return false;
 		}
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 4b0685d41..df0df5489 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -58,7 +58,7 @@ using boost::shared_ptr;
 using boost::bind;
 
 enum {
-	ID_help_report_a_problem,
+	ID_help_report_a_problem = 1,
 };
 
 class DOMFrame : public wxFrame
-- 
2.30.2