X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fplayer_config_dialog.cc;h=c270abd856c8962bf75f717e4f9e06df119b57dc;hb=60b1ea28addbb5779bdc7221fbfc473440cb7663;hp=508b91746f0a09302a2b20343b8892697495a6c6;hpb=30c9ecad729397574754163d13253c54a2285a6a;p=dcpomatic.git

diff --git a/src/wx/player_config_dialog.cc b/src/wx/player_config_dialog.cc
index 508b91746..c270abd85 100644
--- a/src/wx/player_config_dialog.cc
+++ b/src/wx/player_config_dialog.cc
@@ -266,122 +266,6 @@ private:
 #endif
 };
 
-class LocationsPage : public StandardPage
-{
-public:
-	LocationsPage (wxSize panel_size, int border)
-		: StandardPage (panel_size, border)
-	{}
-
-	wxString GetName () const
-	{
-		return _("Locations");
-	}
-
-#ifdef DCPOMATIC_OSX
-	wxBitmap GetLargeIcon () const
-	{
-		return wxBitmap ("locations", wxBITMAP_TYPE_PNG_RESOURCE);
-	}
-#endif
-
-private:
-	void setup ()
-	{
-
-		int r = 0;
-
-		wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-		_panel->GetSizer()->Add (table, 1, wxALL | wxEXPAND, _border);
-
-		add_label_to_sizer (table, _panel, _("Content directory"), true, wxGBPosition (r, 0));
-		_content_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
-		table->Add (_content_directory, wxGBPosition (r, 1));
-		++r;
-
-		add_label_to_sizer (table, _panel, _("Playlist directory"), true, wxGBPosition (r, 0));
-		_playlist_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
-		table->Add (_playlist_directory, wxGBPosition (r, 1));
-		++r;
-
-		add_label_to_sizer (table, _panel, _("KDM directory"), true, wxGBPosition (r, 0));
-		_kdm_directory = new wxDirPickerCtrl (_panel, wxID_ANY, wxEmptyString, wxDirSelectorPromptStr, wxDefaultPosition, wxSize (300, -1));
-		table->Add (_kdm_directory, wxGBPosition (r, 1));
-		++r;
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		add_label_to_sizer (table, _panel, _("Background image"), true, wxGBPosition (r, 0));
-		_background_image = new FilePickerCtrl (_panel, _("Select image file"), "*.png;*.jpg;*.jpeg;*.tif;*.tiff", true);
-		table->Add (_background_image, wxGBPosition (r, 1));
-		++r;
-#endif
-
-		_content_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::content_directory_changed, this));
-		_playlist_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::playlist_directory_changed, this));
-		_kdm_directory->Bind (wxEVT_DIRPICKER_CHANGED, bind(&LocationsPage::kdm_directory_changed, this));
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		_background_image->Bind (wxEVT_FILEPICKER_CHANGED, bind(&LocationsPage::background_image_changed, this));
-#endif
-	}
-
-	void config_changed ()
-	{
-		Config* config = Config::instance ();
-
-		if (config->player_content_directory()) {
-			checked_set (_content_directory, *config->player_content_directory());
-		}
-		if (config->player_playlist_directory()) {
-			checked_set (_playlist_directory, *config->player_playlist_directory());
-		}
-		if (config->player_kdm_directory()) {
-			checked_set (_kdm_directory, *config->player_kdm_directory());
-		}
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-		if (config->player_background_image()) {
-			checked_set (_background_image, *config->player_background_image());
-		}
-#endif
-	}
-
-	void content_directory_changed ()
-	{
-		Config::instance()->set_player_content_directory(wx_to_std(_content_directory->GetPath()));
-	}
-
-	void playlist_directory_changed ()
-	{
-		Config::instance()->set_player_playlist_directory(wx_to_std(_playlist_directory->GetPath()));
-	}
-
-	void kdm_directory_changed ()
-	{
-		Config::instance()->set_player_kdm_directory(wx_to_std(_kdm_directory->GetPath()));
-	}
-
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	void background_image_changed ()
-	{
-		boost::filesystem::path const f = wx_to_std(_background_image->GetPath());
-		if (!boost::filesystem::is_regular_file(f) || !wxImage::CanRead(std_to_wx(f.string()))) {
-			error_dialog (0, _("Could not load image file."));
-			if (Config::instance()->player_background_image()) {
-				checked_set (_background_image, *Config::instance()->player_background_image());
-			}
-			return;
-		}
-
-		Config::instance()->set_player_background_image(f);
-	}
-#endif
-
-	wxDirPickerCtrl* _content_directory;
-	wxDirPickerCtrl* _playlist_directory;
-	wxDirPickerCtrl* _kdm_directory;
-#ifdef DCPOMATIC_VARIANT_SWAROOP
-	FilePickerCtrl* _background_image;
-#endif
-};
 
 /** @class PlayerAdvancedPage
  *  @brief Advanced page of the preferences dialog for the player.
@@ -395,7 +279,6 @@ public:
 		, _log_warning (0)
 		, _log_error (0)
 		, _log_timing (0)
-		, _log_debug_decode (0)
 	{}
 
 private:
@@ -428,8 +311,6 @@ private:
 			/// TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
 			_log_timing = new CheckBox (_panel, S_("Config|Timing"));
 			t->Add (_log_timing, 1, wxEXPAND | wxALL);
-			_log_debug_decode = new CheckBox (_panel, _("Debug"));
-			t->Add (_log_debug_decode, 1, wxEXPAND | wxALL);
 			table->Add (t, 0, wxALL, 6);
 		}
 
@@ -443,7 +324,6 @@ private:
 		_log_warning->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
 		_log_error->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
 		_log_timing->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
-		_log_debug_decode->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::log_changed, this));
 #ifdef DCPOMATIC_WINDOWS
 		_win32_console->Bind (wxEVT_CHECKBOX, boost::bind (&PlayerAdvancedPage::win32_console_changed, this));
 #endif
@@ -457,7 +337,6 @@ private:
 		checked_set (_log_warning, config->log_types() & LogEntry::TYPE_WARNING);
 		checked_set (_log_error, config->log_types() & LogEntry::TYPE_ERROR);
 		checked_set (_log_timing, config->log_types() & LogEntry::TYPE_TIMING);
-		checked_set (_log_debug_decode, config->log_types() & LogEntry::TYPE_DEBUG_DECODE);
 #ifdef DCPOMATIC_WINDOWS
 		checked_set (_win32_console, config->win32_console());
 #endif
@@ -478,9 +357,6 @@ private:
 		if (_log_timing->GetValue ()) {
 			types |= LogEntry::TYPE_TIMING;
 		}
-		if (_log_debug_decode->GetValue ()) {
-			types |= LogEntry::TYPE_DEBUG_DECODE;
-		}
 		Config::instance()->set_log_types (types);
 	}
 
@@ -495,7 +371,6 @@ private:
 	wxCheckBox* _log_warning;
 	wxCheckBox* _log_error;
 	wxCheckBox* _log_timing;
-	wxCheckBox* _log_debug_decode;
 #ifdef DCPOMATIC_WINDOWS
 	wxCheckBox* _win32_console;
 #endif
@@ -668,7 +543,7 @@ private:
 wxPreferencesEditor*
 create_player_config_dialog ()
 {
-	wxPreferencesEditor* e = new wxPreferencesEditor ();
+	wxPreferencesEditor* e = new wxPreferencesEditor (_("DCP-o-matic Player Preferences"));
 
 #ifdef DCPOMATIC_OSX
 	/* Width that we force some of the config panels to be on OSX so that