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

SysTray Setup. server-console.exe should be included in client-only

Browse source 
installs.

By default, on new install, tray notifier should be enabled.
This commit is contained in:
Roxanne Skelly 2018-09-26 12:59:15 -07:00
parent be87773b2c
commit 2c6e9349eb
3 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server-console/CMakeLists.txt
View file

@ -36,7 +36,11 @@ if (APPLE)
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}" PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR} DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
COMPONENT ${CLIENT_COMPONENT} )
install(
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT}
) )
elseif (WIN32) elseif (WIN32)
set(CONSOLE_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}") set(CONSOLE_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}")
@ -45,7 +49,11 @@ elseif (WIN32)
DIRECTORY "${CONSOLE_DESTINATION}/" DIRECTORY "${CONSOLE_DESTINATION}/"
DESTINATION ${CONSOLE_INSTALL_DIR} DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT} COMPONENT ${SERVER_COMPONENT}
COMPONENT ${CLIENT_COMPONENT} )
install(
DIRECTORY "${CONSOLE_DESTINATION}/"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${CLIENT_COMPONENT}
) )
# sign the copied server console executable after install # sign the copied server console executable after install

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

@ -509,11 +509,13 @@ function buildMenuArray(serverState) {
menuArray.push(labels.share); menuArray.push(labels.share);
menuArray.push(separator); menuArray.push(separator);
if (isInterfaceInstalled()) { if (isInterfaceInstalled()) {
menuArray.push(labels.goto); if(trayNotifications.enabled()) {
menuArray.push(labels.people); menuArray.push(labels.goto);
menuArray.push(labels.wallet); menuArray.push(labels.people);
menuArray.push(labels.marketplace); menuArray.push(labels.wallet);
menuArray.push(separator); menuArray.push(labels.marketplace);
menuArray.push(separator);
}
menuArray.push(labels.showNotifications); menuArray.push(labels.showNotifications);
menuArray.push(separator); menuArray.push(separator);
} }
@ -545,10 +547,6 @@ function updateLabels(serverState) {
} }
labels.showNotifications.checked = trayNotifications.enabled(); labels.showNotifications.checked = trayNotifications.enabled();
labels.people.visible = trayNotifications.enabled();
labels.goto.visible = trayNotifications.enabled();
labels.wallet.visible = trayNotifications.enabled();
labels.marketplace.visible = trayNotifications.enabled();
labels.goto.icon = pendingNotifications[HifiNotificationType.GOTO] ? menuNotificationIcon : null; labels.goto.icon = pendingNotifications[HifiNotificationType.GOTO] ? menuNotificationIcon : null;
labels.people.icon = pendingNotifications[HifiNotificationType.PEOPLE] ? menuNotificationIcon : null; labels.people.icon = pendingNotifications[HifiNotificationType.PEOPLE] ? menuNotificationIcon : null;
labels.wallet.icon = pendingNotifications[HifiNotificationType.WALLET] ? menuNotificationIcon : null; labels.wallet.icon = pendingNotifications[HifiNotificationType.WALLET] ? menuNotificationIcon : null;

4
server-console/src/modules/hf-notifications.js
View file

@ -139,7 +139,7 @@ function HifiNotifications(config, menuNotificationCallback) {
HifiNotifications.prototype = { HifiNotifications.prototype = {
enable: function (enabled) { enable: function (enabled) {
this.config.set("enableTrayNotifications", enabled); this.config.set("disableTrayNotifications", !enabled);
if (enabled) { if (enabled) {
var _this = this; var _this = this;
this.storiesPollTimer = setInterval(function () { this.storiesPollTimer = setInterval(function () {
@ -185,7 +185,7 @@ HifiNotifications.prototype = {
} }
}, },
enabled: function () { enabled: function () {
return this.config.get("enableTrayNotifications", true); return !this.config.get("disableTrayNotifications", false);
}, },
stopPolling: function () { stopPolling: function () {
this.config.set("storiesNotifySince", this.storiesSince.toISOString()); this.config.set("storiesNotifySince", this.storiesSince.toISOString());