Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Made MediaBrowse directory persistence code more self-contained

Browse Source
This commit is contained in:
Etoh 2013-06-13 11:12:00 +02:00
parent aa9e13f17e
commit 7addb42c58
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
syncplay/ui/GuiConfiguration.py
View File

@ -32,7 +32,6 @@ 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:
@ -115,7 +114,20 @@ class ConfigDialog(QtGui.QDialog):
if fileName: if fileName:
self.executablepathCombobox.setEditText(fileName) self.executablepathCombobox.setEditText(fileName)
def loadMediaBrowseSettings(self):
settings = QSettings("Syncplay", "MediaBrowseDialog")
settings.beginGroup("MediaBrowseDialog")
self.mediadirectory = settings.value("mediadir", "")
settings.endGroup()
def saveMediaBrowseSettings(self):
settings = QSettings("Syncplay", "MediaBrowseDialog")
settings.beginGroup("MediaBrowseDialog")
settings.setValue("mediadir", self.mediadirectory)
settings.endGroup()
def browseMediapath(self): def browseMediapath(self):
self.loadMediaBrowseSettings()
options = QtGui.QFileDialog.Options() options = QtGui.QFileDialog.Options()
if (os.path.isdir(self.mediadirectory)): if (os.path.isdir(self.mediadirectory)):
defaultdirectory = self.mediadirectory defaultdirectory = self.mediadirectory
@ -131,6 +143,7 @@ class ConfigDialog(QtGui.QDialog):
if fileName: if fileName:
self.mediapathTextbox.setText(fileName) self.mediapathTextbox.setText(fileName)
self.mediadirectory = os.path.dirname(fileName) self.mediadirectory = os.path.dirname(fileName)
self.saveMediaBrowseSettings()
def _saveDataAndLeave(self): def _saveDataAndLeave(self):
self.config['host'] = self.hostTextbox.text() self.config['host'] = self.hostTextbox.text()
@ -161,7 +174,6 @@ 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
@ -185,18 +197,6 @@ class ConfigDialog(QtGui.QDialog):
self.executablepathCombobox.setEditText(dropfilepath) self.executablepathCombobox.setEditText(dropfilepath)
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):
@ -331,5 +331,4 @@ 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)