From 6a3dea030e0f7a2e6710e020aedd7126da6a1361 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Tue, 28 Mar 2017 15:15:33 +1300
Subject: [PATCH] Settings link

---
 scripts/system/html/SnapshotReview.html | 2 +-
 scripts/system/snapshot.js              | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/system/html/SnapshotReview.html b/scripts/system/html/SnapshotReview.html
index 3a2262e308..145cfb16a9 100644
--- a/scripts/system/html/SnapshotReview.html
+++ b/scripts/system/html/SnapshotReview.html
@@ -34,7 +34,7 @@
         <div class="snapsection" id="snap-settings">
             <span class="setting">
                 <input type="button" class="glyph naked" id="snapshotSettings" value="@" onclick="snapshotSettings()" />
-                <label for="snapshotSettings">Snapshot settings</label>
+                <label for="snapshotSettings">Settings</label>
             </span>
             <span class="setting checkbox">
                 <input id="openFeed" type="checkbox" checked />
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 4c454dbc7b..010544a2c6 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -60,7 +60,12 @@ function onMessage(message) {
             outstanding = 0;
             break;
         case 'openSettings':
-            Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
+            if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar"))
+                    || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar"))) {
+                Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "General Preferences");
+            } else {
+                tablet.loadQMLSource("TabletGeneralPreferences.qml");
+            }
             break;
         case 'setOpenFeedFalse':
             Settings.setValue('openFeedAfterShare', false);