From 4ca0048ec9605fe5df00c2d8c00ba5422126f03d Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Oct 2016 15:21:24 +1300 Subject: [PATCH 1/4] Display minimized users list when not logged in --- scripts/system/users.js | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 76722bd58d..454f8811a6 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -565,28 +565,28 @@ var usersWindow = (function () { function updateOverlayVisibility() { Overlays.editOverlay(windowBorder, { - visible: isLoggedIn && isVisible && isBorderVisible + visible: isVisible && isBorderVisible }); Overlays.editOverlay(windowPane, { - visible: isLoggedIn && isVisible + visible: isVisible }); Overlays.editOverlay(windowHeading, { - visible: isLoggedIn && isVisible + visible: isVisible }); Overlays.editOverlay(minimizeButton, { visible: isLoggedIn && isVisible }); Overlays.editOverlay(scrollbarBackground, { - visible: isLoggedIn && isVisible && isUsingScrollbars && !isMinimized + visible: isVisible && isUsingScrollbars && !isMinimized }); Overlays.editOverlay(scrollbarBar, { - visible: isLoggedIn && isVisible && isUsingScrollbars && !isMinimized + visible: isVisible && isUsingScrollbars && !isMinimized }); Overlays.editOverlay(friendsButton, { - visible: isLoggedIn && isVisible && !isMinimized + visible: isVisible && !isMinimized }); - displayControl.setVisible(isLoggedIn && isVisible && !isMinimized); - visibilityControl.setVisible(isLoggedIn && isVisible && !isMinimized); + displayControl.setVisible(isVisible && !isMinimized); + visibilityControl.setVisible(isVisible && !isMinimized); } function checkLoggedIn() { @@ -594,6 +594,13 @@ var usersWindow = (function () { isLoggedIn = Account.isLoggedIn(); if (isLoggedIn !== wasLoggedIn) { + if (wasLoggedIn) { + setMinimized(true); + calculateWindowHeight(); + updateOverlayPositions(); + updateUsersDisplay(); + } + updateOverlayVisibility(); } } From c637649805edf81f794dfd944a6936c3d1fa7ff8 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Oct 2016 15:25:47 +1300 Subject: [PATCH 2/4] Make users online title say to login to view --- scripts/system/users.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 454f8811a6..9dc451a8ed 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -559,7 +559,7 @@ var usersWindow = (function () { }); Overlays.editOverlay(windowHeading, { - text: linesOfUsers.length > 0 ? "Users online" : "No users online" + text: isLoggedIn ? (linesOfUsers.length > 0 ? "Users online" : "No users online") : "Users online - log in to view" }); } @@ -1028,7 +1028,7 @@ var usersWindow = (function () { color: WINDOW_HEADING_COLOR, alpha: WINDOW_HEADING_ALPHA, backgroundAlpha: 0.0, - text: "No users online", + text: "Users online", font: WINDOW_FONT, visible: false }); From c76bb01359f45173d7415e8f9be63b052b7ddc34 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Oct 2016 15:39:46 +1300 Subject: [PATCH 3/4] Make Interface title say if user not logged in --- interface/src/Application.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 610144b2cc..c7101f7434 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4568,11 +4568,15 @@ void Application::resetSensors(bool andReload) { void Application::updateWindowTitle() const { - QString buildVersion = " (build " + applicationVersion() + ")"; auto nodeList = DependencyManager::get(); + auto accountManager = DependencyManager::get(); - QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) "; - QString username = DependencyManager::get()->getAccountInfo().getUsername(); + QString buildVersion = " (build " + applicationVersion() + ")"; + + QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)"; + + QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)"; + QString username = accountManager->getAccountInfo().getUsername(); QString currentPlaceName = DependencyManager::get()->getHost(); if (currentPlaceName.isEmpty()) { @@ -4580,7 +4584,7 @@ void Application::updateWindowTitle() const { } QString title = QString() + (!username.isEmpty() ? username + " @ " : QString()) - + currentPlaceName + connectionStatus + buildVersion; + + currentPlaceName + connectionStatus + loginStatus + buildVersion; #ifndef WIN32 // crashes with vs2013/win32 From 52fbb654fae3f876a6a34d2880b9df3eb8f41b74 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Oct 2016 15:43:54 +1300 Subject: [PATCH 4/4] Tweak location of users online minimize/maximize button --- scripts/system/users.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/users.js b/scripts/system/users.js index 9dc451a8ed..1e1a68fd9c 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -469,7 +469,7 @@ var usersWindow = (function () { Overlays.editOverlay(minimizeButton, { x: windowLeft + WINDOW_WIDTH - WINDOW_MARGIN / 2 - MIN_MAX_BUTTON_WIDTH, - y: windowTop + WINDOW_MARGIN / 2 + y: windowTop + WINDOW_MARGIN }); scrollbarBackgroundPosition.x = windowLeft + WINDOW_WIDTH - 0.5 * WINDOW_MARGIN - SCROLLBAR_BACKGROUND_WIDTH;