CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCRATCH move icons over to Env, instance proxy model to gui

Browse Source
This commit is contained in:
Petr Mrázek
2015-02-01 11:44:47 +01:00
parent 154d19bb74
commit aa70ed2244
22 changed files with 92 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
logic/icons/IconList.cpp
View File

@ -20,14 +20,15 @@
#include <QMimeData>
#include <QUrl>
#include <QFileSystemWatcher>
#include <MultiMC.h>
#include <QSet>
#include <logger/QsLog.h>
#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)
{

3
logic/icons/IconList.h
View File

@ -23,6 +23,7 @@
#include <memory>
#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);