History

Implemented Domain Connection statistics for Tablet UI

Vladyslav Stelmakhovskyi committed 9 years ago

Commit 856e1501 parent cf0e90e7 files · +325 −1Browse files

Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all

Unified · Split

interface/src/Application.cpp+13−0
@@ -171,6 +171,7 @@ · 170 unmodified lines
171171 #include "ui/Stats.h"
172172 #include "ui/UpdateDialog.h"
173173 #include "ui/overlays/Overlays.h"
174+#include "ui/DomainConnectionModel.h"
174175 #include "Util.h"
175176 #include "InterfaceParentFinder.h"
176177 #include "ui/OctreeStatsProvider.h"
@@ -501,6 +502,7 @@ bool setupEssentials(int& argc, char** argv) { · 324 unmodified lines
501502 DependencyManager::set<ToolbarScriptingInterface>();
502503 DependencyManager::set<UserActivityLoggerScriptingInterface>();
503504 DependencyManager::set<AssetMappingsScriptingInterface>();
505+ DependencyManager::set<DomainConnectionModel>();
504506
505507 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
506508 DependencyManager::set<SpeechRecognizer>();
@@ -6412,8 +6414,19 @@ void Application::loadEntityStatisticsDialog() { · 5905 unmodified lines
64126414 } else {
64136415 tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml");
64146416 }
6417+}
64156418
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+ }
64166428 }
6429+
64176430 void Application::toggleLogDialog() {
64186431 if (! _logDialog) {
64196432 _logDialog = new LogDialog(nullptr, getLogger());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t