Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add app user-model IDs to Sandbox shortcut and use in server-console

Browse source
This commit is contained in:
Simon Walton 2018-05-30 10:21:07 -07:00
parent 65bb4c218e
commit ef4d09c5e2
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/templates/NSIS.template.in
View file

@ -1174,8 +1174,14 @@ Section "-Core installation"
!insertmacro MUI_STARTMENU_WRITE_END !insertmacro MUI_STARTMENU_WRITE_END
!if @PRODUCTION_BUILD@ == 1 !if @PRODUCTION_BUILD@ == 1
${If} @SERVER_COMPONENT_CONDITIONAL@
ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "com.highfidelity.sandbox"
${EndIf}
ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface" ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface"
!else !else
${If} @SERVER_COMPONENT_CONDITIONAL@
ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "com.highfidelity.sandbox-dev"
${EndIf}
ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface-dev" ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@INTERFACE_SHORTCUT_NAME@.lnk" "com.highfidelity.interface-dev"
!endif !endif

5
server-console/src/main.js
View file

@ -44,6 +44,8 @@ const LOG_FILE_REGEX = /(domain-server|ac-monitor|ac)-.*-std(out|err).txt/;
const HOME_CONTENT_URL = "http://cdn.highfidelity.com/content-sets/home-tutorial-RC40.tar.gz"; const HOME_CONTENT_URL = "http://cdn.highfidelity.com/content-sets/home-tutorial-RC40.tar.gz";
const APP_USER_MODEL_ID = 'com.highfidelity.sandbox'; // For Windows jump list, etc.
function getBuildInfo() { function getBuildInfo() {
var buildInfoPath = null; var buildInfoPath = null;
@ -867,7 +869,6 @@ function onContentLoaded() {
} catch (e) { } catch (e) {
} }
var appUserModelId = 'com.highfidelity.interface'; // For Windows jump list, etc.
if (currentVersion !== null) { if (currentVersion !== null) {
const CHECK_FOR_UPDATES_INTERVAL_SECONDS = 60 * 30; const CHECK_FOR_UPDATES_INTERVAL_SECONDS = 60 * 30;
var hasShownUpdateNotification = false; var hasShownUpdateNotification = false;
@ -879,7 +880,7 @@ function onContentLoaded() {
title: 'An update is available!', title: 'An update is available!',
message: 'High Fidelity version ' + latestVersion + ' is available', message: 'High Fidelity version ' + latestVersion + ' is available',
wait: true, wait: true,
appID: appUserModelId, appID: APP_USER_MODEL_ID,
url: url url: url
}); });
hasShownUpdateNotification = true; hasShownUpdateNotification = true;