|
[-]
[+]
|
Changed |
_service:tar_git:machines-vs-machines-sfos.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/machines-vs-machines-sfos</param>
<param name="branch">master</param>
- <param name="revision">1.3.5</param>
+ <param name="revision">1.3.6</param>
<param name="token"></param>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-machines-vs-machines-sfos-1.3.6.tar.bz2/harbour-machines-vs-machines-sfos.desktop
^
|
| @@ -11,6 +11,6 @@
# a different app name in German locale (de).
#Name[de]=machines-vs-machines-sfos
[X-Sailjail]
-OrganizationName=de.poetaster
+OrganizationName=com.github.mzanetti
ApplicationName=harbour-machines-vs-machines-sfos
Permissions=UserDirs;RemovableMedia;Audio
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-machines-vs-machines-sfos-1.3.6.tar.bz2/src/machines-vs-machines-sfos.cpp
^
|
| @@ -32,6 +32,12 @@
#include <QtQuick>
#endif
+#include <QGuiApplication>
+#include <QLocale>
+#include <QScopedPointer>
+#include <QStandardPaths>
+#include <QQuickView>
+
#include <sailfishapp.h>
#include "engine.h"
@@ -49,9 +55,24 @@
QObject* createSettings(QQmlEngine *engine, QJSEngine *jsEngine)
{
+
return new Settings();
}
+void migrateSettings()
+{
+QDir dir(QStandardPaths::writableLocation(QStandardPaths::ConfigLocation));
+ if (dir.exists("harbour-machines-vs-machines-sfos"))
+ {
+ dir.mkpath("com.github.mzanetti/harbour-machines-vs-machines-sfos");
+ if (dir.exists("harbour-machines-vs-machines-sfos/harbour-machines-vs-machines-sfos.conf"))
+ {
+ dir.rename("harbour-machines-vs-machines-sfos/harbour-machines-vs-machines-sfos.conf", "com.github.mzanetti/harbour-machines-vs-machines-sfos/harbour-machines-vs-machines-sfos.conf");
+ }
+ dir.rename("harbour-machines-vs-machines-sfos", "com.github.mzanetti/harbour-machines-vs-machines-sfos/old");
+ }
+}
+
int main(int argc, char *argv[])
{
// SailfishApp::main() will display "qml/template.qml", if you need more
@@ -62,6 +83,7 @@
// - SailfishApp::pathTo(QString) to get a QUrl to a resource file
//
// To display the view, call "show()" (will show fullscreen on device).
+ migrateSettings();
qmlRegisterType<Engine>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "Engine");
qmlRegisterUncreatableType<LevelPacks>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "LevelPacks", "Can't create this in QML. Get it from Engine.");
@@ -76,7 +98,29 @@
qmlRegisterType<TowerProxyModel>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "TowerProxyModel");
qmlRegisterType<BoardProxyModel>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "BoardProxyModel");
+ //qmlRegisterSingletonType<Settings>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "SettingsBackend", createSettings);
+
+ //return SailfishApp::main(argc, argv);
+
+
+ QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
+
+ app->setApplicationName("harbour-machines-vs-machines-sfos");
+ app->setOrganizationDomain("com.github.mzanetti");
+ app->setOrganizationName("com.github.mzanetti");
+/*
+ QString newConfigDir = QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+ QString configFile = QCoreApplication::applicationName() + ".conf";
+ QSettings global(newConfigDir + "/" + configFile, QSettings::IniFormat);
+*/
qmlRegisterSingletonType<Settings>("harbour.machines.vs.machines.sfos.Machines", 1, 0, "SettingsBackend", createSettings);
- return SailfishApp::main(argc, argv);
+ QScopedPointer<QQuickView> view(SailfishApp::createView());
+
+ view->setSource(SailfishApp::pathTo("qml/harbour-machines-vs-machines-sfos.qml"));
+ view->setTitle("Machines vs. Machines");
+ view->showFullScreen();
+
+ return app->exec();
+
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-machines-vs-machines-sfos-1.3.6.tar.bz2/src/settings.cpp
^
|
| @@ -3,7 +3,7 @@
#include <QSettings>
#include <QDebug>
-Settings::Settings(QObject *parent):
+Settings::Settings( QObject *parent):
QObject(parent)
{
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-machines-vs-machines-sfos-1.3.6.tar.bz2/src/settings.h
^
|
| @@ -4,7 +4,7 @@
#include <QObject>
#include <QSettings>
-#define SETTINGS(group) QSettings settings("harbour-machines-vs-machines-sfos", "harbour-machines-vs-machines-sfos"); settings.beginGroup(group)
+#define SETTINGS(group) QSettings settings("com.github.mzanetti/harbour-machines-vs-machines-sfos/harbour-machines-vs-machines-sfos"); settings.beginGroup(group)
class QSettings;
|
