Merge lp:~widelands-dev/widelands/bug-1797702-spaces-in-names-clean-start into lp:widelands

[Toni Förster]

rework netsetup

- allowed characters are limited
- login with empty username not allowed
- if username ist taken append number
- don't join game with empty username

editbox

- added has_warning()

[Toni Förster (stonerl)]

This is the same as this one:

https://code.launchpad.net/~widelands-dev/widelands/bug-1797702-spaces-in-names/+merge/367123

The old one got approved but was merged too early. This is the third patch that needs to go in when the others have been merged

review: Approve

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4948. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/531272166.
Appveyor build 4729. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names_clean_start-4729.

[GunChleoc (gunchleoc)]

There is some code duplication that I'd like to see solved.

[Toni Förster (stonerl)]

Solved :)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5034. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/536418869.
Appveyor build 4814. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1797702_spaces_in_names_clean_start-4814.

[Toni Förster (stonerl)]

Since the parent branch has been merged, this can go in as well.

@bunnybot merge

=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc	2019-05-11 18:50:30 +0000
+++ src/network/gamehost.cc	2019-05-23 17:14:57 +0000
@@ -1621,13 +1621,13 @@
 
 	// Assign the player a name, preferably the name chosen by the client
 	if (playername.empty())  // Make sure there is at least a name base.
-		playername = _("Player");
+		playername = "Player";
 	std::string effective_name = playername;
 
 	if (has_user_name(effective_name, client.usernum)) {
-		uint32_t i = 2;
+		uint32_t i = 1;
 		do {
-			effective_name = (boost::format(_("Player %u")) % i++).str();
+			effective_name = (boost::format("%s%u") % playername % i++).str();
 		} while (has_user_name(effective_name, client.usernum));
 	}
 

=== modified file 'src/ui_basic/editbox.h'
--- src/ui_basic/editbox.h	2019-05-23 17:14:56 +0000
+++ src/ui_basic/editbox.h	2019-05-23 17:14:57 +0000
@@ -80,6 +80,10 @@
 		warning_ = warn;
 	}
 
+	bool has_warning() {
+		return warning_;
+	}
+
 	bool is_password() {
 		return password_;
 	}

=== modified file 'src/ui_fsmenu/netsetup_lan.cc'
--- src/ui_fsmenu/netsetup_lan.cc	2019-05-11 18:50:30 +0000
+++ src/ui_fsmenu/netsetup_lan.cc	2019-05-23 17:14:57 +0000
@@ -24,6 +24,7 @@
 #include "graphic/graphic.h"
 #include "graphic/text_constants.h"
 #include "network/constants.h"
+#include "network/internet_gaming.h"
 #include "network/network.h"
 #include "profile/profile.h"
 
@@ -136,6 +137,7 @@
 
 void FullscreenMenuNetSetupLAN::think() {
 	FullscreenMenuBase::think();
+	change_playername();
 
 	discovery.run();
 }
@@ -186,7 +188,7 @@
 	assert(opengames.has_selection());
 	const NetOpenGame* const game = opengames.get_selected();
 	// Only join games that are open
-	if (game->info.state == LAN_GAME_OPEN) {
+	if (game->info.state == LAN_GAME_OPEN || !playername.has_warning()) {
 		clicked_joingame();
 	}
 }
@@ -247,6 +249,22 @@
 }
 
 void FullscreenMenuNetSetupLAN::change_playername() {
+	playername.set_warning(false);
+	playername.set_tooltip("");
+	hostgame.set_enabled(true);
+
+	if (!InternetGaming::ref().valid_username(playername.text())) {
+			playername.set_warning(true);
+			playername.set_tooltip(_("Enter a valid nickname. This value may contain only "
+													  "English letters, numbers, and @ . + - _ characters."));
+			joingame.set_enabled(false);
+			hostgame.set_enabled(false);
+			return;
+	}
+	if (!hostname.text().empty()) {
+		joingame.set_enabled(true);
+	}
+
 	g_options.pull_section("global").set_string("nickname", playername.text());
 }