diff --git a/qml/FlatButtonStyle.qml b/qml/FlatButtonStyle.qml deleted file mode 100644 index 032c458..0000000 --- a/qml/FlatButtonStyle.qml +++ /dev/null @@ -1,27 +0,0 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Controls.Styles 1.2 -import com.iktwo.components 1.0 - -ButtonStyle { - id: buttonStyle - - property color backgroundColor: Theme.titleBarColor - property color fontColor: Theme.titleBarTextColor - - background: Rectangle { - height: buttonStyle.control.height - width: buttonStyle.control.width - color: control.pressed ? Qt.darker(backgroundColor) : backgroundColor - } - - label: Label { - elide: "ElideRight" - color: control.pressed ? Qt.darker(fontColor) : fontColor - text: buttonStyle.control.text - font.pixelSize: 14 * ScreenValues.dp - renderType: "NativeRendering" - verticalAlignment: "AlignVCenter" - horizontalAlignment: "AlignHCenter" - } -} diff --git a/qml/UpdateDialog.qml b/qml/UpdateDialog.qml deleted file mode 100644 index ec2c78a..0000000 --- a/qml/UpdateDialog.qml +++ /dev/null @@ -1,56 +0,0 @@ -import QtQuick 2.3 -import QtQuick.Controls 1.2 -import QtQuick.Layouts 1.1 -import com.iktwo.components 1.0 - -Dialog { - id: root - - property UpdateChecker updateCheckerElement - - buttons: [ - Button { - anchors { - horizontalCenter: parent.horizontalCenter - } - - text: qsTr("Update") - height: 40 * ScreenValues.dp - Layout.preferredHeight: 40 * ScreenValues.dp - width: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - style: FlatButtonStyle { } - onClicked: updateCheckerElement.openPackageOnGooglePlay() - }, - Button { - anchors { - horizontalCenter: parent.horizontalCenter - } - - text: qsTr("Skip") - height: 40 * ScreenValues.dp - Layout.preferredHeight: 40 * ScreenValues.dp - width: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - style: FlatButtonStyle { backgroundColor: "#cccccc"; fontColor: "#757575" } - onClicked: root.close() - }, - Button { - anchors { - horizontalCenter: parent.horizontalCenter - } - - text: qsTr("Skip until next") - height: 40 * ScreenValues.dp - Layout.preferredHeight: 40 * ScreenValues.dp - width: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - Layout.preferredWidth: Math.min(root.width / 2.5, 220 * ScreenValues.dp) - style: FlatButtonStyle { backgroundColor: "#cccccc"; fontColor: "#757575" } - - onClicked: { - /// TODO: store skipped version, if new version is greater than skipped then show dialog - root.close() - } - } - ] -} diff --git a/resources.qrc b/resources.qrc index 5d9b27d..7512ff2 100644 --- a/resources.qrc +++ b/resources.qrc @@ -14,10 +14,8 @@ qml/Arrow.qml qml/FakeMainPage.qml qml/FakePlaybackControls.qml - qml/FlatButtonStyle.qml qml/FakeSearchPage.qml qml/testModels/TestSearchModel.qml - qml/UpdateDialog.qml resources/images/search.svg