Moved 'Accept whispers from friends only' pref from Advanced to Multiplayer

data/advanced_preferences.cfg

@@ -73,13 +73,6 @@
     step=5
 [/advanced_preference]
 
-[advanced_preference]
-    field=lobby_whisper_friends_only
-    name= _ "Accept whispers from friends only"
-    type=boolean
-    default=no
-[/advanced_preference]
-
 [advanced_preference]
     field=lobby_auto_open_whisper_windows
     name= _ "Auto-open whisper windows in lobby"

data/gui/default/window/preferences/04_multiplayer.cfg

@@ -101,6 +101,20 @@
 		[/column]
 	[/row]
 
+	[row]
+		[column]
+			border = "top,left,right"
+			border_size = 5
+			horizontal_alignment = "left"
+
+			[toggle_button]
+				id = "lobby_whisper_friends_only"
+				label = _ "Accept whispers from friends only"
+				tooltip = _ "Only accept whisper messages from people on your friends list"
+			[/toggle_button]
+		[/column]
+	[/row]
+
 	{_GUI_PREFERENCES_SPACER_ROW}
 
 	[row]
@@ -147,6 +161,7 @@
 			[/toggle_button]
 		[/column]
 	[/row]
+
 #enddef
 
 #define _GUI_PREFERENCES_MP_PAGE_1_GRID_2

src/gui/dialogs/preferences_dialog.cpp

@@ -563,6 +563,10 @@ void tpreferences::initialize_members(twindow& window)
 	setup_single_toggle("lobby_player_icons",
 		iconize_list(), _set_iconize_list, window);
 
+	/** WHISPERS FROM FRIENDS ONLY **/
+	setup_single_toggle("lobby_whisper_friends_only",
+		whisper_friends_only(), set_whisper_friends_only, window);
+
 	/** LOBBY JOIN NOTIFICATIONS **/
 	setup_radio_toggle("lobby_joins_none", SHOW_NONE,
 		lobby_joins(), lobby_joins_, window);

src/lobby_preferences.cpp

@@ -39,12 +39,16 @@ void _set_iconize_list(bool sort)
 	preferences::set("iconize_list", sort);
 }
 
-
 bool whisper_friends_only()
 {
 	return preferences::get("lobby_whisper_friends_only", false);
 }
 
+void set_whisper_friends_only(bool v)
+{
+	preferences::set("lobby_whisper_friends_only", v);
+}
+
 bool auto_open_whisper_windows()
 {
 	return preferences::get("lobby_auto_open_whisper_windows", true);