diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2016-01-13 09:58:19 +0100 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2016-01-14 07:31:42 +0000 |
| commit | c6672c36d94ea5357a3bac028e62a0ee96aab31d (patch) | |
| tree | 71b164e748e476689884823e6b2fc160791cabb9 /ui/qt | |
| parent | 68be8bbc36d4c2de8a9063a5da7cdfee84eb593e (diff) | |
| download | wireshark-c6672c36d94ea5357a3bac028e62a0ee96aab31d.tar.gz wireshark-c6672c36d94ea5357a3bac028e62a0ee96aab31d.tar.bz2 wireshark-c6672c36d94ea5357a3bac028e62a0ee96aab31d.zip | |
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>
Reviewed-on: https://code.wireshark.org/review/13282
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/main_window.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 4b94a826c6..233ed967f1 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1857,13 +1857,17 @@ void MainWindow::setTitlebarForCaptureFile() void MainWindow::setWSWindowTitle(QString title) { - - if(title.isEmpty()) { + if (title.isEmpty()) { title = tr("The Wireshark Network Analyzer"); } - 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); |