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

Improve device icon loading

Browse Source
This commit is contained in:
Jonas Kvinge
2021-05-04 21:55:05 +02:00
parent 5fbdbffa23
commit 240dcf2e5c
3 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/device/deviceinfo.cpp
View File

@@ -98,29 +98,41 @@ void DeviceInfo::LoadIcon(const QVariantList &icons, const QString &name_hint) {
// Try to load the icon with that exact name first // Try to load the icon with that exact name first
for (const QVariant &icon : icons) { for (const QVariant &icon : icons) {
if (!icon.value<QPixmap>().isNull()) { if (icon.isNull()) continue;
if (icon.userType() == QMetaType::QString) {
QString icon_name = icon.toString();
if (!icon_name.isEmpty()) {
icon_ = IconLoader::Load(icon_name);
if (!icon_.isNull()) {
icon_name_ = icon_name;
return;
}
}
}
else if (!icon.value<QPixmap>().isNull()) {
icon_ = QIcon(icon.value<QPixmap>()); icon_ = QIcon(icon.value<QPixmap>());
return; return;
} }
else { }
if (!icon.toString().isEmpty()) icon_ = IconLoader::Load(icon.toString());
if (!icon_.isNull()) { for (const QVariant &icon : icons) {
icon_name_ = icon.toString(); if (!icon.isNull() && icon.userType() == QMetaType::QString) {
return; QString icon_name = icon.toString();
if (!icon_name.isEmpty()) {
QString hint = QString(icons.first().toString() + name_hint).toLower();
if (hint.contains("phone")) icon_name_ = "device-phone";
else if (hint.contains("ipod") || hint.contains("apple")) icon_name_ = "device-ipod";
else if ((hint.contains("usb")) && (hint.contains("reader"))) icon_name_ = "device-usb-flash";
else if (hint.contains("usb")) icon_name_ = "device-usb-drive";
icon_ = IconLoader::Load(icon_name_);
if (!icon_.isNull()) {
return;
}
} }
} }
} }
QString hint = QString(icons.first().toString() + name_hint).toLower(); icon_name_ = "device";
if (hint.contains("phone")) icon_name_ = "device-phone";
else if (hint.contains("ipod") || hint.contains("apple")) icon_name_ = "device-ipod";
else if ((hint.contains("usb")) && (hint.contains("reader"))) icon_name_ = "device-usb-flash";
else if (hint.contains("usb")) icon_name_ = "device-usb-drive";
else icon_name_ = "device";
icon_ = IconLoader::Load(icon_name_); icon_ = IconLoader::Load(icon_name_);
} }

15
src/device/devicelister.cpp
View File

@@ -30,8 +30,7 @@
#include <QFile> #include <QFile>
#include <QByteArray> #include <QByteArray>
#include <QString> #include <QString>
#include <QStringList> #include <QVariantList>
#include <QStringBuilder>
#include <QUrl> #include <QUrl>
#include "devicelister.h" #include "devicelister.h"
@@ -228,15 +227,15 @@ bool DeviceLister::IsIpod(const QString &path) const {
QFile::exists(path + "/iTunes/iTunes_Control"); QFile::exists(path + "/iTunes/iTunes_Control");
} }
QStringList DeviceLister::GuessIconForPath(const QString &path) { QVariantList DeviceLister::GuessIconForPath(const QString &path) {
QStringList ret; QVariantList ret;
#ifdef HAVE_LIBGPOD #ifdef HAVE_LIBGPOD
if (IsIpod(path)) { if (IsIpod(path)) {
Itdb_Device* device = itdb_device_new(); Itdb_Device *device = itdb_device_new();
itdb_device_set_mountpoint(device, path.toLocal8Bit().constData()); itdb_device_set_mountpoint(device, path.toLocal8Bit().constData());
const Itdb_IpodInfo* info = itdb_device_get_ipod_info(device); const Itdb_IpodInfo *info = itdb_device_get_ipod_info(device);
if (info->ipod_model == ITDB_IPOD_MODEL_INVALID) { if (info->ipod_model == ITDB_IPOD_MODEL_INVALID) {
ret << "device-ipod"; ret << "device-ipod";
@@ -271,9 +270,9 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) {
} }
QStringList DeviceLister::GuessIconForModel(const QString &vendor, const QString &model) { QVariantList DeviceLister::GuessIconForModel(const QString &vendor, const QString &model) {
QStringList ret; QVariantList ret;
if (vendor.startsWith("Google") && model.contains("Nexus")) { if (vendor.startsWith("Google") && model.contains("Nexus")) {
ret << "phone-google-nexus-one"; ret << "phone-google-nexus-one";
} }

6
src/device/devicelister.h
View File

@@ -28,6 +28,8 @@
#include <QObject> #include <QObject>
#include <QList> #include <QList>
#include <QMetaType> #include <QMetaType>
#include <QVariantList>
#include <QVariantMap>
#include <QString> #include <QString>
#include <QStringList> #include <QStringList>
#include <QUrl> #include <QUrl>
@@ -91,8 +93,8 @@ class DeviceLister : public QObject {
QUrl MakeUrlFromLocalPath(const QString &path) const; QUrl MakeUrlFromLocalPath(const QString &path) const;
bool IsIpod(const QString &path) const; bool IsIpod(const QString &path) const;
QStringList GuessIconForPath(const QString &path); QVariantList GuessIconForPath(const QString &path);
QStringList GuessIconForModel(const QString &vendor, const QString &model); QVariantList GuessIconForModel(const QString &vendor, const QString &model);
protected: protected:
QThread *thread_; QThread *thread_;