diff options
author | Roland Knall <rknall@gmail.com> | 2019-08-09 11:28:04 +0200 |
---|---|---|
committer | Roland Knall <rknall@gmail.com> | 2019-08-09 11:03:07 +0000 |
commit | 372fc9ff6ce9d6c3b0860694876d7a16435901e3 (patch) | |
tree | 920a4f571403d54abbb191ca970c78f3f86213c5 /ui | |
parent | a41c7aa2238288f894b32c78c34c490f4f42211f (diff) |
Qt: Fix Preference dialog translation
The title names of each section are not presented correctly
Bug: 15977
Change-Id: I68ab0fb6fc7131f9d2af67fa38c509ed6808c7d3
Reviewed-on: https://code.wireshark.org/review/34218
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/qt/filter_expression_frame.cpp | 2 | ||||
-rw-r--r-- | ui/qt/main_window_slots.cpp | 4 | ||||
-rw-r--r-- | ui/qt/models/pref_models.cpp | 52 | ||||
-rw-r--r-- | ui/qt/models/pref_models.h | 24 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.cpp | 18 | ||||
-rw-r--r-- | ui/qt/widgets/display_filter_edit.cpp | 2 | ||||
-rw-r--r-- | ui/qt/widgets/packet_list_header.cpp | 2 | ||||
-rw-r--r-- | ui/qt/widgets/pref_module_view.cpp | 2 |
8 files changed, 56 insertions, 50 deletions
diff --git a/ui/qt/filter_expression_frame.cpp b/ui/qt/filter_expression_frame.cpp index c976466842..f6a69841b1 100644 --- a/ui/qt/filter_expression_frame.cpp +++ b/ui/qt/filter_expression_frame.cpp @@ -106,7 +106,7 @@ void FilterExpressionFrame::updateWidgets() void FilterExpressionFrame::on_filterExpressionPreferencesPushButton_clicked() { on_buttonBox_rejected(); - emit showPreferencesDialog(PrefsModel::FILTER_BUTTONS_PREFERENCE_TREE_NAME); + emit showPreferencesDialog(PrefsModel::typeToString(PrefsModel::FilterButtons)); } void FilterExpressionFrame::on_labelLineEdit_textChanged(const QString) diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 16fcd83ec4..7b2cbb37a5 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1630,7 +1630,7 @@ void MainWindow::onFilterSelected(QString filterText, bool prepare) void MainWindow::onFilterPreferences() { - emit showPreferencesDialog(PrefsModel::FILTER_BUTTONS_PREFERENCE_TREE_NAME); + emit showPreferencesDialog(PrefsModel::typeToString(PrefsModel::FilterButtons)); } void MainWindow::onFilterEdit(int uatIndex) @@ -2164,7 +2164,7 @@ void MainWindow::showPreferencesDialog(QString pane_name) void MainWindow::on_actionEditPreferences_triggered() { - showPreferencesDialog(PrefsModel::APPEARANCE_PREFERENCE_TREE_NAME); + showPreferencesDialog(PrefsModel::typeToString(PrefsModel::Appearance)); } // View Menu diff --git a/ui/qt/models/pref_models.cpp b/ui/qt/models/pref_models.cpp index c6b8f4fc95..16065afd89 100644 --- a/ui/qt/models/pref_models.cpp +++ b/ui/qt/models/pref_models.cpp @@ -124,18 +124,6 @@ void PrefsItem::setChanged(bool changed) changed_ = changed; } -//: Names of special preferences handled by the GUI -const char* PrefsModel::ADVANCED_PREFERENCE_TREE_NAME = QT_TR_NOOP("Advanced"); -const char* PrefsModel::APPEARANCE_PREFERENCE_TREE_NAME = QT_TR_NOOP("Appearance"); -const char* PrefsModel::LAYOUT_PREFERENCE_TREE_NAME = QT_TR_NOOP("Layout"); -const char* PrefsModel::COLUMNS_PREFERENCE_TREE_NAME = QT_TR_NOOP("Columns"); -const char* PrefsModel::FONT_AND_COLORS_PREFERENCE_TREE_NAME = QT_TR_NOOP("Font and Colors"); -const char* PrefsModel::CAPTURE_PREFERENCE_TREE_NAME = QT_TR_NOOP("Capture"); -const char* PrefsModel::EXPERT_PREFERENCE_TREE_NAME = QT_TR_NOOP("Expert"); -const char* PrefsModel::FILTER_BUTTONS_PREFERENCE_TREE_NAME = QT_TR_NOOP("Filter Buttons"); -const char* PrefsModel::RSA_KEYS_PREFERENCE_TREE_NAME = QT_TR_NOOP("RSA Keys"); - - PrefsModel::PrefsModel(QObject *parent) : QAbstractItemModel(parent), root_(new PrefsItem(QString("ROOT"), NULL)) @@ -306,33 +294,49 @@ void PrefsModel::populate() //Add the "specially handled" preferences PrefsItem *appearance_item, *appearance_subitem, *special_item; - appearance_item = new PrefsItem(APPEARANCE_PREFERENCE_TREE_NAME, root_); + appearance_item = new PrefsItem(typeToString(PrefsModel::Appearance), root_); root_->prependChild(appearance_item); - appearance_subitem = new PrefsItem(LAYOUT_PREFERENCE_TREE_NAME, appearance_item); + appearance_subitem = new PrefsItem(typeToString(PrefsModel::Layout), appearance_item); appearance_item->prependChild(appearance_subitem); - appearance_subitem = new PrefsItem(COLUMNS_PREFERENCE_TREE_NAME, appearance_item); + appearance_subitem = new PrefsItem(typeToString(PrefsModel::Columns), appearance_item); appearance_item->prependChild(appearance_subitem); - appearance_subitem = new PrefsItem(FONT_AND_COLORS_PREFERENCE_TREE_NAME, appearance_item); + appearance_subitem = new PrefsItem(typeToString(PrefsModel::FontAndColors), appearance_item); appearance_item->prependChild(appearance_subitem); - special_item = new PrefsItem(CAPTURE_PREFERENCE_TREE_NAME, root_); + special_item = new PrefsItem(typeToString(PrefsModel::Capture), root_); root_->prependChild(special_item); - special_item = new PrefsItem(EXPERT_PREFERENCE_TREE_NAME, root_); + special_item = new PrefsItem(typeToString(PrefsModel::Expert), root_); root_->prependChild(special_item); - special_item = new PrefsItem(FILTER_BUTTONS_PREFERENCE_TREE_NAME, root_); + special_item = new PrefsItem(typeToString(PrefsModel::FilterButtons), root_); root_->prependChild(special_item); #ifdef HAVE_LIBGNUTLS - special_item = new PrefsItem(RSA_KEYS_PREFERENCE_TREE_NAME, root_); + special_item = new PrefsItem(typeToString(PrefsModel::RSAKeys), root_); root_->prependChild(special_item); #endif - special_item = new PrefsItem(ADVANCED_PREFERENCE_TREE_NAME, root_); + special_item = new PrefsItem(typeToString(PrefsModel::Advanced), root_); root_->prependChild(special_item); } +QString PrefsModel::typeToString(int type) +{ + QString typeStr; + switch(type) + { + case Advanced: typeStr = tr("Advanced"); break; + case Appearance: typeStr = tr("Appearance"); break; + case Layout: typeStr = tr("Layout"); break; + case Columns: typeStr = tr("Columns"); break; + case FontAndColors: typeStr = tr("Font and Colors"); break; + case Capture: typeStr = tr("Capture"); break; + case Expert: typeStr = tr("Expert"); break; + case FilterButtons: typeStr = tr("Filter Buttons"); break; + case RSAKeys: typeStr = tr("RSA Keys"); break; + } - + return typeStr; +} AdvancedPrefsModel::AdvancedPrefsModel(QObject * parent) : QSortFilterProxyModel(parent), @@ -637,7 +641,7 @@ void AdvancedPrefsModel::setFilter(const QString& filter) ModulePrefsModel::ModulePrefsModel(QObject* parent) : QSortFilterProxyModel(parent) - , advancedPrefName_(PrefsModel::ADVANCED_PREFERENCE_TREE_NAME) + , advancedPrefName_(PrefsModel::typeToString(PrefsModel::Advanced)) { } @@ -698,7 +702,7 @@ Qt::ItemFlags ModulePrefsModel::flags(const QModelIndex &index) const if (item == NULL) return flags; - if (item->getName().compare(PrefsModel::CAPTURE_PREFERENCE_TREE_NAME) == 0) { + if (item->getName().compare(PrefsModel::typeToString(PrefsModel::Capture)) == 0) { flags &= (~Qt::ItemIsEnabled); } } diff --git a/ui/qt/models/pref_models.h b/ui/qt/models/pref_models.h index 0f34150f74..4c0a591917 100644 --- a/ui/qt/models/pref_models.h +++ b/ui/qt/models/pref_models.h @@ -55,17 +55,17 @@ public: explicit PrefsModel(QObject * parent = Q_NULLPTR); virtual ~PrefsModel(); - //Names of special preferences handled by the GUI - //Names used as keys to determine correct pan displayed - static const char* ADVANCED_PREFERENCE_TREE_NAME; - static const char* APPEARANCE_PREFERENCE_TREE_NAME; - static const char* LAYOUT_PREFERENCE_TREE_NAME; - static const char* COLUMNS_PREFERENCE_TREE_NAME; - static const char* FONT_AND_COLORS_PREFERENCE_TREE_NAME; - static const char* CAPTURE_PREFERENCE_TREE_NAME; - static const char* EXPERT_PREFERENCE_TREE_NAME; - static const char* FILTER_BUTTONS_PREFERENCE_TREE_NAME; - static const char* RSA_KEYS_PREFERENCE_TREE_NAME; + enum PrefsModelType { + Advanced = Qt::UserRole, + Appearance, + Layout, + Columns, + FontAndColors, + Capture, + Expert, + FilterButtons, + RSAKeys + }; enum PrefsModelColumn { colName = 0, @@ -83,6 +83,8 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; + static QString typeToString(int type); + private: void populate(); diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index 8f0ffacd80..789053c12a 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -113,15 +113,15 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) : // PreferencesPane, prefsView, and stackedWidget must all correspond to each other. - prefs_pane_to_item_[PrefsModel::APPEARANCE_PREFERENCE_TREE_NAME] = pd_ui_->appearanceFrame; - prefs_pane_to_item_[PrefsModel::LAYOUT_PREFERENCE_TREE_NAME] = pd_ui_->layoutFrame; - prefs_pane_to_item_[PrefsModel::COLUMNS_PREFERENCE_TREE_NAME] = pd_ui_->columnFrame; - prefs_pane_to_item_[PrefsModel::FONT_AND_COLORS_PREFERENCE_TREE_NAME] = pd_ui_->fontandcolorFrame; - prefs_pane_to_item_[PrefsModel::CAPTURE_PREFERENCE_TREE_NAME] = pd_ui_->captureFrame; - prefs_pane_to_item_[PrefsModel::EXPERT_PREFERENCE_TREE_NAME] = pd_ui_->expertFrame; - prefs_pane_to_item_[PrefsModel::FILTER_BUTTONS_PREFERENCE_TREE_NAME] = pd_ui_->filterExpressonsFrame; - prefs_pane_to_item_[PrefsModel::RSA_KEYS_PREFERENCE_TREE_NAME] = pd_ui_->rsaKeysFrame; - prefs_pane_to_item_[PrefsModel::ADVANCED_PREFERENCE_TREE_NAME] = pd_ui_->advancedFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Appearance)] = pd_ui_->appearanceFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Layout)] = pd_ui_->layoutFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Columns)] = pd_ui_->columnFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::FontAndColors)] = pd_ui_->fontandcolorFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Capture)] = pd_ui_->captureFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Expert)] = pd_ui_->expertFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::FilterButtons)] = pd_ui_->filterExpressonsFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::RSAKeys)] = pd_ui_->rsaKeysFrame; + prefs_pane_to_item_[PrefsModel::typeToString(PrefsModel::Advanced)] = pd_ui_->advancedFrame; prefs_pane_to_item_[MODULES_NAME] = NULL; pd_ui_->filterExpressonsFrame->setUat(uat_get_table_by_name("Display expressions")); diff --git a/ui/qt/widgets/display_filter_edit.cpp b/ui/qt/widgets/display_filter_edit.cpp index 879c3d41e9..8c12ad2b09 100644 --- a/ui/qt/widgets/display_filter_edit.cpp +++ b/ui/qt/widgets/display_filter_edit.cpp @@ -514,7 +514,7 @@ void DisplayFilterEdit::showFilters() void DisplayFilterEdit::showExpressionPrefs() { - emit showPreferencesDialog(PrefsModel::FILTER_BUTTONS_PREFERENCE_TREE_NAME); + emit showPreferencesDialog(PrefsModel::typeToString(PrefsModel::FilterButtons)); } void DisplayFilterEdit::applyOrPrepareFilter() diff --git a/ui/qt/widgets/packet_list_header.cpp b/ui/qt/widgets/packet_list_header.cpp index 8750672efe..f901d28570 100644 --- a/ui/qt/widgets/packet_list_header.cpp +++ b/ui/qt/widgets/packet_list_header.cpp @@ -252,7 +252,7 @@ void PacketListHeader::setAlignment(QAction *action) void PacketListHeader::showColumnPrefs() { - emit showColumnPreferences(PrefsModel::COLUMNS_PREFERENCE_TREE_NAME); + emit showColumnPreferences(PrefsModel::typeToString(PrefsModel::Columns)); } void PacketListHeader::doEditColumn() diff --git a/ui/qt/widgets/pref_module_view.cpp b/ui/qt/widgets/pref_module_view.cpp index 579671ea90..6b8bcaf2ac 100644 --- a/ui/qt/widgets/pref_module_view.cpp +++ b/ui/qt/widgets/pref_module_view.cpp @@ -14,7 +14,7 @@ #include <QHeaderView> PrefModuleTreeView::PrefModuleTreeView(QWidget *parent) : QTreeView(parent), - appearanceName_(PrefsModel::APPEARANCE_PREFERENCE_TREE_NAME) + appearanceName_(PrefsModel::typeToString(PrefsModel::Appearance)) { } |