diff options
| author | Weblate <noreply@weblate.org> | 2017-09-20 10:04:33 +0000 |
|---|---|---|
| committer | Weblate <noreply@weblate.org> | 2017-09-20 10:04:33 +0000 |
| commit | 6a570a2c9648c47c3c58d96f139feab6596105ae (patch) | |
| tree | a61a7e3e8149c96474db636b282559ddd9d90ed9 /src-qt5/core/libLumina/LIconCache.h | |
| parent | Translated using Weblate (Finnish) (diff) | |
| parent | Get the window embed routine cleaned up and demo-ready. (diff) | |
| download | lumina-6a570a2c9648c47c3c58d96f139feab6596105ae.tar.gz lumina-6a570a2c9648c47c3c58d96f139feab6596105ae.tar.bz2 lumina-6a570a2c9648c47c3c58d96f139feab6596105ae.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src-qt5/core/libLumina/LIconCache.h')
| -rw-r--r-- | src-qt5/core/libLumina/LIconCache.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/core/libLumina/LIconCache.h b/src-qt5/core/libLumina/LIconCache.h index 428ffcab..691d328c 100644 --- a/src-qt5/core/libLumina/LIconCache.h +++ b/src-qt5/core/libLumina/LIconCache.h @@ -4,7 +4,7 @@ // Available under the 3-clause BSD license // See the LICENSE file for full details //=========================================== -// This is a simple class for loading/serving icon files +// This is a simple class for loading/serving icon files // from the icon theme or local filesystem //=========================================== #include <QHash> @@ -26,6 +26,7 @@ struct icon_data{ QList<QPointer<QLabel> > pendingLabels; QList<QPointer<QAbstractButton> > pendingButtons; QList<QPointer<QAction> > pendingActions; + QList<QPointer<QMenu> > pendingMenus; QIcon icon; QIcon thumbnail; }; @@ -50,6 +51,7 @@ public: void loadIcon(QAbstractButton *button, QString icon, bool noThumb = false); void loadIcon(QLabel *label, QString icon, bool noThumb = false); void loadIcon(QAction *action, QString icon, bool noThumb = false); + void loadIcon(QMenu *action, QString icon, bool noThumb = false); QIcon loadIcon(QString icon, bool noThumb = false); //generic loading routine - does not background the loading of icons when not in the cache |