summaryrefslogtreecommitdiff
path: root/ui/qt/label_stack.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2012-12-07 20:08:00 +0000
committerGerald Combs <gerald@wireshark.org>2012-12-07 20:08:00 +0000
commitc9d4240196669f506db29a68ec7799574305a080 (patch)
tree14a0bdbe632cb90ee6acd858215bcf275750d9eb /ui/qt/label_stack.cpp
parent4ca2e780bfae8dc523f35b376b21197c0ad3c4aa (diff)
downloadwireshark-c9d4240196669f506db29a68ec7799574305a080.tar.gz
Add a context menu to the packet list and fill in the
apply/match-related actions. Have matchSelectedFilter figure out our filter strings, which lets us remove duplicate code in the apply/match action slots. Remove some leftover code from an experiment. Adjust the temporary message colors in the status bar and label stack. Add a NULL check to construct_match_selected_string. svn path=/trunk/; revision=46449
Diffstat (limited to 'ui/qt/label_stack.cpp')
-rw-r--r--ui/qt/label_stack.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/qt/label_stack.cpp b/ui/qt/label_stack.cpp
index a41132a6cc..142d097716 100644
--- a/ui/qt/label_stack.cpp
+++ b/ui/qt/label_stack.cpp
@@ -64,11 +64,12 @@ void LabelStack::fillLabel() {
if (si->ctx == temporary_ctx_) {
style_sheet += QString(
- " border-radius: 0.25em;"
- " color: black;"
- " background-color: #%1;"
- )
- .arg(tango_butter_4, 6, 16, QChar('0'));
+ " border-radius: 0.25em;"
+ " color: #%1;"
+ " background-color: #%2;"
+ )
+ .arg(tango_aluminium_6, 6, 16, QChar('0'))
+ .arg(tango_butter_2, 6, 16, QChar('0'));
}
style_sheet += "}";