Merge lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box into lp:widelands

[Toni Förster]

redesigned login box

- limit the possible characters for usernames
- draw a red box around the input field for erroneous input
- tell user were to register their username
- clicking registered checkbox focuses password field
- remove check from registered clears password field
- password field is only accessible when checkbox is clicked
- when a password is set, ***** is shown onopening

multiplayer login redesign

- only show login dialog when no name is set
- always show login box settings button

[lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box]

9106. By Toni Förster on 2019-05-08

uncheck registered when username was changed

9107. By Toni Förster on 2019-05-08

double check username before joining the lobby

[kaputtnik (franku)]

It would be good to have the registered checkbox above the password field. It would be a more logical ordering, imho.

[lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box]

9108. By Toni Förster on 2019-05-08

switch order of password field and checkbox

[Toni Förster (stonerl)]

Your're right. Chnaged it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4915. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/529968856.
Appveyor build 4696. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1827786_metaserver_login_box-4696.

[Toni Förster (stonerl)]

Will address the strings later. For the others see the diff comments.

[lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box]

9109. By Toni Förster on 2019-05-09

proper formated translatable string

9110. By Toni Förster on 2019-05-09

added missing space

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4925. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/530433164.
Appveyor build 4706. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1827786_metaserver_login_box-4706.

[kaputtnik (franku)]

As talked on IRC: Can you try to remove the red border around the password editbox and instead show the string 'Password' and the corresponding editbox look sort of grayed out?

I think the text below can also be improved: "You need an account on the widelands website to use a registered account. Please visit ...."

[GunChleoc (gunchleoc)]

Changing editbox styles is implemented in https://code.launchpad.net/~widelands-dev/widelands/font_size-lua/+merge/366938, so we really need somebody to review that branch and make Toni's life easier.

[GunChleoc (gunchleoc)]

The changes string is missing a . after the %

I'll do some testing before I reply to the remaining diff comments.

[lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box]

9111. By Toni Förster on 2019-05-11

changed wording & removed red border around password field

9112. By Toni Förster on 2019-05-11

add missing .

[Toni Förster (stonerl)]

@kaputtnik

I addressed your comments. The only thing I can't do ATM is, greying out the password field.

[Toni Förster (stonerl)]

But I'm not confident whether we should grey the password field out as well. I would look too similar to an active edit box. Greying out the text "Password" and making the input box not editable should be sufficient, IMHO.

[lp:~widelands-dev/widelands/bug-1827786-metaserver-login-box]

9113. By Toni Förster on 2019-05-11

Fix issue with empty string.

[Toni Förster (stonerl)]

This one gets replaced by the following one:

https://code.launchpad.net/~widelands-dev/widelands/bug-1827786-metaserver-login-box-clean-start/+merge/367312

Unmerged revisions

9113. By Toni Förster on 2019-05-11

Fix issue with empty string.

9112. By Toni Förster on 2019-05-11

add missing .

9111. By Toni Förster on 2019-05-11

changed wording & removed red border around password field

9110. By Toni Förster on 2019-05-09

added missing space

9109. By Toni Förster on 2019-05-09

proper formated translatable string

9108. By Toni Förster on 2019-05-08

switch order of password field and checkbox

