From 54c301a0d61a31b0a0469d8d9346b51af37c0009 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 8 Mar 2015 10:41:13 -0700 Subject: Add the @2x expert indicators. We currently load the expert indicator resources using an tag. According to QTBUG-36383 the @2x versions won't load unless you've built with Qt 5.4.0 or later. Change-Id: I003fd5d5f10e779f2e7ca6ba9fbb8e033df85b80 Reviewed-on: https://code.wireshark.org/review/7601 Reviewed-by: Gerald Combs --- Makefile.am | 5 +++++ image/expert_chat@2x.png | Bin 0 -> 1155 bytes image/expert_error@2x.png | Bin 0 -> 1085 bytes image/expert_none@2x.png | Bin 0 -> 1095 bytes image/expert_note@2x.png | Bin 0 -> 1002 bytes image/expert_warn@2x.png | Bin 0 -> 1143 bytes image/status.qrc | 5 +++++ ui/qt/main_status_bar.cpp | 2 ++ 8 files changed, 12 insertions(+) create mode 100644 image/expert_chat@2x.png create mode 100644 image/expert_error@2x.png create mode 100644 image/expert_none@2x.png create mode 100644 image/expert_note@2x.png create mode 100644 image/expert_warn@2x.png diff --git a/Makefile.am b/Makefile.am index 12b03c747c..6a78af1e0c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -898,11 +898,16 @@ EXTRA_DIST = \ 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 \ diff --git a/image/expert_chat@2x.png b/image/expert_chat@2x.png new file mode 100644 index 0000000000..e0e306e671 Binary files /dev/null and b/image/expert_chat@2x.png differ diff --git a/image/expert_error@2x.png b/image/expert_error@2x.png new file mode 100644 index 0000000000..9dea7e0119 Binary files /dev/null and b/image/expert_error@2x.png differ diff --git a/image/expert_none@2x.png b/image/expert_none@2x.png new file mode 100644 index 0000000000..71c659fd87 Binary files /dev/null and b/image/expert_none@2x.png differ diff --git a/image/expert_note@2x.png b/image/expert_note@2x.png new file mode 100644 index 0000000000..a3ffaf2c4d Binary files /dev/null and b/image/expert_note@2x.png differ diff --git a/image/expert_warn@2x.png b/image/expert_warn@2x.png new file mode 100644 index 0000000000..1860a18b8a Binary files /dev/null and b/image/expert_warn@2x.png differ diff --git a/image/status.qrc b/image/status.qrc index 15b3c8c27d..2a5e8bcfd1 100644 --- a/image/status.qrc +++ b/image/status.qrc @@ -1,10 +1,15 @@ expert_chat.png + expert_chat@2x.png expert_error.png + expert_error@2x.png expert_none.png + expert_none@2x.png expert_note.png + expert_note@2x.png expert_warn.png + expert_warn@2x.png capture_comment_update.png diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index b879d52366..8e242269f6 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -190,6 +190,8 @@ void MainStatusBar::hideExpert() { } void MainStatusBar::expertUpdate() { + // won't load @2x versions in Qt versions earlier than 5.4. + // We might have to switch to a QPushButton. QString img_text = "