diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-03-02 11:50:36 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-03-02 19:53:31 +0000 |
commit | 342c55b925b7607dfd355a593cf7bd4a04dd80bc (patch) | |
tree | 1abe3ba4b261eee5cf1cbe9660545cad1df1cfcf | |
parent | 68781221878372e3045690a5fb943852b88739a6 (diff) | |
download | wireshark-342c55b925b7607dfd355a593cf7bd4a04dd80bc.tar.gz wireshark-342c55b925b7607dfd355a593cf7bd4a04dd80bc.tar.bz2 wireshark-342c55b925b7607dfd355a593cf7bd4a04dd80bc.zip |
Qt: Add @2x images to the layout preferences.
Run compress-pngs on the normal and @2x images.
Change-Id: Ic5bc3c42273078f32511d986b299d8606c016f6d
Reviewed-on: https://code.wireshark.org/review/7499
Reviewed-by: Gerald Combs <gerald@wireshark.org>
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | image/layout.qrc | 6 | ||||
-rw-r--r-- | image/layout_1@2x.png | bin | 0 -> 1029 bytes | |||
-rw-r--r-- | image/layout_2@2x.png | bin | 0 -> 1032 bytes | |||
-rw-r--r-- | image/layout_3@2x.png | bin | 0 -> 1024 bytes | |||
-rw-r--r-- | image/layout_4.png | bin | 561 -> 561 bytes | |||
-rw-r--r-- | image/layout_4@2x.png | bin | 0 -> 1021 bytes | |||
-rw-r--r-- | image/layout_5.png | bin | 563 -> 563 bytes | |||
-rw-r--r-- | image/layout_5@2x.png | bin | 0 -> 999 bytes | |||
-rw-r--r-- | image/layout_6@2x.png | bin | 0 -> 1016 bytes |
10 files changed, 12 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 1bb959dd29..62d9383cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -916,11 +916,17 @@ EXTRA_DIST = \ image/languages/pl.svg \ image/languages/zh_CN.svg \ image/layout_1.png \ + image/layout_1@2x.png \ image/layout_2.png \ + image/layout_2@2x.png \ image/layout_3.png \ + image/layout_3@2x.png \ image/layout_4.png \ + image/layout_4@2x.png \ image/layout_5.png \ + image/layout_5@2x.png \ image/layout_6.png \ + image/layout_6@2x.png \ image/libwireshark.rc.in \ image/libwsutil.rc.in \ image/lo16-app-wireshark.png \ diff --git a/image/layout.qrc b/image/layout.qrc index 6843733966..7b45e7fc17 100644 --- a/image/layout.qrc +++ b/image/layout.qrc @@ -1,10 +1,16 @@ <RCC> <qresource prefix="/layout"> <file>layout_1.png</file> + <file>layout_1@2x.png</file> <file>layout_2.png</file> + <file>layout_2@2x.png</file> <file>layout_3.png</file> + <file>layout_3@2x.png</file> <file>layout_4.png</file> + <file>layout_4@2x.png</file> <file>layout_5.png</file> + <file>layout_5@2x.png</file> <file>layout_6.png</file> + <file>layout_6@2x.png</file> </qresource> </RCC> diff --git a/image/layout_1@2x.png b/image/layout_1@2x.png Binary files differnew file mode 100644 index 0000000000..090a6f4dec --- /dev/null +++ b/image/layout_1@2x.png diff --git a/image/layout_2@2x.png b/image/layout_2@2x.png Binary files differnew file mode 100644 index 0000000000..066f5027d8 --- /dev/null +++ b/image/layout_2@2x.png diff --git a/image/layout_3@2x.png b/image/layout_3@2x.png Binary files differnew file mode 100644 index 0000000000..c469979155 --- /dev/null +++ b/image/layout_3@2x.png diff --git a/image/layout_4.png b/image/layout_4.png Binary files differindex 950ff0172a..f8d44ca531 100644 --- a/image/layout_4.png +++ b/image/layout_4.png diff --git a/image/layout_4@2x.png b/image/layout_4@2x.png Binary files differnew file mode 100644 index 0000000000..5dd0337345 --- /dev/null +++ b/image/layout_4@2x.png diff --git a/image/layout_5.png b/image/layout_5.png Binary files differindex ed54eaa2bf..be58187cd9 100644 --- a/image/layout_5.png +++ b/image/layout_5.png diff --git a/image/layout_5@2x.png b/image/layout_5@2x.png Binary files differnew file mode 100644 index 0000000000..38722d2581 --- /dev/null +++ b/image/layout_5@2x.png diff --git a/image/layout_6@2x.png b/image/layout_6@2x.png Binary files differnew file mode 100644 index 0000000000..6253b7035f --- /dev/null +++ b/image/layout_6@2x.png |