From aa70ed2244700dbcc93c1fadb22edc1c1caede37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 1 Feb 2015 11:44:47 +0100 Subject: SCRATCH move icons over to Env, instance proxy model to gui --- logic/icons/IconList.cpp | 7 ++++--- logic/icons/IconList.h | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'logic/icons') diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp index 6db8b035..964d61e9 100644 --- a/logic/icons/IconList.cpp +++ b/logic/icons/IconList.cpp @@ -20,14 +20,15 @@ #include #include #include -#include +#include +#include #define MAX_SIZE 1024 -IconList::IconList(QString path, QObject *parent) : QAbstractListModel(parent) +IconList::IconList(QString builtinPath, QString path, QObject *parent) : QAbstractListModel(parent) { // add builtin icons - QDir instance_icons(":/icons/instances/"); + QDir instance_icons(builtinPath); auto file_info_list = instance_icons.entryInfoList(QDir::Files, QDir::Name); for (auto file_info : file_info_list) { diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h index 8687eba6..124ecf27 100644 --- a/logic/icons/IconList.h +++ b/logic/icons/IconList.h @@ -23,6 +23,7 @@ #include #include "MMCIcon.h" #include "logic/settings/Setting.h" +#include "logic/Env.h" // there is a global icon list inside Env. class QFileSystemWatcher; @@ -30,7 +31,7 @@ class IconList : public QAbstractListModel { Q_OBJECT public: - explicit IconList(QString path, QObject *parent = 0); + explicit IconList(QString builtinPath, QString path, QObject *parent = 0); virtual ~IconList() {}; QIcon getIcon(QString key); -- cgit v1.2.3