summaryrefslogtreecommitdiff
path: root/ui/qt/preference_editor_frame.cpp
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2016-02-18 20:48:23 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2016-02-19 12:16:16 +0000
commit61f73a3262fe724b7b31f14e842a80c5121301dd (patch)
treec1e0ac7f8c52b76392e5c329c408e17a1c72c849 /ui/qt/preference_editor_frame.cpp
parent4c1869f4871211b3c7518e4858b8372c27013acc (diff)
downloadwireshark-61f73a3262fe724b7b31f14e842a80c5121301dd.tar.gz
Qt: Update AccordionFrame widgets to use common layout
- Use QPushButton for buttons and set the "Find" button as default in SearchFrame. - Use QPushButton for buttons, added a "Packet:" label, and set the "Go to packet" button as default in GoToFrame. - Set Qt::WA_MacSmallSize in OS X for FilterExpressionFrame and PreferenceEditorFrame. - Removed QFrame::StyledPanel and QFrame::Raised from ColumnEditorFrame. - Update ui files to reflect that AccordionFrame is used for AddressEditorFrame, FilterExpressionFrame and PreferenceEditorFrame. Change-Id: Icfbfff973535317997109a1020dfe24ba932e098 Reviewed-on: https://code.wireshark.org/review/13995 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'ui/qt/preference_editor_frame.cpp')
-rw-r--r--ui/qt/preference_editor_frame.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/ui/qt/preference_editor_frame.cpp b/ui/qt/preference_editor_frame.cpp
index 6b193e36c0..6999f7273c 100644
--- a/ui/qt/preference_editor_frame.cpp
+++ b/ui/qt/preference_editor_frame.cpp
@@ -55,6 +55,12 @@ PreferenceEditorFrame::PreferenceEditorFrame(QWidget *parent) :
new_range_(NULL)
{
ui->setupUi(this);
+
+#ifdef Q_OS_MAC
+ foreach (QWidget *w, findChildren<QWidget *>()) {
+ w->setAttribute(Qt::WA_MacSmallSize, true);
+ }
+#endif
}
PreferenceEditorFrame::~PreferenceEditorFrame()
@@ -72,10 +78,10 @@ void PreferenceEditorFrame::editPreference(preference *pref, pref_module *module
return;
}
- ui->modulePreferencesToolButton->setText(tr("Open %1 preferences").arg(module_->title));
+ ui->modulePreferencesToolButton->setText(tr("Open %1 preferences…").arg(module_->title));
pref_stash(pref_, NULL);
- ui->preferenceTitleLabel->setText(pref->title);
+ ui->preferenceTitleLabel->setText(QString("%1:").arg(pref->title));
// Convert the pref description from plain text to rich text.
QString description;