diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 91c09f7b5b..952f6fff8c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -194,7 +194,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : // call Menu getInstance static method to set up the menu _window->setMenuBar(Menu::getInstance()); - + // Check to see if the user passed in a command line option for loading a local // Voxel File. _voxelsFilename = getCmdOption(argc, constArgv, "-i"); @@ -533,6 +533,7 @@ void Application::resetProfile(const QString& username) { // call the destructor on the old profile and construct a new one (&_profile)->~Profile(); new (&_profile) Profile(username); + updateWindowTitle(); } void Application::controlledBroadcastToNodes(unsigned char* broadcastData, size_t dataBytes, @@ -3790,13 +3791,25 @@ void Application::attachNewHeadToNode(Node* newNode) { } } +void Application::updateWindowTitle(){ + QString title = ""; + QString username = _profile.getUsername(); + if(!username.isEmpty()){ + title += _profile.getUsername(); + title += " @ "; + } + title += _profile.getLastDomain(); + + qDebug("Application title set to: %s.\n", title.toStdString().c_str()); + _window->setWindowTitle(title); +} + void Application::domainChanged(QString domain) { - qDebug("Application title set to: %s.\n", domain.toStdString().c_str()); - _window->setWindowTitle(domain); - // update the user's last domain in their Profile (which will propagate to data-server) _profile.updateDomain(domain); + updateWindowTitle(); + // reset the environment so that we don't erroneously end up with multiple _environment.resetToDefault(); } diff --git a/interface/src/Application.h b/interface/src/Application.h index 6118bfb8b3..fb258f0353 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -109,6 +109,8 @@ public: void touchEndEvent(QTouchEvent* event); void touchUpdateEvent(QTouchEvent* event); + void updateWindowTitle(); + void wheelEvent(QWheelEvent* event); const glm::vec3 getMouseVoxelWorldCoordinates(const VoxelDetail _mouseVoxel); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 1775c250f1..a31ff61ae8 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -532,6 +532,7 @@ void Menu::loadSettings(QSettings* settings) { Application::getInstance()->getAvatar()->loadData(settings); Application::getInstance()->getSwatch()->loadData(settings); Application::getInstance()->getProfile()->loadData(settings); + Application::getInstance()->updateWindowTitle(); NodeList::getInstance()->loadData(settings); }