Merge lp:~gerboland/qtmir/desktopFileReader into lp:qtmir/rtm-14.09

[Michał Sawicz]

Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys

Rewrite DesktopFileReader to use GDesktopAppInfo, enables reading localized keys

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'src/modules/Unity/Application/Application.pro'
--- src/modules/Unity/Application/Application.pro	2014-09-11 16:18:40 +0000
+++ src/modules/Unity/Application/Application.pro	2014-10-13 09:06:32 +0000
@@ -12,7 +12,7 @@
 QMAKE_CXXFLAGS = -std=c++11 -Werror -Wall
 QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
 
-PKGCONFIG += mirserver glib-2.0 process-cpp ubuntu-app-launch-2
+PKGCONFIG += mirserver glib-2.0 gio-unix-2.0 process-cpp ubuntu-app-launch-2
 
 INCLUDEPATH += ../../../platforms/mirserver ../../../common
 LIBS += -L../../../platforms/mirserver -lqpa-mirserver
@@ -65,7 +65,8 @@
     session.h \
     session_interface.h \
     sessionmodel.h \
-    upstart/applicationcontroller.h
+    upstart/applicationcontroller.h \
+    gscopedpointer.h
 
 LTTNG_TP_FILES += tracepoints.tp
 

=== modified file 'src/modules/Unity/Application/desktopfilereader.cpp'
--- src/modules/Unity/Application/desktopfilereader.cpp	2014-08-07 18:15:45 +0000
+++ src/modules/Unity/Application/desktopfilereader.cpp	2014-10-13 09:06:32 +0000
@@ -16,142 +16,196 @@
 
 // local
 #include "desktopfilereader.h"
+#include "gscopedpointer.h"
 #include "logging.h"
 
 // Qt
 #include <QFile>
