Showing the changes to interface/src/Menu.cpp (1 of 3 files). Show all
Unified · Split
| @@ -114,6 +114,7 @@ Menu::Menu() : · 113 unmodified lines | ||
| 114 | 114 | _loginAction(NULL), |
| 115 | 115 | _preferencesDialog(NULL), |
| 116 | 116 | _loginDialog(NULL), |
| 117 | + _loginDomain(), | |
| 117 | 118 | _snapshotsLocation(), |
| 118 | 119 | _scriptsLocation(), |
| 119 | 120 | _walletPrivateKey() |
| @@ -1052,14 +1053,28 @@ void sendFakeEnterEvent() { · 932 unmodified lines | ||
| 1052 | 1053 | |
| 1053 | 1054 | const float DIALOG_RATIO_OF_WINDOW = 0.30f; |
| 1054 | 1055 | |
| 1056 | +void Menu::clearLoginDomain() { | |
| 1057 | + // Needed for domains that don't require login. | |
| 1058 | + _loginDomain = QString(); | |
| 1059 | +} | |
| 1060 | + | |
| 1055 | 1061 | void Menu::loginForCurrentDomain() { |
| 1056 | − if (!_loginDialog) { | |
| 1062 | + QString domain = NodeList::getInstance()->getDomainHandler().getHostname(); | |
| 1063 | + bool hasShownForDomain = domain == _loginDomain; | |
| 1064 | + | |
| 1065 | + if (!_loginDialog && !hasShownForDomain) { | |
| 1066 | + _loginDomain = domain; | |
| 1057 | 1067 | _loginDialog = new LoginDialog(Application::getInstance()->getWindow()); |
| 1058 | 1068 | _loginDialog->show(); |
| 1059 | 1069 | _loginDialog->resizeAndPosition(false); |
| 1060 | 1070 | } |
| 1061 | 1071 | } |
| 1062 | 1072 | |
| 1073 | +void Menu::showLoginForCurrentDomain() { | |
| 1074 | + _loginDomain = QString(); | |
| 1075 | + loginForCurrentDomain(); | |
| 1076 | +} | |
| 1077 | + | |
| 1063 | 1078 | void Menu::editPreferences() { |
| 1064 | 1079 | if (!_preferencesDialog) { |
| 1065 | 1080 | _preferencesDialog = new PreferencesDialog(Application::getInstance()->getWindow()); |
| @@ -1404,7 +1419,7 @@ void Menu::toggleLoginMenuItem() { · 338 unmodified lines | ||
| 1404 | 1419 | // change the menu item to login |
| 1405 | 1420 | _loginAction->setText("Login"); |
| 1406 | 1421 | |
| 1407 | − connect(_loginAction, &QAction::triggered, this, &Menu::loginForCurrentDomain); | |
| 1422 | + connect(_loginAction, &QAction::triggered, this, &Menu::showLoginForCurrentDomain); | |
| 1408 | 1423 | } |
| 1409 | 1424 | } |
| 1410 | 1425 | |