Attempt to rationalise menu IDs and avoid duplicates.

7 files changed, 16 insertions, 10 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 8faaf5bcd..6635cdb82 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -37,6 +37,7 @@
 #include "wx/hints_dialog.h"
 #include "wx/html_dialog.h"
 #include "wx/i18n_hook.h"
+#include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/kdm_dialog.h"
 #include "wx/nag_dialog.h"
@@ -211,7 +212,7 @@ private:
 map<wxMenuItem*, int> menu_items;
 
 enum {
-	ID_file_new = 1,
+	ID_file_new = DCPOMATIC_MAIN_MENU,
 	ID_file_open,
 	ID_file_save,
 	ID_file_save_as_template,
@@ -219,7 +220,7 @@ enum {
 	ID_file_duplicate_and_open,
 	ID_file_history,
 	/* Allow spare IDs after _history for the recent files list */
-	ID_file_close = 100,
+	ID_file_close = DCPOMATIC_MAIN_MENU + 100,
 	ID_edit_copy,
 	ID_edit_paste,
 	ID_edit_select_all,
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index 3114768ac..6a0e46cf8 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/full_config_dialog.h"
+#include "wx/id.h"
 #include "wx/job_manager_view.h"
 #include "wx/servers_list_dialog.h"
 #include "wx/wx_ptr.h"
@@ -71,7 +72,7 @@ static list<boost::filesystem::path> films_to_load;
 
 
 enum {
-	ID_file_add_film = 1,
+	ID_file_add_film = DCPOMATIC_MAIN_MENU,
 	ID_tools_encoding_servers,
 	ID_help_about
 };
diff --git a/src/tools/dcpomatic_disk.cc b/src/tools/dcpomatic_disk.cc
index 5941d6d70..c1b262351 100644
--- a/src/tools/dcpomatic_disk.cc
+++ b/src/tools/dcpomatic_disk.cc
@@ -69,7 +69,7 @@ using namespace boost::placeholders;
 
 #ifdef DCPOMATIC_OSX
 enum {
-	ID_tools_uninstall = 1,
+	ID_tools_uninstall = DCPOMATIC_MAIN_MENU,
 };
 #endif
 
diff --git a/src/tools/dcpomatic_editor.cc b/src/tools/dcpomatic_editor.cc
index eb968b1e8..14ff6da7f 100644
--- a/src/tools/dcpomatic_editor.cc
+++ b/src/tools/dcpomatic_editor.cc
@@ -21,6 +21,7 @@
 
 #include "wx/about_dialog.h"
 #include "wx/editable_list.h"
+#include "wx/id.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
 #include "lib/constants.h"
@@ -59,7 +60,7 @@ using namespace boost::placeholders;
 
 
 enum {
-	ID_file_open = 1,
+	ID_file_open = DCPOMATIC_MAIN_MENU,
 	ID_file_save,
 };
 
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 372a711a0..8e5e75da0 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -22,6 +22,7 @@
 #include "wx/about_dialog.h"
 #include "wx/dcpomatic_button.h"
 #include "wx/editable_list.h"
+#include "wx/id.h"
 #include "wx/invalid_certificate_period_dialog.h"
 #include "wx/file_dialog.h"
 #include "wx/file_picker_ctrl.h"
@@ -96,7 +97,7 @@ using namespace dcpomatic;
 
 
 enum {
-	ID_help_report_a_problem = 1,
+	ID_help_report_a_problem = DCPOMATIC_MAIN_MENU,
 };
 
 
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 301e893ff..feac2a915 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -21,6 +21,7 @@
 #include "wx/about_dialog.h"
 #include "wx/file_dialog.h"
 #include "wx/film_viewer.h"
+#include "wx/id.h"
 #include "wx/nag_dialog.h"
 #include "wx/player_config_dialog.h"
 #include "wx/player_information.h"
@@ -119,16 +120,16 @@ using namespace dcpomatic;
 
 
 enum {
-	ID_file_open = 1,
+	ID_file_open = DCPOMATIC_MAIN_MENU,
 	ID_file_add_ov,
 	ID_file_add_kdm,
 	ID_file_save_frame,
 	ID_file_history,
 	/* Allow spare IDs after _history for the recent files list */
-	ID_file_close = 100,
+	ID_file_close = DCPOMATIC_MAIN_MENU + 100,
 	ID_view_cpl,
 	/* Allow spare IDs for CPLs */
-	ID_view_full_screen = 200,
+	ID_view_full_screen = DCPOMATIC_MAIN_MENU + 200,
 	ID_view_dual_screen,
 	ID_view_closed_captions,
 	ID_view_scale_appropriate,
diff --git a/src/tools/dcpomatic_server.cc b/src/tools/dcpomatic_server.cc
index d93dec853..9bdc688c8 100644
--- a/src/tools/dcpomatic_server.cc
+++ b/src/tools/dcpomatic_server.cc
@@ -18,6 +18,7 @@
 
 */
 
+#include "wx/id.h"
 #include "wx/static_text.h"
 #include "wx/wx_signal_manager.h"
 #include "wx/wx_util.h"
@@ -57,7 +58,7 @@ using namespace boost::placeholders;
 
 
 enum {
-	ID_status = 1,
+	ID_status = DCPOMATIC_MAIN_MENU,
 	ID_quit,
 	ID_timer
 };