diff --git a/src/QmlUtils.cpp b/src/QmlUtils.cpp index 84e5386..224cac4 100644 --- a/src/QmlUtils.cpp +++ b/src/QmlUtils.cpp @@ -1,204 +1,204 @@ /* * Kaidan - A user-friendly XMPP client for every device! * * Copyright (C) 2016-2019 Kaidan developers and contributors * (see the LICENSE file for a full list of copyright authors) * * Kaidan is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * In addition, as a special exception, the author of Kaidan gives * permission to link the code of its release with the OpenSSL * project's "OpenSSL" library (or with modified versions of it that * use the same license as the "OpenSSL" library), and distribute the * linked executables. You must obey the GNU General Public License in * all respects for all of the code used other than "OpenSSL". If you * modify this file, you may extend this exception to your version of * the file, but you are not obligated to do so. If you do not wish to * do so, delete this exception statement from your version. * * Kaidan is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Kaidan. If not, see . */ #include "QmlUtils.h" // Qt #include #include #include #include #include #include #include #include #include #include // QXmpp #include "qxmpp-exts/QXmppColorGenerator.h" QmlUtils::QmlUtils(QObject *parent) : QObject(parent) { } QString QmlUtils::presenceTypeToIcon(Enums::AvailabilityTypes type) { switch (type) { case AvailabilityTypes::PresOnline: return "im-user-online"; case AvailabilityTypes::PresChat: return "im-user-online"; case AvailabilityTypes::PresAway: return "im-user-away"; case AvailabilityTypes::PresDND: return "im-kick-user"; case AvailabilityTypes::PresXA: return "im-user-away"; case AvailabilityTypes::PresUnavailable: return "im-user-offline"; case AvailabilityTypes::PresError: return "im-ban-kick-user"; case AvailabilityTypes::PresInvisible: return "im-invisible-user"; } Q_UNREACHABLE(); } QString QmlUtils::presenceTypeToText(AvailabilityTypes type) { switch (type) { case AvailabilityTypes::PresOnline: return tr("Available"); case AvailabilityTypes::PresChat: return tr("Free for chat"); case AvailabilityTypes::PresAway: return tr("Away"); case AvailabilityTypes::PresDND: return tr("Do not disturb"); case AvailabilityTypes::PresXA: return tr("Away for longer"); case AvailabilityTypes::PresUnavailable: return tr("Offline"); case AvailabilityTypes::PresError: return tr("Error"); case AvailabilityTypes::PresInvisible: return tr("Invisible"); } Q_UNREACHABLE(); } QColor QmlUtils::presenceTypeToColor(AvailabilityTypes type) { switch (type) { case AvailabilityTypes::PresOnline: return {"green"}; case AvailabilityTypes::PresChat: return {"darkgreen"}; case AvailabilityTypes::PresAway: return {"orange"}; case AvailabilityTypes::PresDND: return QColor::fromRgb(218, 68, 83); case AvailabilityTypes::PresXA: return {"orange"}; case AvailabilityTypes::PresError: return {"red"}; case AvailabilityTypes::PresUnavailable: return {"silver"}; case AvailabilityTypes::PresInvisible: return {"grey"}; } Q_UNREACHABLE(); } -QString QmlUtils::getResourcePath(const QString &name) const +QString QmlUtils::getResourcePath(const QString &name) { // We generally prefer to first search for files in application resources if (QFile::exists(":/" + name)) return QString("qrc:/" + name); // list of file paths where to search for the resource file QStringList pathList; // add relative path from binary (only works if installed) pathList << QCoreApplication::applicationDirPath() + QString("/../share/") + QString(APPLICATION_NAME); // get the standard app data locations for current platform pathList << QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); #ifdef UBUNTU_TOUCH pathList << QString("./share/") + QString(APPLICATION_NAME); #endif #ifndef NDEBUG #ifdef DEBUG_SOURCE_PATH // add source directory (only for debug builds) pathList << QString(DEBUG_SOURCE_PATH) + QString("/data"); #endif #endif // search for file in directories for (int i = 0; i < pathList.size(); i++) { // open directory QDir directory(pathList.at(i)); // look up the file if (directory.exists(name)) { // found the file, return the path return QUrl::fromLocalFile(directory.absoluteFilePath(name)).toString(); } } // no file found qWarning() << "[main] Could NOT find media file:" << name; return QString(); } -bool QmlUtils::isImageFile(const QUrl &fileUrl) const +bool QmlUtils::isImageFile(const QUrl &fileUrl) { QMimeType type = QMimeDatabase().mimeTypeForUrl(fileUrl); return type.inherits("image/jpeg") || type.inherits("image/png"); } -void QmlUtils::copyToClipboard(const QString &text) const +void QmlUtils::copyToClipboard(const QString &text) { QGuiApplication::clipboard()->setText(text); } -QString QmlUtils::fileNameFromUrl(const QUrl &url) const +QString QmlUtils::fileNameFromUrl(const QUrl &url) { return QUrl(url).fileName(); } -QString QmlUtils::fileSizeFromUrl(const QUrl &url) const +QString QmlUtils::fileSizeFromUrl(const QUrl &url) { return QLocale::system().formattedDataSize( QFileInfo(QUrl(url).toLocalFile()).size()); } -QString QmlUtils::formatMessage(const QString &message) const +QString QmlUtils::formatMessage(const QString &message) { // escape all special XML chars (like '<' and '>') // and spilt into words for processing return processMsgFormatting(message.toHtmlEscaped().split(" ")); } -QColor QmlUtils::getUserColor(const QString &nickName) const +QColor QmlUtils::getUserColor(const QString &nickName) { QXmppColorGenerator::RGBColor color = QXmppColorGenerator::generateColor(nickName); return {color.red, color.green, color.blue}; } -QString QmlUtils::processMsgFormatting(const QStringList &list, bool isFirst) const +QString QmlUtils::processMsgFormatting(const QStringList &list, bool isFirst) { if (list.isEmpty()) return QString(); // link highlighting if (list.first().startsWith("https://") || list.first().startsWith("http://")) return (isFirst ? QString() : " ") + QString("%1").arg(list.first()) + processMsgFormatting(list.mid(1), false); return (isFirst ? QString() : " ") + list.first() + processMsgFormatting(list.mid(1), false); } diff --git a/src/QmlUtils.h b/src/QmlUtils.h index 6269a26..d5b1c0a 100644 --- a/src/QmlUtils.h +++ b/src/QmlUtils.h @@ -1,136 +1,135 @@ /* * Kaidan - A user-friendly XMPP client for every device! * * Copyright (C) 2016-2019 Kaidan developers and contributors * (see the LICENSE file for a full list of copyright authors) * * Kaidan is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * In addition, as a special exception, the author of Kaidan gives * permission to link the code of its release with the OpenSSL * project's "OpenSSL" library (or with modified versions of it that * use the same license as the "OpenSSL" library), and distribute the * linked executables. You must obey the GNU General Public License in * all respects for all of the code used other than "OpenSSL". If you * modify this file, you may extend this exception to your version of * the file, but you are not obligated to do so. If you do not wish to * do so, delete this exception statement from your version. * * Kaidan is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with Kaidan. If not, see . */ #ifndef UTILS_H #define UTILS_H #include #include "Globals.h" #include "Enums.h" using namespace Enums; /** * @brief C++ utitlities to be used in QML * * The methods are not static, because they need to be used from QML and registered in * Qt. */ class QmlUtils : public QObject { Q_OBJECT public: QmlUtils(QObject *parent = nullptr); /** * Returns the icon belonging to the given presence status type */ Q_INVOKABLE static QString presenceTypeToIcon(Enums::AvailabilityTypes type); /** * Returns the text belonging to the given presence status type */ Q_INVOKABLE static QString presenceTypeToText(Enums::AvailabilityTypes type); /** * Returns the color belonging to the given presence status type */ Q_INVOKABLE static QColor presenceTypeToColor(Enums::AvailabilityTypes type); -public slots: /** * Returns a URL to a given resource file name * * This will check various paths which could contain the searched file. * If the file was found, it'll return a `file://` or a `qrc:/` url to * the file. */ - QString getResourcePath(const QString &resourceName) const; + Q_INVOKABLE static QString getResourcePath(const QString &resourceName); /** * Returns a string of this build's Kaidan version */ - QString getVersionString() const + Q_INVOKABLE static QString getVersionString() { return VERSION_STRING; } /** * Returns a string without new lines, unneeded spaces, etc. * * See QString::simplified for more information. */ - QString removeNewLinesFromString(const QString &input) const + Q_INVOKABLE static QString removeNewLinesFromString(const QString &input) { return input.simplified(); } /** * Checks whether a file is an image and could be displayed as such. * @param fileUrl URL to the possible image file */ - bool isImageFile(const QUrl &fileUrl) const; + Q_INVOKABLE static bool isImageFile(const QUrl &fileUrl); /** * Copy text to the clipboard */ - void copyToClipboard(const QString &text) const; + Q_INVOKABLE static void copyToClipboard(const QString &text); /** * Returns the file name from a URL */ - QString fileNameFromUrl(const QUrl &url) const; + Q_INVOKABLE static QString fileNameFromUrl(const QUrl &url); /** * Returns the file size from a URL */ - QString fileSizeFromUrl(const QUrl &url) const; + Q_INVOKABLE static QString fileSizeFromUrl(const QUrl &url); /** * Styles/formats a message for displaying * * This currently only adds some link highlighting */ - QString formatMessage(const QString &message) const; + Q_INVOKABLE static QString formatMessage(const QString &message); /** * Returns a consistent user color generated from the nickname. */ - QColor getUserColor(const QString &nickName) const; + Q_INVOKABLE static QColor getUserColor(const QString &nickName); private: /** * Highlights links in a list of words */ - QString processMsgFormatting(const QStringList &words, bool isFirst = true) const; + static QString processMsgFormatting(const QStringList &words, bool isFirst = true); }; #endif // UTILS_H