Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -171,6 +171,7 @@ · 170 unmodified lines | ||
| 171 | 171 | #include "ui/Stats.h" |
| 172 | 172 | #include "ui/UpdateDialog.h" |
| 173 | 173 | #include "ui/overlays/Overlays.h" |
| 174 | +#include "ui/DomainConnectionModel.h" | |
| 174 | 175 | #include "Util.h" |
| 175 | 176 | #include "InterfaceParentFinder.h" |
| 176 | 177 | #include "ui/OctreeStatsProvider.h" |
| @@ -501,6 +502,7 @@ bool setupEssentials(int& argc, char** argv) { · 324 unmodified lines | ||
| 501 | 502 | DependencyManager::set<ToolbarScriptingInterface>(); |
| 502 | 503 | DependencyManager::set<UserActivityLoggerScriptingInterface>(); |
| 503 | 504 | DependencyManager::set<AssetMappingsScriptingInterface>(); |
| 505 | + DependencyManager::set<DomainConnectionModel>(); | |
| 504 | 506 | |
| 505 | 507 | #if defined(Q_OS_MAC) || defined(Q_OS_WIN) |
| 506 | 508 | DependencyManager::set<SpeechRecognizer>(); |
| @@ -6412,8 +6414,19 @@ void Application::loadEntityStatisticsDialog() { · 5905 unmodified lines | ||
| 6412 | 6414 | } else { |
| 6413 | 6415 | tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml"); |
| 6414 | 6416 | } |
| 6417 | +} | |
| 6415 | 6418 | |
| 6419 | +void Application::loadDomainConnectionDialog() { | |
| 6420 | + auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>(); | |
| 6421 | + auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); | |
| 6422 | + if (tablet->getToolbarMode() || (!tablet->getTabletRoot() && !isHMDMode())) { | |
| 6423 | + auto dialogsManager = DependencyManager::get<DialogsManager>(); | |
| 6424 | + dialogsManager->showDomainConnectionDialog(); | |
| 6425 | + } else { | |
| 6426 | + tablet->pushOntoStack("../../hifi/dialogs/TabletDCDialog.qml"); | |
| 6427 | + } | |
| 6416 | 6428 | } |
| 6429 | + | |
| 6417 | 6430 | void Application::toggleLogDialog() { |
| 6418 | 6431 | if (! _logDialog) { |
| 6419 | 6432 | _logDialog = new LogDialog(nullptr, getLogger()); |