diff --git a/src/Globals.h b/src/Globals.h
index c8679dd..31bef5c 100644
--- a/src/Globals.h
+++ b/src/Globals.h
@@ -1,60 +1,61 @@
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2020 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 GLOBALS_H
#define GLOBALS_H
// Kaidan settings
#define KAIDAN_SETTINGS_AUTH_JID "auth/jid"
#define KAIDAN_SETTINGS_AUTH_RESOURCE "auth/resource"
#define KAIDAN_SETTINGS_AUTH_PASSWD "auth/password"
#define KAIDAN_RESOURCE_RANDOM_CHARS \
"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
#define INVITATION_URL "https://i.kaidan.im/#"
#define APPLICATION_SOURCE_CODE_URL "https://invent.kde.org/kde/kaidan"
+#define ISSUE_TRACKING_URL "https://invent.kde.org/kde/kaidan/issues"
#define MESSAGE_MAX_CHARS 1e4
// XML namespaces
#define NS_SPOILERS "urn:xmpp:spoiler:0"
#define NS_CARBONS "urn:xmpp:carbons:2"
#define NS_REGISTER "jabber:iq:register"
// SQL
#define DB_CONNECTION "kaidan-messages"
#define DB_FILENAME "messages.sqlite3"
#define DB_MSG_QUERY_LIMIT 20
#define DB_TABLE_INFO "dbinfo"
#define DB_TABLE_ROSTER "Roster"
#define DB_TABLE_MESSAGES "Messages"
#endif // GLOBALS_H
diff --git a/src/QmlUtils.cpp b/src/QmlUtils.cpp
index 30e0468..a659f4b 100644
--- a/src/QmlUtils.cpp
+++ b/src/QmlUtils.cpp
@@ -1,254 +1,259 @@
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2020 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"
static QmlUtils *s_instance;
QmlUtils *QmlUtils::instance()
{
if (!s_instance)
return new QmlUtils(QGuiApplication::instance());
return s_instance;
}
QmlUtils::QmlUtils(QObject *parent)
: QObject(parent)
{
Q_ASSERT(!s_instance);
s_instance = this;
}
QmlUtils::~QmlUtils()
{
s_instance = nullptr;
}
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();
return { };
}
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();
return { };
}
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();
return { };
}
QString QmlUtils::connectionErrorMessage(ClientWorker::ConnectionError error)
{
switch (error) {
case ClientWorker::AuthenticationFailed:
return tr("Invalid username or password.");
case ClientWorker::NotConnected:
return tr("Cannot connect to the server. Please check your internet connection.");
case ClientWorker::TlsNotAvailable:
return tr("The server doesn't support secure connections.");
case ClientWorker::TlsFailed:
return tr("Error while trying to connect securely.");
case ClientWorker::DnsError:
return tr("Could not resolve the server's address. Please check your server name.");
case ClientWorker::ConnectionRefused:
return tr("Could not connect to the server.");
case ClientWorker::NoSupportedAuth:
return tr("Authentification protocol not supported by the server.");
case ClientWorker::RegistrationUnsupported:
return tr("This server does not support registration.");
default:
return tr("An unknown error occured.");
}
Q_UNREACHABLE();
}
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();
}
+QUrl QmlUtils::issueTrackingUrl()
+{
+ return {QStringLiteral(ISSUE_TRACKING_URL)};
+}
+
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)
{
QGuiApplication::clipboard()->setText(text);
}
QString QmlUtils::fileNameFromUrl(const QUrl &url)
{
return QUrl(url).fileName();
}
QString QmlUtils::fileSizeFromUrl(const QUrl &url)
{
return QLocale::system().formattedDataSize(
QFileInfo(QUrl(url).toLocalFile()).size());
}
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)
{
QXmppColorGenerator::RGBColor color = QXmppColorGenerator::generateColor(nickName);
return {color.red, color.green, color.blue};
}
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);
// preserve newlines
if (list.first().contains("\n"))
return (isFirst ? QString() : " ") + QString(list.first()).replace("\n", "
")
+ 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 a5626cd..9d54cf0 100644
--- a/src/QmlUtils.h
+++ b/src/QmlUtils.h
@@ -1,172 +1,178 @@
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2020 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 QMLUTILS_H
#define QMLUTILS_H
#include
#include
#include "ClientWorker.h"
#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
+ Q_PROPERTY(QUrl issueTrackingUrl READ issueTrackingUrl CONSTANT)
public:
static QmlUtils *instance();
QmlUtils(QObject *parent = nullptr);
~QmlUtils();
/**
* 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);
/**
* Returns an error message for a connection error.
*
* @param error error for which an error message should be returned
*/
Q_INVOKABLE static QString connectionErrorMessage(ClientWorker::ConnectionError error);
/**
* 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.
*/
Q_INVOKABLE static QString getResourcePath(const QString &resourceName);
/**
* Returns a string of this build's Kaidan version
*/
Q_INVOKABLE static QString versionString()
{
return QStringLiteral(VERSION_STRING);
}
/**
* Returns the name of this application as it should be displayed to the user
*/
Q_INVOKABLE static QString applicationDisplayName()
{
return QStringLiteral(APPLICATION_DISPLAY_NAME);
}
/**
* Returns the URL where the source code of this application can be found
*/
Q_INVOKABLE static QUrl applicationSourceCodeUrl()
{
return {QStringLiteral(APPLICATION_SOURCE_CODE_URL)};
}
+ /**
+ * Returns the URL to view and report issues.
+ */
+ static QUrl issueTrackingUrl();
+
/**
* Returns an invitation URL to the given JID
*/
Q_INVOKABLE static QUrl invitationUrl(const QString &jid)
{
return {QStringLiteral(INVITATION_URL) + jid};
}
/**
* Returns a string without new lines, unneeded spaces, etc.
*
* See QString::simplified for more information.
*/
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
*/
Q_INVOKABLE static bool isImageFile(const QUrl &fileUrl);
/**
* Copy text to the clipboard
*/
Q_INVOKABLE static void copyToClipboard(const QString &text);
/**
* Returns the file name from a URL
*/
Q_INVOKABLE static QString fileNameFromUrl(const QUrl &url);
/**
* Returns the file size from a URL
*/
Q_INVOKABLE static QString fileSizeFromUrl(const QUrl &url);
/**
* Styles/formats a message for displaying
*
* This currently only adds some link highlighting
*/
Q_INVOKABLE static QString formatMessage(const QString &message);
/**
* Returns a consistent user color generated from the nickname.
*/
Q_INVOKABLE static QColor getUserColor(const QString &nickName);
private:
/**
* Highlights links in a list of words
*/
static QString processMsgFormatting(const QStringList &words, bool isFirst = true);
};
#endif // QMLUTILS_H
diff --git a/src/qml/AboutDialog.qml b/src/qml/AboutDialog.qml
index a8d10eb..037448e 100644
--- a/src/qml/AboutDialog.qml
+++ b/src/qml/AboutDialog.qml
@@ -1,108 +1,113 @@
/*
* Kaidan - A user-friendly XMPP client for every device!
*
* Copyright (C) 2016-2020 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 .
*/
import QtQuick 2.12
import QtQuick.Layouts 1.12
import QtQuick.Controls 2.12 as Controls
import org.kde.kirigami 2.8 as Kirigami
import im.kaidan.kaidan 1.0
import "elements"
Controls.Dialog {
id: aboutDialog
modal: true
standardButtons: Controls.Dialog.Ok
onAccepted: close()
GridLayout {
anchors.fill: parent
flow: root.width > root.height ? GridLayout.LeftToRight : GridLayout.TopToBottom
columnSpacing: 20
rowSpacing: 20
Image {
source: Utils.getResourcePath("images/kaidan.svg")
Layout.preferredWidth: Kirigami.Units.gridUnit * 9
Layout.preferredHeight: Kirigami.Units.gridUnit * 9
Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignCenter
fillMode: Image.PreserveAspectFit
mipmap: true
sourceSize: Qt.size(width, height)
}
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
spacing: Kirigami.gridUnit * 0.6
Kirigami.Heading {
text: Utils.applicationDisplayName() + " " + Utils.versionString()
textFormat: Text.PlainText
wrapMode: Text.WordWrap
Layout.fillWidth: true
horizontalAlignment: Qt.AlignHCenter
}
Controls.Label {
text: "" + qsTr("A simple, user-friendly Jabber/XMPP client") + ""
textFormat: Text.StyledText
wrapMode: Text.WordWrap
Layout.fillWidth: true
horizontalAlignment: Qt.AlignHCenter
}
Controls.Label {
text: "" + qsTr("License:") + " GPLv3+ / CC BY-SA 4.0"
textFormat: Text.StyledText
wrapMode: Text.WordWrap
Layout.fillWidth: true
horizontalAlignment: Qt.AlignHCenter
}
Controls.Label {
text: "Copyright © 2016-2020\nKaidan developers and contributors"
textFormat: Text.PlainText
wrapMode: Text.WordWrap
Layout.fillWidth: true
Layout.preferredWidth: contentWidth
horizontalAlignment: Qt.AlignHCenter
}
+ CenteredAdaptiveButton {
+ label.text: qsTr("Report problems")
+ onClicked: Qt.openUrlExternally(Utils.issueTrackingUrl)
+ }
+
CenteredAdaptiveButton {
label.text: qsTr("View source code online")
onClicked: Qt.openUrlExternally(Utils.applicationSourceCodeUrl())
}
}
}
}