|
[-]
[+]
|
Changed |
_service:tar_git:harbour-moremahjong.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/poetaster/harbour-moremahjong.git</param>
<param name="branch">main</param>
- <param name="revision">1.2.1</param>
+ <param name="revision">1.2.3</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Deleted |
_service:tar_git:harbour-moremahjong-1.2.1.tar.bz2/src/harbour-moremahjong.cpp
^
|
| @@ -1,64 +0,0 @@
-#ifdef QT_QML_DEBUG
-#include <QtQuick>
-#endif
-
-#include <QGuiApplication>
-#include <QLocale>
-#include <QQuickView>
-#include <QScopedPointer>
-#include <QStandardPaths>
-#include <QString>
-#include <QStringList>
-#include <QTranslator>
-#include <QtQml>
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <QString>
-#include <QStandardPaths>
-#include <QCryptographicHash>
-#include <sailfishapp.h>
-
-void migrateLocalStorage()
-{
-
- // The new location of the LocalStorage database
- QDir newDbDir(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/de.poetaster/harbour-moremahjong/");
-
- //if(newDbDir.exists())
- // return;
-
- newDbDir.mkpath(newDbDir.path());
-
- //QString dbname = QString(QCryptographicHash::hash(("harbour-dwd"), QCryptographicHash::Md5).toHex());
- //qDebug() << "dbname: " + name;
-
- QString pathOld = "/harbour-moremahjong/harbour-moremahjong/.mozilla/webappsstore.sqlite";
- QString pathNew = "/de.poetaster/harbour-moremahjong/.mozilla/webappsstore.sqlite";
-
- // The old LocalStorage database
- // QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)
- QFile newDb(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + pathNew );
- newDb.remove();
- QFile oldDb(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + pathOld );
- oldDb.rename(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + pathNew );
-
- // proof of concept you can just move.
- //oldDb.rename(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathNew + dbname + ".sqlite");
- //oldIni.rename(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + pathNew + dbname + ".ini");
-}
-
-int main(int argc, char *argv[])
-{
- // SailfishApp::main() will display "qml/harbour-greenmahjong.qml", if you need more
- // control over initialization, you can use:
- //
- // - SailfishApp::application(int, char *[]) to get the QGuiApplication *
- // - SailfishApp::createView() to get a new QQuickView * instance
- // - SailfishApp::pathTo(QString) to get a QUrl to a resource file
- // - SailfishApp::pathToMainQml() to get a QUrl to the main QML file
- //
- // To display the view, call "show()" (will show fullscreen on device).
- // migrateLocalStorage();
- return SailfishApp::main(argc, argv);
-}
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-moremahjong-1.2.3.tar.bz2/harbour-moremahjong.desktop
^
|
| @@ -2,8 +2,9 @@
Type=Application
X-Nemo-Application-Type=silica-qt5
Icon=harbour-moremahjong
-Exec=harbour-moremahjong
+Exec=sailfish-qml harbour-moremahjong
Name=Mah Solitaire
+
# translation example:
# your app name in German locale (de)
#
@@ -14,3 +15,4 @@
[X-Sailjail]
OrganizationName=de.poetaster
ApplicationName=harbour-moremahjong
+Permissions=UserDirs;WebView;Audio
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-moremahjong-1.2.3.tar.bz2/harbour-moremahjong.pro
^
|
| @@ -11,9 +11,7 @@
# The name of your application
TARGET = harbour-moremahjong
-CONFIG += sailfishapp
-SOURCES += \
- src/harbour-moremahjong.cpp
+CONFIG += sailfishapp_qml
PKGCONFIG += qt5embedwidget
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-moremahjong-1.2.3.tar.bz2/harbour-moremahjong.pro.user
^
|
| @@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.15.2, 2022-01-03T17:25:20. -->
+<!-- Written by QtCreator 4.15.2, 2022-03-18T10:46:45. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -91,7 +91,7 @@
<value type="QString" key="DeviceType">Mer.Device.Type</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.3.0.12-aarch64 (in Sailfish SDK Build Engine)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.3.0.12-aarch64 (in Sailfish SDK Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{8066f8d8-13de-4c6d-a549-399237383095}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-4.3.0.12-aarch64.default</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -411,15 +411,15 @@
<value type="QString" key="MerRunConfiguration.QmlLiveTargetWorkspace"></value>
<value type="int" key="PE.EnvironmentAspect.Base">1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">harbour-moremahjong (on %{Device:Name})</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-moremahjong/harbour-moremahjong.pro</value>
- <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/mwa/src/sailfish/harbour-moremahjong/harbour-moremahjong.pro</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene (on %{Device:Name})</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerQmlRunConfiguration</value>
+ <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
<value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
+ <value type="QString" key="RunConfiguration.Arguments">harbour-moremahjong</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- <value type="QString" key="RunConfiguration.X11Forwarding">:0.0</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
@@ -430,8 +430,8 @@
<value type="QString" key="DeviceType">Mer.Device.Type</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.3.0.12-armv7hl (in Sailfish SDK Build Engine)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.3.0.12-armv7hl (in Sailfish SDK Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{3af74a5d-ebf1-4d97-8bad-0a4dfbc1c285}</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-4.3.0.12-armv7hl.default</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -640,11 +640,7 @@
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRpmBuildStep</value>
</valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRpmValidationStep</value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
@@ -748,11 +744,87 @@
<value type="int" key="MerRunConfiguration.QmlLiveIpcPort">-1</value>
<value type="int" key="MerRunConfiguration.QmlLiveOptions">3</value>
<value type="QString" key="MerRunConfiguration.QmlLiveTargetWorkspace"></value>
+ <value type="int" key="PE.EnvironmentAspect.Base">2</value>
+ <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.CustomExecutableRunConfiguration</value>
+ <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
+ <value type="QString" key="Analyzer.Perf.CallgraphMode">dwarf</value>
+ <valuelist type="QVariantList" key="Analyzer.Perf.Events">
+ <value type="QString">cpu-cycles</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="Analyzer.Perf.ExtraArguments"/>
+ <value type="int" key="Analyzer.Perf.Frequency">250</value>
+ <valuelist type="QVariantList" key="Analyzer.Perf.RecordArguments">
+ <value type="QString">-e</value>
+ <value type="QString">cpu-cycles</value>
+ <value type="QString">--call-graph</value>
+ <value type="QString">dwarf,4096</value>
+ <value type="QString">-F</value>
+ <value type="QString">250</value>
+ </valuelist>
+ <value type="QString" key="Analyzer.Perf.SampleMode">-F</value>
+ <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
+ <value type="int" key="Analyzer.Perf.StackSize">4096</value>
+ <value type="bool" key="Analyzer.QmlProfiler.AggregateTraces">false</value>
+ <value type="bool" key="Analyzer.QmlProfiler.FlushEnabled">false</value>
+ <value type="uint" key="Analyzer.QmlProfiler.FlushInterval">1000</value>
+ <value type="QString" key="Analyzer.QmlProfiler.LastTraceFile"></value>
+ <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="QString" key="Analyzer.Valgrind.Callgrind.Arguments"></value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="QString" key="Analyzer.Valgrind.KCachegrindExecutable">kcachegrind</value>
+ <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
+ <value type="QString" key="Analyzer.Valgrind.Memcheck.Arguments"></value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
+ <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
+ <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindArguments"></value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="CustomOutputParsers"/>
+ <value type="bool" key="MerRunConfiguration.DebugBypassOpenSslArmCapEnabled">true</value>
+ <value type="QString" key="MerRunConfiguration.QmlLiveBenchWorkspace">/home/mwa/src/sailfish/harbour-moremahjong</value>
+ <value type="bool" key="MerRunConfiguration.QmlLiveEnabled">false</value>
+ <value type="int" key="MerRunConfiguration.QmlLiveIpcPort">-1</value>
+ <value type="int" key="MerRunConfiguration.QmlLiveOptions">3</value>
+ <value type="QString" key="MerRunConfiguration.QmlLiveTargetWorkspace"></value>
<value type="int" key="PE.EnvironmentAspect.Base">1</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">harbour-moremahjong (on %{Device:Name})</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerRunConfiguration:/home/mwa/src/sailfish/harbour-moremahjong/harbour-moremahjong.pro</value>
- <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">/home/mwa/src/sailfish/harbour-moremahjong/harbour-moremahjong.pro</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmakeProjectManager.MerCustomRunConfiguration:</value>
+ <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value>
<value type="int" key="RemoteLinux.EnvironmentAspect.Version">1</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
@@ -760,7 +832,7 @@
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
<value type="QString" key="RunConfiguration.X11Forwarding">:0.0</value>
</valuemap>
- <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
</valuemap>
</data>
<data>
@@ -769,7 +841,7 @@
<value type="QString" key="DeviceType">Mer.Device.Type</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SailfishOS-4.3.0.12-i486 (in Sailfish SDK Build Engine)</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">SailfishOS-4.3.0.12-i486 (in Sailfish SDK Build Engine)</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{b010e714-18aa-423f-9530-d3556ec97a22}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">SailfishOS-4.3.0.12-i486.default</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
|
|
[-]
[+]
|
Changed |
_service:tar_git:harbour-moremahjong-1.2.3.tar.bz2/qml/pages/FirstPage.qml
^
|
| @@ -1,6 +1,7 @@
import QtQuick 2.6
import Sailfish.Silica 1.0
import Sailfish.WebView 1.0
+import Sailfish.WebEngine 1.0
Page {
id:view
@@ -9,8 +10,8 @@
SilicaFlickable {
anchors.fill: parent
- // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView
-/* PullDownMenu {
+ /* Sadly this ruins the layout
+ * PullDownMenu {
MenuItem {
text: qsTr("About")
onClicked: {
@@ -18,12 +19,16 @@
}
}
}*/
- //WebView { }
- WebView {
- id: webView
- anchors.fill: parent
- url: "../mah/index.html"
- }
+ WebView {
+ /* This will probably be required from 4.4 on. */
+ Component.onCompleted: {
+ //WebEngineSettings.setPreference("security.disable_cors_checks", true, WebEngineSettings.BoolPref)
+ WebEngineSettings.setPreference("security.fileuri.strict_origin_policy", false, WebEngineSettings.BoolPref)
+ }
+ id: webView
+ anchors.fill: parent
+ url: "../mah/index.html"
+ }
}
|
