Showing the changes to interface/src/Application.cpp (1 of 82 files). Show all
Unified · Split
| @@ -203,6 +203,8 @@ · 202 unmodified lines | |||
| 203 | #include "commerce/Wallet.h" | 203 | #include "commerce/Wallet.h" |
| 204 | #include "commerce/QmlCommerce.h" | 204 | #include "commerce/QmlCommerce.h" |
| 205 | 205 | ||
| 206 | #include "webbrowser/WebBrowserSuggestionsEngine.h" | ||
| 207 | |||
| 206 | // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU | 208 | // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU |
| 207 | // FIXME seems to be broken. | 209 | // FIXME seems to be broken. |
| 208 | #if defined(Q_OS_WIN) | 210 | #if defined(Q_OS_WIN) |
| @@ -1392,7 +1394,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1183 unmodified lines | |||
| 1392 | // Make sure we don't time out during slow operations at startup | 1394 | // Make sure we don't time out during slow operations at startup |
| 1393 | updateHeartbeat(); | 1395 | updateHeartbeat(); |
| 1394 | 1396 | ||
| 1395 | |||
| 1396 | QTimer* settingsTimer = new QTimer(); | 1397 | QTimer* settingsTimer = new QTimer(); |
| 1397 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ | 1398 | moveToNewNamedThread(settingsTimer, "Settings Thread", [this, settingsTimer]{ |
| 1398 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ | 1399 | connect(qApp, &Application::beforeAboutToQuit, [this, settingsTimer]{ |
| @@ -1823,6 +1824,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 424 unmodified lines | |||
| 1823 | // Preload Tablet sounds | 1824 | // Preload Tablet sounds |
| 1824 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); | 1825 | DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); |
| 1825 | 1826 | ||
| 1827 | _pendingIdleEvent = false; | ||
| 1828 | _pendingRenderEvent = false; | ||
| 1829 | |||
| 1826 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); | 1830 | qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); |
| 1827 | } | 1831 | } |
| 1828 | 1832 | ||
| @@ -2221,6 +2225,7 @@ void Application::initializeUi() { · 392 unmodified lines | |||
| 2221 | QmlCommerce::registerType(); | 2225 | QmlCommerce::registerType(); |
| 2222 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); | 2226 | qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem"); |
| 2223 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); | 2227 | qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); |
| 2228 | qmlRegisterType<WebBrowserSuggestionsEngine>("HifiWeb", 1, 0, "WebBrowserSuggestionsEngine"); | ||
| 2224 | 2229 | ||
| 2225 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 2230 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 2226 | offscreenUi->create(); | 2231 | offscreenUi->create(); |
| @@ -4479,8 +4484,11 @@ void Application::resetPhysicsReadyInformation() { · 2252 unmodified lines | |||
| 4479 | 4484 | ||
| 4480 | void Application::reloadResourceCaches() { | 4485 | void Application::reloadResourceCaches() { |
| 4481 | resetPhysicsReadyInformation(); | 4486 | resetPhysicsReadyInformation(); |
| 4487 | |||
| 4482 | // Query the octree to refresh everything in view | 4488 | // Query the octree to refresh everything in view |
| 4483 | _lastQueriedTime = 0; | 4489 | _lastQueriedTime = 0; |
| 4490 | _octreeQuery.incrementConnectionID(); | ||
| 4491 | |||
| 4484 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); | 4492 | queryOctree(NodeType::EntityServer, PacketType::EntityQuery, _entityServerJurisdictions); |
| 4485 | 4493 | ||
| 4486 | DependencyManager::get<AssetClient>()->clearCache(); | 4494 | DependencyManager::get<AssetClient>()->clearCache(); |
| @@ -5543,6 +5551,7 @@ void Application::nodeActivated(SharedNodePointer node) { · 1056 unmodified lines | |||
| 5543 | // so we will do a proper query during update | 5551 | // so we will do a proper query during update |
| 5544 | if (node->getType() == NodeType::EntityServer) { | 5552 | if (node->getType() == NodeType::EntityServer) { |
| 5545 | _lastQueriedTime = 0; | 5553 | _lastQueriedTime = 0; |
| 5554 | _octreeQuery.incrementConnectionID(); | ||
| 5546 | } | 5555 | } |
| 5547 | 5556 | ||
| 5548 | if (node->getType() == NodeType::AudioMixer) { | 5557 | if (node->getType() == NodeType::AudioMixer) { |
| @@ -7082,6 +7091,7 @@ DisplayPluginPointer Application::getActiveDisplayPlugin() const { · 1533 unmodified lines | |||
| 7082 | return _displayPlugin; | 7091 | return _displayPlugin; |
| 7083 | } | 7092 | } |
| 7084 | 7093 | ||
| 7094 | static const char* EXCLUSION_GROUP_KEY = "exclusionGroup"; | ||
| 7085 | 7095 | ||
| 7086 | static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) { | 7096 | static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) { |
| 7087 | auto menu = Menu::getInstance(); | 7097 | auto menu = Menu::getInstance(); |
| @@ -7117,6 +7127,8 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti · 29 unmodified lines | |||
| 7117 | action->setCheckable(true); | 7127 | action->setCheckable(true); |
| 7118 | action->setChecked(active); | 7128 | action->setChecked(active); |
| 7119 | displayPluginGroup->addAction(action); | 7129 | displayPluginGroup->addAction(action); |
| 7130 | |||
| 7131 | action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup)); | ||
| 7120 | Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name)); | 7132 | Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name)); |
| 7121 | } | 7133 | } |
| 7122 | 7134 | ||