Wireshark-commits: [Wireshark-commits] master b94047c: Qt: Add support for template icons.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=b94047c606a53f405ea24ca5bf5161a74da7d4b9
Submitter: "Anders Broman <a.broman58@xxxxxxxxx>"
Changed: branch: master
Repository: wireshark
Commits:
b94047c by Gerald Combs (gerald@xxxxxxxxxxxxx):
Qt: Add support for template icons.
Add support for ".template" icons, which are masked against the current
WindowText color. Convert the edit-find icons to templates.
Reload our icon(s) when we receive a QEvent::PaletteChange in MainWindow
and in StockIconToolButton.
Clean our SVGs.
To do:
- Convert other black or mostly black icons to templates.
- Handle QEvent::PaletteChange in more places.
Ping-Bug: 15511
Change-Id: I1ce78d92e769861dc38d86a3def5116fb869e2bf
Reviewed-on: https://code.wireshark.org/review/33571
Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from f41e1d2 [SCTP] ui: fix Analyse Association with correct number of endpoint streams
add b94047c Qt: Add support for template icons.
Summary of changes:
image/stock_icons.qrc | 8 +-
image/stock_icons/16x16/edit-find.png | Bin 523 -> 0 bytes
image/stock_icons/16x16/edit-find.svg | 120 ----------------------
image/stock_icons/16x16/edit-find.template.png | Bin 0 -> 427 bytes
image/stock_icons/16x16/edit-find.template.svg | 92 +++++++++++++++++
image/stock_icons/16x16/edit-find.template@xxxxxx | Bin 0 -> 1192 bytes
image/stock_icons/16x16/edit-find@xxxxxx | Bin 899 -> 0 bytes
image/stock_icons/24x24/edit-find.png | Bin 763 -> 0 bytes
image/stock_icons/24x24/edit-find.svg | 120 ----------------------
image/stock_icons/24x24/edit-find.template.png | Bin 0 -> 544 bytes
image/stock_icons/24x24/edit-find.template.svg | 94 +++++++++++++++++
image/stock_icons/24x24/edit-find.template@xxxxxx | Bin 0 -> 1177 bytes
image/stock_icons/24x24/edit-find@xxxxxx | Bin 1302 -> 0 bytes
image/stock_icons/svg-to-png.sh | 20 +++-
ui/qt/main_window.cpp | 13 +++
ui/qt/main_window.h | 1 +
ui/qt/utils/stock_icon.cpp | 35 ++++++-
ui/qt/widgets/stock_icon_tool_button.cpp | 15 ++-
ui/qt/widgets/stock_icon_tool_button.h | 3 +-
19 files changed, 268 insertions(+), 253 deletions(-)
delete mode 100644 image/stock_icons/16x16/edit-find.png
delete mode 100644 image/stock_icons/16x16/edit-find.svg
create mode 100644 image/stock_icons/16x16/edit-find.template.png
create mode 100644 image/stock_icons/16x16/edit-find.template.svg
create mode 100644 image/stock_icons/16x16/edit-find.template@xxxxxx
delete mode 100644 image/stock_icons/16x16/edit-find@xxxxxx
delete mode 100644 image/stock_icons/24x24/edit-find.png
delete mode 100644 image/stock_icons/24x24/edit-find.svg
create mode 100644 image/stock_icons/24x24/edit-find.template.png
create mode 100644 image/stock_icons/24x24/edit-find.template.svg
create mode 100644 image/stock_icons/24x24/edit-find.template@xxxxxx
delete mode 100644 image/stock_icons/24x24/edit-find@xxxxxx