Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 16:41:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3331 from ctrlaltdavid/19961

Browse source 
Code Review for Job #19961
This commit is contained in:
Stephen Birarda 2014-08-28 14:30:01 -07:00
commit 29ed1b3fcd
3 changed files with 20 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::clearLoginDialogDisplayedFlag);
// 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,

17
interface/src/Menu.cpp
View file

@ -114,6 +114,7 @@ Menu::Menu() :
_loginAction(NULL), _loginAction(NULL),
_preferencesDialog(NULL), _preferencesDialog(NULL),
_loginDialog(NULL), _loginDialog(NULL),
_hasLoginDialogDisplayed(false),
_snapshotsLocation(), _snapshotsLocation(),
_scriptsLocation(), _scriptsLocation(),
_walletPrivateKey() _walletPrivateKey()
@ -1052,12 +1053,24 @@ void sendFakeEnterEvent() {
const float DIALOG_RATIO_OF_WINDOW = 0.30f; const float DIALOG_RATIO_OF_WINDOW = 0.30f;
void Menu::clearLoginDialogDisplayedFlag() {
// Needed for domains that don't require login.
_hasLoginDialogDisplayed = false;
}
void Menu::loginForCurrentDomain() { void Menu::loginForCurrentDomain() {
if (!_loginDialog) { if (!_loginDialog && !_hasLoginDialogDisplayed) {
_loginDialog = new LoginDialog(Application::getInstance()->getWindow()); _loginDialog = new LoginDialog(Application::getInstance()->getWindow());
_loginDialog->show(); _loginDialog->show();
_loginDialog->resizeAndPosition(false); _loginDialog->resizeAndPosition(false);
} }
_hasLoginDialogDisplayed = true;
}
void Menu::showLoginForCurrentDomain() {
_hasLoginDialogDisplayed = false;
loginForCurrentDomain();
} }
void Menu::editPreferences() { void Menu::editPreferences() {
@ -1404,7 +1417,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 clearLoginDialogDisplayedFlag();
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;
bool _hasLoginDialogDisplayed;
QAction* _chatAction; QAction* _chatAction;
QString _snapshotsLocation; QString _snapshotsLocation;
QString _scriptsLocation; QString _scriptsLocation;