diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-10-14 15:29:04 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-10-16 19:07:53 +0000 |
| commit | 7b38b87acb49e2551dfbb932ffb84318b6c2af3e (patch) | |
| tree | e76a151c1edaf9b3b275378f92227642ea6fb242 /Makefile.am | |
| parent | 93bcbd35c32a73b8271fc5978c333b716f73fee7 (diff) | |
| download | wireshark-7b38b87acb49e2551dfbb932ffb84318b6c2af3e.tar.gz wireshark-7b38b87acb49e2551dfbb932ffb84318b6c2af3e.tar.bz2 wireshark-7b38b87acb49e2551dfbb932ffb84318b6c2af3e.zip | |
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@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit b4a4de78d8f78f0cea54b9ae846a120c2a68d893)
Reviewed-on: https://code.wireshark.org/review/11080
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index b8e0161188..2599639ef6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -893,23 +893,11 @@ EXTRA_DIST = \ image/capture_comment_disabled.png \ image/capture_comment_update.png \ image/capture_comment_update.svg \ - image/capture_comment_update@2x.png \ image/clist_ascend.xpm \ image/clist_descend.xpm \ image/copy-8.png \ image/dumpcap.rc.in \ image/editcap.rc.in \ - image/expert_chat.png \ - image/expert_chat@2x.png \ - image/expert_error.png \ - image/expert_error@2x.png \ - image/expert_indicators.svg \ - image/expert_none.png \ - image/expert_none@2x.png \ - image/expert_note.png \ - image/expert_note@2x.png \ - image/expert_warn.png \ - image/expert_warn@2x.png \ image/file_dlg_win32.rc \ image/hi16-app-wireshark.png \ image/hi32-app-wireshark.png \ @@ -949,7 +937,6 @@ EXTRA_DIST = \ image/README.image \ image/reordercap.rc.in \ image/rubberband-16.png \ - image/status.qrc \ image/stock_dialog_error_48.xpm \ image/stock_dialog_info_48.xpm \ image/stock_dialog_question_48.xpm \ @@ -957,6 +944,20 @@ EXTRA_DIST = \ image/stock_dialog_warning_48.xpm \ image/text2pcap.rc.in \ image/tfshark.rc.in \ + image/toolbar/14x14/x-capture-comment-update.png \ + image/toolbar/14x14/x-capture-comment-update.svg \ + image/toolbar/14x14/x-capture-comment-update@2x.png \ + image/toolbar/14x14/x-expert-chat.png \ + image/toolbar/14x14/x-expert-chat@2x.png \ + image/toolbar/14x14/x-expert-error.png \ + image/toolbar/14x14/x-expert-error@2x.png \ + image/toolbar/14x14/x-expert-indicators-all.svg \ + image/toolbar/14x14/x-expert-none.png \ + image/toolbar/14x14/x-expert-none@2x.png \ + image/toolbar/14x14/x-expert-note.png \ + image/toolbar/14x14/x-expert-note@2x.png \ + image/toolbar/14x14/x-expert-warn.png \ + image/toolbar/14x14/x-expert-warn@2x.png \ image/toolbar/14x14/x-filter-bookmark.active.png \ image/toolbar/14x14/x-filter-bookmark.active.svg \ image/toolbar/14x14/x-filter-bookmark.active@2x.png \ |