c56d828 · unity8 · git.iko.soy

git.iko.soy/unity8

removed InputWindow

commitc56d828fbb17cd24cc324a05f31baa70a1d76d4a authorNick Dedekind <nick.dedekind@canonical.com> dateMon 27 Mar 2017, 16:42 (10 years ago) parentee0e9fd

5 files changed+7−91

compare with xenial

unifiedsplit

tests/mocks/Unity/InputInfo/InputWindow.qml−68 tests/mocks/Unity/InputInfo/mockcontroller.cpp+4−16 tests/mocks/Unity/InputInfo/mockcontroller.h+2−4 tests/mocks/Unity/InputInfo/plugin.cpp+1−1 tests/mocks/Unity/InputInfo/qmldir−2

tests/mocks/Unity/InputInfo/InputWindow.qmldeleted−68

@@ -1,68 +0,0 @@

1−import QtQuick 2.4

2−import Ubuntu.Components 1.3

3−import Unity.InputInfo 0.1

4−

5−Rectangle {

6− id: rect

7− color: "white"

8− width: parent.width

9− height: parent.height

10−

11− Action {

12− id: mouseAction

13− text: checked ? "Remove Mouse" : "Add Mouse"

14− onTriggered: {

15− if (checked) {

16− console.log("ADD")

17− MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);

18− } else {

19− console.log("REMOVE")

20− MockInputDeviceBackend.removeDevice("/mouse0");

21− }

22− }

23− iconName: "input-mouse-symbolic"

24− checkable: true

25− checked: false

26− }

27−

28− Action {

29− id: kbAction

30− text: checked ? "Remove Keyboard" : "Add Keyboard"

31− onTriggered: {

32− if (checked) {

33− MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

34− } else {

35− MockInputDeviceBackend.removeDevice("/kbd0");

36− }

37− }

38− iconName: "input-keyboard-symbolic"

39− checkable: true

40− checked: false

41− }

42−

43− Column {

44− anchors {

45− fill: parent

46− margins: units.gu(1)

47− }

48− spacing: units.gu(1)

49−

50− Button {

51− anchors {

52− left: parent.left

53− right: parent.right

54− }

55− action: mouseAction

56− color: mouseAction.checked ? UbuntuColors.red : UbuntuColors.green

57− }

58−

59− Button {

60− anchors {

61− left: parent.left

62− right: parent.right

63− }

64− action: kbAction

65− color: kbAction.checked ? UbuntuColors.red : UbuntuColors.green

66− }

67− }

68−}

tests/mocks/Unity/InputInfo/mockcontroller.cpp+4−16

@@ -23,26 +23,14 @@

2323#include <QQuickItem>

2424#include <paths.h>

2525

26−MockController::MockController(QQmlEngine *engine)

26+MockController::MockController(QObject *parent):

27+ QObject(parent)

2728{

28− QQmlComponent component(engine);

29− component.setData("import QtQuick 2.4; import Unity.InputInfo 0.1; InputWindow { }", ::qmlDirectory());

30− QObject *myObject = component.create();

31− QQuickItem *item = qobject_cast<QQuickItem*>(myObject);

32− if (item) {

33− auto window = new QQuickView();

34− window->setTitle("Input");

35− item->setParentItem(window->contentItem());

36− window->setResizeMode(QQuickView::SizeRootObjectToView);

37− window->setWidth(200);

38− window->setHeight(100);

39− window->show();

40− }

4129}

4230

43−MockController *MockController::instance(QQmlEngine *engine)

31+MockController *MockController::instance()

4432{

45− static MockController* controller = new MockController(engine);

33+ static MockController* controller = new MockController();

4634 return controller;

4735}

4836

tests/mocks/Unity/InputInfo/mockcontroller.h+2−4

@@ -20,16 +20,14 @@

2020#include <QObject>

2121#include "qinputinfo.h"

2222

23−class QQmlEngine;

24−

2523class MockController: public QObject

2624{

2725 Q_OBJECT

2826public:

29− MockController(QQmlEngine *engine);

27+ MockController(QObject *parent = nullptr);

3028 ~MockController() = default;

3129

32− static MockController *instance(QQmlEngine *engine);

30+ static MockController *instance();

3331

3432 Q_INVOKABLE QInputDevice* addMockDevice(const QString &devicePath, QInputDevice::InputType type);

3533 Q_INVOKABLE void removeDevice(const QString &devicePath);

tests/mocks/Unity/InputInfo/plugin.cpp+1−1

@@ -27,7 +27,7 @@

2727static QObject *backendProvider(QQmlEngine *engine, QJSEngine *scriptEngine)

2828{

2929 Q_UNUSED(scriptEngine)

30− return MockController::instance(engine);

30+ return MockController::instance();

3131}

3232

3333void InputInfoPlugin::registerTypes(const char *uri)

tests/mocks/Unity/InputInfo/qmldir−2

@@ -1,4 +1,2 @@

11module Unity.InputInfo

22plugin MockInputInfo

3−

4−InputWindow 0.1 InputWindow.qml