ceced58 · unity8 · git.iko.soy

plugins/AccountsService/AccountsService.cpp+26

compare with xenial

unifiedsplit

@@ -37,6 +37,7 @@

37#define PROP_ENABLE_INDICATORS_WHILE_LOCKED QStringLiteral("EnableIndicatorsWhileLocked")

38#define PROP_ENABLE_LAUNCHER_WHILE_LOCKED QStringLiteral("EnableLauncherWhileLocked")

39#define PROP_FAILED_LOGINS QStringLiteral("FailedLogins")

40+#define PROP_INPUT_SOURCES QStringLiteral("InputSources")

40#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

41#define PROP_LICENSE_ACCEPTED QStringLiteral("LicenseAccepted")

41#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")

42#define PROP_LICENSE_BASE_PATH QStringLiteral("LicenseBasePath")

42#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")

43#define PROP_MOUSE_CURSOR_SPEED QStringLiteral("MouseCursorSpeed")

@@ -55,6 +56,10 @@

55#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")

56#define PROP_TOUCHPAD_TAP_TO_CLICK QStringLiteral("TouchpadTapToClick")

56#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")

57#define PROP_TOUCHPAD_TWO_FINGER_SCROLL QStringLiteral("TouchpadTwoFingerScroll")

57

58

59+using StringMap = QMap<QString,QString>;

60+using StringMapList = QList<StringMap>;

61+Q_DECLARE_METATYPE(StringMapList)

62+

58

63

59QVariant primaryButtonConverter(const QVariant &value)

64QVariant primaryButtonConverter(const QVariant &value)

60{

65{

@@ -83,6 +88,7 @@ AccountsService::AccountsService(QObject* parent, const QString &user)

83 registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));

88 registerProperty(IFACE_ACCOUNTS_USER, PROP_BACKGROUND_FILE, QStringLiteral("backgroundFileChanged"));

84 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));

89 registerProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, QStringLiteral("emailChanged"));

85 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));

90 registerProperty(IFACE_ACCOUNTS_USER, PROP_REAL_NAME, QStringLiteral("realNameChanged"));

91+ registerProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES, QStringLiteral("keymapsChanged"));

86 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));

92 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_ACCEPTED, QStringLiteral("hereEnabledChanged"));

87 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));

93 registerProperty(IFACE_LOCATION_HERE, PROP_LICENSE_BASE_PATH, QStringLiteral("hereLicensePathChanged"));

88 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));

94 registerProperty(IFACE_UBUNTU_SECURITY, PROP_ENABLE_LAUNCHER_WHILE_LOCKED, QStringLiteral("enableLauncherWhileLockedChanged"));

@@ -246,6 +252,26 @@ void AccountsService::setEmail(const QString &email)

246 setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);

252 setProperty(IFACE_ACCOUNTS_USER, PROP_EMAIL, email);

247}

253}

248

254

255+QStringList AccountsService::keymaps() const

256+{

257+ auto value = getProperty(IFACE_ACCOUNTS_USER, PROP_INPUT_SOURCES);

258+ QDBusArgument arg = value.value<QDBusArgument>();

259+ StringMapList maps = qdbus_cast<StringMapList>(arg);

260+ QStringList simplifiedMaps;

261+

262+ Q_FOREACH(const StringMap &map, maps) {

263+ Q_FOREACH(const QString &entry, map) {

264+ simplifiedMaps.append(entry);

265+ }

266+ }

267+

268+ if (!simplifiedMaps.isEmpty()) {

269+ return simplifiedMaps;

270+ }

271+

272+ return {QStringLiteral("us")};

273+}

274+

249uint AccountsService::failedLogins() const

275uint AccountsService::failedLogins() const

250{

276{

251 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

277 return getProperty(IFACE_UNITY_PRIVATE, PROP_FAILED_LOGINS).toUInt();

plugins/AccountsService/AccountsService.h+5

@@ -72,6 +72,9 @@ class AccountsService: public QObject

72 NOTIFY hereLicensePathChanged)

73 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)

74 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)

