Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

A couple more places with dt -> qdt conversion needed

Browse Source
This commit is contained in:
Kovid Goyal 2023-11-07 19:52:50 +05:30
parent f3b37944c4
commit 292e4c9da8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/calibre/gui2/library/delegates.py
View File

@ -5,28 +5,38 @@ __license__ = 'GPL v3'
__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en'
import os, sys
import os
import sys
from datetime import datetime
from qt.core import (
QAbstractTextDocumentLayout, QApplication, QComboBox, QDate, QDateTime,
QDateTimeEdit, QDialog, QDoubleSpinBox, QEvent, QFont, QFontInfo, QIcon,
QKeySequence, QLineEdit, QLocale, QMenu, QPalette, QSize, QSpinBox, QStyle,
QStyledItemDelegate, QStyleOptionComboBox, QStyleOptionSpinBox,
QStyleOptionViewItem, Qt, QTextDocument, QUrl,
)
from qt.core import (Qt, QApplication, QStyle, QIcon, QDoubleSpinBox, QStyleOptionViewItem,
QSpinBox, QStyledItemDelegate, QComboBox, QTextDocument, QMenu, QKeySequence, QUrl,
QAbstractTextDocumentLayout, QFont, QFontInfo, QDate, QDateTimeEdit, QDateTime, QEvent,
QStyleOptionComboBox, QStyleOptionSpinBox, QLocale, QSize, QLineEdit, QDialog, QPalette)
from calibre.ebooks.metadata import rating_to_stars, title_sort
from calibre.gui2 import UNDEFINED_QDATETIME, rating_font, gprefs
from calibre.constants import iswindows
from calibre.gui2.markdown_editor import MarkdownEditDialog
from calibre.gui2.widgets import EnLineEdit
from calibre.gui2.widgets2 import populate_standard_spinbox_context_menu, RatingEditor, DateTimeEdit as DateTimeEditBase
from calibre.ebooks.metadata import rating_to_stars, title_sort
from calibre.gui2 import UNDEFINED_QDATETIME, gprefs, rating_font
from calibre.gui2.complete2 import EditWithComplete
from calibre.utils.date import now, format_date, qt_to_dt, is_date_undefined, internal_iso_format_string
from calibre.utils.config import tweaks
from calibre.utils.icu import sort_key
from calibre.gui2.dialogs.comments_dialog import CommentsDialog, PlainTextDialog
from calibre.gui2.dialogs.tag_editor import TagEditor
from calibre.gui2.languages import LanguagesEdit
from calibre.gui2.markdown_editor import MarkdownEditDialog
from calibre.gui2.widgets import EnLineEdit
from calibre.gui2.widgets2 import (
DateTimeEdit as DateTimeEditBase, RatingEditor,
populate_standard_spinbox_context_menu,
)
from calibre.library.comments import markdown
from calibre.utils.config import tweaks
from calibre.utils.date import (
format_date, internal_iso_format_string, is_date_undefined, now, qt_from_dt,
qt_to_dt,
)
from calibre.utils.icu import sort_key
class UpdateEditorGeometry:
@ -252,6 +262,8 @@ class DateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
val = index.data(Qt.ItemDataRole.EditRole)
if is_date_undefined(val):
val = now()
if isinstance(val, datetime):
val = qt_from_dt(val)
editor.setDateTime(val)
# }}}
@ -450,6 +462,8 @@ class CcDateDelegate(QStyledItemDelegate, UpdateEditorGeometry): # {{{
val = index.data(Qt.ItemDataRole.EditRole)
if is_date_undefined(val):
val = now()
if isinstance(val, datetime):
val = qt_from_dt(val)
editor.setDateTime(val)
def setModelData(self, editor, model, index):

2
src/calibre/gui2/metadata/basic_widgets.py
View File

@ -136,6 +136,8 @@ def make_undoable(spinbox):
self.undo_val = widget.value()
if isinstance(val, date) and not isinstance(val, datetime):
val = parse_only_date(val.isoformat(), assume_utc=False, as_utc=False)
if isinstance(val, datetime):
val = qt_from_dt(val)
self.redo_val = val
def undo(self):