From fda033166256d9f085f6919498fd1f6a86dd4557 Mon Sep 17 00:00:00 2001 From: alby128 Date: Sat, 16 Sep 2017 17:43:11 +0200 Subject: [PATCH] Fixed drag and drop dependencies on PySide2 --- syncplay/ui/GuiConfiguration.py | 14 +++++++------- syncplay/ui/gui.py | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 47a2412..7878096 100644 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -1,7 +1,7 @@ from PySide2 import QtCore, QtWidgets, QtGui -from PySide2.QtCore import Qt, QSettings, QCoreApplication, QSize, QPoint, QUrl, QLine +from PySide2.QtCore import Qt, QSettings, QCoreApplication, QSize, QPoint, QUrl, QLine, QStandardPaths from PySide2.QtWidgets import QApplication, QLineEdit, QLabel, QCheckBox, QButtonGroup, QRadioButton, QDoubleSpinBox, QPlainTextEdit -from PySide2.QtGui import QCursor, QIcon, QImage, QDesktopServices +from PySide2.QtGui import QCursor, QIcon, QImage from syncplay.players.playerFactory import PlayerFactory from datetime import datetime from syncplay import utils @@ -114,7 +114,7 @@ class ConfigDialog(QtWidgets.QDialog): self.executablepathCombobox.setFixedWidth(self.mediapathTextbox.width()) def openHelp(self): - self.QtWidgets.QDesktopServices.openUrl(QUrl("http://syncplay.pl/guide/client/")) + self.QtGui.QDesktopServices.openUrl(QUrl("http://syncplay.pl/guide/client/")) def safenormcaseandpath(self, path): if utils.isURL(path): @@ -346,10 +346,10 @@ class ConfigDialog(QtWidgets.QDialog): defaultdirectory = self.config["mediaSearchDirectories"][0] elif os.path.isdir(self.mediadirectory): defaultdirectory = self.mediadirectory - elif os.path.isdir(QDesktopServices.storageLocation(QDesktopServices.MoviesLocation)): - defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.MoviesLocation) - elif os.path.isdir(QDesktopServices.storageLocation(QDesktopServices.HomeLocation)): - defaultdirectory = QDesktopServices.storageLocation(QDesktopServices.HomeLocation) + elif os.path.isdir(QStandardPaths.standardLocations(QStandardPaths.MoviesLocation)[0]): + defaultdirectory = QStandardPaths.standardLocations(QStandardPaths.MoviesLocation)[0] + elif os.path.isdir(QStandardPaths.standardLocations(QStandardPaths.HomeLocation)[0]): + defaultdirectory = QStandardPaths.standardLocations(QStandardPaths.HomeLocation)[0] else: defaultdirectory = "" browserfilter = "All files (*)" diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py index 57c0f77..cb22972 100644 --- a/syncplay/ui/gui.py +++ b/syncplay/ui/gui.py @@ -152,8 +152,8 @@ class MainWindow(QtWidgets.QMainWindow): if not window.playlist.isEnabled(): return window.setPlaylistInsertPosition(None) - if QtWidgets.QDropEvent.proposedAction(event) == Qt.MoveAction: - QtWidgets.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted + if QtGui.QDropEvent.proposedAction(event) == Qt.MoveAction: + QtGui.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted data = event.mimeData() urls = data.urls() @@ -251,8 +251,8 @@ class MainWindow(QtWidgets.QMainWindow): if not window.playlist.isEnabled(): return window.setPlaylistInsertPosition(None) - if QtWidgets.QDropEvent.proposedAction(event) == Qt.MoveAction: - QtWidgets.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted + if QtGui.QDropEvent.proposedAction(event) == Qt.MoveAction: + QtGui.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted data = event.mimeData() urls = data.urls() @@ -1490,8 +1490,8 @@ class MainWindow(QtWidgets.QMainWindow): def dropEvent(self, event): rewindFile = False - if QtWidgets.QDropEvent.proposedAction(event) == Qt.MoveAction: - QtWidgets.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted + if QtGui.QDropEvent.proposedAction(event) == Qt.MoveAction: + QtGui.QDropEvent.setDropAction(event, Qt.CopyAction) # Avoids file being deleted rewindFile = True data = event.mimeData() urls = data.urls()