diff --git a/gui_main.py b/gui_main.py index c6cc618..51eea74 100644 --- a/gui_main.py +++ b/gui_main.py @@ -3,7 +3,7 @@ # Form implementation generated from reading ui file 'D:\Apps\DEV\PROJECTS\KoHighlights\gui_main.ui', # licensing of 'D:\Apps\DEV\PROJECTS\KoHighlights\gui_main.ui' applies. # -# Created: Mon Aug 26 13:41:15 2024 +# Created: Tue Aug 27 20:07:56 2024 # by: pyside2-uic running on PySide2 5.13.2 # # WARNING! All changes made in this file will be lost! @@ -339,5 +339,5 @@ def retranslateUi(self, Base): self.act_view_book.setText(QtWidgets.QApplication.translate("Base", "View Book", None, -1)) self.act_view_book.setShortcut(QtWidgets.QApplication.translate("Base", "Ctrl+B", None, -1)) -from secondary import XTableWidget, DropTableWidget +from secondary import DropTableWidget, XTableWidget import images_rc diff --git a/images.qrc b/images.qrc deleted file mode 100644 index 45d44d2..0000000 --- a/images.qrc +++ /dev/null @@ -1,44 +0,0 @@ - - -stuff/power32gray.png -stuff/view-sync.png -stuff/db_open.png -stuff/folder_open.png -stuff/refresh16.png -stuff/font.ttf -stuff/paypal.png -stuff/db.png -stuff/sync.png -stuff/folder_reader.png -stuff/del.png -stuff/calendar.png -stuff/view_books.png -stuff/file_exists.png -stuff/show_pages.png -stuff/wait.gif -stuff/trash.png -stuff/power32red.png -stuff/description.png -stuff/files_merge.png -stuff/delete.png -stuff/logo64.png -stuff/files_add.png -stuff/file_missing.png -stuff/trans32.png -stuff/paypal76.png -stuff/file_edit.png -stuff/filter.png -stuff/file_save.png -stuff/files_view.png -stuff/db_compact.png -stuff/copy.png -stuff/logo.png -stuff/files_delete.png -stuff/add.png -stuff/view-highlights.png -stuff/sort.png -stuff/db_add.png -stuff/label_green.png -stuff/books.png - - \ No newline at end of file diff --git a/main.py b/main.py index e52234e..cc8dbcc 100644 --- a/main.py +++ b/main.py @@ -44,7 +44,7 @@ __author__ = "noEmbryo" -__version__ = "2.1.0.0" +__version__ = "2.1.1.0" class Base(QMainWindow, Ui_Base): @@ -1667,6 +1667,12 @@ def save_book_data(self, path, data): :type data: dict :param data: The book's data """ + if data.get("annotations") is not None: # new metadata format + for annot in data["annotations"].values(): + note = annot.get("note") + if note is not None and not note: + del annot["note"] # delete key if empty + times = os.stat(path) # read the file's created/modified times encode_data(path, data) if data.get("summary", {}).get("status", "") in ["abandoned", "complete"]: