UAL moved back to networking
Showing the changes to interface/src/Menu.cpp (1 of 16 files). Show all
Unified · Split
| @@ -57,6 +57,7 @@ · 56 unmodified lines | |||
| 57 | #include "LocationBookmarks.h" | 57 | #include "LocationBookmarks.h" |
| 58 | #include "DeferredLightingEffect.h" | 58 | #include "DeferredLightingEffect.h" |
| 59 | #include "PickManager.h" | 59 | #include "PickManager.h" |
| 60 | #include "crash-handler/CrashHandler.h" | ||
| 60 | 61 | ||
| 61 | #include "scripting/SettingsScriptingInterface.h" | 62 | #include "scripting/SettingsScriptingInterface.h" |
| 62 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) | 63 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| @@ -636,12 +637,13 @@ Menu::Menu() { · 573 unmodified lines | |||
| 636 | true, | 637 | true, |
| 637 | &UserActivityLogger::getInstance(), | 638 | &UserActivityLogger::getInstance(), |
| 638 | SLOT(disable(bool))); | 639 | SLOT(disable(bool))); |
| 640 | |||
| 639 | addCheckableActionToQMenuAndActionHash(networkMenu, | 641 | addCheckableActionToQMenuAndActionHash(networkMenu, |
| 640 | MenuOption::EnableCrashReporting, | 642 | MenuOption::EnableCrashReporting, |
| 641 | 0, | 643 | 0, |
| 642 | UserActivityLogger::getInstance().isCrashReportingEnabled(), | 644 | CrashHandler::getInstance().isEnabled(), |
| 643 | &UserActivityLogger::getInstance(), | 645 | &CrashHandler::getInstance(), |
| 644 | SLOT(setCrashReportingEnabled(bool))); | 646 | SLOT(setEnabled(bool))); |
| 645 | 647 | ||
| 646 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0, | 648 | addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0, |
| 647 | qApp, SLOT(loadDomainConnectionDialog())); | 649 | qApp, SLOT(loadDomainConnectionDialog())); |