diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-12-29 01:39:02 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-12-29 01:39:02 +0000 |
| commit | 5bd252c44fd47ccf95ed6cedfa8759ac1c1c9dae (patch) | |
| tree | 295b7b923bd8ea4f15e75ca4873b84d318199d27 /ui/qt/syntax_line_edit.cpp | |
| parent | c7dd6480e4554178e2c74114eb7421a11dc325de (diff) | |
| download | wireshark-5bd252c44fd47ccf95ed6cedfa8759ac1c1c9dae.tar.gz | |
Remove some duplicate code from ui/profile.c and move in more code from
ui/gtk/profile_dialog.c. Use the correct profile list in
profile_dialog.c so that deletion works.
Add a profile dialog to the Qt port. For some reason it crashes when
changing configuration profiles, which might be related to bug 7722.
Move the Qt configuration profile initialization from main.cpp to
wireshark_application.cpp. Make sure QMenuBar doesn't grab the
configuration profiles action on OS X. Add more role color names to
tango_colors.h.
svn path=/trunk/; revision=46834
Diffstat (limited to 'ui/qt/syntax_line_edit.cpp')
| -rw-r--r-- | ui/qt/syntax_line_edit.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/qt/syntax_line_edit.cpp b/ui/qt/syntax_line_edit.cpp index 24e59ff617..92ac540f10 100644 --- a/ui/qt/syntax_line_edit.cpp +++ b/ui/qt/syntax_line_edit.cpp @@ -25,10 +25,10 @@ SyntaxLineEdit::SyntaxLineEdit(QWidget *parent) : .arg(Invalid) .arg(Deprecated) .arg(Valid) - .arg(tango_aluminium_6, 6, 16, QChar('0')) // Foreground - .arg(tango_scarlet_red_1, 6, 16, QChar('0')) // Invalid - .arg(tango_butter_1, 6, 16, QChar('0')) // Deprecated - .arg(tango_chameleon_1, 6, 16, QChar('0')) // Valid + .arg(ws_syntax_invalid_foreground, 6, 16, QChar('0')) // Foreground + .arg(ws_syntax_invalid_background, 6, 16, QChar('0')) // Invalid + .arg(ws_syntax_deprecated_background, 6, 16, QChar('0')) // Deprecated + .arg(ws_syntax_valid_background, 6, 16, QChar('0')) // Valid ; setStyleSheet(tr("")); setSyntaxState(); |