From 84b06c51d9969996140e9eec6c84febf16ec40cb Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 30 Sep 2015 04:59:44 +0200 Subject: [PATCH] refs #475 new icons for load/save --- src/blackmisc/blackmisc.qrc | 1 + src/blackmisc/iconlist.cpp | 2 ++ src/blackmisc/icons.cpp | 20 ++++++++++++++++++++ src/blackmisc/icons.h | 11 +++++++++++ 4 files changed, 34 insertions(+) diff --git a/src/blackmisc/blackmisc.qrc b/src/blackmisc/blackmisc.qrc index 348d528ca..5fd2542a3 100644 --- a/src/blackmisc/blackmisc.qrc +++ b/src/blackmisc/blackmisc.qrc @@ -81,6 +81,7 @@ icons/pastel/16/database-lightning.png icons/pastel/16/database-table.png icons/pastel/16/paintcan.png + icons/pastel/16/disk.png icons/vatsim/C1.png diff --git a/src/blackmisc/iconlist.cpp b/src/blackmisc/iconlist.cpp index 80fa265f0..b1ff02074 100644 --- a/src/blackmisc/iconlist.cpp +++ b/src/blackmisc/iconlist.cpp @@ -132,6 +132,7 @@ namespace BlackMisc CIcon(CIcons::StandardIconJoystick16, "joystick"), CIcon(CIcons::StandardIconLockClosed16, "lock"), CIcon(CIcons::StandardIconLockOpen16, "lock open"), + CIcon(CIcons::StandardIconLoad16, "load open"), CIcon(CIcons::StandardIconMonitorError16, "monitor error"), CIcon(CIcons::StandardIconPaperPlane16, "plane"), CIcon(CIcons::StandardIconPaintCan16, "paint can"), @@ -142,6 +143,7 @@ namespace BlackMisc CIcon(CIcons::StandardIconResize16, "resize"), CIcon(CIcons::StandardIconResizeHorizontal16, "resize (horizontal)"), CIcon(CIcons::StandardIconResizeVertical16, "resize (vertical)"), + CIcon(CIcons::StandardIconSave16, "save"), CIcon(CIcons::StandardIconSpeakerNetwork16, "speaker (network)"), CIcon(CIcons::StandardIconStatusBar16, "status bar"), CIcon(CIcons::StandardIconTableRelationship16, "relationship"), diff --git a/src/blackmisc/icons.cpp b/src/blackmisc/icons.cpp index 381eec805..2464495ee 100644 --- a/src/blackmisc/icons.cpp +++ b/src/blackmisc/icons.cpp @@ -46,6 +46,22 @@ namespace BlackMisc return pm; } + const QPixmap &CIcons::disk16() + { + static const QPixmap pm(":/pastel/icons/pastel/16/disk.png"); + return pm; + } + + const QPixmap &CIcons::load16() + { + return disk16(); + } + + const QPixmap &CIcons::save16() + { + return disk16(); + } + const QPixmap &CIcons::colorPicker16() { static const QPixmap pm(":/diagona/icons/diagona/icons/ui-color-picker.png"); @@ -965,6 +981,8 @@ namespace BlackMisc return info16(); case StandardIconJoystick16: return joystick16(); + case StandardIconLoad16: + return load16(); case StandardIconMonitorError16: return monitorError16(); case StandardIconPaperPlane16: @@ -985,6 +1003,8 @@ namespace BlackMisc return resizeHorizontal16(); case StandardIconResizeVertical16: return resizeVertical16(); + case StandardIconSave16: + return save16(); case StandardIconSpeakerNetwork16: return speakerNetwork16(); case StandardIconStatusBar16: diff --git a/src/blackmisc/icons.h b/src/blackmisc/icons.h index 2a836bb85..36dea42d3 100644 --- a/src/blackmisc/icons.h +++ b/src/blackmisc/icons.h @@ -123,6 +123,7 @@ namespace BlackMisc StandardIconHeadingOne16, StandardIconInfo16, StandardIconJoystick16, + StandardIconLoad16, StandardIconLockClosed16, StandardIconLockOpen16, StandardIconMonitorError16, @@ -135,6 +136,7 @@ namespace BlackMisc StandardIconResize16, StandardIconResizeHorizontal16, StandardIconResizeVertical16, + StandardIconSave16, StandardIconSpeakerNetwork16, StandardIconStatusBar16, StandardIconTableRelationship16, @@ -192,6 +194,15 @@ namespace BlackMisc //! Close static const QPixmap &close16(); + //! Disk + static const QPixmap &disk16(); + + //! Load + static const QPixmap &load16(); + + //! Save + static const QPixmap &save16(); + //! Color static const QPixmap &color16();