Showing the changes to interface/src/Menu.cpp (1 of 4 files). Show all
Unified · Split
| @@ -153,11 +153,6 @@ Menu::Menu() : · 152 unmodified lines | |||
| 153 | // connect to the appropriate signal of the AccountManager so that we can change the Login/Logout menu item | 153 | // connect to the appropriate signal of the AccountManager so that we can change the Login/Logout menu item |
| 154 | connect(&accountManager, &AccountManager::profileChanged, this, &Menu::toggleLoginMenuItem); | 154 | connect(&accountManager, &AccountManager::profileChanged, this, &Menu::toggleLoginMenuItem); |
| 155 | connect(&accountManager, &AccountManager::logoutComplete, this, &Menu::toggleLoginMenuItem); | 155 | connect(&accountManager, &AccountManager::logoutComplete, this, &Menu::toggleLoginMenuItem); |
| 156 | |||
| 157 | // connect to signal of account manager so we can tell user when the user/place they looked at is offline | ||
| 158 | AddressManager* addressManager = DependencyManager::get<AddressManager>(); | ||
| 159 | connect(addressManager, &AddressManager::lookupResultIsOffline, this, &Menu::displayAddressOfflineMessage); | ||
| 160 | connect(addressManager, &AddressManager::lookupResultIsNotFound, this, &Menu::displayAddressNotFoundMessage); | ||
| 161 | 156 | ||
| 162 | addDisabledActionAndSeparator(fileMenu, "Scripts"); | 157 | addDisabledActionAndSeparator(fileMenu, "Scripts"); |
| 163 | addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL | Qt::Key_O, appInstance, SLOT(loadDialog())); | 158 | addActionToQMenuAndActionHash(fileMenu, MenuOption::LoadScript, Qt::CTRL | Qt::Key_O, appInstance, SLOT(loadDialog())); |
| @@ -1146,16 +1141,6 @@ void Menu::toggleAddressBar() { · 982 unmodified lines | |||
| 1146 | } | 1141 | } |
| 1147 | } | 1142 | } |
| 1148 | 1143 | ||
| 1149 | void Menu::displayAddressOfflineMessage() { | ||
| 1150 | QMessageBox::information(Application::getInstance()->getWindow(), "Address offline", | ||
| 1151 | "That user or place is currently offline."); | ||
| 1152 | } | ||
| 1153 | |||
| 1154 | void Menu::displayAddressNotFoundMessage() { | ||
| 1155 | QMessageBox::information(Application::getInstance()->getWindow(), "Address not found", | ||
| 1156 | "There is no address information for that user or place."); | ||
| 1157 | } | ||
| 1158 | |||
| 1159 | void Menu::muteEnvironment() { | 1144 | void Menu::muteEnvironment() { |
| 1160 | int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment); | 1145 | int headerSize = numBytesForPacketHeaderGivenPacketType(PacketTypeMuteEnvironment); |
| 1161 | int packetSize = headerSize + sizeof(glm::vec3) + sizeof(float); | 1146 | int packetSize = headerSize + sizeof(glm::vec3) + sizeof(float); |