From bfb5a2546e3263069036371306a37e2e7607102f Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 4 Dec 2022 15:43:29 +0000 Subject: [PATCH 1/2] Enhancement #1998036 : MDE: Option to view full datetime --- src/calibre/gui2/custom_column_widgets.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/custom_column_widgets.py b/src/calibre/gui2/custom_column_widgets.py index a3c73d7cbc..7969dbfe9d 100644 --- a/src/calibre/gui2/custom_column_widgets.py +++ b/src/calibre/gui2/custom_column_widgets.py @@ -15,7 +15,8 @@ from qt.core import (Qt, QComboBox, QLabel, QSpinBox, QDoubleSpinBox, QMessageBox, QToolButton, QPlainTextEdit, QApplication, QStyle, QDialog) from calibre.ebooks.metadata import title_sort -from calibre.utils.date import qt_to_dt, now, as_local_time, as_utc, internal_iso_format_string +from calibre.utils.date import (qt_to_dt, now, as_local_time, as_utc, + internal_iso_format_string, is_date_undefined) from calibre.gui2.complete2 import EditWithComplete as EWC from calibre.gui2.comments_editor import Editor as CommentsEditor from calibre.gui2 import UNDEFINED_QDATETIME, error_dialog, elided_text, gprefs @@ -362,6 +363,14 @@ class DateTime(Base): self.clear_button.clicked.connect(dte.set_to_clear) self.clear_button.setToolTip(_('Clear {0}').format(self.col_metadata['name'])) l.addWidget(self.clear_button) + self.connect_data_changed(self.set_tooltip) + + def set_tooltip(self, val): + if is_date_undefined(val): + self.dte.setToolTip(get_tooltip(self.col_metadata, False)) + else: + self.dte.setToolTip(get_tooltip(self.col_metadata, False) + '\n' + + _('Exact time: {}').format(as_local_time(qt_to_dt(val)))) def setter(self, val): if val is None: From eb1858165a43e2c95dee6fd2f3cb7925e45170f8 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 4 Dec 2022 15:48:21 +0000 Subject: [PATCH 2/2] Bug #1997926: in_tag_browser appears in Search & Replace --- src/calibre/gui2/dialogs/metadata_bulk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index e57902c90a..2706c34906 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -636,7 +636,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): if (f in ['author_sort'] or (fm[f]['datatype'] in ['text', 'series', 'enumeration', 'comments', 'rating'] and fm[f].get('search_terms', None) and - f not in ['formats', 'ondevice', 'series_sort']) or + f not in ['formats', 'ondevice', 'series_sort', 'in_tag_browser']) or (fm[f]['datatype'] in ['int', 'float', 'bool', 'datetime'] and f not in ['id', 'timestamp'])): self.all_fields.append(f)