diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-13 15:46:41 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-14 00:46:22 +0300 |
commit | 93feb7fbf408ccc9178832d5f21c3806cb2a9f16 (patch) | |
tree | b0ee8c847e5933a86ea53dea5a3f87b8c6533191 /src/gui/windows/logindialog.cpp | |
parent | 99ecd9ba734a308ae374d4494856d8bb3617f8a0 (diff) | |
download | mv-93feb7fbf408ccc9178832d5f21c3806cb2a9f16.tar.gz mv-93feb7fbf408ccc9178832d5f21c3806cb2a9f16.tar.bz2 mv-93feb7fbf408ccc9178832d5f21c3806cb2a9f16.tar.xz mv-93feb7fbf408ccc9178832d5f21c3806cb2a9f16.zip |
Add support for different groups of update servers reading from servers list.
Diffstat (limited to 'src/gui/windows/logindialog.cpp')
-rw-r--r-- | src/gui/windows/logindialog.cpp | 43 |
1 files changed, 36 insertions, 7 deletions
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 34f84fee4..937af72be 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -41,7 +41,9 @@ #include "gui/widgets/layoutcell.h" #include "net/charserverhandler.h" +#include "net/logindata.h" #include "net/loginhandler.h" +#include "net/serverinfo.h" #include "net/updatetypeoperators.h" #include "utils/delete2.h" @@ -58,13 +60,14 @@ namespace } // namespace LoginDialog::LoginDialog(LoginData &data, - std::string serverName, + ServerInfo *const server, std::string *const updateHost) : // TRANSLATORS: login dialog name Window(_("Login"), Modal_false, nullptr, "login.xml"), ActionListener(), KeyListener(), mLoginData(&data), + mServer(server), mUserField(new TextField(this, mLoginData->username)), mPassField(new PasswordField(this, mLoginData->password)), // TRANSLATORS: login dialog label @@ -89,7 +92,7 @@ LoginDialog::LoginDialog(LoginData &data, mUpdateListModel(nullptr), mUpdateHostDropDown(nullptr), mUpdateHost(updateHost), - mServerName(serverName) + mServerName(server->hostname) { setCloseButton(true); setWindowName("Login"); @@ -97,20 +100,22 @@ LoginDialog::LoginDialog(LoginData &data, if (charServerHandler) charServerHandler->clear(); + mergeUpdateHosts(); + // TRANSLATORS: login dialog label Label *const serverLabel1 = new Label(this, _("Server:")); - Label *const serverLabel2 = new Label(this, serverName); + Label *const serverLabel2 = new Label(this, mServerName); serverLabel2->adjustSize(); // TRANSLATORS: login dialog label Label *const userLabel = new Label(this, _("Name:")); // TRANSLATORS: login dialog label Label *const passLabel = new Label(this, _("Password:")); - if (mLoginData->updateHosts.size() > 1) + if (mServer->updateHosts.size() > 1) { // TRANSLATORS: login dialog label mUpdateHostLabel = new Label(this, strprintf(_("Update host: %s"), mLoginData->updateHost.c_str())); - mUpdateListModel = new UpdateListModel(mLoginData); + mUpdateListModel = new UpdateListModel(mServer); mUpdateHostDropDown = new DropDown(this, mUpdateListModel, false, Modal_false, this, "updateselect"); const std::string str = serverConfig.getValue("updateHost2", ""); @@ -321,14 +326,28 @@ void LoginDialog::prepareUpdate() std::string str; if (mUpdateHostDropDown) { - str = mUpdateHostDropDown->getSelectedString(); + const int sel = mUpdateHostDropDown->getSelected(); + if (sel >= 0) + { + const HostsGroup &group = mServer->updateHosts[sel]; + if (!group.hosts.empty()) + { + str = group.hosts[0]; + mLoginData->updateHosts = group.hosts; + serverConfig.setValue("updateHost2", group.name); + } + else + { + serverConfig.setValue("updateHost2", ""); + } + } } else if (mLoginData->updateHost.empty() && !mLoginData->updateHosts.empty()) { str = mLoginData->updateHosts[0]; + serverConfig.setValue("updateHost2", str); } - serverConfig.setValue("updateHost2", str); if (!str.empty() && checkPath(str)) { mLoginData->updateHost = str; @@ -360,3 +379,13 @@ void LoginDialog::close() client->setState(State::SWITCH_SERVER); Window::close(); } + +void LoginDialog::mergeUpdateHosts() +{ + HostsGroup group; + + // TRANSLATORS: update hosts group default name + group.name = _("default"); + group.hosts = mLoginData->updateHosts; + mServer->updateHosts.insert(mServer->updateHosts.begin(), group); +} |