Revise main window title bar text

nyalldawson · nyalldawson · commit 490f5f06feab · 2017-04-20T11:44:32.000+10:00
- Change order to "project name - QGIS" to follow standard
convention (also avoids possible truncation of project name which is
more useful then the "QGIS" text)
- Don't show version number in release builds. Only show version
in dev builds instead. Showing the version number violates the
HIG for Windows and OSX (and probably Linux DEs too).
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -389,25 +389,15 @@ class QTreeWidgetItem;
 
   If the current project title is null
   if the project file is null then
-  set title text to just application name and version
+  set title text to just application name
   else
   set set title text to the project file name
   else
   set the title text to project title
   */
 static void setTitleBarText_( QWidget &qgisApp )
 {
-  QString caption = QgisApp::tr( "QGIS " );
-
-  if ( Qgis::QGIS_VERSION.endsWith( QLatin1String( "Master" ) ) )
-  {
-    caption += QStringLiteral( "%1" ).arg( Qgis::QGIS_DEV_VERSION );
-  }
-  else
-  {
-    caption += Qgis::QGIS_VERSION;
-  }
-
+  QString caption;
   if ( QgsProject::instance()->title().isEmpty() )
   {
     if ( QgsProject::instance()->fileName().isEmpty() )
@@ -418,16 +408,23 @@ static void setTitleBarText_( QWidget &qgisApp )
     else
     {
       QFileInfo projectFileInfo( QgsProject::instance()->fileName() );
-      caption += " - " + projectFileInfo.completeBaseName();
+      caption = projectFileInfo.completeBaseName() + " - ";
     }
   }
   else
   {
-    caption += " - " + QgsProject::instance()->title();
+    caption = QgsProject::instance()->title() + " - ";
+  }
+
+  caption += QgisApp::tr( "QGIS" );
+
+  if ( Qgis::QGIS_VERSION.endsWith( QLatin1String( "Master" ) ) )
+  {
+    caption += QStringLiteral( " %1" ).arg( Qgis::QGIS_DEV_VERSION );
   }
 
   qgisApp.setWindowTitle( caption );
-} // setTitleBarText_( QWidget * qgisApp )
+}
 
 /**
  Creator function for output viewer
