# Conflicts: # CMakeLists.txt # README.md # cmake/externals/glad32es/CMakeLists.txt # cmake/externals/glad41/CMakeLists.txt # cmake/externals/glad45/CMakeLists.txt # cmake/externals/polyvox/CMakeLists.txt # cmake/externals/quazip/CMakeLists.txt # cmake/externals/vhacd/CMakeLists.txt # cmake/init.cmake # cmake/ports/hifi-deps/CONTROL # cmake/ports/sdl2/CONTROL # cmake/ports/sdl2/disable-hidapi-for-uwp.patch # cmake/ports/sdl2/enable-winrt-cmake.patch # cmake/ports/sdl2/fix-arm64-headers.patch # cmake/ports/sdl2/fix-x86-windows.patch # cmake/ports/sdl2/portfile.cmake # cmake/ports/sdl2/vcpkg-cmake-wrapper.cmake # cmake/ports/tbb/portfile.cmake # hifi_vcpkg.py # interface/src/avatar/MyAvatar.h # libraries/avatars-renderer/src/avatars-renderer/Avatar.h # libraries/avatars/src/AvatarData.h # libraries/entities-renderer/src/RenderableEntityItem.h # libraries/entities/src/EntityItem.cpp # libraries/entities/src/EntityItem.h # libraries/fbx/src/GLTFSerializer.cpp # libraries/graphics-scripting/src/graphics-scripting/Forward.h # libraries/networking/src/AddressManager.cpp # libraries/networking/src/DomainHandler.h # libraries/procedural/src/procedural/ProceduralMaterialCache.cpp # libraries/render-utils/src/HighlightEffect.cpp # libraries/render-utils/src/MeshPartPayload.cpp # libraries/render-utils/src/Model.cpp # libraries/render-utils/src/RenderShadowTask.cpp # libraries/script-engine/src/WebSocketClass.cpp
Showing the changes to interface/src/Menu.cpp (1 of 403 files). Show all
Unified · Split
| @@ -29,6 +29,8 @@ · 28 unmodified lines | |||
| 29 | #include <VrMenu.h> | 29 | #include <VrMenu.h> |
| 30 | #include <ScriptEngines.h> | 30 | #include <ScriptEngines.h> |
| 31 | #include <MenuItemProperties.h> | 31 | #include <MenuItemProperties.h> |
| 32 | #include <ui/types/FileTypeProfile.h> | ||
| 33 | #include <ui/types/HFWebEngineProfile.h> | ||
| 32 | 34 | ||
| 33 | #include "Application.h" | 35 | #include "Application.h" |
| 34 | #include "AccountManager.h" | 36 | #include "AccountManager.h" |
| @@ -595,8 +597,20 @@ Menu::Menu() { · 560 unmodified lines | |||
| 595 | QString("hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog"); | 597 | QString("hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog"); |
| 596 | }); | 598 | }); |
| 597 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); | 599 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches())); |
| 598 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ClearDiskCache, 0, | 600 | |
| 599 | DependencyManager::get<AssetClient>().data(), SLOT(clearCache())); | 601 | action = addActionToQMenuAndActionHash(networkMenu, MenuOption::ClearDiskCaches); |
| 602 | connect(action, &QAction::triggered, [] { | ||
| 603 | // The following caches are cleared immediately | ||
| 604 | DependencyManager::get<AssetClient>()->clearCache(); | ||
| 605 | #ifndef Q_OS_ANDROID | ||
| 606 | FileTypeProfile::clearCache(); | ||
| 607 | HFWebEngineProfile::clearCache(); | ||
| 608 | #endif | ||
| 609 | |||
| 610 | // Clear the KTX cache on the next restart. It can't be cleared immediately because its files might be in use. | ||
| 611 | Setting::Handle<int>(KTXCache::SETTING_VERSION_NAME, KTXCache::INVALID_VERSION).set(KTXCache::INVALID_VERSION); | ||
| 612 | }); | ||
| 613 | |||
| 600 | addCheckableActionToQMenuAndActionHash(networkMenu, | 614 | addCheckableActionToQMenuAndActionHash(networkMenu, |
| 601 | MenuOption::DisableActivityLogger, | 615 | MenuOption::DisableActivityLogger, |
| 602 | 0, | 616 | 0, |