Wireshark-commits: [Wireshark-commits] master-2.0 2f7f8ad: Qt: "Conversation" → "Coloring"
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Sat, 26 Mar 2016 13:16:16 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2f7f8adde6acdbe9cf4a3b4d751f4aa756c6de25
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

2f7f8ad by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Qt: "Conversation" → "Coloring"
    
    Change actionViewColorizeNewConversationRule to
    actionViewColorizeNewColoringRule and change its text accordingly.
    We're building a rule based on a general filter, not a conversation.
    
    Bug: 12289
    Change-Id: Ic408050eed6f24690e3e759e6963f9930fe4b5e9
    Reviewed-on: https://code.wireshark.org/review/13266
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit cd5b93281287b7fb169e1bd9be0a3c60814c4dec)
    Reviewed-on: https://code.wireshark.org/review/14628
    Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  b7ebeeb   Make sure there's enough data in the header for a FMTP packet.
    adds  2f7f8ad   Qt: "Conversation" → "Coloring"


Summary of changes:
 ui/qt/main_window.h         |    2 +-
 ui/qt/main_window.ui        |    8 ++++----
 ui/qt/main_window_slots.cpp |   10 ++++------
 3 files changed, 9 insertions(+), 11 deletions(-)