More OS X tweaks.

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 6e1382fef9fdaf9aa3ebdb312cb57180fcb81887..068fe41105f4c6482eca930db32dac8c257da7ad 100644 (file)
--- 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 8d787dd50192a58dde06efcef321210290a08ee9..a5c498e0b19a25c5e0ded07e7061d350b59fe6d6 100644 (file)
--- 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 4b0685d4136db3cf2617fbb12c8b2669b8077941..df0df54896a87e3cfc6c92b674fe3a496217dc04 100644 (file)
--- 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