1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2016-12-12 16:45:09 +0000
3
+++ CMakeLists.txt	2017-01-02 11:20:59 +0000
4
@@ -70,7 +70,7 @@
5
70
find_package(Qt5Concurrent 5.4 REQUIRED)
70
find_package(Qt5Concurrent 5.4 REQUIRED)
6
71
find_package(Qt5Sql 5.4 REQUIRED)
71
find_package(Qt5Sql 5.4 REQUIRED)
7
72
72
9
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=23)
73
pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=25)
10
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
74
pkg_check_modules(GEONAMES REQUIRED geonames>=0.2)
11
75
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
75
pkg_check_modules(GIO REQUIRED gio-2.0>=2.32)
12
76
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
76
pkg_check_modules(GLIB REQUIRED glib-2.0>=2.32)
13
77
77
14
=== modified file 'debian/control'
15
--- debian/control	2016-12-12 16:45:09 +0000
16
+++ debian/control	2017-01-02 11:20:59 +0000
17
@@ -38,7 +38,7 @@
18
38
               libubuntugestures5-private-dev (>= 1.3.2030),
38
               libubuntugestures5-private-dev (>= 1.3.2030),
19
39
               libudev-dev,
39
               libudev-dev,
20
40
               libudm-common-dev,
40
               libudm-common-dev,
22
41
               libunity-api-dev (>= 8.0),
41
               libunity-api-dev (>= 8.1),
23
42
               libusermetricsoutput1-dev,
42
               libusermetricsoutput1-dev,
24
43
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
43
# Need those X11 libs touch emulation from mouse events in manual QML tests on a X11 desktop
25
44
               libx11-dev[!arm64 !armhf],
44
               libx11-dev[!arm64 !armhf],
26
45
45
27
=== modified file 'qml/Components/KeymapSwitcher.qml'
28
--- qml/Components/KeymapSwitcher.qml	2016-11-30 19:24:02 +0000
29
+++ qml/Components/KeymapSwitcher.qml	2017-01-02 11:20:59 +0000
30
@@ -51,6 +51,9 @@
31
51
            nextIndex = currentKeymapIndex + 1;
51
            nextIndex = currentKeymapIndex + 1;
32
52
        }
52
        }
33
53
        currentKeymapIndex = nextIndex;
53
        currentKeymapIndex = nextIndex;
34
54
        if (actionGroup.currentAction.valid) {
35
55
            actionGroup.currentAction.updateState(currentKeymapIndex);
36
56
        }
37
54
    }
57
    }
38
55
58
39
56
    function previousKeymap() {
59
    function previousKeymap() {
40
@@ -60,30 +63,35 @@
41
60
            prevIndex = currentKeymapIndex - 1;
63
            prevIndex = currentKeymapIndex - 1;
42
61
        }
64
        }
43
62
        currentKeymapIndex = prevIndex;
65
        currentKeymapIndex = prevIndex;
44
66
        if (actionGroup.currentAction.valid) {
45
67
            actionGroup.currentAction.updateState(currentKeymapIndex);
46
68
        }
47
63
    }
69
    }
48
64
70
50
65
    property Binding surfaceKeymapBinding: Binding {
71
    property Binding surfaceKeymapBinding: Binding { // NB: needed mainly for xmir & libertine apps
51
66
        target: root.focusedSurface
72
        target: root.focusedSurface
52
67
        property: "keymap"
73
        property: "keymap"
53
68
        value: root.currentKeymap
74
        value: root.currentKeymap
54
69
    }
75
    }
55
70
76
56
77
    property Binding unityKeymapBinding: Binding {
57
78
        target: Mir
58
79
        property: "currentKeymap"
59
80
        value: root.currentKeymap
60
81
    }
61
82
62
71
    // indicator
83
    // indicator
63
72
    property QDBusActionGroup actionGroup: QDBusActionGroup {
84
    property QDBusActionGroup actionGroup: QDBusActionGroup {
64
73
        busType: DBus.SessionBus
85
        busType: DBus.SessionBus
65
74
        busName: "com.canonical.indicator.keyboard"
86
        busName: "com.canonical.indicator.keyboard"
66
75
        objectPath: "/com/canonical/indicator/keyboard"
87
        objectPath: "/com/canonical/indicator/keyboard"
67
76
88
70
77
        property variant currentAction: action("current")
89
        property variant currentAction: action("current") // the one that's checked by the indicator
71
78
        property variant activeAction: action("active")
90
        property variant activeAction: action("active")   // the one that we clicked
72
79
91
73
80
        Component.onCompleted: actionGroup.start();
92
        Component.onCompleted: actionGroup.start();
74
81
    }
93
    }
75
82
94
76
83
    onCurrentKeymapIndexChanged: {
77
84
        actionGroup.currentAction.updateState(currentKeymapIndex);
78
85
    }
79
86
80
87
    readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
95
    readonly property int activeActionState: actionGroup.activeAction.valid ? actionGroup.activeAction.state : -1
81
88
96
82
89
    onActiveActionStateChanged: {
97
    onActiveActionStateChanged: {
83
90
98
84
=== modified file 'tests/mocks/Unity/Application/MirMock.cpp'
85
--- tests/mocks/Unity/Application/MirMock.cpp	2016-10-20 14:37:34 +0000
86
+++ tests/mocks/Unity/Application/MirMock.cpp	2017-01-02 11:20:59 +0000
87
@@ -47,3 +47,16 @@
88
47
{
47
{
89
48
    return m_cursorName;
48
    return m_cursorName;
90
49
}
49
}
91
50
92
51
QString MirMock::currentKeymap() const
93
52
{
94
53
    return m_keymap;
95
54
}
96
55
97
56
void MirMock::setCurrentKeymap(const QString &keymap)
98
57
{
99
58
    if (keymap != m_keymap) {
100
59
        m_keymap = keymap;
101
60
        Q_EMIT currentKeymapChanged(m_keymap);
102
61
    }
103
62
}
104
50
63
105
=== modified file 'tests/mocks/Unity/Application/MirMock.h'
106
--- tests/mocks/Unity/Application/MirMock.h	2016-10-20 14:37:34 +0000
107
+++ tests/mocks/Unity/Application/MirMock.h	2017-01-02 11:20:59 +0000
108
@@ -31,9 +31,13 @@
109
31
    void setCursorName(const QString &cursorName) override;
31
    void setCursorName(const QString &cursorName) override;
110
32
    QString cursorName() const override;
32
    QString cursorName() const override;
111
33
33
112
34
    QString currentKeymap() const override;
113
35
    void setCurrentKeymap(const QString &keymap) override;
114
36
115
34
private:
37
private:
116
35
    static MirMock *the_mir;
38
    static MirMock *the_mir;
117
36
    QString m_cursorName;
39
    QString m_cursorName;
118
40
    QString m_keymap;
119
37
};
41
};
120
38
42
121
39
#endif
43
#endif
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-01-20
Gerry Boland (community)		2016-09-26	Approve on 2017-01-05
Review via email: mp+306761@code.launchpad.net