diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-12-31 14:21:50 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-31 22:48:17 +0000 |
commit | 91e43303949491d8865bac6fd0464102f176fc52 (patch) | |
tree | ac6b03e8a9cf96727e02818d0d52c5646e25fef0 /ui/qt | |
parent | 0e57ff2ca1ac3f8e409927d677ae4f6d5c3a9bcb (diff) |
Qt: Convert more dialog titles.
Change-Id: I9c3e3471a92b7af9347a541bece3d9405d37dce0
Reviewed-on: https://code.wireshark.org/review/6193
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/capture_interfaces_dialog.cpp | 1 | ||||
-rw-r--r-- | ui/qt/capture_interfaces_dialog.ui | 4 | ||||
-rw-r--r-- | ui/qt/decode_as_dialog.cpp | 1 | ||||
-rw-r--r-- | ui/qt/decode_as_dialog.ui | 3 | ||||
-rw-r--r-- | ui/qt/export_dissection_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/export_object_dialog.cpp | 5 | ||||
-rw-r--r-- | ui/qt/follow_stream_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/font_color_preferences_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/import_text_dialog.cpp | 3 | ||||
-rw-r--r-- | ui/qt/import_text_dialog.ui | 4 | ||||
-rw-r--r-- | ui/qt/io_graph_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/lbm_uimflow_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/main_window_slots.cpp | 6 | ||||
-rw-r--r-- | ui/qt/module_preferences_scroll_area.cpp | 7 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.cpp | 6 | ||||
-rw-r--r-- | ui/qt/print_dialog.cpp | 1 | ||||
-rw-r--r-- | ui/qt/print_dialog.ui | 4 | ||||
-rw-r--r-- | ui/qt/sctp_graph_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/sequence_dialog.cpp | 4 | ||||
-rw-r--r-- | ui/qt/stats_tree_dialog.cpp | 8 | ||||
-rw-r--r-- | ui/qt/tcp_stream_dialog.cpp | 2 |
21 files changed, 42 insertions, 37 deletions
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp index 34f305174d..a2e0a824b8 100644 --- a/ui/qt/capture_interfaces_dialog.cpp +++ b/ui/qt/capture_interfaces_dialog.cpp @@ -101,6 +101,7 @@ CaptureInterfacesDialog::CaptureInterfacesDialog(QWidget *parent) : ui(new Ui::CaptureInterfacesDialog) { ui->setupUi(this); + setWindowTitle(wsApp->windowTitleString(tr("Capture Interfaces"))); stat_timer_ = NULL; stat_cache_ = NULL; diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui index 29f831f2df..0d3c3b4f2c 100644 --- a/ui/qt/capture_interfaces_dialog.ui +++ b/ui/qt/capture_interfaces_dialog.ui @@ -10,9 +10,6 @@ <height>435</height> </rect> </property> - <property name="windowTitle"> - <string>Wireshark: Capture interfaces</string> - </property> <layout class="QVBoxLayout" name="verticalLayout_12"> <item> <widget class="QTabWidget" name="tabWidget"> @@ -814,5 +811,6 @@ PLEASE NOTE: One option MUST be selected.</string> <header>capture_filter_combo.h</header> </customwidget> </customwidgets> + <resources/> <connections/> </ui> diff --git a/ui/qt/decode_as_dialog.cpp b/ui/qt/decode_as_dialog.cpp index 72e9455e6e..d1b4952890 100644 --- a/ui/qt/decode_as_dialog.cpp +++ b/ui/qt/decode_as_dialog.cpp @@ -59,6 +59,7 @@ DecodeAsDialog::DecodeAsDialog(QWidget *parent, capture_file *cf, bool create_ne selector_combo_box_(NULL) { ui->setupUi(this); + setWindowTitle(wsApp->windowTitleString(tr("Decode As" UTF8_HORIZONTAL_ELLIPSIS))); ui->deleteToolButton->setEnabled(false); GList *cur; diff --git a/ui/qt/decode_as_dialog.ui b/ui/qt/decode_as_dialog.ui index d089933c16..77ade5ccd8 100644 --- a/ui/qt/decode_as_dialog.ui +++ b/ui/qt/decode_as_dialog.ui @@ -10,9 +10,6 @@ <height>460</height> </rect> </property> - <property name="windowTitle"> - <string>Wireshark: Decode As</string> - </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <widget class="QTreeWidget" name="decodeAsTreeWidget"> diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp index 6fa8831d83..c0a58501f1 100644 --- a/ui/qt/export_dissection_dialog.cpp +++ b/ui/qt/export_dissection_dialog.cpp @@ -59,9 +59,9 @@ ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *ca QStringList name_filters; int last_row; - setWindowTitle(tr("Wireshark: Export Packet Dissections")); + setWindowTitle(wsApp->windowTitleString(tr("Export Packet Dissections"))); setAcceptMode(QFileDialog::AcceptSave); - setLabelText(FileType, tr("Export as:")); + setLabelText(FileType, tr("Export As:")); // export_type_map_keys() sorts alphabetically. We don't want that. name_filters diff --git a/ui/qt/export_object_dialog.cpp b/ui/qt/export_object_dialog.cpp index c98e9c5beb..35b56e45e4 100644 --- a/ui/qt/export_object_dialog.cpp +++ b/ui/qt/export_object_dialog.cpp @@ -23,6 +23,7 @@ #include "ui_export_object_dialog.h" #include <ui/alert_box.h> +#include <ui/utf8_entities.h> #include <wsutil/filesystem.h> #include <wsutil/str_util.h> @@ -256,7 +257,7 @@ void ExportObjectDialog::saveCurrentEntry() entry = item->data(0, Qt::UserRole).value<export_object_entry_t *>(); if (!entry) return; - file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save Object As..."), + file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Object As" UTF8_HORIZONTAL_ELLIPSIS)), path.filePath(entry->filename)); if (file_name.length() > 0) { @@ -273,7 +274,7 @@ void ExportObjectDialog::saveAllEntries() QString file_path; bool all_saved = true; - file_path = QFileDialog::getSaveFileName(this, tr("Wireshark: Save All Objects In..."), + file_path = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save All Objects In" UTF8_HORIZONTAL_ELLIPSIS)), path.canonicalPath(), QString(), NULL, QFileDialog::ShowDirsOnly); diff --git a/ui/qt/follow_stream_dialog.cpp b/ui/qt/follow_stream_dialog.cpp index 6c98db6029..06742f4d97 100644 --- a/ui/qt/follow_stream_dialog.cpp +++ b/ui/qt/follow_stream_dialog.cpp @@ -214,7 +214,7 @@ void FollowStreamDialog::findText(bool go_back) void FollowStreamDialog::saveAs() { - QString file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save stream content as")); + QString file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Stream Content As" UTF8_HORIZONTAL_ELLIPSIS))); file_.setFileName(file_name); file_.open( QIODevice::WriteOnly ); QTextStream out(&file_); diff --git a/ui/qt/font_color_preferences_frame.cpp b/ui/qt/font_color_preferences_frame.cpp index fd44f2fda9..1c53b43957 100644 --- a/ui/qt/font_color_preferences_frame.cpp +++ b/ui/qt/font_color_preferences_frame.cpp @@ -194,7 +194,7 @@ void FontColorPreferencesFrame::changeColor(pref_t *pref) void FontColorPreferencesFrame::on_fontPushButton_clicked() { bool ok; - QFont new_font = QFontDialog::getFont(&ok, cur_font_, this, tr("Wireshark: Font")); + QFont new_font = QFontDialog::getFont(&ok, cur_font_, this, wsApp->windowTitleString(tr("Font"))); if (ok) { g_free(pref_qt_gui_font_name_->stashed_val.string); pref_qt_gui_font_name_->stashed_val.string = qstring_strdup(new_font.toString()); diff --git a/ui/qt/import_text_dialog.cpp b/ui/qt/import_text_dialog.cpp index 39cf304bcd..71847d456b 100644 --- a/ui/qt/import_text_dialog.cpp +++ b/ui/qt/import_text_dialog.cpp @@ -55,6 +55,7 @@ ImportTextDialog::ImportTextDialog(QWidget *parent) : int i; ti_ui_->setupUi(this); + setWindowTitle(wsApp->windowTitleString(tr("Import From Hex Dump"))); memset(&import_info_, 0, sizeof(import_info_)); ok_button_ = ti_ui_->buttonBox->button(QDialogButtonBox::Ok); @@ -277,7 +278,7 @@ void ImportTextDialog::on_textFileBrowseButton_clicked() break; } - QString file_name = QFileDialog::getOpenFileName(this, tr("Wireshark: Import text file"), open_dir); + QString file_name = QFileDialog::getOpenFileName(this, wsApp->windowTitleString(tr("Import Text File")), open_dir); ti_ui_->textFileLineEdit->setText(file_name); } diff --git a/ui/qt/import_text_dialog.ui b/ui/qt/import_text_dialog.ui index f557fd52a4..86af3786f5 100644 --- a/ui/qt/import_text_dialog.ui +++ b/ui/qt/import_text_dialog.ui @@ -22,9 +22,6 @@ <height>486</height> </size> </property> - <property name="windowTitle"> - <string>Wireshark: Import from Hex Dump</string> - </property> <property name="sizeGripEnabled"> <bool>true</bool> </property> @@ -456,6 +453,7 @@ <header>syntax_line_edit.h</header> </customwidget> </customwidgets> + <resources/> <connections> <connection> <sender>buttonBox</sender> diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp index f52a9e4746..034d23cbc3 100644 --- a/ui/qt/io_graph_dialog.cpp +++ b/ui/qt/io_graph_dialog.cpp @@ -26,6 +26,8 @@ #include "epan/stats_tree_priv.h" #include "epan/uat-int.h" +#include "ui/utf8_entities.h" + #include "qt_ui_utils.h" #include "tango_colors.h" @@ -1471,7 +1473,7 @@ void IOGraphDialog::on_buttonBox_accepted() if (!file_closed_) { save_file += QString("/%1").arg(cap_file_.fileTitle()); } - file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save Graph As..."), + file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), save_file, filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index 1f67677e11..b4bdb6aa41 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -32,6 +32,8 @@ #include <epan/addr_resolv.h> #include <wsutil/nstime.h> +#include "ui/utf8_entities.h" + #include "wireshark_application.h" #include <QDir> @@ -464,7 +466,7 @@ void LBMUIMFlowDialog::on_buttonBox_accepted(void) filter.append(QString(";;%5").arg(ascii_filter)); } - file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save Graph As..."), + file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 4461a8248f..4407290688 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1434,7 +1434,7 @@ void MainWindow::on_actionFileExportPacketBytes_triggered() if (!capture_file_.capFile() || !capture_file_.capFile()->finfo_selected) return; file_name = QFileDialog::getSaveFileName(this, - tr("Wireshark: Export Selected Packet Bytes"), + wsApp->windowTitleString(tr("Export Selected Packet Bytes")), wsApp->lastOpenDir().canonicalPath(), tr("Raw data (*.bin *.dat *.raw);;Any File (*.*)") ); @@ -1500,8 +1500,8 @@ void MainWindow::on_actionFileExportSSLSessionKeys_triggered() return; } - save_title.append(QString("Wireshark: Export SSL Session Keys (%1 key%2"). - arg(keylist_len).arg(plurality(keylist_len, "", "s"))); + save_title.append(wsApp->windowTitleString(tr("Export SSL Session Keys (%1 key%2"). + arg(keylist_len).arg(plurality(keylist_len, "", "s")))); file_name = QFileDialog::getSaveFileName(this, save_title, wsApp->lastOpenDir().canonicalPath(), diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index cf46347b99..f1290e2fe9 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -24,6 +24,7 @@ #include "syntax_line_edit.h" #include "qt_ui_utils.h" #include "uat_dialog.h" +#include "wireshark_application.h" #include <epan/prefs-int.h> @@ -474,8 +475,7 @@ void ModulePreferencesScrollArea::filenamePushButtonPressed() pref_t *pref = filename_pb->property(pref_prop_).value<pref_t *>(); if (!pref) return; - QString filename = QFileDialog::getSaveFileName(this, - QString(tr("Wireshark: ")) + pref->description, + QString filename = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(pref->title), pref->stashed_val.string); if (!filename.isEmpty()) { @@ -493,8 +493,7 @@ void ModulePreferencesScrollArea::dirnamePushButtonPressed() pref_t *pref = dirname_pb->property(pref_prop_).value<pref_t *>(); if (!pref) return; - QString dirname = QFileDialog::getExistingDirectory(this, - QString(tr("Wireshark: ")) + pref->description, + QString dirname = QFileDialog::getExistingDirectory(this, wsApp->windowTitleString(pref->title), pref->stashed_val.string); if (!dirname.isEmpty()) { diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index be08d1c16d..48590a7797 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -604,12 +604,10 @@ void PreferencesDialog::on_advancedTree_itemActivated(QTreeWidgetItem *item, int QString filename; if (pref->type == PREF_FILENAME) { - filename = QFileDialog::getSaveFileName(this, - QString(tr("Wireshark: ")) + pref->description, + filename = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(pref->title), pref->stashed_val.string); } else { - filename = QFileDialog::getExistingDirectory(this, - QString(tr("Wireshark: ")) + pref->description, + filename = QFileDialog::getExistingDirectory(this, wsApp->windowTitleString(pref->title), pref->stashed_val.string); } if (!filename.isEmpty()) { diff --git a/ui/qt/print_dialog.cpp b/ui/qt/print_dialog.cpp index 0717a8ea3b..bed0e49885 100644 --- a/ui/qt/print_dialog.cpp +++ b/ui/qt/print_dialog.cpp @@ -82,6 +82,7 @@ PrintDialog::PrintDialog(QWidget *parent, capture_file *cf) : if (!cf) done(QDialog::Rejected); // ...or assert? pd_ui_->setupUi(this); + setWindowTitle(wsApp->windowTitleString(tr("Print"))); pd_ui_->previewLayout->insertWidget(0, preview_, Qt::AlignTop); diff --git a/ui/qt/print_dialog.ui b/ui/qt/print_dialog.ui index 6c4257860a..314dbe45ce 100644 --- a/ui/qt/print_dialog.ui +++ b/ui/qt/print_dialog.ui @@ -10,9 +10,6 @@ <height>328</height> </rect> </property> - <property name="windowTitle"> - <string>Wireshark: Print</string> - </property> <layout class="QVBoxLayout" name="verticalLayout_2"> <item> <layout class="QHBoxLayout" name="previewLayout"> @@ -104,6 +101,7 @@ <container>1</container> </customwidget> </customwidgets> + <resources/> <connections> <connection> <sender>buttonBox</sender> diff --git a/ui/qt/sctp_graph_dialog.cpp b/ui/qt/sctp_graph_dialog.cpp index b2e90f0d9b..432754caf3 100644 --- a/ui/qt/sctp_graph_dialog.cpp +++ b/ui/qt/sctp_graph_dialog.cpp @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include "ui/utf8_entities.h" + #include "sctp_graph_dialog.h" #include "ui_sctp_graph_dialog.h" #include "sctp_assoc_analyse_dialog.h" @@ -432,7 +434,7 @@ void SCTPGraphDialog::save_graph(QDialog *dlg, QCustomPlot *plot) .arg(bmp_filter) .arg(jpeg_filter); - file_name = QFileDialog::getSaveFileName(dlg, tr("Wireshark: Save Graph As..."), + file_name = QFileDialog::getSaveFileName(dlg, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/sequence_dialog.cpp b/ui/qt/sequence_dialog.cpp index 674a95a90b..437493ae3d 100644 --- a/ui/qt/sequence_dialog.cpp +++ b/ui/qt/sequence_dialog.cpp @@ -24,6 +24,8 @@ #include "epan/addr_resolv.h" +#include "ui/utf8_entities.h" + #include "wsutil/nstime.h" #include "sequence_diagram.h" @@ -314,7 +316,7 @@ void SequenceDialog::on_buttonBox_accepted() filter.append(QString(";;%5").arg(ascii_filter)); } - file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save Graph As..."), + file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { diff --git a/ui/qt/stats_tree_dialog.cpp b/ui/qt/stats_tree_dialog.cpp index c9f8ad3d85..fde13beaf0 100644 --- a/ui/qt/stats_tree_dialog.cpp +++ b/ui/qt/stats_tree_dialog.cpp @@ -25,8 +25,11 @@ #include "file.h" #include "epan/stats_tree_priv.h" -#include "wsutil/file_util.h" + #include "ui/last_open_dir.h" +#include "ui/utf8_entities.h" + +#include "wsutil/file_util.h" #include "wireshark_application.h" @@ -262,7 +265,8 @@ void StatsTreeDialog::on_actionSaveAs_triggered() bool success= false; int last_errno; - QFileDialog SaveAsDialog(this, tr("Wireshark: Save stats tree as ..."), get_last_open_dir()); + QFileDialog SaveAsDialog(this, wsApp->windowTitleString(tr("Save Statistics As" UTF8_HORIZONTAL_ELLIPSIS)), + get_last_open_dir()); SaveAsDialog.setNameFilter(tr("Plain text file (*.txt);;" "Comma separated values (*.csv);;" "XML document (*.xml);;" diff --git a/ui/qt/tcp_stream_dialog.cpp b/ui/qt/tcp_stream_dialog.cpp index 17ef7acd27..bbd5113f54 100644 --- a/ui/qt/tcp_stream_dialog.cpp +++ b/ui/qt/tcp_stream_dialog.cpp @@ -987,7 +987,7 @@ void TCPStreamDialog::on_buttonBox_accepted() .arg(bmp_filter) .arg(jpeg_filter); - file_name = QFileDialog::getSaveFileName(this, tr("Wireshark: Save Graph As..."), + file_name = QFileDialog::getSaveFileName(this, wsApp->windowTitleString(tr("Save Graph As" UTF8_HORIZONTAL_ELLIPSIS)), path.canonicalPath(), filter, &extension); if (file_name.length() > 0) { |