diff --git a/app/qml/DevicePage.qml b/app/qml/DevicePage.qml index 8160ef8f3..23c9fce5c 100644 --- a/app/qml/DevicePage.qml +++ b/app/qml/DevicePage.qml @@ -21,7 +21,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami import org.kde.kdeconnect 1.0 Kirigami.Page diff --git a/app/qml/FindDevicesPage.qml b/app/qml/FindDevicesPage.qml index ba544c435..a2d8284b2 100644 --- a/app/qml/FindDevicesPage.qml +++ b/app/qml/FindDevicesPage.qml @@ -21,7 +21,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami import org.kde.kdeconnect 1.0 Kirigami.Page diff --git a/app/qml/PluginItem.qml b/app/qml/PluginItem.qml index cf96aad34..b0d55ddd7 100644 --- a/app/qml/PluginItem.qml +++ b/app/qml/PluginItem.qml @@ -21,7 +21,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami import org.kde.kdeconnect 1.0 Kirigami.BasicListItem diff --git a/app/qml/main.qml b/app/qml/main.qml index 46541cd73..cbd56f875 100644 --- a/app/qml/main.qml +++ b/app/qml/main.qml @@ -21,22 +21,21 @@ import QtQuick 2.2 import QtQuick.Controls 1.1 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami import org.kde.kdeconnect 1.0 Kirigami.ApplicationWindow { id: root visible: true - width: 400 + width: 900 height: 500 Kirigami.Action { id: findDevicesAction text: i18n ("Find devices...") iconName: "list-add" - checkable: pageStack.currentItem && pageStack.currentItem.objectName == "FindDevices" - checked: true + checked: pageStack.currentItem && pageStack.currentItem.objectName == "FindDevices" onTriggered: { root.pageStack.clear() @@ -77,8 +76,7 @@ Kirigami.ApplicationWindow iconName: model.iconName text: display + "\n" + toolTip enabled: status & DevicesModel.Reachable - checkable: pageStack.currentItem && pageStack.currentItem.currentDevice == device - checked: true + checked: pageStack.currentItem && pageStack.currentItem.currentDevice == device onTriggered: { root.pageStack.clear() root.pageStack.push( diff --git a/app/qml/mousepad.qml b/app/qml/mousepad.qml index 1091ff73d..3e10c89ee 100644 --- a/app/qml/mousepad.qml +++ b/app/qml/mousepad.qml @@ -21,7 +21,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami Kirigami.Page { diff --git a/app/qml/mpris.qml b/app/qml/mpris.qml index 3399de32f..fe2c2ed7b 100644 --- a/app/qml/mpris.qml +++ b/app/qml/mpris.qml @@ -21,7 +21,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.2 import QtQuick.Layouts 1.1 -import org.kde.kirigami 1.0 as Kirigami +import org.kde.kirigami 2.0 as Kirigami Kirigami.Page {