Rest of fix

This commit is contained in:
Charles Haley 2019-01-21 11:34:30 +00:00
parent aa1bdda900
commit c8e97f6f50
2 changed files with 8 additions and 6 deletions

View File

@ -1026,12 +1026,12 @@ class BulkDateTime(BulkBase):
l.addStretch(2)
w = self.main_widget
format = cm['display'].get('date_format','')
if not format:
format = 'dd MMM yyyy'
elif format == 'iso':
format = 'yyyy-MM-ddTHH:mm:ss'
w.setDisplayFormat(format)
format_ = cm['display'].get('date_format','')
if not format_:
format_ = 'dd MMM yyyy'
elif format_ == 'iso':
format_ = 'yyyy-MM-ddTHH:mm:ss'
w.setDisplayFormat(format_)
w.setCalendarPopup(True)
w.setMinimumDateTime(UNDEFINED_QDATETIME)
w.setSpecialValueText(_('Undefined'))

View File

@ -515,6 +515,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.adddate_cw = CalendarWidget(self.adddate)
self.adddate.setCalendarWidget(self.adddate_cw)
adddate_format = tweaks['gui_timestamp_display_format']
if adddate_format == 'iso':
adddate_format = 'yyyy-MM-ddTHH:mm:ss'
if adddate_format is not None:
self.adddate.setDisplayFormat(adddate_format)
self.adddate.setSpecialValueText(_('Undefined'))