Skip to content

Commit d369b2d

Browse files
committed
Fix merge errors with constants
1 parent 4090b76 commit d369b2d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

tagstudio/src/qt/widgets/item_thumb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
QWidget,
2323
)
2424
from src.alt_core.library import Entry, ItemType, Library
25-
from src.core.ts_core import AUDIO_TYPES, IMAGE_TYPES, VIDEO_TYPES
25+
from src.core.constants import AUDIO_TYPES, IMAGE_TYPES, VIDEO_TYPES
2626
from src.qt.flowlayout import FlowWidget
2727
from src.qt.helpers.file_opener import FileOpenerHelper
2828
from src.qt.widgets.thumb_button import ThumbButton

tagstudio/src/qt/widgets/preview_panel.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from datetime import datetime as dt
1010

1111
import cv2
12-
from humanfriendly import format_size
1312
import rawpy
13+
from humanfriendly import format_size
1414
from PIL import Image, UnidentifiedImageError
1515
from PIL.Image import DecompressionBombError
1616
from PySide6.QtCore import QSize, Qt, Signal
@@ -29,8 +29,8 @@
2929
QWidget,
3030
)
3131
from src.alt_core.library import Entry, Library
32-
from src.alt_core.constants import IMAGE_TYPES, VIDEO_TYPES, RAW_IMAGE_TYPES
3332
from src.alt_core.types import ItemType, SettingItems, Theme
33+
from src.core.constants import IMAGE_TYPES, RAW_IMAGE_TYPES, VIDEO_TYPES
3434
from src.qt.helpers.file_opener import FileOpenerHelper, FileOpenerLabel, open_file
3535
from src.qt.modals.add_field import AddFieldModal
3636
from src.qt.widgets.fields import FieldContainer

0 commit comments

Comments
 (0)