osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

qt+export objects: Don't sort the header in with the content types 

The Export Objects Content-Type filter combobox should not sort the
header of "All Content-Types" in with the list of content types, but
should ensure that it is always the first item, especially as the first
item position is used to show all content. This is particularly an issue
in some localizations; e.g., すべてのコンテントタイプ alphabetizes
after actual content types. Fixes bug #17048
This commit is contained in:
John Thacker 2020-11-30 20:20:25 -05:00 committed by AndersBroman
parent 6035312ea9
commit 2d8dd9ed4f
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/qt/export_object_dialog.cpp
View File

@ -105,6 +105,7 @@ void ExportObjectDialog::currentHasChanged(QModelIndex current)
void ExportObjectDialog::modelDataChanged(const QModelIndex&, int from, int to)
{
bool contentTypes_changed = false;
bool enabled = (model_.rowCount() > 0);
if (save_bt_) save_bt_->setEnabled(enabled);
if (save_all_bt_) save_all_bt_->setEnabled(enabled);
@ -118,23 +119,26 @@ void ExportObjectDialog::modelDataChanged(const QModelIndex&, int from, int to)
if (dataType.length() > 0 && ! contentTypes.contains(dataType))
{
contentTypes << dataType;
contentTypes.sort(Qt::CaseInsensitive);
QString selType = eo_ui_->cmbContentType->currentText();
eo_ui_->cmbContentType->clear();
eo_ui_->cmbContentType->addItems(contentTypes);
if (contentTypes.contains(selType) )
eo_ui_->cmbContentType->setCurrentText(selType);
contentTypes_changed = true;
}
}
}
if (contentTypes_changed) {
contentTypes.sort(Qt::CaseInsensitive);
QString selType = eo_ui_->cmbContentType->currentText();
eo_ui_->cmbContentType->clear();
eo_ui_->cmbContentType->addItem(tr("All Content-Types"));
eo_ui_->cmbContentType->addItems(contentTypes);
if (contentTypes.contains(selType) )
eo_ui_->cmbContentType->setCurrentText(selType);
}
}
void ExportObjectDialog::modelRowsReset()
{
contentTypes.clear();
contentTypes << tr("All Content-Types");
eo_ui_->cmbContentType->clear();
eo_ui_->cmbContentType->addItems(contentTypes);
eo_ui_->cmbContentType->addItem(tr("All Content-Types"));
if (save_bt_) save_bt_->setEnabled(false);
if (save_all_bt_) save_all_bt_->setEnabled(false);