Merge lp:~mzanetti/reminders-app/qmlfile-param into lp:reminders-app

[Michael Zanetti]

Add command line option -q <qmlfile> to load the main qml file from some other place

Also make it a bit more flexible by unhardcoding the fallback searchpath for /usr/share

[lp:~mzanetti/reminders-app/qmlfile-param]

87. By Michael Zanetti on 2014-03-13

add it to -h

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:87
http://91.189.93.70:8080/job/reminders-app-ci/225/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1728
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/225
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/225

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/225/rebuild

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

So you won't look at /usr/share anymore at all? I can't review too much from a qml perspective, but thank you for making this a bit easier to launch :-)

Anyways, code reads fine to me, I'd like to make sure it works before I +1.

[David Planella (dpm)]

On Fri, Mar 14, 2014 at 1:49 AM, Nicholas Skaggs <
<email address hidden>> wrote:

> So you won't look at /usr/share anymore at all? I can't review too much
> from a qml perspective, but thank you for making this a bit easier to
> launch :-)
>
>
Hi Nick, that's exactly what this line does. The difference is that now the
directory name is not hardcoded, and we're using the Qt API to resolve it:

+ QStringList paths =
QStandardPaths::standardLocations(QStandardPaths::DataLocation);

That resolves ultimately to /usr/share/reminders (
http://qt-project.org/doc/qt-5.0/qtcore/qstandardpaths.html). I remember
having found a URL where there was a table that listed to which directory
each QStandardPath resolved to, but I don't seem to be able to find it
again. In any case, /usr/share/reminders is still one of the dirs where
we're looking for the main .qml file.

Cheers,
David.

Anyways, code reads fine to me, I'd like to make sure it works before I +1.
> --
>
> https://code.launchpad.net/~mzanetti/reminders-app/qmlfile-param/+merge/210891
> Your team Ubuntu Reminders app developers is requested to review the
> proposed merge of lp:~mzanetti/reminders-app/qmlfile-param into
> lp:reminders-app.
>

[Michael Zanetti (mzanetti)]

It also looks in /usr/local/share/, ~/.local/share/ and /opt/share if it can't be found in the local dir or /usr/share

Giving the -q argument disables that searching and only tries to open the given file (to avoid confusion if giving a file and the app silently loading another one)

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-02-25 09:42:51 +0000
+++ src/app/main.cpp	2014-03-13 19:49:58 +0000
@@ -46,9 +46,11 @@
         qDebug() << "    -t|--tablet   If running on Desktop, start in a tablet sized window.";
         qDebug() << "    -h|--help     Print this help.";
         qDebug() << "    -I <path>     Give a path for an additional QML import directory. May be used multiple times.";
+        qDebug() << "    -q <qmlfile>  Give an alternative location for the main qml file.";
         return 0;
     }
 
+    QString qmlfile;
     for (int i = 0; i < args.count(); i++) {
         if (args.at(i) == "-I" && args.count() > i + 1) {
             QString addedPath = args.at(i+1);
@@ -57,6 +59,8 @@
                 addedPath.prepend(QDir::currentPath());
             }
             importPathList.append(addedPath);
+        } else if (args.at(i) == "-q" && args.count() > i + 1) {
+            qmlfile = args.at(i+1);
         }
     }
 
@@ -84,13 +88,20 @@
     view.engine()->rootContext()->setContextProperty("accountPreference", &preferences);
 
     // load the qml file
-    QFileInfo fi("qml/reminders.qml");
-    if (fi.exists()) {
-        view.setSource(QUrl::fromLocalFile("qml/reminders.qml"));
-    } else {
-        view.setSource(QUrl::fromLocalFile("/usr/share/reminders/qml/reminders.qml"));
+    if (qmlfile.isEmpty()) {
+        QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation);
+        paths.prepend(".");
+
+        foreach (const QString &path, paths) {
+            QFileInfo fi(path + "/qml/reminders.qml");
+            if (fi.exists()) {
+                qmlfile = path +  "/qml/reminders.qml";
+                break;
+            }
+        }
     }
-
+    qDebug() << "using main qml file from:" << qmlfile;
+    view.setSource(QUrl::fromLocalFile(qmlfile));
     view.show();
 
     return a.exec();