=== modified file 'src/ui_fsmenu/multiplayer.cc'
--- src/ui_fsmenu/multiplayer.cc	2019-05-11 18:50:30 +0000
+++ src/ui_fsmenu/multiplayer.cc	2019-05-11 20:13:52 +0000
@@ -90,6 +90,7 @@
  */
 void FullscreenMenuMultiPlayer::internet_login() {
 	Section& s = g_options.pull_section("global");
+<<<<<<< TREE
 	if (auto_log_) {
 		nickname_ = s.get_string("nickname", _("nobody"));
 		password_ = s.get_string("password_sha1", "nobody");
@@ -121,6 +122,17 @@
 		} else {
 			return;
 		}
+=======
+
+	nickname_ = s.get_string("nickname", "");
+	password_ = s.get_string("password_sha1", "nobody");
+	register_ = s.get_bool("registered", false);
+
+	if (nickname_.empty() || nickname_.find_first_not_of("abcdefghijklmnopqrstuvwxyz"
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@.+-_") <= nickname_.size()) {
+		show_internet_login();
+		return;
+>>>>>>> MERGE-SOURCE
 	}
 
 	// Try to connect to the metaserver

=== modified file 'src/wui/login_box.cc'
--- src/wui/login_box.cc	2019-05-11 18:50:30 +0000
+++ src/wui/login_box.cc	2019-05-11 20:13:52 +0000
@@ -26,27 +26,46 @@
 #include "ui_basic/messagebox.h"
 
 LoginBox::LoginBox(Panel& parent)
+<<<<<<< TREE
    : Window(&parent, "login_box", 0, 0, 500, 220, _("Metaserver login")) {
+=======
+   : Window(&parent, "login_box", 0, 0, 500, 280, _("Metaserver login")) {
+>>>>>>> MERGE-SOURCE
 	center_to_parent();
 
 	int32_t margin = 10;
 
 	ta_nickname = new UI::Textarea(this, margin, margin, _("Nickname:"));
-	ta_password = new UI::Textarea(this, margin, 40, _("Password:"));
+	ta_password = new UI::Textarea(this, margin, 70, _("Password:"));
 	eb_nickname = new UI::EditBox(this, 150, margin, 330, 20, 2, UI::PanelStyle::kWui);
-	eb_password = new UI::EditBox(this, 150, 40, 330, 20, 2, UI::PanelStyle::kWui);
+	eb_password = new UI::EditBox(this, 150, 70, 330, 20, 2, UI::PanelStyle::kWui);
 
+<<<<<<< TREE
 	pwd_warning =
 	   new UI::MultilineTextarea(this, margin, 65, 505, 50, UI::PanelStyle::kWui,
 	                             _("WARNING: Password will be shown and saved readable!"));
 
 	cb_register = new UI::Checkbox(this, Vector2i(margin, 110), _("Log in to a registered account"),
+=======
+	cb_register = new UI::Checkbox(this, Vector2i(margin, 40), _("Log in to a registered account."),
+>>>>>>> MERGE-SOURCE
 	                               "", get_inner_w() - 2 * margin);
+<<<<<<< TREE
 	cb_auto_log = new UI::Checkbox(this, Vector2i(margin, 135),
 	                               _("Automatically use this login information from now on."), "",
 	                               get_inner_w() - 2 * margin);
 
 	UI::Button* loginbtn = new UI::Button(
+=======
+
+	register_account = new UI::MultilineTextarea(this, margin, 105, 470, 140, UI::PanelStyle::kWui,
+			(boost::format(_("You need an account on the widelands website, to use a registered "
+				"account. Please visit: %s Log in to your newly created account and set an online "
+				"gaming password on your profile page."))
+				% "\n\nhttps://widelands.org/accounts/register/\n\n").str());
+
+	loginbtn = new UI::Button(
+>>>>>>> MERGE-SOURCE
 	   this, "login",
 	   UI::g_fh->fontset()->is_rtl() ? (get_inner_w() / 2 - 200) / 2 :
 	                                   (get_inner_w() / 2 - 200) / 2 + get_inner_w() / 2,
@@ -58,10 +77,26 @@
 	                                   (get_inner_w() / 2 - 200) / 2,
 	   loginbtn->get_y(), 200, 20, UI::ButtonStyle::kWuiSecondary, _("Cancel"));
 	cancelbtn->sigclicked.connect(boost::bind(&LoginBox::clicked_back, boost::ref(*this)));
+<<<<<<< TREE
+=======
+	eb_nickname->changed.connect(boost::bind(&LoginBox::change_playername, this));
+	cb_register->clickedto.connect(boost::bind(&LoginBox::clicked_register, this));
+>>>>>>> MERGE-SOURCE
 
 	Section& s = g_options.pull_section("global");
 	eb_nickname->set_text(s.get_string("nickname", _("nobody")));
 	cb_register->set_state(s.get_bool("registered", false));
+<<<<<<< TREE
+=======
+
+	if (registered()) {
+		eb_password->set_text("*****");
+	} else {
+		eb_password->set_can_focus(false);
+		ta_password->set_color(UI_FONT_CLR_DISABLED);
+	}
+
+>>>>>>> MERGE-SOURCE
 	eb_nickname->focus();
 }
 
@@ -113,3 +148,47 @@
 	}
 	return UI::Panel::handle_key(down, code);
 }
+<<<<<<< TREE
+=======
+
+void LoginBox::clicked_register() {
+	if (cb_register->get_state()) {
+		ta_password->set_color(UI_FONT_CLR_DISABLED);
+		eb_password->set_can_focus(false);
+		eb_password->set_text("");
+	} else {
+		ta_password->set_color(UI_FONT_CLR_FG);
+		eb_password->set_can_focus(true);
+		eb_password->focus();
+	}
+}
+
+void LoginBox::verify_input() {
+	// Check if all needed input fields are valid
+	loginbtn->set_enabled(true);
+	eb_nickname->set_tooltip("");
+	eb_password->set_tooltip("");
+	eb_nickname->set_warning(false);
+
+	if (eb_nickname->text().empty()) {
+		eb_nickname->set_warning(true);
+		eb_nickname->set_tooltip(_("Please enter a nickname!"));
+		loginbtn->set_enabled(false);
+	} else if (eb_nickname->text().find_first_not_of("abcdefghijklmnopqrstuvwxyz"
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890@.+-_") <= eb_nickname->text().size()) {
+			eb_nickname->set_warning(true);
+			eb_nickname->set_tooltip(_("Enter a valid nickname. This value may contain only "
+													  "English letters, numbers, and @ . + - _ characters."));
+			loginbtn->set_enabled(false);
+	}
+
+	if (eb_password->text().empty() && cb_register->get_state()) {
+		eb_password->set_tooltip(_("Please enter your password!"));
+		loginbtn->set_enabled(false);
+	}
+
+	if (eb_password->has_focus() && eb_password->text() == "*****") {
+		eb_password->set_text("");
+	}
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'src/wui/login_box.h'
--- src/wui/login_box.h	2019-05-11 18:50:30 +0000
+++ src/wui/login_box.h	2019-05-11 20:13:52 +0000
@@ -29,6 +29,11 @@
 struct LoginBox : public UI::Window {
 	explicit LoginBox(UI::Panel&);
 
+<<<<<<< TREE
+=======
+	void think() override;
+
+>>>>>>> MERGE-SOURCE
 	std::string get_nickname() {
 		return eb_nickname->text();
 	}
@@ -46,8 +51,14 @@
 	bool handle_key(bool down, SDL_Keysym code) override;
 
 private:
+	void change_playername();
 	void clicked_back();
 	void clicked_ok();
+<<<<<<< TREE
+=======
+	void clicked_register();
+	void verify_input();
+>>>>>>> MERGE-SOURCE
 
 	UI::EditBox* eb_nickname;
 	UI::EditBox* eb_password;