diff options
| author | Gerald Combs <gerald@zing.org> | 2015-03-08 10:41:13 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-08 18:12:06 +0000 |
| commit | 54c301a0d61a31b0a0469d8d9346b51af37c0009 (patch) | |
| tree | 90bec48b422f63a7b8fdc3bf8a19f6b17a49725a | |
| parent | 29f7c7af7d1d101ad0a68378c8255df5da6848a5 (diff) | |
| download | wireshark-54c301a0d61a31b0a0469d8d9346b51af37c0009.tar.gz | |
Add the @2x expert indicators.
We currently load the expert indicator resources using an <img> 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 <gerald@wireshark.org>
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | image/expert_chat@2x.png | bin | 0 -> 1155 bytes | |||
| -rw-r--r-- | image/expert_error@2x.png | bin | 0 -> 1085 bytes | |||
| -rw-r--r-- | image/expert_none@2x.png | bin | 0 -> 1095 bytes | |||
| -rw-r--r-- | image/expert_note@2x.png | bin | 0 -> 1002 bytes | |||
| -rw-r--r-- | image/expert_warn@2x.png | bin | 0 -> 1143 bytes | |||
| -rw-r--r-- | image/status.qrc | 5 | ||||
| -rw-r--r-- | ui/qt/main_status_bar.cpp | 2 |
8 files changed, 12 insertions, 0 deletions
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 Binary files differnew file mode 100644 index 0000000000..e0e306e671 --- /dev/null +++ b/image/expert_chat@2x.png diff --git a/image/expert_error@2x.png b/image/expert_error@2x.png Binary files differnew file mode 100644 index 0000000000..9dea7e0119 --- /dev/null +++ b/image/expert_error@2x.png diff --git a/image/expert_none@2x.png b/image/expert_none@2x.png Binary files differnew file mode 100644 index 0000000000..71c659fd87 --- /dev/null +++ b/image/expert_none@2x.png diff --git a/image/expert_note@2x.png b/image/expert_note@2x.png Binary files differnew file mode 100644 index 0000000000..a3ffaf2c4d --- /dev/null +++ b/image/expert_note@2x.png diff --git a/image/expert_warn@2x.png b/image/expert_warn@2x.png Binary files differnew file mode 100644 index 0000000000..1860a18b8a --- /dev/null +++ b/image/expert_warn@2x.png 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 @@ <RCC> <qresource prefix="/expert"> <file>expert_chat.png</file> + <file>expert_chat@2x.png</file> <file>expert_error.png</file> + <file>expert_error@2x.png</file> <file>expert_none.png</file> + <file>expert_none@2x.png</file> <file>expert_note.png</file> + <file>expert_note@2x.png</file> <file>expert_warn.png</file> + <file>expert_warn@2x.png</file> </qresource> <qresource prefix="/comment"> <file>capture_comment_update.png</file> 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() { + // <img> won't load @2x versions in Qt versions earlier than 5.4. + // We might have to switch to a QPushButton. QString img_text = "<img src=\":/expert/expert_"; QString tt_text = tr(" is the highest expert info level"); |
