Start at previous location for media path browser, else Movie/Home dir
This commit is contained in:
parent
d64c16e4e4
commit
aa9e13f17e
@ -31,8 +31,8 @@ class GuiConfiguration:
|
|||||||
class ConfigDialog(QtGui.QDialog):
|
class ConfigDialog(QtGui.QDialog):
|
||||||
|
|
||||||
pressedclosebutton = False
|
pressedclosebutton = False
|
||||||
|
|
||||||
malToggling = False
|
malToggling = False
|
||||||
|
mediadirectory = ""
|
||||||
|
|
||||||
def malToggled(self):
|
def malToggled(self):
|
||||||
if self.malToggling == False:
|
if self.malToggling == False:
|
||||||
@ -117,14 +117,20 @@ class ConfigDialog(QtGui.QDialog):
|
|||||||
|
|
||||||
def browseMediapath(self):
|
def browseMediapath(self):
|
||||||
options = QtGui.QFileDialog.Options()
|
options = QtGui.QFileDialog.Options()
|
||||||
defaultdirectory = ""
|
if (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)
|
||||||
|
else:
|
||||||
|
defaultdirectory = ""
|
||||||
browserfilter = "All Files (*)"
|
browserfilter = "All Files (*)"
|
||||||
|
fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files",defaultdirectory,
|
||||||
|
|
||||||
fileName, filtr = QtGui.QFileDialog.getOpenFileName(self,"Browse for media files","",
|
|
||||||
browserfilter, "", options)
|
browserfilter, "", options)
|
||||||
if fileName:
|
if fileName:
|
||||||
self.mediapathTextbox.setText(fileName)
|
self.mediapathTextbox.setText(fileName)
|
||||||
|
self.mediadirectory = os.path.dirname(fileName)
|
||||||
|
|
||||||
def _saveDataAndLeave(self):
|
def _saveDataAndLeave(self):
|
||||||
self.config['host'] = self.hostTextbox.text()
|
self.config['host'] = self.hostTextbox.text()
|
||||||
@ -155,6 +161,7 @@ class ConfigDialog(QtGui.QDialog):
|
|||||||
return
|
return
|
||||||
|
|
||||||
def closeEvent(self, event):
|
def closeEvent(self, event):
|
||||||
|
self.saveSettings()
|
||||||
if self.pressedclosebutton == False:
|
if self.pressedclosebutton == False:
|
||||||
sys.exit()
|
sys.exit()
|
||||||
raise GuiConfiguration.WindowClosed
|
raise GuiConfiguration.WindowClosed
|
||||||
@ -179,6 +186,18 @@ class ConfigDialog(QtGui.QDialog):
|
|||||||
else:
|
else:
|
||||||
self.mediapathTextbox.setText(dropfilepath)
|
self.mediapathTextbox.setText(dropfilepath)
|
||||||
|
|
||||||
|
def saveSettings(self):
|
||||||
|
settings = QSettings("Syncplay", "ConfigWindow")
|
||||||
|
settings.beginGroup("ConfigWindow")
|
||||||
|
settings.setValue("mediadir", self.mediadirectory)
|
||||||
|
settings.endGroup()
|
||||||
|
|
||||||
|
def loadSettings(self):
|
||||||
|
settings = QSettings("Syncplay", "ConfigWindow")
|
||||||
|
settings.beginGroup("ConfigWindow")
|
||||||
|
self.mediadirectory = settings.value("mediadir", "")
|
||||||
|
settings.endGroup()
|
||||||
|
|
||||||
def __init__(self, config, playerpaths, error):
|
def __init__(self, config, playerpaths, error):
|
||||||
|
|
||||||
from syncplay import utils
|
from syncplay import utils
|
||||||
@ -312,4 +331,5 @@ class ConfigDialog(QtGui.QDialog):
|
|||||||
self.setLayout(self.mainLayout)
|
self.setLayout(self.mainLayout)
|
||||||
self.runButton.setFocus()
|
self.runButton.setFocus()
|
||||||
self.setFixedSize(self.sizeHint())
|
self.setFixedSize(self.sizeHint())
|
||||||
|
self.loadSettings()
|
||||||
self.setAcceptDrops(True)
|
self.setAcceptDrops(True)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user