Qt: Separate window titles with Em dash on OS X

The window titles on OS X are usually separated by Em dash,
so use this when appending prefs.gui_window_title.

Change-Id: Ice46179fc872eefc7662b42052b428eabf1b6d61
Reviewed-on: https://code.wireshark.org/review/13256
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>

1 files changed, 8 insertions, 4 deletions

diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 7a2aea93f8..4cb8cd93d2 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -1877,17 +1877,21 @@ void MainWindow::setTitlebarForCaptureFile()
 
 void MainWindow::setWSWindowTitle(QString title)
 {
-
-    if(title.isEmpty()) {
+    if (title.isEmpty()) {
         title = tr("The Wireshark Network Analyzer");
     }
 
-    if((prefs.gui_prepend_window_title != NULL) && (*prefs.gui_prepend_window_title != '\0')) {
+    if (prefs.gui_prepend_window_title && prefs.gui_prepend_window_title[0]) {
         title.prepend(QString("[%1] ").arg(prefs.gui_prepend_window_title));
     }
 
-    if((prefs.gui_window_title != NULL) && (*prefs.gui_window_title != '\0')) {
+    if (prefs.gui_window_title && prefs.gui_window_title[0]) {
+#ifdef __APPLE__
+        // On OS X we separate the titles with a unicode em dash
+        title.append(QString(" %1 %2").arg(UTF8_EM_DASH).arg(prefs.gui_window_title));
+#else
         title.append(QString(" [%1]").arg(prefs.gui_window_title));
+#endif
     }
 
     setWindowTitle(title);