From 6711e8cbc2cdf3217ef3ae4d0250daa3eabc9be8 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 26 Apr 2017 13:01:02 -0700
Subject: [PATCH] Remove duplicate setting; Make settings page open; button
 state

---
 interface/src/ui/PreferencesDialog.cpp |  5 --
 scripts/system/snapshot.js             | 64 ++++++++++++++------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp
index a12d9020ae..617ac1ed1c 100644
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@@ -116,11 +116,6 @@ void setupPreferences() {
         auto preference = new BrowsePreference(SNAPSHOTS, "Put my snapshots here", getter, setter);
         preferences->addPreference(preference);
     }
-    {
-        auto getter = []()->bool { return SnapshotAnimated::alsoTakeAnimatedSnapshot.get(); };
-        auto setter = [](bool value) { SnapshotAnimated::alsoTakeAnimatedSnapshot.set(value); };
-        preferences->addPreference(new CheckPreference(SNAPSHOTS, "Take Animated GIF Snapshot", getter, setter));
-    }
     {
         auto getter = []()->float { return SnapshotAnimated::snapshotAnimatedDuration.get(); };
         auto setter = [](float value) { SnapshotAnimated::snapshotAnimatedDuration.set(value); };
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index 88014d5c50..4cb1232a58 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -24,6 +24,7 @@ var buttonConnected = false;
 var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 var button = tablet.addButton({
     icon: "icons/tablet-icons/snap-i.svg",
+    activeIcon: "icons/tablet-icons/snap-a.svg",
     text: buttonName,
     sortOrder: 5
 });
@@ -137,8 +138,7 @@ function onMessage(message) {
             }
             break;
         case 'openSettings':
-            if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar"))
-                    || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar"))) {
+            if ((HMD.active && Settings.getValue("hmdTabletBecomesToolbar", true)) || (!HMD.active && Settings.getValue("desktopTabletBecomesToolbar", false))) {
                 Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "General Preferences");
             } else {
                 tablet.loadQMLOnTop("TabletGeneralPreferences.qml");
@@ -229,29 +229,34 @@ function onMessage(message) {
 
 var SNAPSHOT_REVIEW_URL = Script.resolvePath("html/SnapshotReview.html");
 var isInSnapshotReview = false;
-function openSnapApp() {
-    var previousStillSnapPath = Settings.getValue("previousStillSnapPath");
-    var previousStillSnapStoryID = Settings.getValue("previousStillSnapStoryID");
-    var previousStillSnapSharingDisabled = Settings.getValue("previousStillSnapSharingDisabled");
-    var previousAnimatedSnapPath = Settings.getValue("previousAnimatedSnapPath");
-    var previousAnimatedSnapStoryID = Settings.getValue("previousAnimatedSnapStoryID");
-    var previousAnimatedSnapSharingDisabled = Settings.getValue("previousAnimatedSnapSharingDisabled");
-    snapshotOptions = {
-        containsGif: previousAnimatedSnapPath !== "",
-        processingGif: false,
-        shouldUpload: false
+function onButtonClicked() {
+    if (isInSnapshotReview){
+        // for toolbar-mode: go back to home screen, this will close the window.
+        tablet.gotoHomeScreen();
+    } else {
+        var previousStillSnapPath = Settings.getValue("previousStillSnapPath");
+        var previousStillSnapStoryID = Settings.getValue("previousStillSnapStoryID");
+        var previousStillSnapSharingDisabled = Settings.getValue("previousStillSnapSharingDisabled");
+        var previousAnimatedSnapPath = Settings.getValue("previousAnimatedSnapPath");
+        var previousAnimatedSnapStoryID = Settings.getValue("previousAnimatedSnapStoryID");
+        var previousAnimatedSnapSharingDisabled = Settings.getValue("previousAnimatedSnapSharingDisabled");
+        snapshotOptions = {
+            containsGif: previousAnimatedSnapPath !== "",
+            processingGif: false,
+            shouldUpload: false
+        }
+        imageData = [];
+        if (previousAnimatedSnapPath !== "") {
+            imageData.push({ localPath: previousAnimatedSnapPath, story_id: previousAnimatedSnapStoryID, buttonDisabled: previousAnimatedSnapSharingDisabled });
+        }
+        if (previousStillSnapPath !== "") {
+            imageData.push({ localPath: previousStillSnapPath, story_id: previousStillSnapStoryID, buttonDisabled: previousStillSnapSharingDisabled });
+        }
+        tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
+        tablet.webEventReceived.connect(onMessage);
+        HMD.openTablet();
+        isInSnapshotReview = true;
     }
-    imageData = [];
-    if (previousAnimatedSnapPath !== "") {
-        imageData.push({ localPath: previousAnimatedSnapPath, story_id: previousAnimatedSnapStoryID, buttonDisabled: previousAnimatedSnapSharingDisabled });
-    }
-    if (previousStillSnapPath !== "") {
-        imageData.push({ localPath: previousStillSnapPath, story_id: previousStillSnapStoryID, buttonDisabled: previousStillSnapSharingDisabled });
-    }
-    tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
-    tablet.webEventReceived.connect(onMessage);
-    HMD.openTablet();
-    isInSnapshotReview = true;
 }
 
 function snapshotUploaded(isError, reply) {
@@ -315,7 +320,7 @@ function takeSnapshot() {
         Window.stillSnapshotTaken.connect(stillSnapshotTaken);
     }
     if (buttonConnected) {
-        button.clicked.disconnect(openSnapApp);
+        button.clicked.disconnect(onButtonClicked);
         buttonConnected = false;
     }
 
@@ -366,7 +371,7 @@ function stillSnapshotTaken(pathStillSnapshot, notify) {
     }
     Window.stillSnapshotTaken.disconnect(stillSnapshotTaken);
     if (!buttonConnected) {
-        button.clicked.connect(openSnapApp);
+        button.clicked.connect(onButtonClicked);
         buttonConnected = true;
     }
 
@@ -430,7 +435,7 @@ function processingGifStarted(pathStillSnapshot) {
 function processingGifCompleted(pathAnimatedSnapshot) {
     Window.processingGifCompleted.disconnect(processingGifCompleted);
     if (!buttonConnected) {
-        button.clicked.connect(openSnapApp);
+        button.clicked.connect(onButtonClicked);
         buttonConnected = true;
     }
 
@@ -469,6 +474,7 @@ function maybeDeleteSnapshotStories() {
     }
 }
 function onTabletScreenChanged(type, url) {
+    button.editProperties({ isActive: !isInSnapshotReview });
     if (isInSnapshotReview) {
         tablet.webEventReceived.disconnect(onMessage);
         isInSnapshotReview = false;
@@ -482,14 +488,14 @@ function onUsernameChanged() {
     }
 }
 
-button.clicked.connect(openSnapApp);
+button.clicked.connect(onButtonClicked);
 buttonConnected = true;
 Window.snapshotShared.connect(snapshotUploaded);
 tablet.screenChanged.connect(onTabletScreenChanged);
 Account.usernameChanged.connect(onUsernameChanged);
 Script.scriptEnding.connect(function () {
     if (buttonConnected) {
-        button.clicked.disconnect(openSnapApp);
+        button.clicked.disconnect(onButtonClicked);
         buttonConnected = false;
     }
     if (tablet) {