From eaac4dacd6512fdff0a92640fdab911bff96c34f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 5 Jul 2017 15:13:11 +0200 Subject: [PATCH] Ref T30, added font icons Additionally removed bogus font menu entry in swiftdata --- src/blackmisc/blackmisc.qrc | 8 ++++++++ src/blackmisc/icons.cpp | 3 ++- src/swiftdata/swiftdata.ui | 1 - 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 095875e7a..15a054f1c 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -101,6 +101,14 @@ icons/pastel/48/font-error.png icons/pastel/48/plugin-error.png icons/pastel/48/table-error.png + icons/pastel/16/font.png + icons/pastel/16/font-add.png + icons/pastel/16/font-disk.png + icons/pastel/16/font-edit.png + icons/pastel/16/font-enlarge.png + icons/pastel/16/font-error.png + icons/pastel/16/font-go.png + icons/pastel/16/font-shrink.png icons/vatsim/C1.png diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index e8a72f515..4b261dad8 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -422,7 +422,8 @@ namespace BlackMisc const QPixmap &CIcons::font16() { - return empty16(); //! \fixme icon needed + static const QPixmap pm(":/pastel/icons/pastel/16/font.png"); + return pm; } const QPixmap &CIcons::database16() diff --git a/src/swiftdata/swiftdata.ui b/src/swiftdata/swiftdata.ui index cfed7029d..4b6c1a321 100644 --- a/src/swiftdata/swiftdata.ui +++ b/src/swiftdata/swiftdata.ui @@ -85,7 +85,6 @@ &Window -