Merge lp:~verzegnassi-stefano/ubuntu-terminal-app/layouts-q-argument into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/reboot

[Stefano Verzegnassi]

Fixed layouts not found when terminal-app is launched with '-q' argument

Fixed layouts not found when terminal-app is launched with '-q' argument

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:156
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/168/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/452/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/168/rebuild

review: Approve (continuous-integration)

[Andrea Bernabei (faenil)]

small comment

[lp:~verzegnassi-stefano/ubuntu-terminal-app/layouts-q-argument]

157. By Stefano Verzegnassi on 2016-01-25

added debug output as per MP review

[Stefano Verzegnassi (verzegnassi-stefano)]

Done!

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:157
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/169/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/453/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/169/rebuild

review: Approve (continuous-integration)

[Andrea Bernabei (faenil)]

another comment :)

[lp:~verzegnassi-stefano/ubuntu-terminal-app/layouts-q-argument]

158. By Stefano Verzegnassi on 2016-01-25

Added output in case the default layouts folder doesn't exist, or no default layout has been found

[Andrea Bernabei (faenil)]

lgtm! thanks :)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:158
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/170/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/454/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/170/rebuild

review: Approve (continuous-integration)

[Evan McIntire (mcintire-evan)]

Works well, code all looks good to me - Thanks for the change!

review: Approve

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2015-03-23 17:46:34 +0000
+++ src/app/main.cpp	2016-01-25 12:37:28 +0000
@@ -40,7 +40,7 @@
     QDir layoutDir(path);
     layoutDir.setNameFilters(QStringList("*.json"));
 
-    QStringList jsonFiles = layoutDir.entryList();
+    QStringList jsonFiles = layoutDir.entryList();   
 
     QStringList result;
     foreach (QString s, jsonFiles) {
@@ -174,12 +174,31 @@
             qDebug() << "Trying to load QML from:" << path + "/qml/ubuntu-terminal-app.qml";
             if (fi.exists()) {
                 qmlfile = path +  "/qml/ubuntu-terminal-app.qml";
-                keyboardLayouts << getProfileFromDir(path + "/qml/KeyboardRows/Layouts/");
                 break;
             }
         }
     }
 
+    // Look for default layouts
+    QDir keybLayoutDir = QFileInfo(qmlfile).dir();
+    const QString &layoutsDir("KeyboardRows/Layouts");
+
+    if (keybLayoutDir.cd(layoutsDir)) {
+        QString keybLayoutPath = keybLayoutDir.canonicalPath() + "/";
+        qDebug() << "Retrieving default keyboard profiles from folder: " << keybLayoutPath;
+
+        QStringList kLayouts = getProfileFromDir(keybLayoutPath);
+
+        if (kLayouts.isEmpty()) {
+            qDebug() << "No default keyboard profile found.";
+        } else {
+            keyboardLayouts << kLayouts;
+        }
+    } else {
+        qDebug() << "Not able to locate default keyboard profiles folder:" << keybLayoutDir.canonicalPath() + "/" + layoutsDir;
+    }
+
+    // Look for user-defined layouts
     QStringList configLocations = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation);
     foreach (const QString &path, configLocations) {
         QString fullPath = path + "/com.ubuntu.terminal/Layouts/";