Rename config_dialog.{cc,h} -> preferences_page.{cc,h}

Also trim some includes.

19 files changed, 67 insertions, 64 deletions

diff --git a/src/wx/email_preferences_page.cc b/src/wx/email_preferences_page.cc
index 6264b9336..79ba3965d 100644
--- a/src/wx/email_preferences_page.cc
+++ b/src/wx/email_preferences_page.cc
@@ -19,12 +19,15 @@
 */
 
 
+#include "dcpomatic_button.h"
 #include "email_preferences_page.h"
 #include "password_entry.h"
 #include "send_test_email_dialog.h"
+#include "wx_util.h"
 #include "wx_variant.h"
 #include "lib/email.h"
 #include "lib/variant.h"
+#include <wx/spinctrl.h>
 
 
 using namespace dcpomatic::preferences;
diff --git a/src/wx/email_preferences_page.h b/src/wx/email_preferences_page.h
index 8abbcef33..9b058ae77 100644
--- a/src/wx/email_preferences_page.h
+++ b/src/wx/email_preferences_page.h
@@ -19,7 +19,15 @@
 */
 
 
-#include "config_dialog.h"
+#include "preferences_page.h"
+
+
+class wxChoice;
+class wxSpinCtrl;
+class wxTextCtrl;
+
+class Button;
+class PasswordEntry;
 
 
 namespace dcpomatic {
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index e0b72d8f8..ae275038d 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -25,7 +25,6 @@
 
 
 #include "check_box.h"
-#include "config_dialog.h"
 #include "config_move_dialog.h"
 #include "dcpomatic_button.h"
 #include "dcpomatic_choice.h"
@@ -45,6 +44,7 @@
 #include "nag_dialog.h"
 #include "name_format_editor.h"
 #include "password_entry.h"
+#include "preferences_page.h"
 #include "region_subtag_widget.h"
 #include "send_test_email_dialog.h"
 #include "server_dialog.h"
diff --git a/src/wx/general_preferences_page.cc b/src/wx/general_preferences_page.cc
index c438865b7..abfd500a5 100644
--- a/src/wx/general_preferences_page.cc
+++ b/src/wx/general_preferences_page.cc
@@ -20,12 +20,16 @@
 
 
 #include "check_box.h"
-#include "config_dialog.h"
 #include "config_move_dialog.h"
+#include "dcpomatic_button.h"
 #include "file_picker_ctrl.h"
 #include "general_preferences_page.h"
+#include "preferences_page.h"
+#include "wx_util.h"
 #include "wx_variant.h"
 #include <dcp/filesystem.h>
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>
 
 
 using std::make_pair;
diff --git a/src/wx/general_preferences_page.h b/src/wx/general_preferences_page.h
index fda849862..34801a2ca 100644
--- a/src/wx/general_preferences_page.h
+++ b/src/wx/general_preferences_page.h
@@ -19,7 +19,14 @@
 */
 
 
-#include "config_dialog.h"
+#include "preferences_page.h"
+
+
+class wxChoice;
+class wxGridBagSizer;
+
+class CheckBox;
+class FilePickerCtrl;
 
 
 namespace dcpomatic {
diff --git a/src/wx/kdm_config_dialog.cc b/src/wx/kdm_config_dialog.cc
index 58abda4fa..7cb4b15d8 100644
--- a/src/wx/kdm_config_dialog.cc
+++ b/src/wx/kdm_config_dialog.cc
@@ -25,7 +25,6 @@
 
 
 #include "check_box.h"
-#include "config_dialog.h"
 #include "email_preferences_page.h"
 #include "general_preferences_page.h"
 #include "kdm_email_preferences_page.h"
@@ -33,6 +32,7 @@
 #include "file_picker_ctrl.h"
 #include "static_text.h"
 #include "wx_variant.h"
+#include <wx/filepicker.h>
 
 
 using boost::bind;
diff --git a/src/wx/kdm_email_preferences_page.cc b/src/wx/kdm_email_preferences_page.cc
index ae7eb0bd1..d6e3b0c17 100644
--- a/src/wx/kdm_email_preferences_page.cc
+++ b/src/wx/kdm_email_preferences_page.cc
@@ -21,6 +21,7 @@
 
 #include "email_dialog.h"
 #include "kdm_email_preferences_page.h"
+#include "wx_util.h"
 
 
 using std::string;
diff --git a/src/wx/kdm_email_preferences_page.h b/src/wx/kdm_email_preferences_page.h
index fd51285e6..4697b0c27 100644
--- a/src/wx/kdm_email_preferences_page.h
+++ b/src/wx/kdm_email_preferences_page.h
@@ -19,7 +19,8 @@
 */
 
 
-#include "config_dialog.h"
+#include "editable_list.h"
+#include "preferences_page.h"
 
 
 class EmailDialog;
diff --git a/src/wx/keys_preferences_page.cc b/src/wx/keys_preferences_page.cc
index 4a0c8bc76..91112ca53 100644
--- a/src/wx/keys_preferences_page.cc
+++ b/src/wx/keys_preferences_page.cc
@@ -21,9 +21,11 @@
 
 #include "certificate_chain_editor.h"
 #include "dcpomatic_button.h"
+#include "make_chain_dialog.h"
 #include "nag_dialog.h"
 #include "keys_preferences_page.h"
 #include "static_text.h"
+#include "wx_util.h"
 #include "wx_variant.h"
 #include "lib/exceptions.h"
 #include "lib/util.h"
diff --git a/src/wx/keys_preferences_page.h b/src/wx/keys_preferences_page.h
index 34233e745..210a4714b 100644
--- a/src/wx/keys_preferences_page.h
+++ b/src/wx/keys_preferences_page.h
@@ -19,7 +19,7 @@
 */
 
 
-#include "config_dialog.h"
+#include "preferences_page.h"
 
 
 namespace dcpomatic {
diff --git a/src/wx/locations_preferences_page.cc b/src/wx/locations_preferences_page.cc
index a992b2ed8..f77f88fb4 100644
--- a/src/wx/locations_preferences_page.cc
+++ b/src/wx/locations_preferences_page.cc
@@ -20,6 +20,11 @@
 
 
 #include "locations_preferences_page.h"
+#include "wx_util.h"
+#include <wx/filepicker.h>
+#include <wx/gbsizer.h>
+#include <wx/wx.h>
+
 
 
 using boost::bind;
diff --git a/src/wx/locations_preferences_page.h b/src/wx/locations_preferences_page.h
index de73b8074..8bb9e3e5a 100644
--- a/src/wx/locations_preferences_page.h
+++ b/src/wx/locations_preferences_page.h
@@ -19,7 +19,10 @@
 */
 
 
-#include "config_dialog.h"
+#include "preferences_page.h"
+
+
+class wxDirPickerCtrl;
 
 
 namespace dcpomatic {
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index f0cbf0e31..303774e71 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -25,7 +25,6 @@
 
 
 #include "check_box.h"
-#include "config_dialog.h"
 #include "dir_picker_ctrl.h"
 #include "editable_list.h"
 #include "email_dialog.h"
@@ -37,6 +36,7 @@
 #include "make_chain_dialog.h"
 #include "nag_dialog.h"
 #include "name_format_editor.h"
+#include "preferences_page.h"
 #include "server_dialog.h"
 #include "sound_preferences_page.h"
 #include "static_text.h"
diff --git a/src/wx/playlist_editor_config_dialog.cc b/src/wx/playlist_editor_config_dialog.cc
index 73b44ebe0..dd4eefa2f 100644
--- a/src/wx/playlist_editor_config_dialog.cc
+++ b/src/wx/playlist_editor_config_dialog.cc
@@ -24,7 +24,6 @@
  */
 
 
-#include "config_dialog.h"
 #include "locations_preferences_page.h"
 #include "playlist_editor_config_dialog.h"
 #include "wx_variant.h"
diff --git a/src/wx/config_dialog.cc b/src/wx/preferences_page.cc
index 0d95b4118..2ddd48813 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/preferences_page.cc
@@ -19,34 +19,12 @@
 */
 
 
-#include "audio_backend.h"
-#include "audio_mapping_view.h"
-#include "certificate_chain_editor.h"
-#include "check_box.h"
-#include "config_dialog.h"
-#include "config_move_dialog.h"
-#include "dcpomatic_button.h"
-#include "file_picker_ctrl.h"
-#include "nag_dialog.h"
-#include "static_text.h"
-#include "wx_variant.h"
-#include "lib/constants.h"
-#include "lib/util.h"
-#include <dcp/file.h>
-#include <dcp/filesystem.h>
-#include <fmt/format.h>
-
-
-using std::function;
-using std::make_pair;
-using std::make_shared;
-using std::map;
-using std::pair;
-using std::shared_ptr;
-using std::string;
-using std::vector;
+#include "preferences_page.h"
+#include "lib/config.h"
+#include <wx/wx.h>
+
+
 using boost::bind;
-using boost::optional;
 #if BOOST_VERSION >= 106100
 using namespace boost::placeholders;
 #endif
diff --git a/src/wx/config_dialog.h b/src/wx/preferences_page.h
index f87e60f45..44605ba86 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/preferences_page.h
@@ -19,36 +19,20 @@
 */
 
 
-#ifndef DCPOMATIC_CONFIG_DIALOG_H
-#define DCPOMATIC_CONFIG_DIALOG_H
-
-
-#include "editable_list.h"
-#include "make_chain_dialog.h"
-#include "wx_util.h"
-#include "lib/config.h"
-#include "lib/cross.h"
-#include "lib/dcp_content_type.h"
-#include "lib/exceptions.h"
-#include "lib/filter.h"
-#include "lib/log.h"
-#include "lib/ratio.h"
-#include <dcp/certificate_chain.h>
-#include <dcp/exceptions.h>
-#include <dcp/locale_convert.h>
+#ifndef DCPOMATIC_PREFERENCES_PAGE_H
+#define DCPOMATIC_PREFERENCES_PAGE_H
+
+
 #include <dcp/warnings.h>
 LIBDCP_DISABLE_WARNINGS
-#include <wx/filepicker.h>
 #include <wx/preferences.h>
-#include <wx/spinctrl.h>
-#include <wx/stdpaths.h>
-#include <RtAudio.h>
 LIBDCP_ENABLE_WARNINGS
-#include <boost/filesystem.hpp>
+#include <boost/signals2.hpp>
+
+#undef CreateWindow
 
 
-class AudioMappingView;
-class CheckBox;
+class wxPanel;
 
 
 namespace dcpomatic {
diff --git a/src/wx/sound_preferences_page.cc b/src/wx/sound_preferences_page.cc
index 6018c795f..cf21474be 100644
--- a/src/wx/sound_preferences_page.cc
+++ b/src/wx/sound_preferences_page.cc
@@ -22,7 +22,7 @@
 #include "audio_backend.h"
 #include "audio_mapping_view.h"
 #include "check_box.h"
-#include "config_dialog.h"
+#include "dcpomatic_button.h"
 #include "sound_preferences_page.h"
 #include "wx_util.h"
 #include "lib/constants.h"
diff --git a/src/wx/sound_preferences_page.h b/src/wx/sound_preferences_page.h
index 47bba4c53..f48083de9 100644
--- a/src/wx/sound_preferences_page.h
+++ b/src/wx/sound_preferences_page.h
@@ -19,7 +19,15 @@
 */
 
 
-#include "config_dialog.h"
+#include "preferences_page.h"
+
+
+class wxChoice;
+class wxStaticText;
+
+class AudioMappingView;
+class Button;
+class CheckBox;
 
 
 namespace dcpomatic {
diff --git a/src/wx/wscript b/src/wx/wscript
index c18b83086..6bb10511b 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -41,7 +41,6 @@ sources = """
           cinema_dialog.cc
           closed_captions_dialog.cc
           colour_conversion_editor.cc
-          config_dialog.cc
           config_move_dialog.cc
           confirm_kdm_email_dialog.cc
           content_advanced_dialog.cc
@@ -140,6 +139,7 @@ sources = """
           playhead_to_frame_dialog.cc
           playlist_controls.cc
           playlist_editor_config_dialog.cc
+          preferences_page.cc
           question_dialog.cc
           rating_dialog.cc
           qube_certificate_panel.cc