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

Merge pull request #8753 from ctrlaltdavid/21068

Browse source 
Improve indication of user not being logged in
This commit is contained in:
Andrew Meadows 2016-10-11 10:40:37 -07:00 committed by GitHub
commit abb05bc686
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/src/Application.cpp
View file

@ -4625,11 +4625,15 @@ void Application::resetSensors(bool andReload) {
void Application::updateWindowTitle() const { void Application::updateWindowTitle() const {
QString buildVersion = " (build " + applicationVersion() + ")";
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
auto accountManager = DependencyManager::get<AccountManager>();
QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) "; QString buildVersion = " (build " + applicationVersion() + ")";
QString username = DependencyManager::get<AccountManager>()->getAccountInfo().getUsername();
QString loginStatus = accountManager->isLoggedIn() ? "" : " (NOT LOGGED IN)";
QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED)";
QString username = accountManager->getAccountInfo().getUsername();
QString currentPlaceName = DependencyManager::get<AddressManager>()->getHost(); QString currentPlaceName = DependencyManager::get<AddressManager>()->getHost();
if (currentPlaceName.isEmpty()) { if (currentPlaceName.isEmpty()) {
@ -4637,7 +4641,7 @@ void Application::updateWindowTitle() const {
} }
QString title = QString() + (!username.isEmpty() ? username + " @ " : QString()) QString title = QString() + (!username.isEmpty() ? username + " @ " : QString())
+ currentPlaceName + connectionStatus + buildVersion; + currentPlaceName + connectionStatus + loginStatus + buildVersion;
#ifndef WIN32 #ifndef WIN32
// crashes with vs2013/win32 // crashes with vs2013/win32

29
scripts/system/users.js
View file

@ -469,7 +469,7 @@ var usersWindow = (function () {
Overlays.editOverlay(minimizeButton, { Overlays.editOverlay(minimizeButton, {
x: windowLeft + WINDOW_WIDTH - WINDOW_MARGIN / 2 - MIN_MAX_BUTTON_WIDTH, 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; scrollbarBackgroundPosition.x = windowLeft + WINDOW_WIDTH - 0.5 * WINDOW_MARGIN - SCROLLBAR_BACKGROUND_WIDTH;
@ -559,34 +559,34 @@ var usersWindow = (function () {
}); });
Overlays.editOverlay(windowHeading, { 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"
}); });
} }
function updateOverlayVisibility() { function updateOverlayVisibility() {
Overlays.editOverlay(windowBorder, { Overlays.editOverlay(windowBorder, {
visible: isLoggedIn && isVisible && isBorderVisible visible: isVisible && isBorderVisible
}); });
Overlays.editOverlay(windowPane, { Overlays.editOverlay(windowPane, {
visible: isLoggedIn && isVisible visible: isVisible
}); });
Overlays.editOverlay(windowHeading, { Overlays.editOverlay(windowHeading, {
visible: isLoggedIn && isVisible visible: isVisible
}); });
Overlays.editOverlay(minimizeButton, { Overlays.editOverlay(minimizeButton, {
visible: isLoggedIn && isVisible visible: isLoggedIn && isVisible
}); });
Overlays.editOverlay(scrollbarBackground, { Overlays.editOverlay(scrollbarBackground, {
visible: isLoggedIn && isVisible && isUsingScrollbars && !isMinimized visible: isVisible && isUsingScrollbars && !isMinimized
}); });
Overlays.editOverlay(scrollbarBar, { Overlays.editOverlay(scrollbarBar, {
visible: isLoggedIn && isVisible && isUsingScrollbars && !isMinimized visible: isVisible && isUsingScrollbars && !isMinimized
}); });
Overlays.editOverlay(friendsButton, { Overlays.editOverlay(friendsButton, {
visible: isLoggedIn && isVisible && !isMinimized visible: isVisible && !isMinimized
}); });
displayControl.setVisible(isLoggedIn && isVisible && !isMinimized); displayControl.setVisible(isVisible && !isMinimized);
visibilityControl.setVisible(isLoggedIn && isVisible && !isMinimized); visibilityControl.setVisible(isVisible && !isMinimized);
} }
function checkLoggedIn() { function checkLoggedIn() {
@ -594,6 +594,13 @@ var usersWindow = (function () {
isLoggedIn = Account.isLoggedIn(); isLoggedIn = Account.isLoggedIn();
if (isLoggedIn !== wasLoggedIn) { if (isLoggedIn !== wasLoggedIn) {
if (wasLoggedIn) {
setMinimized(true);
calculateWindowHeight();
updateOverlayPositions();
updateUsersDisplay();
}
updateOverlayVisibility(); updateOverlayVisibility();
} }
} }
@ -1021,7 +1028,7 @@ var usersWindow = (function () {
color: WINDOW_HEADING_COLOR, color: WINDOW_HEADING_COLOR,
alpha: WINDOW_HEADING_ALPHA, alpha: WINDOW_HEADING_ALPHA,
backgroundAlpha: 0.0, backgroundAlpha: 0.0,
text: "No users online", text: "Users online",
font: WINDOW_FONT, font: WINDOW_FONT,
visible: false visible: false
}); });