From 1c0deb0fc818252904878fe5419c75df3873a901 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Wed, 6 Feb 2013 18:22:54 +0000 Subject: Add Filter Expressions^WButton^WShortcut^WBookmark preferences. Add comments noting that - We might want to do something different when the bookmark button is pressed. - The display filters (dfilters file) and gui.filter_expressions preferences should be merged. - Many buttons on Qt4 + OS X + unifiedTitleAndToolBarOnMac makes the main window really wide. Add a qstring_strdup convenience routine. Add "disabled" display filter edit icons. Fix up whitespace and descriptions in a couple of places. svn path=/trunk/; revision=47522 --- ui/qt/column_preferences_frame.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'ui/qt/column_preferences_frame.cpp') diff --git a/ui/qt/column_preferences_frame.cpp b/ui/qt/column_preferences_frame.cpp index ebfdbdce30..097d2c71b0 100644 --- a/ui/qt/column_preferences_frame.cpp +++ b/ui/qt/column_preferences_frame.cpp @@ -44,8 +44,6 @@ #include #include -#include - const int visible_col_ = 0; const int title_col_ = 1; const int type_col_ = 2; @@ -61,8 +59,8 @@ ColumnPreferencesFrame::ColumnPreferencesFrame(QWidget *parent) : ui->setupUi(this); int one_em = ui->columnTreeWidget->fontMetrics().height(); - ui->columnTreeWidget->setColumnWidth(3, one_em * 10); - ui->columnTreeWidget->setColumnWidth(4, one_em * 5); + ui->columnTreeWidget->setColumnWidth(custom_field_col_, one_em * 10); + ui->columnTreeWidget->setColumnWidth(custom_occurrence_col_, one_em * 5); ui->columnTreeWidget->setMinimumWidth(one_em * 20); ui->columnTreeWidget->setMinimumHeight(one_em * 12); @@ -130,11 +128,6 @@ void ColumnPreferencesFrame::unstash() } } -void ColumnPreferencesFrame::showEvent(QShowEvent *evt) -{ - Q_UNUSED(evt); -} - void ColumnPreferencesFrame::keyPressEvent(QKeyEvent *evt) { if (cur_line_edit_ && cur_line_edit_->hasFocus()) { @@ -368,7 +361,7 @@ void ColumnPreferencesFrame::customFieldTextChanged(QString) const char *field_text = syntax_edit->text().toUtf8().constData(); if (strlen(field_text) < 1) { syntax_edit->setSyntaxState(SyntaxLineEdit::Empty); - } else if (proto_check_field_name(field_text) != 0 || !dfilter_compile(field_text, &dfp)) { + } else if (!dfilter_compile(field_text, &dfp)) { syntax_edit->setSyntaxState(SyntaxLineEdit::Invalid); } else { syntax_edit->setSyntaxState(SyntaxLineEdit::Valid); -- cgit v1.2.3