Showing the changes to interface/src/Application.cpp (1 of 48 files). Show all
Unified · Split
| @@ -697,8 +697,8 @@ private: · 696 unmodified lines | ||
| 697 | 697 | }; |
| 698 | 698 | |
| 699 | 699 | /**jsdoc |
| 700 | − * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property | |
| 701 | − * values are integer IDs, uniquely identifying each output. <em>Read-only.</em> These can be mapped to actions or functions or | |
| 700 | + * <p>The <code>Controller.Hardware.Application</code> object has properties representing Interface's state. The property | |
| 701 | + * values are integer IDs, uniquely identifying each output. <em>Read-only.</em> These can be mapped to actions or functions or | |
| 702 | 702 | * <code>Controller.Standard</code> items in a {@link RouteObject} mapping (e.g., using the {@link RouteObject#when} method). |
| 703 | 703 | * Each data value is either <code>1.0</code> for "true" or <code>0.0</code> for "false".</p> |
| 704 | 704 | * <table> |
| @@ -780,7 +780,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) { · 75 unmodified lines | ||
| 780 | 780 | static const auto SUPPRESS_SETTINGS_RESET = "--suppress-settings-reset"; |
| 781 | 781 | bool suppressPrompt = cmdOptionExists(argc, const_cast<const char**>(argv), SUPPRESS_SETTINGS_RESET); |
| 782 | 782 | |
| 783 | − // Ignore any previous crashes if running from command line with a test script. | |
| 783 | + // Ignore any previous crashes if running from command line with a test script. | |
| 784 | 784 | bool inTestMode { false }; |
| 785 | 785 | for (int i = 0; i < argc; ++i) { |
| 786 | 786 | QString parameter(argv[i]); |
| @@ -1108,7 +1108,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 321 unmodified lines | ||
| 1108 | 1108 | qCDebug(interfaceapp) << "[VERSION] Build sequence:" << qPrintable(applicationVersion()); |
| 1109 | 1109 | qCDebug(interfaceapp) << "[VERSION] MODIFIED_ORGANIZATION:" << BuildInfo::MODIFIED_ORGANIZATION; |
| 1110 | 1110 | qCDebug(interfaceapp) << "[VERSION] VERSION:" << BuildInfo::VERSION; |
| 1111 | − qCDebug(interfaceapp) << "[VERSION] BUILD_BRANCH:" << BuildInfo::BUILD_BRANCH; | |
| 1111 | + qCDebug(interfaceapp) << "[VERSION] BUILD_TYPE_STRING:" << BuildInfo::BUILD_TYPE_STRING; | |
| 1112 | 1112 | qCDebug(interfaceapp) << "[VERSION] BUILD_GLOBAL_SERVICES:" << BuildInfo::BUILD_GLOBAL_SERVICES; |
| 1113 | 1113 | #if USE_STABLE_GLOBAL_SERVICES |
| 1114 | 1114 | qCDebug(interfaceapp) << "[VERSION] We will use STABLE global services."; |
| @@ -1365,11 +1365,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 250 unmodified lines | ||
| 1365 | 1365 | initializeGL(); |
| 1366 | 1366 | qCDebug(interfaceapp, "Initialized GL"); |
| 1367 | 1367 | |
| 1368 | − // Initialize the display plugin architecture | |
| 1368 | + // Initialize the display plugin architecture | |
| 1369 | 1369 | initializeDisplayPlugins(); |
| 1370 | 1370 | qCDebug(interfaceapp, "Initialized Display"); |
| 1371 | 1371 | |
| 1372 | − // Create the rendering engine. This can be slow on some machines due to lots of | |
| 1372 | + // Create the rendering engine. This can be slow on some machines due to lots of | |
| 1373 | 1373 | // GPU pipeline creation. |
| 1374 | 1374 | initializeRenderEngine(); |
| 1375 | 1375 | qCDebug(interfaceapp, "Initialized Render Engine."); |
| @@ -1413,7 +1413,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 37 unmodified lines | ||
| 1413 | 1413 | // In practice we shouldn't run across installs that don't have a known installer type. |
| 1414 | 1414 | // Client or Client+Server installs should always have the installer.ini next to their |
| 1415 | 1415 | // respective interface.exe, and Steam installs will be detected as such. If a user were |
| 1416 | − // to delete the installer.ini, though, and as an example, we won't know the context of the | |
| 1416 | + // to delete the installer.ini, though, and as an example, we won't know the context of the | |
| 1417 | 1417 | // original install. |
| 1418 | 1418 | constexpr auto INSTALLER_KEY_TYPE = "type"; |
| 1419 | 1419 | constexpr auto INSTALLER_KEY_CAMPAIGN = "campaign"; |
| @@ -1461,6 +1461,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 41 unmodified lines | ||
| 1461 | 1461 | { "tester", QProcessEnvironment::systemEnvironment().contains(TESTER) }, |
| 1462 | 1462 | { "installer_campaign", installerCampaign }, |
| 1463 | 1463 | { "installer_type", installerType }, |
| 1464 | + { "build_type", BuildInfo::BUILD_TYPE_STRING }, | |
| 1464 | 1465 | { "previousSessionCrashed", _previousSessionCrashed }, |
| 1465 | 1466 | { "previousSessionRuntime", sessionRunTime.get() }, |
| 1466 | 1467 | { "cpu_architecture", QSysInfo::currentCpuArchitecture() }, |
| @@ -2178,7 +2179,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 711 unmodified lines | ||
| 2178 | 2179 | if (testProperty.isValid()) { |
| 2179 | 2180 | auto scriptEngines = DependencyManager::get<ScriptEngines>(); |
| 2180 | 2181 | const auto testScript = property(hifi::properties::TEST).toUrl(); |
| 2181 | − | |
| 2182 | + | |
| 2182 | 2183 | // Set last parameter to exit interface when the test script finishes, if so requested |
| 2183 | 2184 | scriptEngines->loadScript(testScript, false, false, false, false, quitWhenFinished); |
| 2184 | 2185 | |
| @@ -2395,7 +2396,7 @@ void Application::onAboutToQuit() { · 210 unmodified lines | ||
| 2395 | 2396 | } |
| 2396 | 2397 | } |
| 2397 | 2398 | |
| 2398 | − // The active display plugin needs to be loaded before the menu system is active, | |
| 2399 | + // The active display plugin needs to be loaded before the menu system is active, | |
| 2399 | 2400 | // so its persisted explicitly here |
| 2400 | 2401 | Setting::Handle<QString>{ ACTIVE_DISPLAY_PLUGIN_SETTING_NAME }.set(getActiveDisplayPlugin()->getName()); |
| 2401 | 2402 | |
| @@ -2630,7 +2631,7 @@ void Application::initializeGL() { · 228 unmodified lines | ||
| 2630 | 2631 | // Create the GPU backend |
| 2631 | 2632 | |
| 2632 | 2633 | // Requires the window context, because that's what's used in the actual rendering |
| 2633 | − // and the GPU backend will make things like the VAO which cannot be shared across | |
| 2634 | + // and the GPU backend will make things like the VAO which cannot be shared across | |
| 2634 | 2635 | // contexts |
| 2635 | 2636 | _glWidget->makeCurrent(); |
| 2636 | 2637 | gpu::Context::init<gpu::gl::GLBackend>(); |
| @@ -2653,7 +2654,7 @@ void Application::initializeDisplayPlugins() { · 16 unmodified lines | ||
| 2653 | 2654 | auto lastActiveDisplayPluginName = activeDisplayPluginSetting.get(); |
| 2654 | 2655 | |
| 2655 | 2656 | auto defaultDisplayPlugin = displayPlugins.at(0); |
| 2656 | − // Once time initialization code | |
| 2657 | + // Once time initialization code | |
| 2657 | 2658 | DisplayPluginPointer targetDisplayPlugin; |
| 2658 | 2659 | foreach(auto displayPlugin, displayPlugins) { |
| 2659 | 2660 | displayPlugin->setContext(_gpuContext); |
| @@ -2666,7 +2667,7 @@ void Application::initializeDisplayPlugins() { · 6 unmodified lines | ||
| 2666 | 2667 | } |
| 2667 | 2668 | |
| 2668 | 2669 | // The default display plugin needs to be activated first, otherwise the display plugin thread |
| 2669 | − // may be launched by an external plugin, which is bad | |
| 2670 | + // may be launched by an external plugin, which is bad | |
| 2670 | 2671 | setDisplayPlugin(defaultDisplayPlugin); |
| 2671 | 2672 | |
| 2672 | 2673 | // Now set the desired plugin if it's not the same as the default plugin |
| @@ -5787,7 +5788,7 @@ void Application::update(float deltaTime) { · 3114 unmodified lines | ||
| 5787 | 5788 | viewIsDifferentEnough = true; |
| 5788 | 5789 | } |
| 5789 | 5790 | |
| 5790 | − | |
| 5791 | + | |
| 5791 | 5792 | // if it's been a while since our last query or the view has significantly changed then send a query, otherwise suppress it |
| 5792 | 5793 | static const std::chrono::seconds MIN_PERIOD_BETWEEN_QUERIES { 3 }; |
| 5793 | 5794 | auto now = SteadyClock::now(); |
| @@ -6155,7 +6156,9 @@ void Application::updateWindowTitle() const { · 361 unmodified lines | ||
| 6155 | 6156 | auto nodeList = DependencyManager::get<NodeList>(); |
| 6156 | 6157 | auto accountManager = DependencyManager::get<AccountManager>(); |
| 6157 | 6158 | |
| 6158 | − QString buildVersion = " (build " + applicationVersion() + ")"; | |
| 6159 | + QString buildVersion = " - " | |
| 6160 | + + (BuildInfo::BUILD_TYPE == BuildInfo::BuildType::Stable ? QString("Version") : QString("Build")) | |
| 6161 | + + " " + applicationVersion(); | |
| 6159 | 6162 | |
| 6160 | 6163 | QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)"; |
| 6161 | 6164 | |
| @@ -7716,7 +7719,7 @@ void Application::sendLambdaEvent(const std::function<void()>& f) { · 1554 unmodified lines | ||
| 7716 | 7719 | } else { |
| 7717 | 7720 | LambdaEvent event(f); |
| 7718 | 7721 | QCoreApplication::sendEvent(this, &event); |
| 7719 | − } | |
| 7722 | + } | |
| 7720 | 7723 | } |
| 7721 | 7724 | |
| 7722 | 7725 | void Application::initPlugins(const QStringList& arguments) { |
| @@ -7939,7 +7942,7 @@ void Application::setDisplayPlugin(DisplayPluginPointer newDisplayPlugin) { · 216 unmodified lines | ||
| 7939 | 7942 | } |
| 7940 | 7943 | |
| 7941 | 7944 | // FIXME don't have the application directly set the state of the UI, |
| 7942 | − // instead emit a signal that the display plugin is changing and let | |
| 7945 | + // instead emit a signal that the display plugin is changing and let | |
| 7943 | 7946 | // the desktop lock itself. Reduces coupling between the UI and display |
| 7944 | 7947 | // plugins |
| 7945 | 7948 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |