sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-02 00:02:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

[QgsQuick] Support for custom formats and strings

Browse Source
This commit is contained in:
vsklencar 2020-09-10 12:28:39 +02:00 committed by Martin Dobias
parent 3fc61a49da
commit 7aa18dab5e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/quickgui/plugin/editor/qgsquickdatetime.qml
View File

@ -116,7 +116,7 @@ Item {
onClicked: {
var usedDate = new Date();
if (value !== undefined && value !== '') {
usedDate = value;
usedDate = main.isDateOrTime ? value : Date.fromLocaleString(Qt.locale(), value, config['field_format'])
}
calendar.selectedDate = usedDate
@ -147,7 +147,8 @@ Item {
anchors.fill: parent
onClicked: {
var newDate = new Date()
valueChanged(newDate, false)
var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])
valueChanged(newValue, false)
}
}
}
@ -197,7 +198,10 @@ Item {
Controls1.Calendar {
id: calendar
selectedDate: main.currentValue || new Date()
selectedDate: {
var date = field.isDateOrTime ? main.currentValue : Date.fromLocaleString(Qt.locale(), value, config['field_format'])
date || new Date()
}
weekNumbersVisible: true
focus: false
implicitWidth: calendarOverlay.width
@ -302,8 +306,8 @@ Item {
newDate.setSeconds(secondsSpinBox.value);
}
label.text = timeToString(newDate)
valueChanged(newDate, newDate === undefined)
var newValue = field.isDateOrTime ? newDate : Qt.formatDateTime(newDate, config['field_format'])
valueChanged(newValue, newValue === undefined)
popup.close()
}
}
@ -313,7 +317,7 @@ Item {
}
onCurrentValueChanged: {
label.text = timeToString(main.currentValue)
label.text = field.isDateOrTime ? timeToString(main.currentValue) : main.currentValue
}
}

2
src/quickgui/qgsquickutils.cpp
View File

@ -405,7 +405,7 @@ QString QgsQuickUtils::dateTimeFieldFormat( const QString &fieldFormat )
}
else
{
return QString();
return QString( "Date Time" );
}
}