ubuntu-touch-coreapps-reviewers team mailing list archive

[Andrea Bernabei <andrea.bernabei@xxxxxxxxxxxxx>]

another comment :)

Diff comments:

> === modified file 'src/app/main.cpp'
> --- src/app/main.cpp	2015-03-23 17:46:34 +0000
> +++ src/app/main.cpp	2016-01-25 11:54:32 +0000
> @@ -174,12 +174,20 @@
>              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();
> +    if (keybLayoutDir.cd("KeyboardRows/Layouts")) {

I meant debug output if this operation fails :D

> +        QString keybLayoutPath = keybLayoutDir.canonicalPath() + "/";
> +        qDebug() << "Retrieving default keyboard profiles from folder: " << keybLayoutPath;
> +        keyboardLayouts << getProfileFromDir(keybLayoutPath);
> +    }
> +
> +    // Look for user-defined layouts
>      QStringList configLocations = QStandardPaths::standardLocations(QStandardPaths::ConfigLocation);
>      foreach (const QString &path, configLocations) {
>          QString fullPath = path + "/com.ubuntu.terminal/Layouts/";


-- 
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-terminal-app/layouts-q-argument/+merge/283786
Your team Ubuntu Terminal Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-terminal-app/layouts-q-argument into lp:ubuntu-terminal-app.