dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add basic support for system icons and custom icons

Browse Source
This commit is contained in:
Jonas Kvinge
2019-03-13 00:43:46 +01:00
parent d09af19d3f
commit d575ab0b2b
5 changed files with 58 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/core/iconloader.cpp
View File

@@ -3,6 +3,7 @@
* Copyright 2013, Jonas Kvinge <jonas@strawbs.net>
* This file was part of Clementine.
* Copyright 2010, David Sansome <me@davidsansome.com>
* Copyright 2017-2019, Jonas Kvinge <jonas@jkvinge.net>
*
* Strawberry is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,28 +22,64 @@
#include "config.h"
#include <QDir>
#include <QFile>
#include <QList>
#include <QString>
#include <QIcon>
#include <QSize>
#include <QtDebug>
#include <QStandardPaths>
#include <QSettings>
#include "core/logging.h"
#include "settings/appearancesettingspage.h"
#include "iconloader.h"
bool IconLoader::system_icons_ = false;
bool IconLoader::custom_icons_ = false;
void IconLoader::Init() {
QSettings s;
s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
system_icons_ = s.value("system_icons", false).toBool();
s.endGroup();
QDir dir;
if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/icons")) {
custom_icons_ = true;
}
}
QIcon IconLoader::Load(const QString &name, const int size) {
QIcon ret;
if (name.isEmpty()) {
qLog(Error) << "Icon name is empty!";
return ret;
}
QList<int> sizes;
sizes.clear();
if (size == 0) { sizes << 22 << 32 << 48 << 64; }
else sizes << size;
if (name.isEmpty()) {
qLog(Error) << "Icon name is empty!";
return ret;
if (system_icons_) {
ret = QIcon::fromTheme(name);
if (!ret.isNull()) return ret;
qLog(Warning) << "Couldn't load icon" << name << "from system theme icons.";
}
if (custom_icons_) {
QString custom_icon_path = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/icons/%1x%2/%3.png";
for (int s : sizes) {
QString filename(custom_icon_path.arg(s).arg(s).arg(name));
if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));
}
if (!ret.isNull()) return ret;
qLog(Warning) << "Couldn't load icon" << name << "from custom icons.";
}
const QString path(":/icons/%1x%2/%3.png");
@@ -51,13 +88,6 @@ QIcon IconLoader::Load(const QString &name, const int size) {
if (QFile::exists(filename)) ret.addFile(filename, QSize(s, s));
}
// Load icon from system theme only if it hasn't been found
if (ret.isNull()) {
ret = QIcon::fromTheme(name);
if (!ret.isNull()) return ret;
qLog(Warning) << "Couldn't load icon" << name;
}
return ret;
}