Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make login dialog automatically show only once per domain visit

Browse source
This commit is contained in:
David Rowe 2014-08-28 11:25:13 -07:00
parent 61a09146cd
commit 46c1a9d59a
3 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.cpp
View file

@ -246,7 +246,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle())); connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle()));
connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle()));
connect(&domainHandler, &DomainHandler::settingsReceived, this, &Application::domainSettingsReceived); connect(&domainHandler, &DomainHandler::settingsReceived, this, &Application::domainSettingsReceived);
connect(&domainHandler, &DomainHandler::hostnameChanged, Menu::getInstance(), &Menu::clearLoginDomain);
// hookup VoxelEditSender to PaymentManager so we can pay for octree edits // hookup VoxelEditSender to PaymentManager so we can pay for octree edits
const PaymentManager& paymentManager = PaymentManager::getInstance(); const PaymentManager& paymentManager = PaymentManager::getInstance();
connect(&_voxelEditSender, &VoxelEditPacketSender::octreePaymentRequired, connect(&_voxelEditSender, &VoxelEditPacketSender::octreePaymentRequired,

19
interface/src/Menu.cpp
View file

@ -114,6 +114,7 @@ Menu::Menu() :
_loginAction(NULL), _loginAction(NULL),
_preferencesDialog(NULL), _preferencesDialog(NULL),
_loginDialog(NULL), _loginDialog(NULL),
_loginDomain(),
_snapshotsLocation(), _snapshotsLocation(),
_scriptsLocation(), _scriptsLocation(),
_walletPrivateKey() _walletPrivateKey()
@ -1052,14 +1053,28 @@ void sendFakeEnterEvent() {
const float DIALOG_RATIO_OF_WINDOW = 0.30f; const float DIALOG_RATIO_OF_WINDOW = 0.30f;
void Menu::clearLoginDomain() {
// Needed for domains that don't require login.
_loginDomain = QString();
}
void Menu::loginForCurrentDomain() { void Menu::loginForCurrentDomain() {
if (!_loginDialog) { QString domain = NodeList::getInstance()->getDomainHandler().getHostname();
bool hasShownForDomain = domain == _loginDomain;
if (!_loginDialog && !hasShownForDomain) {
_loginDomain = domain;
_loginDialog = new LoginDialog(Application::getInstance()->getWindow()); _loginDialog = new LoginDialog(Application::getInstance()->getWindow());
_loginDialog->show(); _loginDialog->show();
_loginDialog->resizeAndPosition(false); _loginDialog->resizeAndPosition(false);
} }
} }
void Menu::showLoginForCurrentDomain() {
_loginDomain = QString();
loginForCurrentDomain();
}
void Menu::editPreferences() { void Menu::editPreferences() {
if (!_preferencesDialog) { if (!_preferencesDialog) {
_preferencesDialog = new PreferencesDialog(Application::getInstance()->getWindow()); _preferencesDialog = new PreferencesDialog(Application::getInstance()->getWindow());
@ -1404,7 +1419,7 @@ void Menu::toggleLoginMenuItem() {
// change the menu item to login // change the menu item to login
_loginAction->setText("Login"); _loginAction->setText("Login");
connect(_loginAction, &QAction::triggered, this, &Menu::loginForCurrentDomain); connect(_loginAction, &QAction::triggered, this, &Menu::showLoginForCurrentDomain);
} }
} }

3
interface/src/Menu.h
View file

@ -175,7 +175,9 @@ signals:
public slots: public slots:
void clearLoginDomain();
void loginForCurrentDomain(); void loginForCurrentDomain();
void showLoginForCurrentDomain();
void bandwidthDetails(); void bandwidthDetails();
void octreeStatsDetails(); void octreeStatsDetails();
void lodTools(); void lodTools();
@ -302,6 +304,7 @@ private:
QPointer<AttachmentsDialog> _attachmentsDialog; QPointer<AttachmentsDialog> _attachmentsDialog;
QPointer<AnimationsDialog> _animationsDialog; QPointer<AnimationsDialog> _animationsDialog;
QPointer<LoginDialog> _loginDialog; QPointer<LoginDialog> _loginDialog;
QString _loginDomain;
QAction* _chatAction; QAction* _chatAction;
QString _snapshotsLocation; QString _snapshotsLocation;
QString _scriptsLocation; QString _scriptsLocation;