Merge branch 'show-armarx-workspace-in-gs' into 'master'

Show the active ArmarX workspace in title of ArmarX Gui

See merge request !91

source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp

@@ -252,7 +252,7 @@ namespace armarx
     }
 
     static QString
-    getUserNameAtHostName()
+    getUserNameAtHostName(const QString& delimiter, const QString& at)
     {
         const QString hostname = QHostInfo::localHostName();
         QString user = getUserName();
@@ -262,7 +262,7 @@ namespace armarx
         }
         else
         {
-            return user + "-at-" + hostname;
+            return user + delimiter + at + delimiter + hostname;
         }
     }
 
@@ -270,7 +270,7 @@ namespace armarx
     ArmarXGuiApp::makeName()
     {
         std::vector<std::string> items{"ArmarXGui"};
-        items.push_back(getUserNameAtHostName().toStdString());
+        items.push_back(getUserNameAtHostName("-", "at").toStdString());
         items.push_back(DateTime::Now().toDateTimeString());
 
         std::string name = simox::alg::join(items, "_");
@@ -327,7 +327,21 @@ namespace armarx
         const auto guiWindowBaseName = QString{"ArmarX"} + " @ " + QHostInfo::localHostName();
         setApplicationName(guiWindowBaseName);
 
-        setApplicationDisplayName(getUserNameAtHostName());
+        {
+            const char* envArmarxWorkspace = std::getenv("ARMARX_WORKSPACE_NAME");
+            if (envArmarxWorkspace == nullptr)
+            {
+                envArmarxWorkspace = std::getenv("ARMARX_WORKSPACE");
+            }
+
+            QString applicationDisplayName;
+            if (envArmarxWorkspace != nullptr)
+            {
+                applicationDisplayName += "[▽" + QString(envArmarxWorkspace) + "] ";
+            }
+            applicationDisplayName += getUserNameAtHostName(" ", "@");
+            setApplicationDisplayName(applicationDisplayName);
+        }
 
         connect(this,
                 SIGNAL(exceptionCaught(QString)),