fix readme
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include <QJsonDocument>
|
||||
#include <QFileInfo>
|
||||
#include <QDir>
|
||||
#include <QUrl>
|
||||
|
||||
ButtonsModel::ButtonsModel(ConfigManager *config, QObject *parent)
|
||||
: QAbstractListModel(parent)
|
||||
@@ -53,8 +54,8 @@ QVariant ButtonsModel::data(const QModelIndex &index, int role) const
|
||||
if (p.startsWith("qrc:/") || p.startsWith(":/") || p.startsWith("file://") || p.startsWith("http"))
|
||||
return p;
|
||||
if (QFileInfo(p).isAbsolute())
|
||||
return QString("file:///") + p;
|
||||
return QString("file:///") + QDir(m_config->iconsDir()).filePath(p);
|
||||
return QUrl::fromLocalFile(p).toString();
|
||||
return QUrl::fromLocalFile(QDir(m_config->iconsDir()).filePath(p)).toString();
|
||||
}
|
||||
case ActionTypeRole: return action.value("type").toString("http_get");
|
||||
case ActionUrlRole: return action.value("url").toString();
|
||||
|
||||
+11
-1
@@ -193,7 +193,17 @@ QJsonObject ConfigManager::settingsObj() const
|
||||
|
||||
QString ConfigManager::iconsDir() const
|
||||
{
|
||||
return settingsObj().value("iconsDir").toString();
|
||||
QString d = settingsObj().value("iconsDir").toString();
|
||||
if (d.isEmpty())
|
||||
d = QStringLiteral("./icons");
|
||||
QFileInfo fi(d);
|
||||
if (fi.isAbsolute())
|
||||
return fi.absoluteFilePath();
|
||||
const QString root = qEnvironmentVariable("BUTTONTASK_ROOT");
|
||||
if (!root.isEmpty())
|
||||
return QFileInfo(root + QLatin1Char('/') + d).absoluteFilePath();
|
||||
return QFileInfo(QFileInfo(m_configPath).absolutePath()
|
||||
+ QStringLiteral("/../") + d).absoluteFilePath();
|
||||
}
|
||||
|
||||
void ConfigManager::setButtons(const QJsonArray &arr)
|
||||
|
||||
Reference in New Issue
Block a user