+#include <QLocale>
+
+// GIO
+#include <gio/gdesktopappinfo.h>
 
 namespace qtmir
 {
 
-DesktopFileReader::Factory::Factory()
-{
-}
-
-DesktopFileReader::Factory::~Factory()
-{
-}
 
 DesktopFileReader* DesktopFileReader::Factory::createInstance(const QString &appId, const QFileInfo& fi)
 {
     return new DesktopFileReader(appId, fi);
 }
 
-// Retrieves the size of an array at compile time.
-#define ARRAY_SIZE(a) \
-    ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
+typedef GObjectScopedPointer<GAppInfo> GAppInfoPointer;
+
+struct DesktopFileReaderPrivate
+{
+    DesktopFileReaderPrivate(DesktopFileReader *parent):
+            q_ptr( parent )
+    {}
+
+    QString getKey(const char *key) const
+    {
+        if (!loaded()) return QString();
+
+        return QString::fromUtf8(g_desktop_app_info_get_string((GDesktopAppInfo*)appInfo.data(), key));
+    }
+
+    bool loaded() const
+    {
+        return !appInfo.isNull();
+    }
+
+    DesktopFileReader * const q_ptr;
+    Q_DECLARE_PUBLIC(DesktopFileReader)
+
+    QString appId;
+    QString file;
+    GAppInfoPointer appInfo; // GAppInfo is actually implemented by GDesktopAppInfo
+};
+
 
 DesktopFileReader::DesktopFileReader(const QString &appId, const QFileInfo &desktopFile)
-    : appId_(appId)
-    , entries_(DesktopFileReader::kNumberOfEntries, "")
+    : d_ptr(new DesktopFileReaderPrivate(this))
 {
-    qCDebug(QTMIR_APPLICATIONS) << "DesktopFileReader::DesktopFileReader - this=" << this << "appId=" << appId;
-
-    file_ = desktopFile.absoluteFilePath();
-    loaded_ = loadDesktopFile(file_);
+    Q_D(DesktopFileReader);
+
+    d->appId = appId;
+    d->file = desktopFile.absoluteFilePath();
+    d->appInfo.reset((GAppInfo*) g_desktop_app_info_new_from_filename(d->file.toUtf8().constData()));
+
+    if (!d->loaded()) {
+        if (!desktopFile.exists()) {
+            qCWarning(QTMIR_APPLICATIONS) << "Desktop file for appId:" << appId << "at:" << d->file
+                                          << "does not exist";
+        } else {
+            qCWarning(QTMIR_APPLICATIONS) << "Desktop file for appId:" << appId << "at:" << d->file
+                                      << "is not valid - check its syntax, and that the binary specified"
+                                      << "by the Exec line is installed!";
+        }
+    }
 }
 
 DesktopFileReader::~DesktopFileReader()
 {
-    qCDebug(QTMIR_APPLICATIONS) << "DesktopFileReader::~DesktopFileReader";
-    entries_.clear();
-}
-
-bool DesktopFileReader::loadDesktopFile(QString desktopFile)
-{
-    qCDebug(QTMIR_APPLICATIONS) << "DesktopFileReader::loadDesktopFile - this=" << this << "desktopFile=" << desktopFile;
-
-    if (this->file().isNull() || this->file().isEmpty()) {
-        qCritical() << "No desktop file found for appId:" << appId_;
-        return false;
-    }
-
-    Q_ASSERT(desktopFile != NULL);
-    const struct { const char* const name; int size; unsigned int flag; } kEntryNames[] = {
-        { "Name=", sizeof("Name=") - 1, 1 << DesktopFileReader::kNameIndex },
-        { "Comment=", sizeof("Comment=") - 1, 1 << DesktopFileReader::kCommentIndex },
-        { "Icon=", sizeof("Icon=") - 1, 1 << DesktopFileReader::kIconIndex },
-        { "Exec=", sizeof("Exec=") - 1, 1 << DesktopFileReader::kExecIndex },
-        { "Path=", sizeof("Path=") - 1, 1 << DesktopFileReader::kPathIndex },
-        { "X-Ubuntu-StageHint=", sizeof("X-Ubuntu-StageHint=") - 1, 1 << DesktopFileReader::kStageHintIndex },
-        { "X-Ubuntu-Splash-Title=", sizeof("X-Ubuntu-Splash-Title=") - 1, 1 << DesktopFileReader::kSplashTitleIndex },
-        { "X-Ubuntu-Splash-Image=", sizeof("X-Ubuntu-Splash-Image=") - 1, 1 << DesktopFileReader::kSplashImageIndex },
-        { "X-Ubuntu-Splash-Show-Header=", sizeof("X-Ubuntu-Splash-Show-Header=") - 1, 1 << DesktopFileReader::kSplashShowHeaderIndex },
-        { "X-Ubuntu-Splash-Color=", sizeof("X-Ubuntu-Splash-Color=") - 1, 1 << DesktopFileReader::kSplashColorIndex },
-        { "X-Ubuntu-Splash-Color-Header=", sizeof("X-Ubuntu-Splash-Color-Header=") - 1, 1 << DesktopFileReader::kSplashColorHeaderIndex },
-        { "X-Ubuntu-Splash-Color-Footer=", sizeof("X-Ubuntu-Splash-Color-Footer=") - 1, 1 << DesktopFileReader::kSplashColorFooterIndex }
-    };
-    const unsigned int kAllEntriesMask =
-            (1 << DesktopFileReader::kNameIndex) | (1 << DesktopFileReader::kCommentIndex)
-            | (1 << DesktopFileReader::kIconIndex) | (1 << DesktopFileReader::kExecIndex)
-            | (1 << DesktopFileReader::kPathIndex) | (1 << DesktopFileReader::kStageHintIndex)
-            | (1 << DesktopFileReader::kSplashTitleIndex) | (1 << DesktopFileReader::kSplashImageIndex)
-            | (1 << DesktopFileReader::kSplashShowHeaderIndex) | (1 << DesktopFileReader::kSplashColorIndex)
-            | (1 << DesktopFileReader::kSplashColorHeaderIndex) | (1 << DesktopFileReader::kSplashColorFooterIndex);
-    const unsigned int kMandatoryEntriesMask =
-            (1 << DesktopFileReader::kNameIndex) | (1 << DesktopFileReader::kIconIndex)
-            | (1 << DesktopFileReader::kExecIndex);
-    const int kEntriesCount = ARRAY_SIZE(kEntryNames);
-    const int kBufferSize = 256;
-    static char buffer[kBufferSize];
-    QFile file(desktopFile);
-
-    // Open file.
-    if (!file.open(QFile::ReadOnly | QIODevice::Text)) {
-        qWarning() << "Can't open file:" << file.errorString();
-        return false;
-    }
-
-    // Validate "magic key" (standard group header).
-    if (file.readLine(buffer, kBufferSize) != -1) {
-        if (strncmp(buffer, "[Desktop Entry]", sizeof("[Desktop Entry]") - 1)) {
-            qWarning() << "not a desktop file, unable to read it";
-            return false;
-        }
-    }
-
-    int length;
-    unsigned int entryFlags = 0;
-    while ((length = file.readLine(buffer, kBufferSize)) != -1) {
-        // Skip empty lines.
-        if (length > 1) {
-            // Stop when reaching unsupported next group header.
-            if (buffer[0] == '[') {
-                qWarning() << "reached next group header, leaving loop";
-                break;
-            }
-            // Lookup entries ignoring duplicates if any.
-            for (int i = 0; i < kEntriesCount; i++) {
-                if (!strncmp(buffer, kEntryNames[i].name, kEntryNames[i].size)) {
-                    if (~entryFlags & kEntryNames[i].flag) {
-                        buffer[length-1] = '\0';
-                        entries_[i] = QString::fromUtf8(&buffer[kEntryNames[i].size]);
-                        entryFlags |= kEntryNames[i].flag;
-                        break;
-                    }
-                }
-            }
-            // Stop when matching the right number of entries.
-            if (entryFlags == kAllEntriesMask) {
-                break;
-            }
-        }
-    }
-
-    // Check that the mandatory entries are set.
-    if ((entryFlags & kMandatoryEntriesMask) == kMandatoryEntriesMask) {
-        qDebug("loaded desktop file with name='%s', comment='%s', icon='%s', exec='%s', path='%s', stagehint='%s'",
-                qPrintable(entries_[DesktopFileReader::kNameIndex]),
-                qPrintable(entries_[DesktopFileReader::kCommentIndex]),
-                qPrintable(entries_[DesktopFileReader::kIconIndex]),
-                qPrintable(entries_[DesktopFileReader::kExecIndex]),
-                qPrintable(entries_[DesktopFileReader::kPathIndex]),
-                qPrintable(entries_[DesktopFileReader::kStageHintIndex]));
-        return true;
-    } else {
-        qWarning() << "not a valid desktop file, missing mandatory entries in the standard group header";
-        return false;
-    }
+    delete d_ptr;
+}
+
+QString DesktopFileReader::file() const
+{
+    Q_D(const DesktopFileReader);
+    return d->file;
+}
+
+QString DesktopFileReader::appId() const
+{
+    Q_D(const DesktopFileReader);
+    return d->appId;
+}
+
+QString DesktopFileReader::name() const
+{
+    Q_D(const DesktopFileReader);
+    if (!d->loaded()) return QString();
+
+    return QString::fromUtf8(g_app_info_get_name(d->appInfo.data()));
+}
+
+QString DesktopFileReader::comment() const
+{
+    Q_D(const DesktopFileReader);
+    if (!d->loaded()) return QString();
+
+    return QString::fromUtf8(g_app_info_get_description(d->appInfo.data()));
+}
+
+QString DesktopFileReader::icon() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("Icon");
+}
+
+QString DesktopFileReader::exec() const
+{
+    Q_D(const DesktopFileReader);
+    if (!d->loaded()) return QString();
+
+    return QString::fromUtf8(g_app_info_get_commandline(d->appInfo.data()));
+}
+
+QString DesktopFileReader::path() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("Path");
+}
+
+QString DesktopFileReader::stageHint() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-StageHint");
+}
+
+QString DesktopFileReader::splashTitle() const
+{
+    Q_D(const DesktopFileReader);
+    if (!d->loaded()) return QString();
+
+    /* Sadly GDesktopAppInfo only considers Name, GenericName, Comments and Keywords to be keys
+     * which can have locale-specific entries. So we need to work to make X-Ubuntu-Splash-Title
+     * locale-aware, by generating a locale-correct key name and seeing if that exists. If yes,
+     * get the value and return it. Else fallback to the non-localized value.
+     */
+    GDesktopAppInfo *info = (GDesktopAppInfo*)d->appInfo.data();
+    QLocale defaultLocale;
+    QStringList locales = defaultLocale.uiLanguages();
+
+    QString keyTemplate("X-Ubuntu-Splash-Title[%1]");
+    for (QString locale: locales) {
+        // Desktop files use local specifiers with underscore separators but Qt uses hyphens
+        locale = locale.replace('-', '_');
+        const char* key = keyTemplate.arg(locale).toUtf8().constData();
+        if (g_desktop_app_info_has_key(info, key)) {
+            return d->getKey(key);
+        }
+    }
+
+    // Fallback to the non-localized string, if available
+    return d->getKey("X-Ubuntu-Splash-Title");
+}
+
+QString DesktopFileReader::splashImage() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-Splash-Image");
+}
+
+QString DesktopFileReader::splashShowHeader() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-Splash-Show-Header");
+}
+
+QString DesktopFileReader::splashColor() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-Splash-Color");
+}
+
+QString DesktopFileReader::splashColorHeader() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-Splash-Color-Header");
+}
+
+QString DesktopFileReader::splashColorFooter() const
+{
+    Q_D(const DesktopFileReader);
+    return d->getKey("X-Ubuntu-Splash-Color-Footer");
+}
+
+bool DesktopFileReader::loaded() const
+{
+    Q_D(const DesktopFileReader);
+    return d->loaded();
 }
 
 } // namespace qtmir

