renamed for aurora
This commit is contained in:
parent
6ec3d2931f
commit
4b7bfc5f33
6 changed files with 18 additions and 18 deletions
|
@ -44,7 +44,7 @@ namespace {
|
||||||
const QString KEY_HIGHLIGHT_UNREADCONVS("highlightUnreadConversations");
|
const QString KEY_HIGHLIGHT_UNREADCONVS("highlightUnreadConversations");
|
||||||
}
|
}
|
||||||
|
|
||||||
AppSettings::AppSettings(QObject *parent) : QObject(parent), settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/de.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat)
|
AppSettings::AppSettings(QObject *parent) : QObject(parent), settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/org.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@ class DBusAdaptor : public QDBusAbstractAdaptor
|
||||||
{
|
{
|
||||||
|
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
Q_CLASSINFO("D-Bus Interface", "de.ygriega.fernschreiber")
|
Q_CLASSINFO("D-Bus Interface", "org.ygriega.fernschreiber")
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DBusAdaptor(QObject *parent);
|
DBusAdaptor(QObject *parent);
|
||||||
|
|
|
@ -25,8 +25,8 @@
|
||||||
|
|
||||||
#include "dbusadaptor.h"
|
#include "dbusadaptor.h"
|
||||||
|
|
||||||
const QString INTERFACE_NAME = "de.ygriega.fernschreiber";
|
const QString INTERFACE_NAME = "org.ygriega.fernschreiber";
|
||||||
const QString PATH_NAME = "/de/ygriega/fernschreiber";
|
const QString PATH_NAME = "/org/ygriega/fernschreiber";
|
||||||
|
|
||||||
class DBusInterface : public QObject
|
class DBusInterface : public QObject
|
||||||
{
|
{
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <QtQuick>
|
#include <QtQuick>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sailfishapp.h>
|
#include <auroraapp.h>
|
||||||
#include <QScopedPointer>
|
#include <QScopedPointer>
|
||||||
#include <QQuickView>
|
#include <QQuickView>
|
||||||
#include <QtQml>
|
#include <QtQml>
|
||||||
|
@ -73,7 +73,7 @@ void migrateSettings() {
|
||||||
int sailfishOSMinorVersion = sailfishOSVersion.value(1).toInt();
|
int sailfishOSMinorVersion = sailfishOSVersion.value(1).toInt();
|
||||||
if ((sailfishOSMajorVersion == 4 && sailfishOSMinorVersion >= 4) || sailfishOSMajorVersion > 4) {
|
if ((sailfishOSMajorVersion == 4 && sailfishOSMinorVersion >= 4) || sailfishOSMajorVersion > 4) {
|
||||||
LOG("Checking if we need to migrate settings...");
|
LOG("Checking if we need to migrate settings...");
|
||||||
QSettings settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/de.ygriega/fernschreiber/settings.conf", QSettings::NativeFormat);
|
QSettings settings(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + "/org.ygriega/Fernschreiber/settings.conf", QSettings::NativeFormat);
|
||||||
if (settings.contains("migrated")) {
|
if (settings.contains("migrated")) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -120,8 +120,8 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
QLoggingCategory::setFilterRules(DEFAULT_LOG_FILTER);
|
QLoggingCategory::setFilterRules(DEFAULT_LOG_FILTER);
|
||||||
|
|
||||||
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
|
QScopedPointer<QGuiApplication> app(Aurora::Application::application(argc, argv));
|
||||||
QScopedPointer<QQuickView> view(SailfishApp::createView());
|
QScopedPointer<QQuickView> view(Aurora::Application::createView());
|
||||||
|
|
||||||
QQmlContext *context = view.data()->rootContext();
|
QQmlContext *context = view.data()->rootContext();
|
||||||
|
|
||||||
|
@ -182,7 +182,7 @@ int main(int argc, char *argv[])
|
||||||
contactsProxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
|
contactsProxyModel.setFilterCaseSensitivity(Qt::CaseInsensitive);
|
||||||
context->setContextProperty("contactsProxyModel", &contactsProxyModel);
|
context->setContextProperty("contactsProxyModel", &contactsProxyModel);
|
||||||
|
|
||||||
view->setSource(SailfishApp::pathTo("qml/harbour-fernschreiber.qml"));
|
view->setSource(Aurora::Application::pathTo("qml/harbour-fernschreiber.qml"));
|
||||||
view->show();
|
view->show();
|
||||||
return app->exec();
|
return app->exec();
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
#include "notificationmanager.h"
|
#include "notificationmanager.h"
|
||||||
#include "fernschreiberutils.h"
|
#include "fernschreiberutils.h"
|
||||||
#include "chatmodel.h"
|
#include "chatmodel.h"
|
||||||
#include <sailfishapp.h>
|
#include <auroraapp.h>
|
||||||
#include <QListIterator>
|
#include <QListIterator>
|
||||||
#include <QUrl>
|
#include <QUrl>
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
|
@ -126,7 +126,7 @@ NotificationManager::NotificationGroup::~NotificationGroup()
|
||||||
}
|
}
|
||||||
|
|
||||||
NotificationManager::NotificationManager(TDLibWrapper *tdLibWrapper, AppSettings *appSettings, MceInterface *mceInterface, ChatModel *chatModel) :
|
NotificationManager::NotificationManager(TDLibWrapper *tdLibWrapper, AppSettings *appSettings, MceInterface *mceInterface, ChatModel *chatModel) :
|
||||||
appIconFile(SailfishApp::pathTo("images/fernschreiber-notification.png").toLocalFile())
|
appIconFile(Aurora::Application::pathTo("images/fernschreiber-notification.png").toLocalFile())
|
||||||
{
|
{
|
||||||
LOG("Initializing...");
|
LOG("Initializing...");
|
||||||
this->tdLibWrapper = tdLibWrapper;
|
this->tdLibWrapper = tdLibWrapper;
|
||||||
|
@ -335,7 +335,7 @@ void NotificationManager::publishNotification(const NotificationGroup *notificat
|
||||||
remoteActionArguments.append(QString::number(notificationGroup->chatId));
|
remoteActionArguments.append(QString::number(notificationGroup->chatId));
|
||||||
remoteActionArguments.append(messageMap.value(ID).toString());
|
remoteActionArguments.append(messageMap.value(ID).toString());
|
||||||
nemoNotification->setRemoteAction(Notification::remoteAction("default", "openMessage",
|
nemoNotification->setRemoteAction(Notification::remoteAction("default", "openMessage",
|
||||||
"de.ygriega.fernschreiber", "/de/ygriega/fernschreiber", "de.ygriega.fernschreiber",
|
"org.ygriega.fernschreiber", "/org/ygriega/fernschreiber", "org.ygriega.fernschreiber",
|
||||||
"openMessage", remoteActionArguments));
|
"openMessage", remoteActionArguments));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2336,9 +2336,9 @@ void TDLibWrapper::initializeOpenWith()
|
||||||
} else {
|
} else {
|
||||||
fileOut << QString("MimeType=x-url-handler/t.me;x-scheme-handler/tg;").toUtf8() << "\n";
|
fileOut << QString("MimeType=x-url-handler/t.me;x-scheme-handler/tg;").toUtf8() << "\n";
|
||||||
}
|
}
|
||||||
fileOut << QString("X-Maemo-Service=de.ygriega.fernschreiber").toUtf8() << "\n";
|
fileOut << QString("X-Maemo-Service=org.ygriega.fernschreiber").toUtf8() << "\n";
|
||||||
fileOut << QString("X-Maemo-Object-Path=/de/ygriega/fernschreiber").toUtf8() << "\n";
|
fileOut << QString("X-Maemo-Object-Path=/org/ygriega/fernschreiber").toUtf8() << "\n";
|
||||||
fileOut << QString("X-Maemo-Method=de.ygriega.fernschreiber.openUrl").toUtf8() << "\n";
|
fileOut << QString("X-Maemo-Method=org.ygriega.fernschreiber.openUrl").toUtf8() << "\n";
|
||||||
fileOut << QString("Hidden=true;").toUtf8() << "\n";
|
fileOut << QString("Hidden=true;").toUtf8() << "\n";
|
||||||
fileOut.flush();
|
fileOut.flush();
|
||||||
desktopFile.close();
|
desktopFile.close();
|
||||||
|
@ -2351,7 +2351,7 @@ void TDLibWrapper::initializeOpenWith()
|
||||||
LOG("Creating D-Bus directory" << dbusPathName);
|
LOG("Creating D-Bus directory" << dbusPathName);
|
||||||
dbusPath.mkpath(dbusPathName);
|
dbusPath.mkpath(dbusPathName);
|
||||||
}
|
}
|
||||||
QString dbusServiceFileName = dbusPathName + "/de.ygriega.fernschreiber.service";
|
QString dbusServiceFileName = dbusPathName + "/org.ygriega.fernschreiber.service";
|
||||||
QFile dbusServiceFile(dbusServiceFileName);
|
QFile dbusServiceFile(dbusServiceFileName);
|
||||||
if (dbusServiceFile.exists()) {
|
if (dbusServiceFile.exists()) {
|
||||||
LOG("D-BUS service file existing, removing to ensure proper re-creation...");
|
LOG("D-BUS service file existing, removing to ensure proper re-creation...");
|
||||||
|
@ -2362,8 +2362,8 @@ void TDLibWrapper::initializeOpenWith()
|
||||||
QTextStream fileOut(&dbusServiceFile);
|
QTextStream fileOut(&dbusServiceFile);
|
||||||
fileOut.setCodec("UTF-8");
|
fileOut.setCodec("UTF-8");
|
||||||
fileOut << QString("[D-BUS Service]").toUtf8() << "\n";
|
fileOut << QString("[D-BUS Service]").toUtf8() << "\n";
|
||||||
fileOut << QString("Name=de.ygriega.fernschreiber").toUtf8() << "\n";
|
fileOut << QString("Name=org.ygriega.fernschreiber").toUtf8() << "\n";
|
||||||
fileOut << QString("Exec=sailjail -- /usr/bin/harbour-fernschreiber").toUtf8() << "\n";
|
fileOut << QString("Exec=sailjail -- /usr/bin/org.ygriega.Fernschreiberr").toUtf8() << "\n";
|
||||||
fileOut.flush();
|
fileOut.flush();
|
||||||
dbusServiceFile.close();
|
dbusServiceFile.close();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue