Changes of Revision 114
| [-] [+] | Changed | modrana.spec |
| [-] [+] | Changed | modrana-0.56.10.tar.gz/ChangeLog ^ |
| @@ -1,3 +1,25 @@ +commit 2518ed5d3aa951ba6e36a5414404ed7fc92e28f3 +Author: Martin Kolman <martin.kolman@gmail.com> +Date: Tue Mar 19 00:51:43 2019 +0100 + + New modRana version 0.56.10 + + - fix platform id passing + +commit ca050cf716dc642bf1f88827882303cd6f0d5e1a +Author: Martin Kolman <martin.kolman@gmail.com> +Date: Tue Mar 19 00:49:31 2019 +0100 + + Handle native launchers in QML argv processing + + The modRana QML does some argv processing on its side + before it is passed to the modRana Python backend due to + some unwanted arguments QML launchers such as qmlscene + inject to argv. + + This type of processing is not needed for native launchers + so skip it if QML detects it has been started by a native launcher. + commit d73a83abcf708b6b81dfab76c9291abfa74d7bfd Author: Martin Kolman <martin.kolman@gmail.com> Date: Tue Mar 19 00:14:18 2019 +0100 | ||
| [-] [+] | Changed | modrana-0.56.10.tar.gz/modules/gui_modules/gui_qt5/qml/main.qml ^ |
| @@ -10,6 +10,9 @@ title : "modRana" + // report if we were started by a native launcher + property bool nativeLauncher : false + property bool startupDone : false property bool firstPageLoaded : false onFirstPageLoadedChanged : { @@ -407,9 +410,23 @@ rWin.newPoiAddedToDatabase(point) }) - // get the argv & remove the qml launcher - // & qml file name from it (args nr. 0 and 1) - var argv = Qt.application.arguments.slice(2) + rWin.log.debug("QML got argv:") + rWin.log.debug(Qt.application.arguments) + var programName = Qt.application.arguments[0] + // If we detect a native launcher is being used, we can skip + // our own argv manipulation as the launcher should take care + // of all that for us. + // + // modrana - generic native launcher + // harbour-modrana - Sailfish OS native launcher + if (programName == "modrana" || programName == "harbour-modrana") { + rWin.log.debug("QML started by native launcher") + var argv = Qt.application.arguments + } else { + // get the argv & remove the qml launcher + // & qml file name from it (args nr. 0 and 1) + var argv = Qt.application.arguments.slice(2) + } // add the GUI module id if not in argv if (argv.indexOf("-u") == -1) { | ||
| [-] [+] | Changed | modrana-0.56.10.tar.gz/packaging/modrana.spec ^ |
| @@ -18,7 +18,7 @@ %global debug_package %{nil} %endif Url: http://modrana.org -Version: 0.56.9 +Version: 0.56.10 Source0: modrana-%{version}.tar.gz License: GPLv3+ @@ -149,6 +149,9 @@ %endif %changelog +* Tue Mar 19 2019 Martin Kolman <martin.kolman@gmail.com> - 0.56.10-1 +- Handle native launchers in QML argv processing (martin.kolman) + * Tue Mar 19 2019 Martin Kolman <martin.kolman@gmail.com> - 0.56.9-1 - Replace sed-based hacks in main.qml (martin.kolman) - Drop Sailfish OS specific QML source code mangling (martin.kolman) | ||
| [-] [+] | Changed | modrana-0.56.10.tar.gz/translations/modrana.pot ^ |
| @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 00:14+0100\n" +"POT-Creation-Date: 2019-03-19 00:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" | ||
| [-] [+] | Changed | modrana-0.56.10.tar.gz/translations/modrana.ts ^ |
| @@ -1258,12 +1258,12 @@ <context> <name>main</name> <message> - <location filename="../modules/gui_modules/gui_qt5/qml/main.qml" line="301"/> + <location filename="../modules/gui_modules/gui_qt5/qml/main.qml" line="304"/> <source><b>starting modRana...</b></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../modules/gui_modules/gui_qt5/qml/main.qml" line="325"/> + <location filename="../modules/gui_modules/gui_qt5/qml/main.qml" line="328"/> <source>debug</source> <translation type="unfinished"></translation> </message> | ||
| [-] [+] | Changed | modrana-0.56.10.tar.gz/version.txt ^ |
| @@ -1 +1 @@ -0.56.9 +0.56.10 | ||