Showing the changes to interface/src/Application.cpp (1 of 40 files). Show all
Unified · Split
| @@ -355,6 +355,7 @@ static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop"; · 354 unmodified lines | |||
| 355 | static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin"; | 355 | static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin"; |
| 356 | static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system"; | 356 | static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system"; |
| 357 | static const QString KEEP_ME_LOGGED_IN_SETTING_NAME = "keepMeLoggedIn"; | 357 | static const QString KEEP_ME_LOGGED_IN_SETTING_NAME = "keepMeLoggedIn"; |
| 358 | static const QString CACHEBUST_SCRIPT_REQUIRE_SETTING_NAME = "cachebustScriptRequire"; | ||
| 358 | 359 | ||
| 359 | static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f; | 360 | static const float FOCUS_HIGHLIGHT_EXPANSION_FACTOR = 1.05f; |
| 360 | 361 | ||
| @@ -1966,6 +1967,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1605 unmodified lines | |||
| 1966 | loadSettings(); | 1967 | loadSettings(); |
| 1967 | 1968 | ||
| 1968 | updateVerboseLogging(); | 1969 | updateVerboseLogging(); |
| 1970 | |||
| 1971 | setCachebustRequire(); | ||
| 1969 | 1972 | ||
| 1970 | // Make sure we don't time out during slow operations at startup | 1973 | // Make sure we don't time out during slow operations at startup |
| 1971 | updateHeartbeat(); | 1974 | updateHeartbeat(); |
| @@ -2600,6 +2603,16 @@ void Application::updateVerboseLogging() { · 628 unmodified lines | |||
| 2600 | QLoggingCategory::setFilterRules(rules); | 2603 | QLoggingCategory::setFilterRules(rules); |
| 2601 | } | 2604 | } |
| 2602 | 2605 | ||
| 2606 | void Application::setCachebustRequire() { | ||
| 2607 | auto menu = Menu::getInstance(); | ||
| 2608 | if (!menu) { | ||
| 2609 | return; | ||
| 2610 | } | ||
| 2611 | bool enable = menu->isOptionChecked(MenuOption::CachebustRequire); | ||
| 2612 | |||
| 2613 | Setting::Handle<bool>{ CACHEBUST_SCRIPT_REQUIRE_SETTING_NAME, false }.set(enable); | ||
| 2614 | } | ||
| 2615 | |||
| 2603 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) { | 2616 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCodeInt, const QString& extraInfo) { |
| 2604 | DomainHandler::ConnectionRefusedReason reasonCode = static_cast<DomainHandler::ConnectionRefusedReason>(reasonCodeInt); | 2617 | DomainHandler::ConnectionRefusedReason reasonCode = static_cast<DomainHandler::ConnectionRefusedReason>(reasonCodeInt); |
| 2605 | 2618 | ||