Add new macOS preferences icons.

4 files changed, 78 insertions, 66 deletions

diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 0ad7bfffa..44fd8ecde 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -53,6 +53,14 @@ Page::Page (wxSize panel_size, int border)
 	_config_connection = Config::instance()->Changed.connect (bind (&Page::config_changed_wrapper, this));
 }
 
+
+wxWindow*
+Page::CreateWindow (wxWindow* parent)
+{
+	return create_window (parent);
+}
+
+
 wxWindow*
 Page::create_window (wxWindow* parent)
 {
@@ -84,37 +92,20 @@ Page::window_destroyed ()
 }
 
 
-StockPage::StockPage (Kind kind, wxSize panel_size, int border)
-	: wxStockPreferencesPage (kind)
-	, Page (panel_size, border)
-{
-
-}
-
-wxWindow*
-StockPage::CreateWindow (wxWindow* parent)
-{
-	return create_window (parent);
-}
-
-StandardPage::StandardPage (wxSize panel_size, int border)
+GeneralPage::GeneralPage (wxSize panel_size, int border)
 	: Page (panel_size, border)
 {
 
 }
 
-wxWindow*
-StandardPage::CreateWindow (wxWindow* parent)
-{
-	return create_window (parent);
-}
 
-GeneralPage::GeneralPage (wxSize panel_size, int border)
-	: StockPage (Kind_General, panel_size, border)
+wxString
+GeneralPage::GetName () const
 {
-
+	return _("General");
 }
 
