aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core/libLumina/LIconCache.h
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-08-31 21:59:44 -0400
committerKen Moore <ken@ixsystems.com>2017-08-31 21:59:44 -0400
commitaa64ef84cd104cc9364ebf480117174540f69a88 (patch)
tree756030b17e2df6995875283ba144dd3d308f2a9f /src-qt5/core/libLumina/LIconCache.h
parentA bit more cleanup. Nothing too special. (diff)
downloadlumina-aa64ef84cd104cc9364ebf480117174540f69a88.tar.gz
lumina-aa64ef84cd104cc9364ebf480117174540f69a88.tar.bz2
lumina-aa64ef84cd104cc9364ebf480117174540f69a88.zip
Some more cleanup on Lumina2:
1) Get the JsonMenu plugin up and running again for the context menu 2) Get the LIconCache integrated into the context menu (replacing the old LXDG::findIcon calls). 3) Get the window property events working!!! (finally) 4) Start getting some automatic window-verification put in place (for snapping windows to various places and such).
Diffstat (limited to 'src-qt5/core/libLumina/LIconCache.h')
-rw-r--r--src-qt5/core/libLumina/LIconCache.h4
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
bgstack15