Start on resolving the last set of editor/maingame adhesions...

...by breaking preferences_display apart.

src/Makefile.am

@@ -72,6 +72,7 @@ wesnoth_SOURCES = \
 	game_display.cpp \
 	game_events.cpp \
 	game_preferences.cpp \
+	game_preferences_display.cpp \
 	gamestatus.cpp \
 	generate_report.cpp \
 	generic_event.cpp \
@@ -187,6 +188,7 @@ wesnoth_editor_SOURCES = \
 	game_display.cpp \
 	game_events.cpp \
 	game_preferences.cpp \
+	game_preferences_display.cpp \
 	gamestatus.cpp \
 	generate_report.cpp \
 	generic_event.cpp \

src/game_preferences.cpp

@@ -87,33 +87,6 @@ manager::~manager()
 	encountered_terrains_set.clear();
 }
 
-bool adjust_gamma()
-{
-	return preferences::get("adjust_gamma") == "yes";
-}
-
-void _set_adjust_gamma(bool val)
-{
-	preferences::set("adjust_gamma", val ? "yes" : "no");
-}
-
-int gamma()
-{
-	static const int default_value = 100;
-	const string_map::const_iterator gamma = get_prefs()->values.find("gamma");
-	if(adjust_gamma() && gamma != get_prefs()->values.end() && gamma->second.empty() == false)
-		return atoi(gamma->second.c_str());
-	else
-		return default_value;
-}
-
-void _set_gamma(int gamma)
-{
-	std::stringstream stream;
-	stream << gamma;
-	preferences::set("gamma", stream.str());
-}
-
 bool _set_relationship(std::string nick, std::string rela) {
 	if (!get_prefs()->child("relationship")){
 		get_prefs()->add_child("relationship");

src/preferences.cpp

@@ -160,6 +160,33 @@ void set_language(const std::string& s)
 	prefs["locale"] = s;
 }
 
+bool adjust_gamma()
+{
+	return preferences::get("adjust_gamma") == "yes";
+}
+
+void _set_adjust_gamma(bool val)
+{
+	preferences::set("adjust_gamma", val ? "yes" : "no");
+}
+
+int gamma()
+{
+	static const int default_value = 100;
+	const string_map::const_iterator gamma = get_prefs()->values.find("gamma");
+	if(adjust_gamma() && gamma != get_prefs()->values.end() && gamma->second.empty() == false)
+		return atoi(gamma->second.c_str());
+	else
+		return default_value;
+}
+
+void _set_gamma(int gamma)
+{
+	std::stringstream stream;
+	stream << gamma;
+	preferences::set("gamma", stream.str());
+}
+
 bool grid()
 {
 	const string_map::const_iterator it = prefs.values.find("grid");

src/preferences_display.hpp

@@ -27,6 +27,9 @@ namespace preferences {
 	void set_resolution(const std::pair<int,int>& res);
 	void set_turbo(bool ison);
 	void set_grid(bool ison);
+	void set_gamma(int gamma);
+	void set_adjust_gamma(bool val);
+	void set_turbo_speed(double speed);
 	void set_colour_cursors(bool value);
 
 	void show_preferences_dialog(display& disp, const config& game_cfg);