();
+ updateFromOpenVrKeyboardInput();
// Simulate an enter press on the top level window to trigger the action
if (0 == (_currentHints & Qt::ImhMultiLine)) {
qApp->sendEvent(offscreenUi->getWindow(), &QKeyEvent(QEvent::KeyPress, Qt::Key_Return, Qt::KeyboardModifiers(), QString("\n")));
@@ -267,6 +271,11 @@ void handleOpenVrEvents() {
activeHmd->AcknowledgeQuit_Exiting();
break;
+ case vr::VREvent_KeyboardCharInput:
+ // Make the focused field match the keyboard results, inclusive of combining characters and such.
+ updateFromOpenVrKeyboardInput();
+ break;
+
case vr::VREvent_KeyboardDone:
finishOpenVrKeyboardInput();
diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index dc252afcf1..153d39f1f4 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -27,4 +27,6 @@ Script.load("system/controllers/grab.js");
Script.load("system/controllers/teleport.js");
Script.load("system/controllers/toggleAdvancedMovementForHandControllers.js")
Script.load("system/dialTone.js");
-Script.load("system/firstPersonHMD.js");
\ No newline at end of file
+Script.load("system/firstPersonHMD.js");
+Script.load("system/snapshot.js");
+
diff --git a/scripts/system/assets/images/tools/snap.svg b/scripts/system/assets/images/tools/snap.svg
new file mode 100755
index 0000000000..c540f307ae
--- /dev/null
+++ b/scripts/system/assets/images/tools/snap.svg
@@ -0,0 +1,109 @@
+
+
+
diff --git a/scripts/system/html/SnapshotReview.html b/scripts/system/html/SnapshotReview.html
new file mode 100644
index 0000000000..db70a1910b
--- /dev/null
+++ b/scripts/system/html/SnapshotReview.html
@@ -0,0 +1,48 @@
+
+
+ Share
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Would you like to share your pic in the Snapshots feed?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Snapshots can be shared when they're taken in shareable places.";
+ }
+}
+window.onload = function () {
+ // Something like the following will allow testing in a browser.
+ //addImage({localPath: 'c:/Users/howar/OneDrive/Pictures/hifi-snap-by--on-2016-07-27_12-58-43.jpg'});
+ //addImage({localPath: 'http://lorempixel.com/1512/1680'});
+ openEventBridge(function () {
+ // Set up a handler for receiving the data, and tell the .js we are ready to receive it.
+ EventBridge.scriptEventReceived.connect(function (message) {
+ // last element of list contains a bool for whether or not we can share stuff
+ var shareMsg = message.pop();
+ handleShareButtons(shareMsg);
+
+ // rest are image paths which we add
+ useCheckboxes = message.length > 1;
+ message.forEach(addImage);
+ });
+ EventBridge.emitWebEvent('ready');
+ });
+
+};
+// beware of bug: Cannot send objects at top level. (Nested in arrays is fine.)
+function shareSelected() {
+ EventBridge.emitWebEvent(paths);
+};
+function doNotShare() {
+ EventBridge.emitWebEvent([]);
+};
+function snapshotSettings() {
+ EventBridge.emitWebEvent("openSettings");
+};
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index 98a31d708c..34f9814d8a 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -527,12 +527,14 @@ function onDomainConnectionRefused(reason) {
createNotification("Connection refused: " + reason, NotificationType.CONNECTION_REFUSED);
}
-function onSnapshotTaken(path) {
- var imageProperties = {
- path: Script.resolvePath("file:///" + path),
- aspectRatio: Window.innerWidth / Window.innerHeight
+function onSnapshotTaken(path, notify) {
+ if (notify) {
+ var imageProperties = {
+ path: Script.resolvePath("file:///" + path),
+ aspectRatio: Window.innerWidth / Window.innerHeight
+ }
+ createNotification(wordWrap("Snapshot saved to " + path), NotificationType.SNAPSHOT, imageProperties);
}
- createNotification(wordWrap("Snapshot saved to " + path), NotificationType.SNAPSHOT, imageProperties);
}
// handles mouse clicks on buttons
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
new file mode 100644
index 0000000000..2f3b8862c2
--- /dev/null
+++ b/scripts/system/snapshot.js
@@ -0,0 +1,154 @@
+//
+// snapshot.js
+//
+// Created by David Kelly on 1 August 2016
+// Copyright 2016 High Fidelity, Inc
+//
+// Distributed under the Apache License, Version 2.0
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+var SNAPSHOT_DELAY = 500; // 500ms
+var toolBar = Toolbars.getToolbar("com.highfidelity.interface.toolbar.system");
+var resetOverlays;
+var reticleVisible;
+var button = toolBar.addButton({
+ objectName: "snapshot",
+ imageURL: Script.resolvePath("assets/images/tools/snap.svg"),
+ visible: true,
+ buttonState: 1,
+ defaultState: 1,
+ hoverState: 2,
+ alpha: 0.9,
+});
+
+function shouldOpenFeedAfterShare() {
+ var persisted = Settings.getValue('openFeedAfterShare', true); // might answer true, false, "true", or "false"
+ return persisted && (persisted !== 'false');
+}
+function showFeedWindow() {
+ DialogsManager.showFeed();
+}
+
+var outstanding;
+function confirmShare(data) {
+ var dialog = new OverlayWebWindow('Snapshot Review', Script.resolvePath("html/SnapshotReview.html"), 800, 320);
+ function onMessage(message) {
+ // Receives message from the html dialog via the qwebchannel EventBridge. This is complicated by the following:
+ // 1. Although we can send POJOs, we cannot receive a toplevel object. (Arrays of POJOs are fine, though.)
+ // 2. Although we currently use a single image, we would like to take snapshot, a selfie, a 360 etc. all at the
+ // same time, show the user all of them, and have the user deselect any that they do not want to share.
+ // So we'll ultimately be receiving a set of objects, perhaps with different post processing for each.
+ var isLoggedIn;
+ var needsLogin = false;
+ switch (message) {
+ case 'ready':
+ dialog.emitScriptEvent(data); // Send it.
+ outstanding = 0;
+ break;
+ case 'openSettings':
+ Desktop.show("hifi/dialogs/GeneralPreferencesDialog.qml", "GeneralPreferencesDialog");
+ break;
+ case 'setOpenFeedFalse':
+ Settings.setValue('openFeedAfterShare', false)
+ break;
+ case 'setOpenFeedTrue':
+ Settings.setValue('openFeedAfterShare', true)
+ break;
+ default:
+ dialog.webEventReceived.disconnect(onMessage);
+ dialog.close();
+ isLoggedIn = Account.isLoggedIn();
+ message.forEach(function (submessage) {
+ if (submessage.share && !isLoggedIn) {
+ needsLogin = true;
+ submessage.share = false;
+ }
+ if (submessage.share) {
+ print('sharing', submessage.localPath);
+ outstanding++;
+ Window.shareSnapshot(submessage.localPath);
+ } else {
+ print('not sharing', submessage.localPath);
+ }
+ });
+ if (!outstanding && shouldOpenFeedAfterShare()) {
+ showFeedWindow();
+ }
+ if (needsLogin) { // after the possible feed, so that the login is on top
+ Account.checkAndSignalForAccessToken();
+ }
+ }
+ }
+ dialog.webEventReceived.connect(onMessage);
+ dialog.raise();
+}
+
+function snapshotShared(errorMessage) {
+ if (!errorMessage) {
+ print('snapshot uploaded and shared');
+ } else {
+ print(errorMessage);
+ }
+ if ((--outstanding <= 0) && shouldOpenFeedAfterShare()) {
+ showFeedWindow();
+ }
+}
+
+function onClicked() {
+ // update button states
+ resetOverlays = Menu.isOptionChecked("Overlays");
+ reticleVisible = Reticle.visible;
+ Reticle.visible = false;
+ Window.snapshotTaken.connect(resetButtons);
+
+ button.writeProperty("buttonState", 0);
+ button.writeProperty("defaultState", 0);
+ button.writeProperty("hoverState", 2);
+
+ // hide overlays if they are on
+ if (resetOverlays) {
+ Menu.setIsOptionChecked("Overlays", false);
+ }
+
+ // hide hud
+ toolBar.writeProperty("visible", false);
+
+ // take snapshot (with no notification)
+ Script.setTimeout(function () {
+ Window.takeSnapshot(false, 1.91);
+ }, SNAPSHOT_DELAY);
+}
+
+function resetButtons(path, notify) {
+ // show overlays if they were on
+ if (resetOverlays) {
+ Menu.setIsOptionChecked("Overlays", true);
+ }
+ // show hud
+ toolBar.writeProperty("visible", true);
+ Reticle.visible = reticleVisible;
+
+ // update button states
+ button.writeProperty("buttonState", 1);
+ button.writeProperty("defaultState", 1);
+ button.writeProperty("hoverState", 3);
+ Window.snapshotTaken.disconnect(resetButtons);
+
+ // last element in data array tells dialog whether we can share or not
+ confirmShare([
+ { localPath: path },
+ {
+ canShare: !!location.placename,
+ openFeedAfterShare: shouldOpenFeedAfterShare()
+ }
+ ]);
+ }
+
+button.clicked.connect(onClicked);
+Window.snapshotShared.connect(snapshotShared);
+
+Script.scriptEnding.connect(function () {
+ toolBar.removeButton("snapshot");
+ button.clicked.disconnect(onClicked);
+ Window.snapshotShared.disconnect(snapshotShared);
+});