=== modified file 'src/modules/Unity/Application/desktopfilereader.h'
--- src/modules/Unity/Application/desktopfilereader.h	2014-08-07 18:15:45 +0000
+++ src/modules/Unity/Application/desktopfilereader.h	2014-10-13 09:06:32 +0000
@@ -18,20 +18,19 @@
 #define DESKTOPFILEREADER_H
 
 #include <QString>
-#include <QVector>
 #include <QFileInfo>
 
 namespace qtmir
 {
 
+class DesktopFileReaderPrivate;
 class DesktopFileReader {
 public:
     class Factory
     {
     public:
-        Factory();
+        Factory() = default;
         Factory(const Factory&) = delete;
-        virtual ~Factory();
 
         Factory& operator=(const Factory&) = delete;
 
@@ -40,48 +39,31 @@
 
     virtual ~DesktopFileReader();
 
-    virtual QString file() const { return file_; }
-    virtual QString appId() const { return appId_; }
-    virtual QString name() const { return entries_[kNameIndex]; }
-    virtual QString comment() const { return entries_[kCommentIndex]; }
-    virtual QString icon() const { return entries_[kIconIndex]; }
-    virtual QString exec() const { return entries_[kExecIndex]; }
-    virtual QString path() const { return entries_[kPathIndex]; }
-    virtual QString stageHint() const { return entries_[kStageHintIndex]; }
-    virtual QString splashTitle() const { return entries_[kSplashTitleIndex]; }
-    virtual QString splashImage() const { return entries_[kSplashImageIndex]; }
-    virtual QString splashShowHeader() const { return entries_[kSplashShowHeaderIndex]; }
-    virtual QString splashColor() const { return entries_[kSplashColorIndex]; }
-    virtual QString splashColorHeader() const { return entries_[kSplashColorHeaderIndex]; }
-    virtual QString splashColorFooter() const { return entries_[kSplashColorFooterIndex]; }
-    virtual bool loaded() const { return loaded_; }
+    virtual QString file() const;
+    virtual QString appId() const;
+    virtual QString name() const;
+    virtual QString comment() const;
+    virtual QString icon() const;
+    virtual QString exec() const;
+    virtual QString path() const;
+    virtual QString stageHint() const;
+    virtual QString splashTitle() const;
+    virtual QString splashImage() const;
+    virtual QString splashShowHeader() const;
+    virtual QString splashColor() const;
+    virtual QString splashColorHeader() const;
+    virtual QString splashColorFooter() const;
+    virtual bool loaded() const;
 
 protected:
+    DesktopFileReader(const QString &appId, const QFileInfo &desktopFile);
+
+    DesktopFileReaderPrivate * const d_ptr;
+
     friend class DesktopFileReaderFactory;
 
-    DesktopFileReader(const QString &appId, const QFileInfo &desktopFile);
-
 private:
-    static const int kNameIndex = 0,
-    kCommentIndex = 1,
-    kIconIndex = 2,
-    kExecIndex = 3,
-    kPathIndex = 4,
-    kStageHintIndex = 5,
-    kSplashTitleIndex = 6,
-    kSplashImageIndex = 7,
-    kSplashShowHeaderIndex = 8,
-    kSplashColorIndex = 9,
-    kSplashColorHeaderIndex = 10,
-    kSplashColorFooterIndex = 11,
-    kNumberOfEntries = 12;
-
-    virtual bool loadDesktopFile(QString desktopFile);
-
-    QString appId_;
-    QString file_;
-    QVector<QString> entries_;
-    bool loaded_;
+    Q_DECLARE_PRIVATE(DesktopFileReader)
 };
 
 } // namespace qtmir

=== added file 'src/modules/Unity/Application/gscopedpointer.h'
--- src/modules/Unity/Application/gscopedpointer.h	1970-01-01 00:00:00 +0000
+++ src/modules/Unity/Application/gscopedpointer.h	2014-10-13 09:06:32 +0000
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2011-2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * - Aurélien Gâteau <[e-mail]>
+ */
+
+#ifndef GSCOPEDPOINTER_H
+#define GSCOPEDPOINTER_H
+
+// Local
+
+// Qt
+#include <QScopedPointer>
+
+// GLib
+#include <glib-object.h>
+
+/**
+ * Helper class for GScopedPointer
+ */
+template <class T, void (*cleanup_fcn)(T*)>
+class GScopedPointerDeleter
+{
+public:
+    static void cleanup(T* ptr)
+    {
+        if (ptr) {
+            cleanup_fcn(ptr);
+        }
+    }
+};
+
+/**
+ * A GScopedPointer works like a QScopedPointer, except the cleanup static
+ * method is replaced with a cleanup function, making it useful to handle C
+ * structs whose cleanup function prototype is "void cleanup(T*)"
+ *
+ * Best way to use it is to define a typedef for your C struct, like this:
+ *
+ * typedef GScopedPointer<Foo, foo_free> GFooPointer;
+ */
+template <class T, void (*cleanup)(T*)>
+class GScopedPointer : public QScopedPointer<T, GScopedPointerDeleter<T, cleanup> >
+{
+public:
+    GScopedPointer(T* ptr = 0)
+    : QScopedPointer<T, GScopedPointerDeleter<T, cleanup> >(ptr)
+    {}
+};
+
+
+/**
+ * Helper class for GObjectScopedPointer
+ */
+template <class T, void (*cleanup_fcn)(gpointer)>
+class GObjectScopedPointerDeleter
+{
+public:
+    static void cleanup(T* ptr)
+    {
+        if (ptr) {
+            cleanup_fcn(ptr);
+        }
+    }
+};
+
+/**
+ * A GObjectScopedPointer is similar to a GScopedPointer. The only difference
+ * is its cleanup function signature is "void cleanup(gpointer)" and defaults to
+ * g_object_unref(), making it useful for GObject-based classes.
+ *
+ * You can use it directly like this:
+ *
+ * GObjectScopedPointer<GFoo> foo;
+ *
+ * Or define a typedef for your class:
+ *
+ * typedef GObjectScopedPointer<GFoo> GFooPointer;
+ *
+ * Note: GObjectScopedPointer does *not* call gobject_ref() when assigned a
+ * pointer.
+ */
+template <class T, void (*cleanup)(gpointer) = g_object_unref>
+class GObjectScopedPointer : public QScopedPointer<T, GObjectScopedPointerDeleter<T, cleanup> >
+{
+public:
+    GObjectScopedPointer(T* ptr = 0)
+    : QScopedPointer<T, GObjectScopedPointerDeleter<T, cleanup> >(ptr)
+    {}
+};
+
+// A Generic GObject pointer
+typedef GObjectScopedPointer<GObject> GObjectPointer;
+
+// Take advantage of the cleanup signature of GObjectScopedPointer to define
+// a GCharPointer
+typedef GObjectScopedPointer<gchar, g_free> GCharPointer;
+
+#endif /* GSCOPEDPOINTER_H */
+

=== added directory 'tests/modules/DesktopFileReader'
=== added file 'tests/modules/DesktopFileReader/DesktopFileReader.pro'
--- tests/modules/DesktopFileReader/DesktopFileReader.pro	1970-01-01 00:00:00 +0000
+++ tests/modules/DesktopFileReader/DesktopFileReader.pro	2014-10-13 09:06:32 +0000
@@ -0,0 +1,15 @@
+include(../../test-includes.pri)
+include(../common/common.pri)
+
+TARGET = desktopfilereader_test
+
+SOURCES += \
+    desktopfilereader_test.cpp
+
+OTHER_FILES += \
+    calculator.desktop
+
+# Copy to build directory
+for(FILE, OTHER_FILES){
+    QMAKE_POST_LINK += $$quote(cp $${PWD}/$${FILE} $${OUT_PWD}$$escape_expand(\\n\\t))
+}

=== added file 'tests/modules/DesktopFileReader/calculator.desktop'
--- tests/modules/DesktopFileReader/calculator.desktop	1970-01-01 00:00:00 +0000
+++ tests/modules/DesktopFileReader/calculator.desktop	2014-10-13 09:06:32 +0000
@@ -0,0 +1,227 @@
+[Desktop Entry]
+Name=Calculator
+Name[am]=መደመሪያ
+Name[ar]=الآلة الحاسبة
+Name[ast]=Calculadora
+Name[az]=Kalkulyator
+Name[be]=Калькулятар
+Name[bg]=Калкулатор
+Name[br]=Jederez
+Name[bs]=Kalkulator
+Name[ca]=Calculadora
+Name[cs]=Kalkulačka
+Name[cy]=Cyfrifiannell
+Name[da]=Lommeregner
+Name[de]=Taschenrechner
+Name[el]=Αριθμομηχανή
+Name[en_AU]=Calculator
+Name[en_CA]=Calculator
+Name[en_GB]=Calculator
+Name[es]=Calculadora
+Name[eu]=Kalkulagailua
+Name[fa]=ماشین‌حساب
+Name[fi]=Laskin
+Name[fr]=Calculatrice
+Name[gd]=An t-àireamhair
+Name[gl]=Calculadora
+Name[gu]=કેલ્ક્યુલેટર
+Name[he]=מחשבון
+Name[hi]=कैलकुलेटर
+Name[hu]=Számológép
+Name[id]=Kalkulator
+Name[is]=Reiknivél
+Name[it]=Calcolatrice
+Name[ja]=電卓
+Name[km]=ម៉ាស៊ីន​គិត​លេខ
+Name[ko]=계산기
+Name[lv]=Kalkulators
+Name[mr]=गणनयंत्र
+Name[ms]=Kalkulator
+Name[my]=ဂဏန်းတွက်စက်
+Name[nb]=Kalkulator
+Name[ne]=क्याल्कुलेटर
+Name[nl]=Rekenmachine
+Name[pa]=ਕੈਲਕੂਲੇਟਰ
+Name[pl]=Kalkulator
+Name[pt]=Calculadora
+Name[pt_BR]=Calculadora
+Name[ro]=Calculator
+Name[ru]=Калькулятор
+Name[sa]=सङ्कलकम्
+Name[shn]=ၸၢၵ်ႈၼပ့်သွၼ်
+Name[sl]=Računalo
+Name[sr]=Калкулатор
+Name[sv]=Kalkylator
+Name[ta]=கணிப்பான்
+Name[te]=గణన పరికరం
+Name[tr]=Hesap Makinesi
+Name[ug]=ھېسابلىغۇچ
+Name[uk]=Калькулятор
+Name[zh_CN]=计算器
+Name[zh_HK]=計數機
+Name[zh_TW]=計算機
+Comment=A simple calculator for Ubuntu.
+Comment[am]=ለ ኡቡንቱ ቀላል መደመሪያ
+Comment[ar]=آلة حاسبة بسيطة لأوبونتو.
+Comment[ast]=Una calculadora cenciella pa Ubuntu.
+Comment[az]=Ubuntu üçün sadә kalkulyator.
+Comment[br]=Ur jederez eeun evit Ubuntu.
+Comment[ca]=Una calculadora simple per a l'Ubuntu.
+Comment[cy]=Cyfrifiannell hawdd ar gyfer Ubuntu.
+Comment[da]=En simpel lommeregner til Ubuntu.
+Comment[de]=Ein einfach Tachenrechner für Ubuntu.
+Comment[el]=Μια απλή αριθμομηχανή για το Ubuntu
+Comment[en_AU]=A simple calculator for Ubuntu.
+Comment[en_GB]=A simple calculator for Ubuntu.
+Comment[es]=Una calculadora sencilla para Ubuntu.
+Comment[eu]=Ubunturako kalkulagailu sinplea.
+Comment[fa]=یک ماشین حساب ساده برای اوبونتو.
+Comment[fi]=Laskin Ubuntulle.
+Comment[fr]=Une calculatrice simple pour Ubuntu.
+Comment[gd]=Àireamhair simplidh airson Ubuntu.
+Comment[gl]=Calculadora sinxela para Ubuntu.
+Comment[he]=מחשבון פשוט לאובונטו.
+Comment[hu]=Egyszerű számológép Ubuntuhoz.
+Comment[is]=Einföld reiknivél
+Comment[it]=Una semplice calcolatrice per Ubuntu.
+Comment[ja]=Ubuntu用のシンプルな電卓です。
+Comment[km]=ម៉ាស៊ីន​គិត​លេខ​ធម្មតា​សម្រាប់ Ubuntu ។
+Comment[ko]=우분투를 위한 간단한 계산기
+Comment[lv]=Vienkāršs kalkulators priekš Ubuntu
+Comment[nb]=En enkel kalkulator for Ubuntu.
+Comment[ne]=Ubuntu को लागि एक सरल कैलकुलेटर।
+Comment[nl]=Een eenvoudige rekenmachine voor Ubuntu.
+Comment[pa]=ਉਬੰਤੂ ਲਈ ਇੱਕ ਸਧਾਰਨ ਕੈਲਕੂਲੇਟਰ
+Comment[pl]=Prosty kalkulator dla Ubuntu
+Comment[pt]=Uma calculadora simples para o Ubuntu.
+Comment[pt_BR]=Uma simples calculadora para Ubuntu
+Comment[ro]=Un calculator simplu pentru Ubuntu.
+Comment[ru]=Простой калькулятор для Ubuntu
+Comment[sa]=Ubuntu इत्यस्मा एकं सरलं सङ्कलकम्।
+Comment[sl]=Preprost kalkulator za Ubuntu.
+Comment[sr]=Једноставан калкулатор за Убунту
+Comment[sv]=En enkel kalkylator för Ubuntu.
+Comment[tr]=Ubuntu için sade bir hesap makinesi.
+Comment[ug]=ئاددىي ھېسابلىغۇچى
+Comment[uk]=Простий калькулятор для Ubuntu.
+Comment[zh_CN]=Ubuntu 简易计算器
+Comment[zh_TW]=Ubuntu 簡易計算機。
+Keywords=math;addition;subtraction;multiplication;division;
+Keywords[am]=ሂሳብ;መደመሪያ;መቀነሻ;ማባዣ;ማካፈያ;
+Keywords[ar]=رياضة;ياضيات;حساب;حسابات;جمع;طرح;ضرب;قسمة;
+Keywords[ast]=matemática;suma;resta;multiplicación;división;
+Keywords[az]=riyaziyyat;әlavә etmә;çıxma;vurma;bölmә;toplama;
+Keywords[br]=matematikoù;sammadenn;lamadenn;lieskementadenn;rannadenn;
+Keywords[ca]=suma;resta;calculadora;multiplica;divideix
+Keywords[da]=matematik;plus;minus;gange;dividere;beregning;lommeregner;
+Keywords[de]=Mathe;Mathematik;Multiplikation;Subtraktion;Addition;Division;
+Keywords[en_AU]=math;addition;subtraction;multiplication;division;
+Keywords[en_GB]=maths;addition;subtraction;multiplication;division;
+Keywords[es]=matemática;suma;resta;multiplicación;división;
+Keywords[eu]=matematikak;gehitu;kendu;biderkatu;zatitu;
+Keywords[fa]=حساب;جمع;تفریق;ضرب;تقسیم
+Keywords[fi]=math;addition;subtraction;multiplication;division;matematiikka;lisäys;vähennys;kertaus;jakaminen;
+Keywords[fr]=math;addition;soustraction;multiplication;division;
+Keywords[gd]=math;addition;subtraction;multiplication;division;matamataig;roinneadh;toirt air falbh;cur ris;iomadadh
+Keywords[gl]=matemáticas;suma;resta;multiplicación;división;
+Keywords[he]=מתמטיקה;חשבון;חיבור;חיסור;כפל;חילוק;
+Keywords[hu]=számolás;összeadás;kivonás;szorzás;osztás;
+Keywords[is]=reikna;samlagning;frádráttur;margföldun;deiling
+Keywords[it]=matematica;addizioni;sottrazioni;moltiplicazioni;divisioni;
+Keywords[ja]=math;addition;subtraction;multiplication;division;計算;電卓;足し算;引き算;かけ算;わり算;
+Keywords[km]=math;addition;subtraction;multiplication;division;
+Keywords[ko]=수학;덧셈;뺄셈;곱셈;나눗셈;
+Keywords[nb]=matte;addisjon;subtraksjon;multiplikasjon;divisjon;
+Keywords[ne]=गणित; जोड्; घटाउ; गुणन; विभाजन;
+Keywords[nl]=math;addition;subtraction;multiplication;division;optellen;aftrekken;vermenigvuldigen;delen;
+Keywords[pa]=ਹਿਸਾਬ;ਜੋੜ;ਘਟਾਉ;ਗੁਣਾ;ਭਾਗ;
+Keywords[pl]=liczenie;dodawanie;odejmowanie;mnożenie;dzielenie;
+Keywords[pt]=matemática;soma;subtracção;multiplicação;divisão;
+Keywords[pt_BR]=matemática;adição;subtração;multiplicação;divisão
+Keywords[ro]=matematică;adunare;scădere;înmulțire;împărțire
+Keywords[ru]=математика;сложение;умножение;деление;
+Keywords[sa]=गणितम्;योजनम्;वियोजनम्;गुणनम्;विभाजनम्;
+Keywords[sl]=matematika;seštevanje;odštevanje;množenje;deljenje;
+Keywords[sr]=математика;сабирање;одузимање;множење;дељење;рачунање;дигитрон;
+Keywords[sv]=matematik;addition;substraktion;multiplikation;division
+Keywords[tr]=matematik;ekleme;çıkarma;çarpma;bölme;toplama
+Keywords[ug]=ماتېماتىكا;قوشۇش;ئېلىش;كۆپەيتىش;بۆلۈش;
+Keywords[uk]=math;addition;subtraction;multiplication;division;математика;додавання;віднімання;множення;ділення;калькулятор;
+Keywords[zh_CN]=数学;加;减;乘;除;
+Keywords[zh_TW]=math;addition;subtraction;multiplication;division;數學;加;減;乘;除;
+Type=Application
+Terminal=false
+Exec=yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml
+Icon=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
+X-Ubuntu-Default-Department-ID=accessories
+Path=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator
+X-Ubuntu-Old-Icon=[e-mail]
+X-Ubuntu-Application-ID=com.ubuntu.calculator_calculator_1.3.329
+X-Ubuntu-Splash-Show-Header=True
+X-Ubuntu-Splash-Color=#aabbcc
+X-Ubuntu-Splash-Color-Header=purple
+X-Ubuntu-Splash-Color-Footer=#deadbeefda
+X-Ubuntu-Splash-Image=/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]
+X-Ubuntu-Splash-Title=Calculator 2.0
+X-Ubuntu-Splash-Title[am]=መደመሪያ 2.0
+X-Ubuntu-Splash-Title[ar]=الآلة  2.0الحاسبة
+X-Ubuntu-Splash-Title[ast]=Calculadora 2.0
+X-Ubuntu-Splash-Title[az]=Kalkulyator 2.0
+X-Ubuntu-Splash-Title[be]=Калькулятар 2.0
+X-Ubuntu-Splash-Title[bg]=Калкулатор 2.0
+X-Ubuntu-Splash-Title[br]=Jederez 2.0
+X-Ubuntu-Splash-Title[bs]=Kalkulator 2.0
+X-Ubuntu-Splash-Title[ca]=Calculadora 2.0
+X-Ubuntu-Splash-Title[cs]=Kalkulačka 2.0
+X-Ubuntu-Splash-Title[cy]=Cyfrifiannell 2.0
+X-Ubuntu-Splash-Title[da]=Lommeregner 2.0
+X-Ubuntu-Splash-Title[de]=Taschenrechner 2.0
+X-Ubuntu-Splash-Title[el]=Αριθμομηχανή 2.0
+X-Ubuntu-Splash-Title[en_AU]=Calculator 2.0
+X-Ubuntu-Splash-Title[en_CA]=Calculator 2.0
+X-Ubuntu-Splash-Title[en_GB]=Calculator 2.0
+X-Ubuntu-Splash-Title[es]=Calculadora 2.0
+X-Ubuntu-Splash-Title[eu]=Kalkulagailua 2.0
+X-Ubuntu-Splash-Title[fa]= 2.0ماشین‌حساب
+X-Ubuntu-Splash-Title[fi]=Laskin 2.0
+X-Ubuntu-Splash-Title[fr]=Calculatrice 2.0
+X-Ubuntu-Splash-Title[gd]=An t-àireamhair 2.0
+X-Ubuntu-Splash-Title[gl]=Calculadora 2.0
+X-Ubuntu-Splash-Title[gu]=કેલ્ક્યુલેટર 2.0
+X-Ubuntu-Splash-Title[he]= 2.0מחשבון
+X-Ubuntu-Splash-Title[hi]=कैलकुलेटर 2.0
+X-Ubuntu-Splash-Title[hu]=Számológép 2.0
+X-Ubuntu-Splash-Title[id]=Kalkulator 2.0
+X-Ubuntu-Splash-Title[is]=Reiknivél 2.0
+X-Ubuntu-Splash-Title[it]=Calcolatrice 2.0
+X-Ubuntu-Splash-Title[ja]=電卓 2.0
+X-Ubuntu-Splash-Title[km]=ម៉ាស៊ីន​គិត​លេខ 2.0
+X-Ubuntu-Splash-Title[ko]=계산기 2.0
+X-Ubuntu-Splash-Title[lv]=Kalkulators 2.0
+X-Ubuntu-Splash-Title[mr]=गणनयंत्र 2.0
+X-Ubuntu-Splash-Title[ms]=Kalkulator 2.0
+X-Ubuntu-Splash-Title[my]=ဂဏန်းတွက်စက် 2.0
+X-Ubuntu-Splash-Title[nb]=Kalkulator 2.0
+X-Ubuntu-Splash-Title[ne]=क्याल्कुलेटर 2.0
+X-Ubuntu-Splash-Title[nl]=Rekenmachine 2.0
+X-Ubuntu-Splash-Title[pa]=ਕੈਲਕੂਲੇਟਰ 2.0
+X-Ubuntu-Splash-Title[pl]=Kalkulator 2.0
+X-Ubuntu-Splash-Title[pt]=Calculadora 2.0
+X-Ubuntu-Splash-Title[pt_BR]=Calculadora 2.0
+X-Ubuntu-Splash-Title[ro]=Calculator 2.0
+X-Ubuntu-Splash-Title[ru]=Калькулятор 2.0
+X-Ubuntu-Splash-Title[sa]=सङ्कलकम् 2.0
+X-Ubuntu-Splash-Title[shn]=ၸၢၵ်ႈၼပ့်သွၼ် 2.0
+X-Ubuntu-Splash-Title[sl]=Računalo 2.0
+X-Ubuntu-Splash-Title[sr]=Калкулатор 2.0
+X-Ubuntu-Splash-Title[sv]=Kalkylator 2.0
+X-Ubuntu-Splash-Title[ta]=கணிப்பான் 2.0
+X-Ubuntu-Splash-Title[te]=గణన పరికరం 2.0
+X-Ubuntu-Splash-Title[tr]=Hesap Makinesi 2.0
+X-Ubuntu-Splash-Title[ug]= 2.0ھېسابلىغۇچ
+X-Ubuntu-Splash-Title[uk]=Калькулятор 2.0
+X-Ubuntu-Splash-Title[zh_CN]=计算器 2.0
+X-Ubuntu-Splash-Title[zh_HK]=計數機 2.0
+X-Ubuntu-Splash-Title[zh_TW]=計算機 2.0

