Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1358224 into lp:ubuntu-keyboard

[Michael Sheldon]

Hide the settings option in the keyboard's language menu when the phone is locked.

Hide the settings option in the keyboard's language menu when the phone is locked.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:224
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/94
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/94/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/94

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/469/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'plugins/sr/src/database_sr.db'
Binary files plugins/sr/src/database_sr.db	2014-09-10 14:57:12 +0000 and plugins/sr/src/database_sr.db	2014-09-15 10:38:09 +0000 differ
=== modified file 'qml/keys/LanguageMenu.qml'
--- qml/keys/LanguageMenu.qml	2014-08-26 17:26:33 +0000
+++ qml/keys/LanguageMenu.qml	2014-09-15 10:38:09 +0000
@@ -53,16 +53,20 @@
                 maliit_input_method.activeLanguage = modelData
                 canvas.languageMenuShown = false;
             }
-         }
+        }
 
-        footer: ListItem.Standard {
-            text: i18n.tr("Settings")
-            onClicked: {
-                Qt.openUrlExternally("settings:///system/language")
-                canvas.languageMenuShown = false;
-                maliit_input_method.hide();
+        Component {
+            id: settingsItem
+                ListItem.Standard {
+                text: i18n.tr("Settings")
+                onClicked: {
+                    Qt.openUrlExternally("settings:///system/language")
+                    canvas.languageMenuShown = false;
+                    maliit_input_method.hide();
+                }
             }
-         }
+        }
+        footer: greeter_status.greeterActive ? null : settingsItem
     }
 
     function languageIdToName(languageId)

=== added file 'src/plugin/greeterstatus.cpp'
--- src/plugin/greeterstatus.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/greeterstatus.cpp	2014-09-15 10:38:09 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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 <QDBusConnection>
+#include <QDBusInterface>
+#include <QDBusReply>
+#include "greeterstatus.h"
+
+GreeterStatus::GreeterStatus(QObject *parent) : QObject(parent)
+{
+    QDBusConnection connection = QDBusConnection::sessionBus();
+    QDBusInterface greeterPropsIface("com.canonical.UnityGreeter",
+                                     "/",
+                                     "org.freedesktop.DBus.Properties");
+    QDBusReply<QVariant> reply = greeterPropsIface.call("Get", "com.canonical.UnityGreeter", "IsActive");
+    m_greeterActive = reply.isValid() && reply.value().toBool();
+    connection.connect("com.canonical.UnityGreeter",
+                       "/",
+                       "org.freedesktop.DBus.Properties",
+                       "PropertiesChanged",
+                       this,
+                       SLOT(greeterPropertiesChanged(QString, QVariantMap, QStringList)));
+}
+
+bool GreeterStatus::greeterActive() const
+{
+    return m_greeterActive;
+}
+
+void GreeterStatus::greeterPropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated)
+{
+    Q_UNUSED(invalidated);
+
+    if (interface == "com.canonical.UnityGreeter") {
+        if (changed.contains("IsActive")) {
+            m_greeterActive = changed.value("IsActive").toBool();
+            Q_EMIT greeterActiveChanged();
+        }
+    }
+}
+

=== added file 'src/plugin/greeterstatus.h'
--- src/plugin/greeterstatus.h	1970-01-01 00:00:00 +0000
+++ src/plugin/greeterstatus.h	2014-09-15 10:38:09 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 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 as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY 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/>.
+ */
+
+#ifndef GREETERSTATUS_H
+#define GREETERSTATUS_H
+
+#include <QObject>
+
+class GreeterStatus : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool greeterActive READ greeterActive NOTIFY greeterActiveChanged)
+
+public:
+    GreeterStatus(QObject *parent = 0);
+    bool greeterActive() const;
+
+Q_SIGNALS:
+    void greeterActiveChanged();
+
+private Q_SLOTS:
+    void greeterPropertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalidated);
+
+private:
+    bool m_greeterActive;
+};
+
+#endif // GREETERSTATUS_H

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2014-09-09 11:26:52 +0000
+++ src/plugin/inputmethod_p.h	2014-09-15 10:38:09 +0000
@@ -3,6 +3,7 @@
 
 #include "logic/layoutupdater.h"
 #include "editor.h"
+#include "greeterstatus.h"
 #include "keyboardgeometry.h"
 #include "keyboardsettings.h"
 
@@ -60,6 +61,7 @@
 
     KeyboardGeometry *m_geometry;
     KeyboardSettings m_settings;
+    GreeterStatus *m_greeterStatus;
 
     WordRibbon* wordRibbon;
 
@@ -82,6 +84,7 @@
         , keyboardState("CHARACTERS")
         , m_geometry(new KeyboardGeometry(q))
         , m_settings()
+        , m_greeterStatus(new GreeterStatus())
         , wordRibbon(new WordRibbon)
         , previous_position(-1)
     {
@@ -174,6 +177,7 @@
         qml_context->setContextProperty("maliit_event_handler", &event_handler);
         qml_context->setContextProperty("maliit_wordribbon", wordRibbon);
         qml_context->setContextProperty("maliit_word_engine", editor.wordEngine());
+        qml_context->setContextProperty("greeter_status", m_greeterStatus);
     }
 
 

=== modified file 'src/plugin/plugin.pro'
--- src/plugin/plugin.pro	2013-12-19 15:55:17 +0000
+++ src/plugin/plugin.pro	2014-09-15 10:38:09 +0000
@@ -14,9 +14,9 @@
 DEFINES += MALIIT_DEFAULT_PROFILE=\\\"$$MALIIT_DEFAULT_PROFILE\\\"
 
 contains(QT_MAJOR_VERSION, 4) {
-    QT = core gui
+    QT = core gui dbus
 } else {
-    QT = core gui widgets quick qml
+    QT = core gui widgets quick qml dbus
 }
 
 CONFIG += \
@@ -27,6 +27,7 @@
     inputmethod.h \
     inputmethod_p.h \
     editor.h \
+    greeterstatus.h \
     keyboardgeometry.h \
     keyboardsettings.h \
 #    updatenotifier.h \
@@ -36,6 +37,7 @@
     plugin.cpp \
     inputmethod.cpp \
     editor.cpp \
+    greeterstatus.cpp \
     keyboardgeometry.cpp \
     keyboardsettings.cpp \
 #    updatenotifier.cpp \