summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-14 00:52:11 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-14 00:52:11 +0300
commitfc5a71f55255e7ff211efe80b33a2cd3dd89a8ea (patch)
treec57c40aa535ca5aec8095b8ad75bf3d041cd1e05 /src/gui
parent93feb7fbf408ccc9178832d5f21c3806cb2a9f16 (diff)
downloadplus-fc5a71f55255e7ff211efe80b33a2cd3dd89a8ea.tar.gz
plus-fc5a71f55255e7ff211efe80b33a2cd3dd89a8ea.tar.bz2
plus-fc5a71f55255e7ff211efe80b33a2cd3dd89a8ea.tar.xz
plus-fc5a71f55255e7ff211efe80b33a2cd3dd89a8ea.zip
Remove update host label from login dialog.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/windows/logindialog.cpp14
-rw-r--r--src/gui/windows/logindialog.h1
2 files changed, 4 insertions, 11 deletions
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index 937af72be..355f1b26b 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -75,7 +75,6 @@ LoginDialog::LoginDialog(LoginData &data,
mLoginData->remember)),
// TRANSLATORS: login dialog label
mUpdateTypeLabel(new Label(this, _("Update:"))),
- mUpdateHostLabel(nullptr),
mUpdateTypeModel(new UpdateTypeModel),
mUpdateTypeDropDown(new DropDown(this, mUpdateTypeModel)),
// TRANSLATORS: login dialog button
@@ -112,9 +111,6 @@ LoginDialog::LoginDialog(LoginData &data,
Label *const passLabel = new Label(this, _("Password:"));
if (mServer->updateHosts.size() > 1)
{
- // TRANSLATORS: login dialog label
- mUpdateHostLabel = new Label(this, strprintf(_("Update host: %s"),
- mLoginData->updateHost.c_str()));
mUpdateListModel = new UpdateListModel(mServer);
mUpdateHostDropDown = new DropDown(this, mUpdateListModel,
false, Modal_false, this, "updateselect");
@@ -124,7 +120,6 @@ LoginDialog::LoginDialog(LoginData &data,
}
else
{
- mUpdateHostLabel = nullptr;
mUpdateListModel = nullptr;
mUpdateHostDropDown = nullptr;
}
@@ -160,11 +155,10 @@ LoginDialog::LoginDialog(LoginData &data,
place(0, 6, mUpdateTypeLabel, 1);
place(1, 6, mUpdateTypeDropDown, 8);
int n = 7;
- if (mUpdateHostLabel)
+ if (mUpdateHostDropDown)
{
- place(0, 7, mUpdateHostLabel, 9);
- place(0, 8, mUpdateHostDropDown, 9);
- n += 2;
+ place(0, 7, mUpdateHostDropDown, 9);
+ n += 1;
}
place(0, n, mCustomUpdateHost, 9);
place(0, n + 1, mUpdateHostText, 9);
@@ -182,7 +176,7 @@ void LoginDialog::postInit()
setVisible(Visible_true);
const int h = 200;
- if (mUpdateHostLabel)
+ if (mUpdateHostDropDown)
setContentSize(310, 250);
setContentSize(310, h);
#ifdef ANDROID
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index 9047bf123..2af656230 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -96,7 +96,6 @@ class LoginDialog final : public Window,
TextField *mPassField A_NONNULLPOINTER;
CheckBox *mKeepCheck A_NONNULLPOINTER;
Label *mUpdateTypeLabel A_NONNULLPOINTER;
- Label *mUpdateHostLabel;
UpdateTypeModel *mUpdateTypeModel A_NONNULLPOINTER;
DropDown *mUpdateTypeDropDown A_NONNULLPOINTER;
Button *mServerButton A_NONNULLPOINTER;