+
 void
 GeneralPage::add_language_controls (wxGridBagSizer* table, int& r)
 {
@@ -1027,7 +1018,7 @@ SoundPage::get_sound_output ()
 
 
 LocationsPage::LocationsPage (wxSize panel_size, int border)
-	: StandardPage (panel_size, border)
+	: Page (panel_size, border)
 {
 
 }
diff --git a/src/wx/config_dialog.h b/src/wx/config_dialog.h
index 5203af609..f47408a4f 100644
--- a/src/wx/config_dialog.h
+++ b/src/wx/config_dialog.h
@@ -46,12 +46,14 @@
 
 class AudioMappingView;
 
-class Page
+class Page : public wxPreferencesPage
 {
 public:
 	Page (wxSize panel_size, int border);
 	virtual ~Page () {}
 
+	wxWindow* CreateWindow (wxWindow* parent);
+
 protected:
 	wxWindow* create_window (wxWindow* parent);
 
@@ -70,24 +72,19 @@ private:
 	bool _window_exists;
 };
 
-class StockPage : public wxStockPreferencesPage, public Page
+class GeneralPage : public Page
 {
 public:
-	StockPage (Kind kind, wxSize panel_size, int border);
-	wxWindow* CreateWindow (wxWindow* parent);
-};
+	GeneralPage (wxSize panel_size, int border);
 
-class StandardPage : public wxPreferencesPage, public Page
-{
-public:
-	StandardPage (wxSize panel_size, int border);
-	wxWindow* CreateWindow (wxWindow* parent);
-};
+	wxString GetName () const;
 
-class GeneralPage : public StockPage
-{
-public:
-	GeneralPage (wxSize panel_size, int border);
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("general", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
 
 protected:
 	void add_language_controls (wxGridBagSizer* table, int& r);
@@ -150,11 +147,11 @@ private:
 	boost::function<bool (void)> _nag_alter;
 };
 
-class KeysPage : public StandardPage
+class KeysPage : public Page
 {
 public:
 	KeysPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const;
@@ -180,11 +177,11 @@ private:
 };
 
 
-class SoundPage : public StandardPage
+class SoundPage : public Page
 {
 public:
 	SoundPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName() const;
@@ -214,7 +211,7 @@ private:
 	Button* _reset_to_default;
 };
 
-class LocationsPage : public StandardPage
+class LocationsPage : public Page
 {
 public:
 	LocationsPage (wxSize panel_size, int border);
diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index 922758469..af1592d26 100644
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -258,11 +258,11 @@ private:
 	wxCheckBox* _automatic_audio_analysis;
 };
 
-class DefaultsPage : public StandardPage
+class DefaultsPage : public Page
 {
 public:
 	DefaultsPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -487,11 +487,11 @@ private:
 	wxChoice* _standard;
 };
 
-class EncodingServersPage : public StandardPage
+class EncodingServersPage : public Page
 {
 public:
 	EncodingServersPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -547,11 +547,11 @@ private:
 	EditableList<string, ServerDialog>* _servers_list;
 };
 
-class TMSPage : public StandardPage
+class TMSPage : public Page
 {
 public:
 	TMSPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -663,11 +663,11 @@ column (string s)
 	return s;
 }
 
-class EmailPage : public StandardPage
+class EmailPage : public Page
 {
 public:
 	EmailPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -793,16 +793,16 @@ private:
 	PasswordEntry* _password;
 };
 
-class KDMEmailPage : public StandardPage
+class KDMEmailPage : public Page
 {
 public:
 
 	KDMEmailPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -914,15 +914,15 @@ private:
 	wxButton* _reset_email;
 };
 
-class NotificationsPage : public StandardPage
+class NotificationsPage : public Page
 {
 public:
 	NotificationsPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -1084,16 +1084,16 @@ private:
 	wxButton* _reset_email;
 };
 
-class CoverSheetPage : public StandardPage
+class CoverSheetPage : public Page
 {
 public:
 
 	CoverSheetPage (wxSize panel_size, int border)
 #ifdef DCPOMATIC_OSX
 		/* We have to force both width and height of this one */
-		: StandardPage (wxSize (panel_size.GetWidth(), 128), border)
+		: Page (wxSize (panel_size.GetWidth(), 128), border)
 #else
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 #endif
 	{}
 
@@ -1149,11 +1149,11 @@ private:
 };
 
 
-class IdentifiersPage : public StandardPage
+class IdentifiersPage : public Page
 {
 public:
 	IdentifiersPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
+		: Page (panel_size, border)
 	{}
 
 	wxString GetName () const
@@ -1267,11 +1267,11 @@ private:
 /** @class AdvancedPage
  *  @brief Advanced page of the preferences dialog.
  */
-class AdvancedPage : public StockPage
+class AdvancedPage : public Page
 {
 public:
 	AdvancedPage (wxSize panel_size, int border)
-		: StockPage (Kind_Advanced, panel_size, border)
+		: Page (panel_size, border)
 		, _maximum_j2k_bandwidth (0)
 		, _allow_any_dcp_frame_rate (0)
 		, _allow_any_container (0)
@@ -1289,6 +1289,18 @@ public:
 		, _log_debug_audio_analysis (0)
 	{}
 
+	wxString GetName () const
+	{
+		return _("Advanced");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
 private:
 	void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
 	{
diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index c270abd85..00a74c659 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -270,17 +270,29 @@ private:
 /** @class PlayerAdvancedPage
  *  @brief Advanced page of the preferences dialog for the player.
  */
-class PlayerAdvancedPage : public StockPage
+class PlayerAdvancedPage : public Page
 {
 public:
 	PlayerAdvancedPage (wxSize panel_size, int border)
-		: StockPage (Kind_Advanced, panel_size, border)
+		: Page (panel_size, border)
 		, _log_general (0)
 		, _log_warning (0)
 		, _log_error (0)
 		, _log_timing (0)
 	{}
 
+	wxString GetName () const
+	{
+		return _("Advanced");
+	}
+
+#ifdef DCPOMATIC_OSX
+	wxBitmap GetLargeIcon () const
+	{
+		return wxBitmap ("advanced", wxBITMAP_TYPE_PNG_RESOURCE);
+	}
+#endif
+
 private:
 	void add_top_aligned_label_to_sizer (wxSizer* table, wxWindow* parent, wxString text)
 	{