move address lookup errors to AddressBarDialog

This commit is contained in:
Stephen Birarda 2014-12-16 10:12:25 -08:00
parent 1b48cf7f5a
commit 78edb94963
4 changed files with 19 additions and 18 deletions

View file

@ -153,11 +153,6 @@ Menu::Menu() :
// connect to the appropriate signal of the AccountManager so that we can change the Login/Logout menu item
connect(&accountManager, &AccountManager::profileChanged, this, &Menu::toggleLoginMenuItem);
connect(&accountManager, &AccountManager::logoutComplete, this, &Menu::toggleLoginMenuItem);
// connect to signal of account manager so we can tell user when the user/place they looked at is offline
AddressManager* addressManager = DependencyManager::get<AddressManager>();
connect(addressManager, &AddressManager::lookupResultIsOffline, this, &Menu::displayAddressOfflineMessage);
connect(addressManager, &AddressManager::lookupResultIsNotFound, this, &Menu::displayAddressNotFoundMessage);
addDisabledActionAndSeparator(fileMenu, "Scripts");
addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL | Qt::Key_O, appInstance, SLOT(loadDialog()));
@ -1146,16 +1141,6 @@ void Menu::toggleAddressBar() {
}
}
void Menu::displayAddressOfflineMessage() {
QMessageBox::information(Application::getInstance()->getWindow(), "Address offline",
"That user or place is currently offline.");
}
void Menu::displayAddressNotFoundMessage() {
QMessageBox::information(Application::getInstance()->getWindow(), "Address not found",
"There is no address information for that user or place.");
}
void Menu::muteEnvironment() {
int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment);
int packetSize = headerSize + sizeof(glm::vec3) + sizeof(float);

View file

@ -229,8 +229,6 @@ private slots:
void toggleChat();
void audioMuteToggled();
void displayNameLocationResponse(const QString& errorString);
void displayAddressOfflineMessage();
void displayAddressNotFoundMessage();
void muteEnvironment();
void changeVSync();

View file

@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QMessageBox>
#include "AddressBarDialog.h"
#include "AddressManager.h"
#include "Application.h"
@ -21,6 +23,11 @@ AddressBarDialog::AddressBarDialog() :
{
setAttribute(Qt::WA_DeleteOnClose, false);
setupUI();
AddressManager* addressManager = DependencyManager::get<AddressManager>();
connect(addressManager, &AddressManager::lookupResultIsOffline, this, &AddressBarDialog::displayAddressOfflineMessage);
connect(addressManager, &AddressManager::lookupResultIsNotFound, this, &AddressBarDialog::displayAddressNotFoundMessage);
}
void AddressBarDialog::setupUI() {
@ -125,4 +132,14 @@ void AddressBarDialog::accept() {
connect(addressManager, &AddressManager::lookupResultsFinished, this, &QDialog::hide);
addressManager->handleLookupString(_addressLineEdit->text());
}
}
void AddressBarDialog::displayAddressOfflineMessage() {
QMessageBox::information(Application::getInstance()->getWindow(), "Address offline",
"That user or place is currently offline.");
}
void AddressBarDialog::displayAddressNotFoundMessage() {
QMessageBox::information(Application::getInstance()->getWindow(), "Address not found",
"There is no address information for that user or place.");
}

View file

@ -40,7 +40,8 @@ private:
private slots:
void accept();
void displayAddressOfflineMessage();
void displayAddressNotFoundMessage();
};
#endif // hifi_AddressBarDialog_h