From df0ceb17e83e5b5eec980fc30e830d0416f19b1f Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 12 Aug 2016 11:09:22 -0700 Subject: [PATCH 1/4] send (hi res image) details as a json string --- interface/src/ui/Snapshot.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/ui/Snapshot.cpp b/interface/src/ui/Snapshot.cpp index beb86af1c4..b7cdb1a126 100644 --- a/interface/src/ui/Snapshot.cpp +++ b/interface/src/ui/Snapshot.cpp @@ -197,7 +197,8 @@ void SnapshotUploader::uploadSuccess(QNetworkReply& reply) { QJsonObject userStoryObject; QJsonObject detailsObject; detailsObject.insert("image_url", imageUrl); - userStoryObject.insert("details", detailsObject); + QString pickledDetails = QJsonDocument(detailsObject).toJson(); + userStoryObject.insert("details", pickledDetails); userStoryObject.insert("thumbnail_url", thumbnailUrl); userStoryObject.insert("place_name", placeName); userStoryObject.insert("path", currentPath); From ae9af88db287df65ad6d61cb24b2d29d84b996f8 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 12 Aug 2016 11:28:35 -0700 Subject: [PATCH 2/4] Spacing and better size for HMD pictures. --- scripts/system/html/ShareSnapshot.html | 8 +++++--- scripts/system/snapshot.js | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/system/html/ShareSnapshot.html b/scripts/system/html/ShareSnapshot.html index 00f805728c..a30532bbc9 100644 --- a/scripts/system/html/ShareSnapshot.html +++ b/scripts/system/html/ShareSnapshot.html @@ -35,11 +35,13 @@ } .snapsection{ - width:95% !important; - padding-right:0px; + width:95% !important; + padding-right:0px; + } + div#sharing { + margin-top:50px; } - div.clear { clear: both; } diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js index 4c0ba37ab3..39bcc7fe90 100644 --- a/scripts/system/snapshot.js +++ b/scripts/system/snapshot.js @@ -21,7 +21,7 @@ var button = toolBar.addButton({ }); function confirmShare(data) { - var dialog = new OverlayWebWindow('Snapshot', Script.resolvePath("html/ShareSnapshot.html"), 800, 300); + var dialog = new OverlayWebWindow('Snapshot', Script.resolvePath("html/ShareSnapshot.html"), 800, 470); function onMessage(message) { if (message == 'ready') { // The window can now receive data from us. dialog.emitScriptEvent(data); // Send it. From 1b62332058079cd0779657de3a12316b8b92688c Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 12 Aug 2016 11:50:11 -0700 Subject: [PATCH 3/4] don't show checkboxes on confirmation dialog when there's only one picture --- scripts/system/html/ShareSnapshot.html | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/scripts/system/html/ShareSnapshot.html b/scripts/system/html/ShareSnapshot.html index a30532bbc9..f9cc959ba9 100644 --- a/scripts/system/html/ShareSnapshot.html +++ b/scripts/system/html/ShareSnapshot.html @@ -46,7 +46,7 @@