=== added file 'tests/modules/DesktopFileReader/desktopfilereader_test.cpp'
--- tests/modules/DesktopFileReader/desktopfilereader_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/modules/DesktopFileReader/desktopfilereader_test.cpp	2014-10-13 09:06:32 +0000
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3, as published by
+ * the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <Unity/Application/desktopfilereader.h>
+
+#include <gtest/gtest.h>
+
+#include <QDir>
+#include <QFileInfo>
+#include <QLocale>
+#include <QtGlobal>
+#include <QString>
+
+using namespace qtmir;
+
+namespace {
+    static void setLocale(const char *locale)
+    {
+        qputenv("LANGUAGE", locale);
+        qputenv("LC_ALL", locale); // set these for GIO
+        QLocale::setDefault(QString(locale)); // set for Qt
+    }
+}
+
+TEST(DesktopFileReader, testReadsDesktopFile)
+{
+    using namespace ::testing;
+    setLocale("C");
+
+    QFileInfo fileInfo(QDir::currentPath() + "/calculator.desktop");
+    DesktopFileReader::Factory readerFactory;
+    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
+
+    EXPECT_EQ(reader->loaded(), true);
+    EXPECT_EQ(reader->appId(), "calculator");
+    EXPECT_EQ(reader->name(), "Calculator");
+    EXPECT_EQ(reader->exec(), "yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml");
+    EXPECT_EQ(reader->icon(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
+    EXPECT_EQ(reader->path(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator");
+    EXPECT_EQ(reader->comment(), "A simple calculator for Ubuntu.");
+    EXPECT_EQ(reader->stageHint(), "SideStage");
+    EXPECT_EQ(reader->splashColor(), "#aabbcc");
+    EXPECT_EQ(reader->splashColorFooter(), "#deadbeefda");
+    EXPECT_EQ(reader->splashColorHeader(), "purple");
+    EXPECT_EQ(reader->splashImage(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
+    EXPECT_EQ(reader->splashShowHeader(), "True");
+    EXPECT_EQ(reader->splashTitle(), "Calculator 2.0");
+}
+
+TEST(DesktopFileReader, testReadsLocalizedDesktopFile)
+{
+    using namespace ::testing;
+    setLocale("de");
+
+    QFileInfo fileInfo(QDir::currentPath() + "/calculator.desktop");
+    DesktopFileReader::Factory readerFactory;
+    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
+
+    EXPECT_EQ(reader->loaded(), true);
+    EXPECT_EQ(reader->appId(), "calculator");
+    EXPECT_EQ(reader->name(), "Taschenrechner");
+    EXPECT_EQ(reader->exec(), "yes -p com.ubuntu.calculator_calculator_1.3.329 -- qmlscene -qt5 ubuntu-calculator-app.qml");
+    EXPECT_EQ(reader->icon(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
+    EXPECT_EQ(reader->path(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator");
+    EXPECT_EQ(reader->comment(), "Ein einfach Tachenrechner für Ubuntu.");
+    EXPECT_EQ(reader->stageHint(), "SideStage");
+    EXPECT_EQ(reader->splashColor(), "#aabbcc");
+    EXPECT_EQ(reader->splashColorFooter(), "#deadbeefda");
+    EXPECT_EQ(reader->splashColorHeader(), "purple");
+    EXPECT_EQ(reader->splashImage(), "/usr/share/click/preinstalled/.click/users/@all/com.ubuntu.calculator/[e-mail]");
+    EXPECT_EQ(reader->splashShowHeader(), "True");
+    EXPECT_EQ(reader->splashTitle(), "Taschenrechner 2.0");
+}
+
+TEST(DesktopFileReader, testMissingDesktopFile)
+{
+    using namespace ::testing;
+    setLocale("C");
+
+    QFileInfo fileInfo(QDir::currentPath() + "/missing.desktop");
+    DesktopFileReader::Factory readerFactory;
+    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
+
+    EXPECT_EQ(reader->loaded(), false);
+    EXPECT_EQ(reader->appId(), "calculator");
+    EXPECT_EQ(reader->name(), "");
+    EXPECT_EQ(reader->exec(), "");
+    EXPECT_EQ(reader->icon(), "");
+    EXPECT_EQ(reader->path(), "");
+    EXPECT_EQ(reader->comment(), "");
+    EXPECT_EQ(reader->stageHint(), "");
+    EXPECT_EQ(reader->splashColor(), "");
+    EXPECT_EQ(reader->splashColorFooter(), "");
+    EXPECT_EQ(reader->splashColorHeader(), "");
+    EXPECT_EQ(reader->splashImage(), "");
+    EXPECT_EQ(reader->splashShowHeader(), "");
+    EXPECT_EQ(reader->splashTitle(), "");
+}
+
+TEST(DesktopFileReader, testUTF8Characters)
+{
+    using namespace ::testing;
+    setLocale("zh_CN");
+
+    QFileInfo fileInfo(QDir::currentPath() + "/calculator.desktop");
+    DesktopFileReader::Factory readerFactory;
+    DesktopFileReader *reader = readerFactory.createInstance("calculator", fileInfo);
+
+    EXPECT_EQ(reader->loaded(), true);
+    EXPECT_EQ(reader->appId(), "calculator");
+    EXPECT_EQ(reader->name(), "计算器");
+    EXPECT_EQ(reader->comment(), "Ubuntu 简易计算器");
+    EXPECT_EQ(reader->splashTitle(), "计算器 2.0");
+}

=== modified file 'tests/modules/modules.pro'
--- tests/modules/modules.pro	2014-09-11 16:18:40 +0000
+++ tests/modules/modules.pro	2014-10-13 09:06:32 +0000
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = ApplicationManager General MirSurfaceItem SessionManager TaskController
+SUBDIRS = ApplicationManager General MirSurfaceItem SessionManager TaskController DesktopFileReader