Remove the "simple" UI (#1868).

It just seemed to cause more problems than it solved; mainly people
enabling it by mistake and then being told to click buttons that
they could not see.

2 files changed, 0 insertions, 32 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 80c0891a0..8b849dcc1 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -165,7 +165,6 @@ Config::set_defaults ()
 	_christie_password = optional<string>();
 	_gdc_username = optional<string>();
 	_gdc_password = optional<string>();
-	_interface_complexity = INTERFACE_SIMPLE;
 	_player_mode = PLAYER_MODE_WINDOW;
 	_image_display = 0;
 	_video_view_type = VIDEO_VIEW_SIMPLE;
@@ -571,10 +570,6 @@ try
 	_gdc_username = f.optional_string_child("GDCUsername");
 	_gdc_password = f.optional_string_child("GDCPassword");
 
-	optional<string> ic = f.optional_string_child("InterfaceComplexity");
-	if (ic && *ic == "full") {
-		_interface_complexity = INTERFACE_FULL;
-	}
 	optional<string> pm = f.optional_string_child("PlayerMode");
 	if (pm && *pm == "window") {
 		_player_mode = PLAYER_MODE_WINDOW;
@@ -1008,16 +1003,6 @@ Config::write_config () const
 		root->add_child("GDCPassword")->add_child_text(*_gdc_password);
 	}
 
-	/* [XML] InterfaceComplexity <code>simple</code> for the reduced interface or <code>full</code> for the full interface. */
-	switch (_interface_complexity) {
-	case INTERFACE_SIMPLE:
-		root->add_child("InterfaceComplexity")->add_child_text("simple");
-		break;
-	case INTERFACE_FULL:
-		root->add_child("InterfaceComplexity")->add_child_text("full");
-		break;
-	}
-
 	/* [XML] PlayerMode <code>window</code> for a single window, <code>full</code> for full-screen and <code>dual</code> for full screen playback
 	   with controls on another monitor.
 	*/
diff --git a/src/lib/config.h b/src/lib/config.h
index 74a44bc2f..11ca36b85 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -80,7 +80,6 @@ public:
 		DKDM_RECIPIENTS,
 		SOUND,
 		SOUND_OUTPUT,
-		INTERFACE_COMPLEXITY,
 		PLAYER_CONTENT_DIRECTORY,
 		PLAYER_PLAYLIST_DIRECTORY,
 		PLAYER_DEBUG_LOG,
@@ -401,8 +400,6 @@ public:
 		NAG_ENCRYPTED_METADATA,
 		NAG_ALTER_DECRYPTION_CHAIN,
 		NAG_BAD_SIGNER_CHAIN,
-		/* Not really a nag but it's the same idea */
-		NAG_INITIAL_SETUP,
 		NAG_IMPORT_DECRYPTION_CHAIN,
 		NAG_DELETE_DKDM,
 		NAG_32_ON_64,
@@ -494,15 +491,6 @@ public:
 		return _gdc_password;
 	}
 
-	enum Interface {
-		INTERFACE_SIMPLE,
-		INTERFACE_FULL
-	};
-
-	Interface interface_complexity () const {
-		return _interface_complexity;
-	}
-
 	enum PlayerMode {
 		PLAYER_MODE_WINDOW, ///< one window containing image and controls
 		PLAYER_MODE_FULL,   ///< just the image filling the screen
@@ -1014,10 +1002,6 @@ public:
 		maybe_set (_gdc_password, boost::optional<std::string>());
 	}
 
-	void set_interface_complexity (Interface i) {
-		maybe_set (_interface_complexity, i, INTERFACE_COMPLEXITY);
-	}
-
 	void set_player_mode (PlayerMode m) {
 		maybe_set (_player_mode, m);
 	}
@@ -1344,7 +1328,6 @@ private:
 	boost::optional<std::string> _christie_password;
 	boost::optional<std::string> _gdc_username;
 	boost::optional<std::string> _gdc_password;
-	Interface _interface_complexity;
 	PlayerMode _player_mode;
 	int _image_display;
 	VideoViewType _video_view_type;