From b7f5fc2516393404786e8b17d01e9f00fdaa8575 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 08:58:29 -0700 Subject: [PATCH 1/8] Update 'Sandbox' to 'High Fidelity Sandbox' in task manager --- server-console/packager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-console/packager.js b/server-console/packager.js index bc3b8989d2..89bcd7cb71 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -37,7 +37,7 @@ if (osType == "Darwin") { } else if (osType == "Windows_NT") { options["version-string"] = { CompanyName: "High Fidelity, Inc.", - FileDescription: SHORT_NAME, + FileDescription: FULL_NAME, ProductName: FULL_NAME, OriginalFilename: EXEC_NAME + ".exe" } From ea31a8e3b47d4a6e7c23b387d4671c5c70dd99dd Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 08:59:56 -0700 Subject: [PATCH 2/8] Add VersionInfo.rc.in --- cmake/templates/VersionInfo.rc.in | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 cmake/templates/VersionInfo.rc.in diff --git a/cmake/templates/VersionInfo.rc.in b/cmake/templates/VersionInfo.rc.in new file mode 100644 index 0000000000..1d7b3fa585 --- /dev/null +++ b/cmake/templates/VersionInfo.rc.in @@ -0,0 +1,22 @@ +// Language and character set information as described at +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381049(v=vs.85).aspx +#define US_ENGLISH_UNICODE "040904B0" + +// More information about the format of this file can be found at +// https://msdn.microsoft.com/en-us/library/windows/desktop/aa381058(v=vs.85).aspx +1 VERSIONINFO +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK US_ENGLISH_UNICODE + BEGIN + VALUE "CompanyName", "@BUILD_ORGANIZATION@" + VALUE "FileDescription", "@APP_FULL_NAME@" + VALUE "FileVersion", "@BUILD_VERSION@" + VALUE "InternalName", "@TARGET_NAME@" + VALUE "OriginalFilename", "@EXE_NAME@" + VALUE "ProductName", "@APP_FULL_NAME@" + VALUE "ProductVersion", "@BUILD_VERSION@" + END + END +END From 0cc98d4501e6d009d071fda0b262d3ecb9a7a28d Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 09:00:08 -0700 Subject: [PATCH 3/8] Add VersionInfo.rc to interface --- interface/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index b43376c374..f3d684abf1 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -133,8 +133,13 @@ elseif (WIN32) set(CONFIGURE_ICON_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/Icon.rc") configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT}) + set(APP_FULL_NAME "High Fidelity Interface") + set(EXE_NAME "interface.exe") + set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc") + configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) + # add an executable that also has the icon itself and the configured rc file as resources - add_executable(${TARGET_NAME} WIN32 ${INTERFACE_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT}) + add_executable(${TARGET_NAME} WIN32 ${INTERFACE_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) if (NOT DEV_BUILD) add_custom_command( From 5f8cee787fa06a9e84d44395c1ef71553c3ca667 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 1 Nov 2016 09:07:56 -0700 Subject: [PATCH 4/8] Update VersionInfo.rc.in to use TARGET_NAME.exe as original filename --- cmake/templates/VersionInfo.rc.in | 2 +- interface/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/templates/VersionInfo.rc.in b/cmake/templates/VersionInfo.rc.in index 1d7b3fa585..ad192ed87d 100644 --- a/cmake/templates/VersionInfo.rc.in +++ b/cmake/templates/VersionInfo.rc.in @@ -14,7 +14,7 @@ BEGIN VALUE "FileDescription", "@APP_FULL_NAME@" VALUE "FileVersion", "@BUILD_VERSION@" VALUE "InternalName", "@TARGET_NAME@" - VALUE "OriginalFilename", "@EXE_NAME@" + VALUE "OriginalFilename", "@TARGET_NAME@.exe" VALUE "ProductName", "@APP_FULL_NAME@" VALUE "ProductVersion", "@BUILD_VERSION@" END diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index f3d684abf1..131c4ee509 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -134,7 +134,6 @@ elseif (WIN32) configure_file("${HF_CMAKE_DIR}/templates/Icon.rc.in" ${CONFIGURE_ICON_RC_OUTPUT}) set(APP_FULL_NAME "High Fidelity Interface") - set(EXE_NAME "interface.exe") set(CONFIGURE_VERSION_INFO_RC_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/VersionInfo.rc") configure_file("${HF_CMAKE_DIR}/templates/VersionInfo.rc.in" ${CONFIGURE_VERSION_INFO_RC_OUTPUT}) From e78d907db0a9d933a6f30b5929f6fcdc0ec009c2 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 1 Nov 2016 17:28:35 -0700 Subject: [PATCH 5/8] Add clo to launch interface after content loads --- server-console/src/main.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server-console/src/main.js b/server-console/src/main.js index d8a6f30ac1..6c82230601 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -868,6 +868,12 @@ function onContentLoaded() { homeServer.start(); } + // If we were launched with the launchInterface option, then we need to launch interface now + if (argv.launchInterface) { + log.debug("Interface launch requested... argv.launchInterface:", argv.launchInterface); + startInterface(); + } + // If we were launched with the shutdownWatcher option, then we need to watch for the interface app // shutting down. The interface app will regularly update a running state file which we will check. // If the file doesn't exist or stops updating for a significant amount of time, we will shut down. From 46102d93c6f95d7f2cebe3ab65a6b0520a12d3c1 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 1 Nov 2016 18:13:20 -0700 Subject: [PATCH 6/8] Launch interface on install after content loading --- cmake/templates/NSIS.template.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 568418afe1..d65612351c 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -571,7 +571,9 @@ Function HandlePostInstallOptions ; both launches use the explorer trick in case the user has elevated permissions for the installer ; it won't be possible to use this approach if either application should be launched with a command line param ${If} ${SectionIsSelected} ${@SERVER_COMPONENT_NAME@} - Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"' + ; create shortcut with ARGUMENTS + CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface" + Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"' ${Else} Exec '"$WINDIR\explorer.exe" "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"' ${EndIf} From a948e03ed8d831dfbffa0dfbb06c7ebeb9d2bd06 Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Tue, 1 Nov 2016 23:09:59 +0100 Subject: [PATCH 7/8] changed old icon to new icon --- interface/resources/qml/UpdateDialog.qml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml index ca3a2da577..5e05601ce4 100644 --- a/interface/resources/qml/UpdateDialog.qml +++ b/interface/resources/qml/UpdateDialog.qml @@ -20,10 +20,10 @@ ScrollingWindow { anchors.centerIn: parent UpdateDialog { id: updateDialog - + implicitWidth: backgroundRectangle.width implicitHeight: backgroundRectangle.height - + readonly property int contentWidth: 500 readonly property int logoSize: 60 readonly property int borderWidth: 30 @@ -36,7 +36,7 @@ ScrollingWindow { signal triggerBuildDownload signal closeUpdateDialog - + Rectangle { id: backgroundRectangle color: "#ffffff" @@ -47,7 +47,7 @@ ScrollingWindow { Image { id: logo - source: "../images/interface-logo.svg" + source: "../images/hifi-logo.svg" width: updateDialog.logoSize height: updateDialog.logoSize anchors { @@ -65,7 +65,7 @@ ScrollingWindow { topMargin: updateDialog.borderWidth top: parent.top } - + Rectangle { id: header width: parent.width - updateDialog.logoSize - updateDialog.inputSpacing From 54496c2efff2618fda3f726cd24a838944091fd0 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Wed, 2 Nov 2016 09:02:39 -0700 Subject: [PATCH 8/8] Fix tutorial tracking wentToEntry if you haven't finished the tutorial --- tutorial/tutorial.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tutorial/tutorial.js b/tutorial/tutorial.js index 4908465779..6c824d7bbb 100644 --- a/tutorial/tutorial.js +++ b/tutorial/tutorial.js @@ -971,6 +971,7 @@ TutorialManager = function() { var currentStep = null; var startedTutorialAt = 0; var startedLastStepAt = 0; + var didFinishTutorial = false; var wentToEntryStepNum; var VERSION = 1; @@ -1032,6 +1033,7 @@ TutorialManager = function() { info("DONE WITH TUTORIAL"); currentStepNum = -1; currentStep = null; + didFinishTutorial = true; return false; } else { info("Starting step", currentStepNum); @@ -1069,8 +1071,11 @@ TutorialManager = function() { // This is a message sent from the "entry" portal in the courtyard, // after the tutorial has finished. this.enteredEntryPortal = function() { - info("Got enteredEntryPortal, tracking"); - this.trackStep("wentToEntry", wentToEntryStepNum); + info("Got enteredEntryPortal"); + if (didFinishTutorial) { + info("Tracking wentToEntry"); + this.trackStep("wentToEntry", wentToEntryStepNum); + } } }