Commit 41066663 authored by Nicolas Fella's avatar Nicolas Fella

merge datetime into main

parent 416c7103
add_subdirectory(dateandtime)
set(ktrip_SRCS
main.cpp
querycontroller.cpp
......
install(FILES
qmldir
ClockElement.qml
ClockFace.qml
DateInput.qml
Hand.qml
TimePicker.qml
DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kirigamiaddons/dateandtime)
module org.kde.kirigamiaddons.dateandtime
plugin dateandtimeplugin
DateInput 0.1 DateInput.qml
ClockFace 0.1 ClockFace.qml
Hand 0.1 Hand.qml
TimeZoneTable 0.1 TimezoneTable.qml
TimePicker 0.1 TimePicker.qml
ClockElement 0.1 ClockElement.qml
......@@ -24,8 +24,6 @@ import QtQuick.Controls 2.3
import org.kde.kirigami 2.4 as Kirigami
import org.kde.kitemmodels 1.0
import org.kde.kirigamiaddons.dateandtime 0.1
/**
* This Item provides an entry box for inputting a date.
* It is represented in a form suitable for entering a known date (i.e date of birth, current date)
......
......@@ -23,8 +23,6 @@ import QtQuick.Layouts 1.1
import QtQuick.Controls 2.5
import org.kde.kirigami 2.4 as Kirigami
import org.kde.kirigamiaddons.dateandtime 0.1 as KA
Button {
signal datePicked(string theDate)
......@@ -48,7 +46,7 @@ Button {
id: dialog
anchors.centerIn: parent
height: Kirigami.Units.gridUnit * 6
contentItem: KA.DateInput {
contentItem: DateInput {
id: picker
}
......
......@@ -22,7 +22,6 @@ import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.5
import org.kde.kirigami 2.4 as Kirigami
import org.kde.kirigamiaddons.dateandtime 0.1 as KA
Button {
......@@ -46,7 +45,7 @@ Button {
Dialog {
id: dialog
anchors.centerIn: parent
contentItem: KA.TimePicker {
contentItem: TimePicker {
id: picker
}
......
......@@ -10,6 +10,11 @@
<file>qml/TimePickerButton.qml</file>
<file>qml/DepartureQueryPage.qml</file>
<file>qml/DeparturesPage.qml</file>
<file>qml/TimePicker.qml</file>
<file>qml/Hand.qml</file>
<file>qml/DateInput.qml</file>
<file>qml/ClockFace.qml</file>
<file>qml/ClockElement.qml</file>
<file>qtquickcontrols2.conf</file>
</qresource>
</RCC>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment