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
171#include "ui/Stats.h"171#include "ui/Stats.h"
172#include "ui/UpdateDialog.h"172#include "ui/UpdateDialog.h"
173#include "ui/overlays/Overlays.h"173#include "ui/overlays/Overlays.h"
174#include "ui/DomainConnectionModel.h"
174#include "Util.h"175#include "Util.h"
175#include "InterfaceParentFinder.h"176#include "InterfaceParentFinder.h"
176#include "ui/OctreeStatsProvider.h"177#include "ui/OctreeStatsProvider.h"
@@ -501,6 +502,7 @@ bool setupEssentials(int& argc, char** argv) { · 324 unmodified lines
501 DependencyManager::set<ToolbarScriptingInterface>();502 DependencyManager::set<ToolbarScriptingInterface>();
502 DependencyManager::set<UserActivityLoggerScriptingInterface>();503 DependencyManager::set<UserActivityLoggerScriptingInterface>();
503 DependencyManager::set<AssetMappingsScriptingInterface>();504 DependencyManager::set<AssetMappingsScriptingInterface>();
505 DependencyManager::set<DomainConnectionModel>();
504 506
505#if defined(Q_OS_MAC) || defined(Q_OS_WIN)507#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
506 DependencyManager::set<SpeechRecognizer>();508 DependencyManager::set<SpeechRecognizer>();
@@ -6412,8 +6414,19 @@ void Application::loadEntityStatisticsDialog() { · 5905 unmodified lines
6412 } else {6414 } else {
6413 tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml");6415 tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml");
6414 }6416 }
6417}
6415 6418
6419void 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
6417void Application::toggleLogDialog() {6430void Application::toggleLogDialog() {
6418 if (! _logDialog) {6431 if (! _logDialog) {
6419 _logDialog = new LogDialog(nullptr, getLogger());6432 _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