[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7b38b87acb49e2551dfbb932ffb84318b6c2af3e
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

7b38b87 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Use buttons to display the main status bar icons.
    
    Use QToolButtons to display the expert indicator and comment icons in
    the main status bar. Use the same style sheet hack we use in
    ProgressFrame to un-style the buttons.
    
    Make sure we specify the @2x comment icon in our .qrc file so that it's
    loaded and used on retina displays. Move the comment and expert .pngs to
    the stock icon directory and use StockIcon to load them. Remove
    status.qrc since it's no longer used.
    
    Change-Id: I84485b22656f8f9af29ad3c02446ffefb6657ed5
    Reviewed-on: https://code.wireshark.org/review/11048
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    (cherry picked from commit b4a4de78d8f78f0cea54b9ae846a120c2a68d893)
    Reviewed-on: https://code.wireshark.org/review/11080
    

Actions performed:

    from  93bcbd3   GSM: fix dissection of additional access technology type
    adds  7b38b87   Use buttons to display the main status bar icons.


Summary of changes:
 Makefile.am                                        |   27 +++----
 image/status.qrc                                   |   17 -----
 image/toolbar.qrc                                  |   12 +++
 .../14x14/x-capture-comment-update.png}            |  Bin 605 -> 605 bytes
 .../14x14/x-capture-comment-update.svg}            |    0
 .../14x14/x-capture-comment-update@xxxxxx}         |  Bin 1586 -> 1586 bytes
 .../14x14/x-expert-chat.png}                       |  Bin 512 -> 512 bytes
 .../14x14/x-expert-chat@xxxxxx}                    |  Bin 1155 -> 1155 bytes
 .../14x14/x-expert-error.png}                      |  Bin 487 -> 487 bytes
 .../14x14/x-expert-error@xxxxxx}                   |  Bin 1085 -> 1085 bytes
 .../14x14/x-expert-indicators-all.svg}             |    0
 .../14x14/x-expert-none.png}                       |  Bin 488 -> 488 bytes
 .../14x14/x-expert-none@xxxxxx}                    |  Bin 1095 -> 1095 bytes
 .../14x14/x-expert-note.png}                       |  Bin 465 -> 465 bytes
 .../14x14/x-expert-note@xxxxxx}                    |  Bin 1002 -> 1002 bytes
 .../14x14/x-expert-warn.png}                       |  Bin 501 -> 501 bytes
 .../14x14/x-expert-warn@xxxxxx}                    |  Bin 1143 -> 1143 bytes
 ui/qt/CMakeLists.txt                               |    1 -
 ui/qt/Makefile.common                              |    1 -
 ui/qt/Wireshark.pro                                |    1 -
 ui/qt/main_status_bar.cpp                          |   77 ++++++++++++--------
 ui/qt/main_status_bar.h                            |    5 +-
 ui/qt/wireshark_application.cpp                    |    1 -
 23 files changed, 75 insertions(+), 67 deletions(-)
 delete mode 100644 image/status.qrc
 copy image/{capture_comment_update.png => toolbar/14x14/x-capture-comment-update.png} (100%)
 copy image/{capture_comment_update.svg => toolbar/14x14/x-capture-comment-update.svg} (100%)
 rename image/{capture_comment_update@xxxxxx => toolbar/14x14/x-capture-comment-update@xxxxxx} (100%)
 rename image/{expert_chat.png => toolbar/14x14/x-expert-chat.png} (100%)
 rename image/{expert_chat@xxxxxx => toolbar/14x14/x-expert-chat@xxxxxx} (100%)
 rename image/{expert_error.png => toolbar/14x14/x-expert-error.png} (100%)
 rename image/{expert_error@xxxxxx => toolbar/14x14/x-expert-error@xxxxxx} (100%)
 rename image/{expert_indicators.svg => toolbar/14x14/x-expert-indicators-all.svg} (100%)
 rename image/{expert_none.png => toolbar/14x14/x-expert-none.png} (100%)
 rename image/{expert_none@xxxxxx => toolbar/14x14/x-expert-none@xxxxxx} (100%)
 rename image/{expert_note.png => toolbar/14x14/x-expert-note.png} (100%)
 rename image/{expert_note@xxxxxx => toolbar/14x14/x-expert-note@xxxxxx} (100%)
 rename image/{expert_warn.png => toolbar/14x14/x-expert-warn.png} (100%)
 rename image/{expert_warn@xxxxxx => toolbar/14x14/x-expert-warn@xxxxxx} (100%)