75+ Q_PROPERTY(QStringList keymaps

76+ READ keymaps

77+ NOTIFY keymapsChanged)

75

78

76public:

79public:

77 enum PasswordDisplayHint {

80 enum PasswordDisplayHint {

@@ -103,6 +106,7 @@ public:

103 void setRealName(const QString &realName);

106 void setRealName(const QString &realName);

104 QString email() const;

107 QString email() const;

105 void setEmail(const QString &email);

108 void setEmail(const QString &email);

109+ QStringList keymaps() const;

106

110

107Q_SIGNALS:

111Q_SIGNALS:

108 void userChanged();

112 void userChanged();

@@ -118,6 +122,7 @@ Q_SIGNALS:

118 void hereLicensePathChanged();

122 void hereLicensePathChanged();

119 void realNameChanged();

123 void realNameChanged();

120 void emailChanged();

124 void emailChanged();

125+ void keymapsChanged();

121

126

122private Q_SLOTS:

127private Q_SLOTS:

123 void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

128 void onPropertiesChanged(const QString &user, const QString &interface, const QStringList &changed);

qml/Shell.qml+50

@@ -102,6 +102,8 @@ Item {

102 // internal props from here onwards

103 readonly property var mainApp:

104 applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainApp : null

105+ readonly property var mainAppWindow:

106+ applicationsDisplayLoader.item ? applicationsDisplayLoader.item.mainAppWindow : null

105

107

106 // Disable everything while greeter is waiting, so that the user can't swipe

108 // Disable everything while greeter is waiting, so that the user can't swipe

107 // the greeter or launcher until we know whether the session is locked.

109 // the greeter or launcher until we know whether the session is locked.

@@ -719,6 +721,54 @@ Item {

719 onMouseMoved: { cursor.opacity = 1; }

721 onMouseMoved: { cursor.opacity = 1; }

720 }

722 }

721

723

724+ // keymap switching

725+ GlobalShortcut {

726+ shortcut: Qt.MetaModifier|Qt.Key_Space

727+ onTriggered: keymapPriv.nextKeymap()

728+ active: keymapPriv.keymapCount > 1

729+ }

730+

731+ GlobalShortcut {

732+ shortcut: Qt.MetaModifier|Qt.ShiftModifier|Qt.Key_Space

733+ onTriggered: keymapPriv.previousKeymap()

734+ active: keymapPriv.keymapCount > 1

735+ }

736+

737+ QtObject {

738+ id: keymapPriv

739+

740+ readonly property var keymaps: AccountsService.keymaps

741+ readonly property int keymapCount: keymaps.length

742+ property int currentKeymapIndex: 0 // the new one that we're setting

743+ onCurrentKeymapIndexChanged: switchToKeymap();

744+

745+ function nextKeymap() {

746+ var nextIndex = 0;

747+

748+ if (currentKeymapIndex !== -1 && currentKeymapIndex < keymapCount - 1) {

749+ nextIndex = currentKeymapIndex + 1;

750+ }

751+ currentKeymapIndex = nextIndex;

752+ }

753+

754+ function previousKeymap() {

755+ var prevIndex = keymapCount - 1;

756+

757+ if (currentKeymapIndex > 0) {

758+ prevIndex = currentKeymapIndex - 1;

759+ }

760+ currentKeymapIndex = prevIndex;

761+ }

762+

763+ function switchToKeymap() {

764+ if (mainAppWindow) {

765+ mainAppWindow.switchToKeymap(keymaps[currentKeymapIndex]);

766+ }

767+ }

768+ }

769+

770+ onMainAppWindowChanged: keymapPriv.switchToKeymap()

771+

722 Rectangle {

772 Rectangle {

723 id: shutdownFadeOutRectangle

773 id: shutdownFadeOutRectangle

724 z: cursor.z + 1

774 z: cursor.z + 1

qml/Stages/AbstractStage.qml+1

@@ -45,6 +45,7 @@ Rectangle {

45

46 // To be read from outside

47 property var mainApp: null

48+ property var mainAppWindow: null

48 property int mainAppWindowOrientationAngle: 0

49 property int mainAppWindowOrientationAngle: 0

49 property bool orientationChangesEnabled

50 property bool orientationChangesEnabled

50 property int supportedOrientations: Qt.PortraitOrientation

51 property int supportedOrientations: Qt.PortraitOrientation

qml/Stages/ApplicationWindow.qml+4

@@ -39,6 +39,10 @@ FocusScope {

39 property int requestedWidth: -1

40 property int requestedHeight: -1

41

42+ function switchToKeymap(keymap) {

43+ sessionContainer.surfaceContainer.switchToKeymap(keymap);

44+ }

45+

42 readonly property int minimumWidth: sessionContainer.surface ? sessionContainer.surface.minimumWidth : 0

46 readonly property int minimumWidth: sessionContainer.surface ? sessionContainer.surface.minimumWidth : 0

43 readonly property int minimumHeight: sessionContainer.surface ? sessionContainer.surface.minimumHeight : 0

47 readonly property int minimumHeight: sessionContainer.surface ? sessionContainer.surface.minimumHeight : 0

44 readonly property int maximumWidth: sessionContainer.surface ? sessionContainer.surface.maximumWidth : 0

48 readonly property int maximumWidth: sessionContainer.surface ? sessionContainer.surface.maximumWidth : 0

qml/Stages/DesktopStage.qml+4

@@ -40,6 +40,8 @@ AbstractStage {

40 ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)

41 : null

42

43+ mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null

44+

43 // application windows never rotate independently

45 // application windows never rotate independently

44 mainAppWindowOrientationAngle: shellOrientationAngle

46 mainAppWindowOrientationAngle: shellOrientationAngle

45

47

@@ -284,6 +286,8 @@ AbstractStage {

284 property bool visuallyMaximized: false

286 property bool visuallyMaximized: false

285 property bool visuallyMinimized: false

287 property bool visuallyMinimized: false

286

288

289+ readonly property alias appWindow: decoratedWindow.window

290+

287 onFocusChanged: {

291 onFocusChanged: {

288 if (focus && ApplicationManager.focusedApplicationId !== appId) {

292 if (focus && ApplicationManager.focusedApplicationId !== appId) {

289 ApplicationManager.focusApplication(appId);

293 ApplicationManager.focusApplication(appId);

qml/Stages/PhoneStage.qml+2

@@ -111,6 +111,8 @@ AbstractStage {

111 ? applicationManager.findApplication(applicationManager.focusedApplicationId)

112 : null

113

114+ mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null

115+

114 orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled

116 orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled

115 && !priv.focusedAppDelegateIsDislocated

117 && !priv.focusedAppDelegateIsDislocated

116 && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)

118 && !(priv.focusedAppDelegate && priv.focusedAppDelegate.xBehavior.running)

qml/Stages/SpreadDelegate.qml+1

@@ -37,6 +37,7 @@ FocusScope {

37 | Qt.LandscapeOrientation

38 | Qt.InvertedPortraitOrientation

39 | Qt.InvertedLandscapeOrientation

40+ readonly property alias appWindow: appWindow

40

41

41 // to be set from outside

42 // to be set from outside

42 property bool interactive: true

43 property bool interactive: true

qml/Stages/SurfaceContainer.qml+13

@@ -19,6 +19,7 @@ import Ubuntu.Components 1.3

19import Ubuntu.Gestures 0.1 // For TouchGate

20import Utils 0.1 // for InputWatcher

21import Unity.Application 0.1 // for MirSurfaceItem

22+import AccountsService 0.1

22

23

23FocusScope {

24FocusScope {

24 id: root

25 id: root

@@ -34,10 +35,22 @@ FocusScope {

34 property int requestedWidth: -1

35 property int requestedWidth: -1

35 property int requestedHeight: -1

36 property int requestedHeight: -1

36

37

38+ property string savedKeymap: AccountsService.keymaps[0] // start with the user default

39+

37 onSurfaceChanged: {

40 onSurfaceChanged: {

38 if (surface) {

41 if (surface) {

39 surfaceItem.surface = surface;

42 surfaceItem.surface = surface;

40 root.hadSurface = false;

43 root.hadSurface = false;

44+ switchToKeymap(savedKeymap);

45+ }

46+ }

47+

48+ function switchToKeymap(keymap) {

49+ var finalKeymap = keymap.split("+");

50+ savedKeymap = keymap; // save the keymap in case the surface changes later

51+

52+ if (surface) {

53+ surface.setKeymap(finalKeymap[0], finalKeymap[1] || "");

41 }

54 }

42 }

55 }

43

56

qml/Stages/TabletStage.qml+2

@@ -79,6 +79,8 @@ AbstractStage {

79 }

80 }

81

82+ mainAppWindow: priv.focusedAppDelegate ? priv.focusedAppDelegate.appWindow : null

83+

82 orientationChangesEnabled: priv.mainAppOrientationChangesEnabled

84 orientationChangesEnabled: priv.mainAppOrientationChangesEnabled

83

85

84 supportedOrientations: {

86 supportedOrientations: {

tests/mocks/AccountsService/AccountsService.cpp+17

@@ -192,3 +192,20 @@ void AccountsService::setEmail(const QString &email)

192 m_email = email;

193 Q_EMIT emailChanged();

194}

195+

196+QStringList AccountsService::keymaps() const

197+{

198+ if (!m_kbdMap.isEmpty()) {

199+ return m_kbdMap;

200+ }

201+

202+ return {QStringLiteral("us")};

203+}

204+

205+void AccountsService::setKeymaps(const QStringList &keymaps)

206+{

207+ if (keymaps != m_kbdMap) {

208+ m_kbdMap = keymaps;

209+ Q_EMIT keymapsChanged();

210+ }

211+}

tests/mocks/AccountsService/AccountsService.h+8

@@ -74,6 +74,10 @@ class AccountsService: public QObject

74 NOTIFY hereLicensePathChanged)

75 Q_PROPERTY(QString realName READ realName WRITE setRealName NOTIFY realNameChanged)

76 Q_PROPERTY(QString email READ email WRITE setEmail NOTIFY emailChanged)

77+ Q_PROPERTY(QStringList keymaps

78+ READ keymaps

79+ WRITE setKeymaps // only in mock

80+ NOTIFY keymapsChanged)

77

81

78public:

82public:

79 enum PasswordDisplayHint {

83 enum PasswordDisplayHint {

@@ -110,6 +114,8 @@ public:

110 void setRealName(const QString &realName);

114 void setRealName(const QString &realName);

111 QString email() const;

115 QString email() const;

112 void setEmail(const QString &email);

116 void setEmail(const QString &email);

117+ QStringList keymaps() const;

118+ void setKeymaps(const QStringList &keymaps);

113

119

114Q_SIGNALS:

120Q_SIGNALS:

115 void userChanged();

121 void userChanged();

@@ -125,6 +131,7 @@ Q_SIGNALS:

125 void hereLicensePathChanged();

131 void hereLicensePathChanged();

126 void realNameChanged();

132 void realNameChanged();

127 void emailChanged();

133 void emailChanged();

134+ void keymapsChanged();

128

135

129private:

136private:

130 bool m_enableLauncherWhileLocked;

137 bool m_enableLauncherWhileLocked;

@@ -138,6 +145,7 @@ private:

138 bool m_hereEnabled;

145 bool m_hereEnabled;

139 QString m_hereLicensePath;

146 QString m_hereLicensePath;

140 QString m_realName;

147 QString m_realName;

148+ QStringList m_kbdMap;

141 QString m_email;

149 QString m_email;

142};

150};

143

151

tests/mocks/QMenuModel/QDBusActionGroup.qml+5−5

@@ -1,8 +1,5 @@

1/*

3− *

4− * Authors:

5− * Daniel d'Andrada <daniel.dandrada@canonical.com>

6 *

3 *

7 * This program is free software; you can redistribute it and/or modify

4 * This program is free software; you can redistribute it and/or modify

8 * it under the terms of the GNU General Public License as published by

5 * it under the terms of the GNU General Public License as published by

@@ -18,7 +15,6 @@

18 */

15 */

19

16

20import QtQuick 2.4

17import QtQuick 2.4

21−import Ubuntu.Settings.Menus 0.1 as Menus

22import QMenuModel 0.1

18import QMenuModel 0.1

23

19

24QtObject {

20QtObject {

@@ -47,6 +43,10 @@ QtObject {

47 function activate() {

43 function activate() {

48 activated();

44 activated();

49 }

45 }

46+

47+ function updateState(newState) {

48+ state = newState;

49+ }

50 }", actionGroup);

51 }

52}

tests/mocks/Unity/Application/MirSurface.cpp+17−1

@@ -134,7 +134,6 @@ void MirSurface::setOrientationAngle(Mir::OrientationAngle angle)

134 Q_EMIT orientationAngleChanged(angle);

135}

136

137−

138Mir::ShellChrome MirSurface::shellChrome() const

137Mir::ShellChrome MirSurface::shellChrome() const

139{

138{

140 return m_shellChrome;

139 return m_shellChrome;

@@ -149,7 +148,24 @@ void MirSurface::setShellChrome(Mir::ShellChrome shellChrome)

149 Q_EMIT shellChromeChanged(shellChrome);

148 Q_EMIT shellChromeChanged(shellChrome);

150}

149}

151

150

151+QString MirSurface::keymapLayout() const

152+{

153+ return m_keyMap.first;

154+}

155+

156+QString MirSurface::keymapVariant() const

157+{

158+ return m_keyMap.second;

159+}

152

160

161+void MirSurface::setKeymap(const QString &layout, const QString &variant)

162+{

163+ if (layout.isEmpty()) {

164+ return;

165+ }

166+ m_keyMap = qMakePair(layout, variant);

167+ Q_EMIT keymapChanged(layout, variant);

168+}

153

169

154void MirSurface::registerView(qintptr viewId)

170void MirSurface::registerView(qintptr viewId)

155{

171{

tests/mocks/Unity/Application/MirSurface.h+5

@@ -75,6 +75,9 @@ public:

75 int heightIncrement() const override { return m_heightIncrement; }

76

77 Mir::ShellChrome shellChrome() const override;

78+ QString keymapLayout() const override;

79+ QString keymapVariant() const override;

80+ Q_INVOKABLE void setKeymap(const QString &layout, const QString &variant) override;

78

81

79 ////

82 ////

80 // API for tests

83 // API for tests

@@ -158,6 +161,8 @@ private:

158 bool visible;

161 bool visible;

159 };

162 };

160 QHash<qintptr, View> m_views;

163 QHash<qintptr, View> m_views;

164+

165+ QPair<QString,QString> m_keyMap; // pair of layout+variant

161};

166};

162

167

163#endif // MOCK_MIR_SURFACE_H

168#endif // MOCK_MIR_SURFACE_H

tests/plugins/AccountsService/PropertiesServer.cpp+9

@@ -25,10 +25,16 @@

25#include <QDBusMessage>

26#include <QDBusMetaType>

27

28+using StringMap = QMap<QString,QString>;

29+using StringMapList = QList<StringMap>;

30+Q_DECLARE_METATYPE(StringMapList)

31+

28PropertiesServer::PropertiesServer(QObject *parent)

32PropertiesServer::PropertiesServer(QObject *parent)

29 : QObject(parent)

33 : QObject(parent)

30{

34{

31 qDBusRegisterMetaType<QList<QVariantMap>>();

35 qDBusRegisterMetaType<QList<QVariantMap>>();

36+ qDBusRegisterMetaType<StringMap>();

37+ qDBusRegisterMetaType<StringMapList>();

32 Reset();

38 Reset();

33}

39}

34

40

@@ -63,6 +69,8 @@ void PropertiesServer::Set(const QString &interface, const QString &property, co

63 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&

69 if (interface == QStringLiteral("com.canonical.unity.AccountsService") &&

64 property == QStringLiteral("LauncherItems")) {

70 property == QStringLiteral("LauncherItems")) {

65 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));

71 newValue = QVariant::fromValue(qdbus_cast<QList<QVariantMap>>(newValue.value<QDBusArgument>()));

72+ } else if (interface == "org.freedesktop.Accounts.User" && property == "InputSources") {

73+ newValue = QVariant::fromValue(qdbus_cast<StringMapList>(newValue.value<QDBusArgument>()));

66 }

74 }

67

75

68 oldValue = newValue;

76 oldValue = newValue;

@@ -101,4 +109,5 @@ void PropertiesServer::Reset()

101 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";

109 m_properties["com.ubuntu.location.providers.here.AccountsService"]["LicenseBasePath"] = "";

102 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";

110 m_properties["org.freedesktop.Accounts.User"]["BackgroundFile"] = "";

103 m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";

111 m_properties["org.freedesktop.Accounts.User"]["RealName"] = "";

112+ m_properties["org.freedesktop.Accounts.User"]["InputSources"] = QVariant::fromValue(StringMapList());

104}

113}

tests/plugins/AccountsService/PropertiesServer.h−1

@@ -20,7 +20,6 @@

20#ifndef UNITY_PROPERTIESSERVER_H

21#define UNITY_PROPERTIESSERVER_H

22

23−#include "PropertiesServer.h"

24#include <QDBusContext>

23#include <QDBusContext>

25#include <QDBusVariant>

24#include <QDBusVariant>

26#include <QObject>

25#include <QObject>

tests/plugins/AccountsService/client.cpp+30

@@ -23,6 +23,11 @@

23#include <QTest>

24#include <QDebug>

25#include <QDBusReply>

26+#include <QDBusMetaType>

27+

28+using StringMap = QMap<QString,QString>;

29+using StringMapList = QList<StringMap>;

30+Q_DECLARE_METATYPE(StringMapList)

26

31

27template <class T>

32template <class T>

28QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }

33QVariant dbusVariant(const T& value) { return QVariant::fromValue(QDBusVariant(value)); }

@@ -52,6 +57,9 @@ public:

52

57

53 QObject::connect(m_uscInputInterface, SIGNAL(setMousePrimaryButtonCalled(int)),

58 QObject::connect(m_uscInputInterface, SIGNAL(setMousePrimaryButtonCalled(int)),

54 this, SIGNAL(setMousePrimaryButtonCalled(int)));

59 this, SIGNAL(setMousePrimaryButtonCalled(int)));

60+

61+ qDBusRegisterMetaType<StringMap>();

62+ qDBusRegisterMetaType<StringMapList>();

55 }

63 }

56

64

57private Q_SLOTS:

65private Q_SLOTS:

@@ -303,6 +311,28 @@ private Q_SLOTS:

303 QCOMPARE(arguments.at(0).toInt(), 0);

311 QCOMPARE(arguments.at(0).toInt(), 0);

304 }

312 }

305

313

314+ void testAsynchronousChangeForKeymaps()

315+ {

316+ AccountsService session(this, QTest::currentTestFunction());

317+

318+ QCOMPARE(session.keymaps(), {"us"});

319+

320+ StringMapList inputSources;

321+ StringMap map1;

322+ map1.insert("xkb", "cz+qwerty");

323+ inputSources.append(map1);

324+ StringMap map2;

325+ map2.insert("xkb", "fr");

326+ inputSources.append(map2);

327+

328+ ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",

329+ "org.freedesktop.Accounts.User",

330+ "InputSources",

331+ QVariant::fromValue(QDBusVariant(QVariant::fromValue(inputSources)))));

332+ QStringList result = {"cz+qwerty", "fr"};

333+ QTRY_COMPARE(session.keymaps(), result);

334+ }

