From 7985c39f2a0c1bf46d1c3d51a96fdc4bb7af293c Mon Sep 17 00:00:00 2001
From: vladest <vladstelmahovsky@gmail.com>
Date: Thu, 21 Dec 2017 22:14:15 +0100
Subject: [PATCH] Adopt path to certain Tablet dialogs to new loading subsystem
 and path resolver

---
 .../qml/hifi/tablet/TabletMenuStack.qml         |  10 +++++++---
 interface/resources/qml/js/Utils.jsc            | Bin 6596 -> 0 bytes
 interface/src/Application.cpp                   |   8 ++++----
 interface/src/Menu.cpp                          |  16 ++++++++--------
 4 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 100644 interface/resources/qml/js/Utils.jsc

diff --git a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
index 8cd696a41b..ff653b6457 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuStack.qml
@@ -48,11 +48,15 @@ Item {
         }
 
         function pushSource(path) {
-            d.push(Qt.resolvedUrl(path));
-            d.currentItem.sendToScript.connect(tabletMenu.sendToScript);
+            d.push(Qt.resolvedUrl("../../" + path));
+            if (d.currentItem.sendToScript !== undefined) {
+                d.currentItem.sendToScript.connect(tabletMenu.sendToScript);
+            }
             d.currentItem.focus = true;
             d.currentItem.forceActiveFocus();
-            breadcrumbText.text = d.currentItem.title;
+            if (d.currentItem.title !== undefined) {
+                breadcrumbText.text = d.currentItem.title;
+            }
             if (typeof bgNavBar !== "undefined") {
                 d.currentItem.y = bgNavBar.height;
                 d.currentItem.height -= bgNavBar.height;
diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
deleted file mode 100644
index ab20e996b9469915ac6a89901da175143e6b5024..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6596
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
IW4T=ZA1knw6aWAK

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index f17e06cb35..fe60c63c31 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -6313,7 +6313,7 @@ void Application::showAssetServerWidget(QString filePath) {
         if (!hmd->getShouldShowTablet() && !isHMDMode()) {
             DependencyManager::get<OffscreenUi>()->show(url, "AssetServer", startUpload);
         } else {
-            static const QUrl url("../../hifi/dialogs/TabletAssetServer.qml");
+            static const QUrl url("hifi/dialogs/TabletAssetServer.qml");
             tablet->pushOntoStack(url);
         }
     }
@@ -6886,7 +6886,7 @@ void Application::loadLODToolsDialog() {
         auto dialogsManager = DependencyManager::get<DialogsManager>();
         dialogsManager->lodTools();
     } else {
-        tablet->pushOntoStack("../../hifi/dialogs/TabletLODTools.qml");
+        tablet->pushOntoStack("hifi/dialogs/TabletLODTools.qml");
     }
 }
 
@@ -6898,7 +6898,7 @@ void Application::loadEntityStatisticsDialog() {
         auto dialogsManager = DependencyManager::get<DialogsManager>();
         dialogsManager->octreeStatsDetails();
     } else {
-        tablet->pushOntoStack("../../hifi/dialogs/TabletEntityStatistics.qml");
+        tablet->pushOntoStack("hifi/dialogs/TabletEntityStatistics.qml");
     }
 }
 
@@ -6909,7 +6909,7 @@ void Application::loadDomainConnectionDialog() {
         auto dialogsManager = DependencyManager::get<DialogsManager>();
         dialogsManager->showDomainConnectionDialog();
     } else {
-        tablet->pushOntoStack("../../hifi/dialogs/TabletDCDialog.qml");
+        tablet->pushOntoStack("hifi/dialogs/TabletDCDialog.qml");
     }
 }
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index eeda9e9036..2ba569f75b 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -166,7 +166,7 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(avatarMenu, MenuOption::Attachments);
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/AttachmentsDialog.qml"),
-            QString("../../hifi/tablet/TabletAttachmentsDialog.qml"), "AttachmentsDialog");
+            QString("hifi/tablet/TabletAttachmentsDialog.qml"), "AttachmentsDialog");
     });
 
     // Avatar > Size
@@ -309,13 +309,13 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(settingsMenu, MenuOption::Preferences, Qt::CTRL | Qt::Key_Comma, nullptr, nullptr, QAction::PreferencesRole);
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/GeneralPreferencesDialog.qml"),
-            QString("../../hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");
+            QString("hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog");
     });
 
     action = addActionToQMenuAndActionHash(settingsMenu, "Audio...");
     connect(action, &QAction::triggered, [] {
         static const QUrl widgetUrl("hifi/dialogs/Audio.qml");
-        static const QUrl tabletUrl("../../hifi/audio/Audio.qml");
+        static const QUrl tabletUrl("hifi/audio/Audio.qml");
         static const QString name("AudioDialog");
         qApp->showDialog(widgetUrl, tabletUrl, name);
     });
@@ -324,14 +324,14 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(settingsMenu, "Avatar...");
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/AvatarPreferencesDialog.qml"),
-            QString("../../hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");
+            QString("hifi/tablet/TabletAvatarPreferences.qml"), "AvatarPreferencesDialog");
     });
 
     // Settings > LOD...
     action = addActionToQMenuAndActionHash(settingsMenu, "LOD...");
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/LodPreferencesDialog.qml"),
-            QString("../../hifi/tablet/TabletLodPreferences.qml"), "LodPreferencesDialog");
+            QString("hifi/tablet/TabletLodPreferences.qml"), "LodPreferencesDialog");
     });
 
     action = addActionToQMenuAndActionHash(settingsMenu, "Controller Settings...");
@@ -364,7 +364,7 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
-            QString("../../hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
+            QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
     });
 
     // Developer > UI >>>
@@ -615,7 +615,7 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(networkMenu, MenuOption::Networking);
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/NetworkingPreferencesDialog.qml"),
-            QString("../../hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog");
+            QString("hifi/tablet/TabletNetworkingPreferences.qml"), "NetworkingPreferencesDialog");
     });
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ClearDiskCache, 0,
@@ -676,7 +676,7 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(audioDebugMenu, "Buffers...");
     connect(action, &QAction::triggered, [] {
         qApp->showDialog(QString("hifi/dialogs/AudioBuffers.qml"),
-            QString("../../hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");
+            QString("hifi/tablet/TabletAudioBuffers.qml"), "AudioBuffersDialog");
     });
 
     auto audioIO = DependencyManager::get<AudioClient>();