Qt: Continue using the new window title format.

Update several dialog titles to "Wireshark · <subtile...>".

Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9
Reviewed-on: https://code.wireshark.org/review/6127
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>

10 files changed, 16 insertions, 20 deletions

diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp
index 03d4892411..c68db555d8 100644
--- a/ui/qt/capture_file_dialog.cpp
+++ b/ui/qt/capture_file_dialog.cpp
@@ -556,7 +556,7 @@ QDialogButtonBox *CaptureFileDialog::addHelpButton(topic_action_e help_topic)
 }
 
 int CaptureFileDialog::open(QString &file_name, unsigned int &type) {
-    setWindowTitle(tr("Wireshark: Open Capture File"));
+    setWindowTitle(wsApp->windowTitleString(tr("Open Capture File")));
     setNameFilters(buildFileOpenTypeList());
     setFileMode(QFileDialog::ExistingFile);
 
@@ -592,7 +592,7 @@ int CaptureFileDialog::open(QString &file_name, unsigned int &type) {
 }
 
 check_savability_t CaptureFileDialog::saveAs(QString &file_name, bool must_support_all_comments) {
-    setWindowTitle(tr("Wireshark: Save Capture File As"));
+    setWindowTitle(wsApp->windowTitleString(tr("Save Capture File As")));
     // XXX There doesn't appear to be a way to use setNameFilters without restricting
     // what the user can select. We might want to use our own combobox instead and
     // let the user select anything.
@@ -620,7 +620,7 @@ check_savability_t CaptureFileDialog::saveAs(QString &file_name, bool must_suppo
 check_savability_t CaptureFileDialog::exportSelectedPackets(QString &file_name, packet_range_t *range) {
     QDialogButtonBox *button_box;
 
-    setWindowTitle(tr("Wireshark: Export Specified Packets"));
+    setWindowTitle(wsApp->windowTitleString(tr("Export Specified Packets")));
     // XXX See comment in ::saveAs regarding setNameFilters
     setNameFilters(buildFileSaveAsTypeList(false));
     setAcceptMode(QFileDialog::AcceptSave);
@@ -653,7 +653,7 @@ check_savability_t CaptureFileDialog::exportSelectedPackets(QString &file_name,
 }
 
 int CaptureFileDialog::merge(QString &file_name) {
-    setWindowTitle(tr("Wireshark: Merge Capture File"));
+    setWindowTitle(wsApp->windowTitleString(tr("Merge Capture File")));
     setNameFilters(buildFileOpenTypeList());
     setFileMode(QFileDialog::ExistingFile);
 
diff --git a/ui/qt/file_set_dialog.cpp b/ui/qt/file_set_dialog.cpp
index 9e6898d7e8..2a9dd7763b 100644
--- a/ui/qt/file_set_dialog.cpp
+++ b/ui/qt/file_set_dialog.cpp
@@ -92,7 +92,7 @@ void FileSetDialog::addFile(fileset_entry *entry) {
     gchar *size_str;
 
     if (!entry) {
-        setWindowTitle(tr("Wireshark: No files in Set"));
+        setWindowTitle(wsApp->windowTitleString(tr("No files in Set")));
         fs_ui_->directoryLabel->setText(tr("No capture loaded"));
         fs_ui_->directoryLabel->setEnabled(false);
         return;
@@ -122,9 +122,9 @@ void FileSetDialog::addFile(fileset_entry *entry) {
     // Not perfect but better than nothing.
     entry_item->setTextAlignment(3, Qt::AlignRight);
 
-    setWindowTitle(QString(tr("Wireshark: %1 File%2 in Set"))
-                   .arg(fs_ui_->fileSetTree->topLevelItemCount())
-                   .arg(plurality(fs_ui_->fileSetTree->topLevelItemCount(), "", "s")));
+    setWindowTitle(wsApp->windowTitleString(tr("%1 File%2 in Set")
+                                            .arg(fs_ui_->fileSetTree->topLevelItemCount())
+                                            .arg(plurality(fs_ui_->fileSetTree->topLevelItemCount(), "", "s"))));
 
     dir_name = fileset_get_dirname();
     fs_ui_->directoryLabel->setText(dir_name);
diff --git a/ui/qt/packet_comment_dialog.cpp b/ui/qt/packet_comment_dialog.cpp
index 28f4e3994a..9ead3d6422 100644
--- a/ui/qt/packet_comment_dialog.cpp
+++ b/ui/qt/packet_comment_dialog.cpp
@@ -29,6 +29,7 @@ PacketCommentDialog::PacketCommentDialog(QWidget *parent, QString comment) :
     pc_ui_(new Ui::PacketCommentDialog)
 {
     pc_ui_->setupUi(this);
+    setWindowTitle(wsApp->windowTitleString(tr("Packet Comment")));
 
     pc_ui_->commentTextEdit->setPlainText(comment);
 }
diff --git a/ui/qt/packet_comment_dialog.ui b/ui/qt/packet_comment_dialog.ui
index ab1b1c2e6a..db14c1ada2 100644
--- a/ui/qt/packet_comment_dialog.ui
+++ b/ui/qt/packet_comment_dialog.ui
@@ -10,9 +10,6 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Wireshark: Packet Comment</string>
-  </property>
   <property name="modal">
    <bool>true</bool>
   </property>
@@ -32,6 +29,7 @@
    </item>
   </layout>
  </widget>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp
index 475cd3389f..be08d1c16d 100644
--- a/ui/qt/preferences_dialog.cpp
+++ b/ui/qt/preferences_dialog.cpp
@@ -38,6 +38,7 @@
 #include "syntax_line_edit.h"
 #include "qt_ui_utils.h"
 #include "uat_dialog.h"
+#include "wireshark_application.h"
 
 #include <QColorDialog>
 #include <QFileDialog>
@@ -271,6 +272,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) :
     // Some classes depend on pref_ptr_to_pref_ so this MUST be called after
     // fill_advanced_prefs.
     pd_ui_->setupUi(this);
+    setWindowTitle(wsApp->windowTitleString(tr("Preferences")));
     pd_ui_->advancedTree->invisibleRootItem()->addChildren(tmp_item.takeChildren());
     QTreeWidgetItemIterator pref_it(pd_ui_->advancedTree, QTreeWidgetItemIterator::NoChildren);
     while (*pref_it) {
diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui
index fb04f46719..69d59d7808 100644
--- a/ui/qt/preferences_dialog.ui
+++ b/ui/qt/preferences_dialog.ui
@@ -10,9 +10,6 @@
     <height>475</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Wireshark: Preferences</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QSplitter" name="splitter">
@@ -203,6 +200,7 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>
diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp
index a3160feb35..2d5ab8bca7 100644
--- a/ui/qt/profile_dialog.cpp
+++ b/ui/qt/profile_dialog.cpp
@@ -52,6 +52,7 @@ ProfileDialog::ProfileDialog(QWidget *parent) :
     const gchar *profile_name = get_profile_name();
 
     pd_ui_->setupUi(this);
+    setWindowTitle(wsApp->windowTitleString(tr("Configuration Profiles")));
     ok_button_ = pd_ui_->buttonBox->button(QDialogButtonBox::Ok);
 
     // XXX - Use NSImageNameAddTemplate and NSImageNameRemoveTemplate to set stock
diff --git a/ui/qt/profile_dialog.ui b/ui/qt/profile_dialog.ui
index 054fa8a729..b5b178282e 100644
--- a/ui/qt/profile_dialog.ui
+++ b/ui/qt/profile_dialog.ui
@@ -10,9 +10,6 @@
     <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Wireshark: Configuration Profiles</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QTreeWidget" name="profileTreeWidget">
diff --git a/ui/qt/time_shift_dialog.cpp b/ui/qt/time_shift_dialog.cpp
index ce0d13eaf9..5f628c5b87 100644
--- a/ui/qt/time_shift_dialog.cpp
+++ b/ui/qt/time_shift_dialog.cpp
@@ -35,6 +35,7 @@ TimeShiftDialog::TimeShiftDialog(QWidget *parent, capture_file *cf) :
     apply_button_(NULL)
 {
     ts_ui_->setupUi(this);
+    setWindowTitle(wsApp->windowTitleString(tr("Time Shift")));
     apply_button_ = ts_ui_->buttonBox->button(QDialogButtonBox::Apply);
     connect(apply_button_, SIGNAL(clicked()), this, SLOT(applyTimeShift()));
 
diff --git a/ui/qt/time_shift_dialog.ui b/ui/qt/time_shift_dialog.ui
index 939a80e446..6e8ba82231 100644
--- a/ui/qt/time_shift_dialog.ui
+++ b/ui/qt/time_shift_dialog.ui
@@ -16,9 +16,6 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle">
-   <string>Wireshark: Time Shift</string>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -218,6 +215,7 @@
    <header>syntax_line_edit.h</header>
   </customwidget>
  </customwidgets>
+ <resources/>
  <connections>
   <connection>
    <sender>buttonBox</sender>