Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race

interface/src/scripting/HMDScriptingInterface.cpp

@@ -81,6 +81,10 @@ void  HMDScriptingInterface::closeTablet() {
     _showTablet = false;
 }
 
+void HMDScriptingInterface::openTablet() {
+    _showTablet = true;
+}
+
 QScriptValue HMDScriptingInterface::getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine) {
     glm::vec3 hudIntersection;
     auto instance = DependencyManager::get<HMDScriptingInterface>();

interface/src/scripting/HMDScriptingInterface.h

@@ -76,6 +76,8 @@ public:
 
     Q_INVOKABLE void closeTablet();
 
+    Q_INVOKABLE void openTablet();
+
 signals:
     bool shouldShowHandControllersChanged();
 

libraries/script-engine/src/TabletScriptingInterface.cpp

@@ -287,7 +287,8 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
             QMetaObject::invokeMethod(_qmlTabletRoot, "loadSource", Q_ARG(const QVariant&, QVariant(TABLET_SOURCE_URL)));
         }
 
-        gotoHomeScreen();
+        // force to the tablet to go to the homescreen
+        loadHomeScreen(true);
 
         QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));
 
@@ -305,6 +306,9 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
     }
 }
 
+void TabletProxy::gotoHomeScreen() {
+    loadHomeScreen(false);
+}
 void TabletProxy::gotoMenuScreen(const QString& submenu) {
 
     QObject* root = nullptr;
@@ -388,8 +392,8 @@ void TabletProxy::popFromStack() {
     }
 }
 
-void TabletProxy::gotoHomeScreen() {
-    if (_state != State::Home) {
+void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) {
+    if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) {
         if (!_toolbarMode && _qmlTabletRoot) {
             auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");
             QObject::connect(loader, SIGNAL(loaded()), this, SLOT(addButtonsToHomeScreen()), Qt::DirectConnection);

libraries/script-engine/src/TabletScriptingInterface.h

@@ -202,6 +202,7 @@ protected slots:
     void desktopWindowClosed();
 protected:
     void removeButtonsFromHomeScreen();
+    void loadHomeScreen(bool forceOntoHomeScreen);
     void addButtonsToToolbar();
     void removeButtonsFromToolbar();
 

scripts/system/audio.js

@@ -72,6 +72,9 @@ tablet.screenChanged.connect(onScreenChanged);
 AudioDevice.muteToggled.connect(onMuteToggled);
 
 Script.scriptEnding.connect(function () {
+    if (onAudioScreen) {
+        tablet.gotoHomeScreen();
+    }
     button.clicked.disconnect(onClicked);
     tablet.screenChanged.disconnect(onScreenChanged);
     AudioDevice.muteToggled.disconnect(onMuteToggled);

scripts/system/goto.js

@@ -18,13 +18,14 @@ var button;
 var buttonName = "GOTO";
 var toolBar = null;
 var tablet = null;
-
+var onGotoScreen = false;
 function onAddressBarShown(visible) {
     button.editProperties({isActive: visible});
 }
 
 function onClicked(){
     DialogsManager.toggleAddressBar();
+    onGotoScreen = !onGotoScreen;
 }
 
 if (Settings.getValue("HUDUIEnabled")) {
@@ -49,6 +50,9 @@ button.clicked.connect(onClicked);
 DialogsManager.addressBarShown.connect(onAddressBarShown);
 
 Script.scriptEnding.connect(function () {
+    if (onGotoScreen) {
+        DialogsManager.toggleAddressBar();
+    }
     button.clicked.disconnect(onClicked);
     if (tablet) {
         tablet.removeButton(button);

scripts/system/help.js

@@ -48,6 +48,9 @@
     }, POLL_RATE);
 
     Script.scriptEnding.connect(function () {
+        if (enabled) {
+             Menu.closeInfoView('InfoView_html/help.html');
+        }
         button.clicked.disconnect(onClicked);
         Script.clearInterval(interval);
         if (tablet) {

scripts/system/marketplaces/marketplaces.js

@@ -121,6 +121,7 @@ function onClick() {
     if (onMarketplaceScreen) {
         // for toolbar-mode: go back to home screen, this will close the window.
         tablet.gotoHomeScreen();
+        onMarketplaceScreen = false;
     } else {
         var entity = HMD.tabletID;
         Entities.editEntity(entity, {textures: JSON.stringify({"tex.close": HOME_BUTTON_TEXTURE})});
@@ -140,6 +141,9 @@ tablet.screenChanged.connect(onScreenChanged);
 Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
 
 Script.scriptEnding.connect(function () {
+    if (onMarketplaceScreen) {
+        tablet.gotoHomeScreen();
+    }
     tablet.removeButton(marketplaceButton);
     tablet.screenChanged.disconnect(onScreenChanged);
     Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);

scripts/system/menu.js

@@ -48,6 +48,9 @@ var HOME_BUTTON_TEXTURE = "http://hifi-content.s3.amazonaws.com/alan/dev/tablet-
     tablet.screenChanged.connect(onScreenChanged);
 
     Script.scriptEnding.connect(function () {
+        if (onMenuScreen) {
+            tablet.gotoHomeScreen();
+        }
         button.clicked.disconnect(onClicked);
         tablet.removeButton(button);
         tablet.screenChanged.disconnect(onScreenChanged);

scripts/system/pal.js

@@ -696,6 +696,9 @@ function clearLocalQMLDataAndClosePAL() {
 }
 
 function shutdown() {
+    if (onPalScreen) {
+        tablet.gotoHomeScreen();
+    }
     button.clicked.disconnect(onTabletButtonClicked);
     tablet.removeButton(button);
     tablet.screenChanged.disconnect(onTabletScreenChanged);

scripts/system/snapshot.js

@@ -191,12 +191,12 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
     if (clearOverlayWhenMoving) {
         MyAvatar.setClearOverlayWhenMoving(true); // not until after the share dialog
     }
+    HMD.openTablet();
 }
 
 function processingGif() {
     // show hud
     Reticle.visible = reticleVisible;
-
     button.clicked.disconnect(onClicked);
     buttonConnected = false;
     // show overlays if they were on
@@ -211,8 +211,10 @@ Window.snapshotShared.connect(snapshotShared);
 Window.processingGif.connect(processingGif);
 
 Script.scriptEnding.connect(function () {
-    button.clicked.disconnect(onClicked);
-    buttonConnected = false;
+    if (buttonConnected) {
+        button.clicked.disconnect(onClicked);
+        buttonConnected = false;
+    }
     if (tablet) {
         tablet.removeButton(button);
     }

scripts/system/tablet-users.js

@@ -114,6 +114,9 @@
     tablet.screenChanged.connect(onScreenChanged);
 
     function cleanup() {
+        if (onUsersScreen) {
+            tablet.gotoHomeScreen();
+        }
         button.clicked.disconnect(onClicked);
         tablet.removeButton(button);
     }