Skip to content

Commit df1e2e1

Browse files
committed
rebased
1 parent f0bcf75 commit df1e2e1

File tree

2 files changed

+34
-24
lines changed

2 files changed

+34
-24
lines changed

tagstudio/src/qt/modals/drop_import.py

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,54 @@
22
import shutil
33
import typing
44

5-
from PySide6.QtCore import QThreadPool,Qt,QMimeData,QUrl
6-
from PySide6.QtGui import QDropEvent, QDragEnterEvent,QImage, QDragMoveEvent,QMouseEvent,QDrag,QDragLeaveEvent
5+
from PySide6.QtCore import QThreadPool, Qt, QMimeData, QUrl
6+
from PySide6.QtGui import (
7+
QDropEvent,
8+
QDragEnterEvent,
9+
QDragMoveEvent,
10+
QMouseEvent,
11+
QDrag,
12+
QDragLeaveEvent,
13+
)
714
from PySide6.QtWidgets import QMessageBox
8-
from src.qt.widgets import ProgressWidget
9-
from src.qt.helpers import FunctionIterator, CustomRunnable
10-
11-
from ctypes import wintypes,windll
15+
from src.qt.widgets.progress import ProgressWidget
16+
from src.qt.helpers.function_iterator import FunctionIterator
17+
from src.qt.helpers.custom_runnable import CustomRunnable
1218

1319
if typing.TYPE_CHECKING:
1420
from src.qt.ts_qt import QtDriver
1521

1622
import logging
1723

24+
1825
class DropImport:
1926
def __init__(self, driver: "QtDriver"):
2027
self.driver = driver
21-
22-
def mouseMoveEvent(self,event:QMouseEvent):
23-
if event.buttons() is not Qt.MouseButton.LeftButton: return
24-
if len(self.driver.selected) == 0: return
25-
28+
29+
def mouseMoveEvent(self, event: QMouseEvent):
30+
if event.buttons() is not Qt.MouseButton.LeftButton:
31+
return
32+
if len(self.driver.selected) == 0:
33+
return
34+
2635
drag = QDrag(self.driver)
2736
paths = []
2837
mimedata = QMimeData()
29-
for selected in self.driver.selected:
30-
entry =self.driver.lib.get_entry(selected[1])
31-
url = QUrl.fromLocalFile(self.driver.lib.library_dir+"/"+entry.path+"/"+entry.filename)
38+
for selected in self.driver.selected:
39+
entry = self.driver.lib.get_entry(selected[1])
40+
url = QUrl.fromLocalFile(
41+
self.driver.lib.library_dir + "/" + entry.path + "/" + entry.filename
42+
)
3243
paths.append(url)
33-
44+
3445
mimedata.setUrls(paths)
3546
drag.setMimeData(mimedata)
3647
drag.exec(Qt.DropAction.CopyAction)
37-
48+
3849
def dropEvent(self, event: QDropEvent):
39-
if event.source() is self.driver: # change that if you want to drop something originating from tagstudio, for moving or so
50+
if (
51+
event.source() is self.driver
52+
): # change that if you want to drop something originating from tagstudio, for moving or so
4053
return
4154

4255
if not event.mimeData().hasUrls():
@@ -45,7 +58,7 @@ def dropEvent(self, event: QDropEvent):
4558
self.urls = event.mimeData().urls()
4659
self.import_files()
4760

48-
def dragLeaveEvent(self,event:QDragLeaveEvent):
61+
def dragLeaveEvent(self, event: QDragLeaveEvent):
4962
if event.mimeData().hasUrls():
5063
event.accept()
5164
else:
@@ -244,5 +257,3 @@ def get_renamed_duplicate_filename_in_lib(self, filePath: Path) -> str:
244257
)
245258
index += 1
246259
return filePath.name
247-
248-

tagstudio/src/qt/ts_qt.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
from src.qt.modals.fix_unlinked import FixUnlinkedEntriesModal
9191
from src.qt.modals.fix_dupes import FixDupeFilesModal
9292
from src.qt.modals.folders_to_tags import FoldersToTagsModal
93-
from src.qt.modals.drop_import import DropImport
93+
from src.qt.modals.drop_import import DropImport
9494

9595
# this import has side-effect of import PySide resources
9696
import src.qt.resources_rc # pylint: disable=unused-import
@@ -278,7 +278,6 @@ def start(self) -> None:
278278
self.main_window.dropEvent = self.drop_import.dropEvent
279279
self.main_window.dragMoveEvent = self.drop_import.dragMoveEvent
280280

281-
282281
# # self.main_window.windowFlags() &
283282
# # self.main_window.setWindowFlag(Qt.WindowType.FramelessWindowHint, True)
284283
# self.main_window.setWindowFlag(Qt.WindowType.NoDropShadowWindowHint, True)
@@ -1067,10 +1066,10 @@ def _init_thumb_grid(self):
10671066
item_thumb = ItemThumb(
10681067
None, self.lib, self.preview_panel, (self.thumb_size, self.thumb_size)
10691068
)
1070-
1069+
10711070
item_thumb.setMouseTracking(True)
10721071
item_thumb.mouseMoveEvent = self.drop_import.mouseMoveEvent
1073-
1072+
10741073
layout.addWidget(item_thumb)
10751074
self.item_thumbs.append(item_thumb)
10761075

0 commit comments

Comments
 (0)