335+

306Q_SIGNALS:

336Q_SIGNALS:

307 void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);

337 void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);

308 void setMousePrimaryButtonCalled(int button);

338 void setMousePrimaryButtonCalled(int button);

tests/qmltests/Stages/tst_DesktopStage.qml−2

@@ -510,8 +510,6 @@ Item {

510 }

511

512 function test_dropShadow() {

513− killAllRunningApps();

514−

515 // verify the drop shadow is not visible initially

513 // verify the drop shadow is not visible initially

516 verify(PanelState.dropShadow == false);

514 verify(PanelState.dropShadow == false);

517

515

tests/qmltests/tst_Shell.qml+64

@@ -2281,5 +2281,69 @@ Rectangle {

2281 compare(topmostSurfaceItem.touchPressCount, 2);

2282 compare(topmostSurfaceItem.touchReleaseCount, 2);

2283 }

2284+

2285+ function test_switchKeymap() {

2286+ // start with phone shell

2287+ loadShell("phone");

2288+ shell.usageScenario = "shell";

2289+ waitForRendering(shell);

2290+ swipeAwayGreeter();

2291+

2292+ // configure keymaps

2293+ AccountsService.keymaps = ["sk", "cz+qwerty", "fr"] // "configure" the keymaps for user

2294+

2295+ // start some app

2296+ var app = ApplicationManager.startApplication("dialer-app");

2297+ waitUntilAppWindowIsFullyLoaded(app);

2298+

2299+ // verify the initial keymap of the newly started app is the first one from the list

2300+ tryCompare(app.session.lastSurface, "keymapLayout", "sk");

2301+ tryCompare(app.session.lastSurface, "keymapVariant", "");

2302+

2303+ // switch to next keymap, should go to "cz+qwerty"

2304+ keyClick(Qt.Key_Space, Qt.MetaModifier);

2305+ tryCompare(app.session.lastSurface, "keymapLayout", "cz");

2306+ tryCompare(app.session.lastSurface, "keymapVariant", "qwerty");

2307+

2308+ // switch to next keymap, should go to "fr"

2309+ keyClick(Qt.Key_Space, Qt.MetaModifier);

2310+

2311+ // go to e.g. desktop stage

2312+ loadShell("desktop");

2313+ shell.usageScenario = "desktop";

2314+ waitForRendering(shell);

2315+

2316+ // start a second app, should get the last configured keyboard, "fr"

2317+ var app2 = ApplicationManager.startApplication("calendar-app");

2318+ waitUntilAppWindowIsFullyLoaded(app2);

2319+ tryCompare(app2.session.lastSurface, "keymapLayout", "fr");

2320+ tryCompare(app2.session.lastSurface, "keymapVariant", "");

2321+

2322+ // focus our first app, make sure it also has the "fr" keymap

2323+ ApplicationManager.requestFocusApplication("dialer-app");

2324+ tryCompare(app.session.lastSurface, "keymapLayout", "fr");

2325+ tryCompare(app.session.lastSurface, "keymapVariant", "");

2326+

2327+ // switch to previous keymap, should be "cz+qwerty"

2328+ keyClick(Qt.Key_Space, Qt.MetaModifier|Qt.ShiftModifier);

2329+ tryCompare(app.session.lastSurface, "keymapLayout", "cz");

2330+ tryCompare(app.session.lastSurface, "keymapVariant", "qwerty");

2331+

2332+ // go next twice to "sk", past the end

2333+ keyClick(Qt.Key_Space, Qt.MetaModifier);

2334+ keyClick(Qt.Key_Space, Qt.MetaModifier);

2335+ tryCompare(app.session.lastSurface, "keymapLayout", "sk");

2336+ tryCompare(app.session.lastSurface, "keymapVariant", "");

2337+

2338+ // go back once to past the beginning, to "fr"

2339+ keyClick(Qt.Key_Space, Qt.MetaModifier|Qt.ShiftModifier);

2340+ tryCompare(app.session.lastSurface, "keymapLayout", "fr");

2341+ tryCompare(app.session.lastSurface, "keymapVariant", "");

2342+

2343+ // switch to app2, should also get "fr"

2344+ ApplicationManager.requestFocusApplication("calendar-app");

2345+ tryCompare(app2.session.lastSurface, "keymapLayout", "fr");

2346+ tryCompare(app2.session.lastSurface, "keymapVariant", "");

2347+ }

2284 }

2348 }

2285}

2349}