Browse Source

Render: Save/Load settings, shared accross apps, fixes #23

tags/v0.9.0
falkTX 12 years ago
parent
commit
041c564fe5
3 changed files with 66 additions and 2 deletions
  1. +1
    -1
      resources/ui/render.ui
  2. +4
    -0
      src/claudia.py
  3. +61
    -1
      src/render.py

+ 1
- 1
resources/ui/render.ui View File

@@ -333,7 +333,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="minimum"> <property name="minimum">
<number>1</number>
<number>3</number>
</property> </property>
</widget> </widget>
</item> </item>


+ 4
- 0
src/claudia.py View File

@@ -505,8 +505,12 @@ class ClaudiaLauncherW(QDialog):
self.layoutV = QVBoxLayout(self) self.layoutV = QVBoxLayout(self)
self.layoutH = QHBoxLayout() self.layoutH = QHBoxLayout()


#if QDialogButtonBox.ButtonLayout:
self.layoutH.addWidget(self.checkBox) self.layoutH.addWidget(self.checkBox)
self.layoutH.addWidget(self.buttonBox) self.layoutH.addWidget(self.buttonBox)
#else:
#self.layoutH.addWidget(self.buttonBox)
#self.layoutH.addWidget(self.checkBox)


self.layoutV.addWidget(self.launcher) self.layoutV.addWidget(self.launcher)
self.layoutV.addLayout(self.layoutH) self.layoutV.addLayout(self.layoutH)


+ 61
- 1
src/render.py View File

@@ -19,7 +19,7 @@
# ------------------------------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------------------------------
# Imports (Global) # Imports (Global)


from PyQt4.QtCore import pyqtSlot, QProcess, QTime, QTimer
from PyQt4.QtCore import pyqtSlot, QProcess, QTime, QTimer, QSettings
from PyQt4.QtGui import QDialog from PyQt4.QtGui import QDialog
from time import sleep from time import sleep


@@ -149,6 +149,8 @@ class RenderW(QDialog):


# ------------------------------------------------------------- # -------------------------------------------------------------


self.loadSettings()

@pyqtSlot() @pyqtSlot()
def slot_renderStart(self): def slot_renderStart(self):
if not os.path.exists(self.ui.le_folder.text()): if not os.path.exists(self.ui.le_folder.text()):
@@ -325,9 +327,67 @@ class RenderW(QDialog):


self.fLastTime = time self.fLastTime = time


def saveSettings(self):
settings = QSettings("Cadence", "Cadence-Render")

if self.ui.rb_mono.isChecked():
channels = 1
elif self.ui.rb_stereo.isChecked():
channels = 2
else:
channels = self.ui.sb_channels.value()

settings.setValue("Geometry", self.saveGeometry())
settings.setValue("OutputFolder", self.ui.le_folder.text())
settings.setValue("EncodingFormat", self.ui.cb_format.currentText())
settings.setValue("EncodingDepth", self.ui.cb_depth.currentText())
settings.setValue("EncodingChannels", channels)
settings.setValue("UseTransport", self.ui.group_time.isChecked())
settings.setValue("StartTime", self.ui.te_start.time())
settings.setValue("EndTime", self.ui.te_end.time())

def loadSettings(self):
settings = QSettings("Cadence", "Cadence-Render")

self.restoreGeometry(settings.value("Geometry", ""))

outputFolder = settings.value("OutputFolder", HOME)

if os.path.exists(outputFolder):
self.ui.le_folder.setText(outputFolder)

encFormat = settings.value("EncodingFormat", "Wav", type=str)

for i in range(self.ui.cb_format.count()):
if self.ui.cb_format.itemText(i) == encFormat:
self.ui.cb_format.setCurrentIndex(i)
break

encDepth = settings.value("EncodingDepth", "Float", type=str)

for i in range(self.ui.cb_depth.count()):
if self.ui.cb_depth.itemText(i) == encDepth:
self.ui.cb_depth.setCurrentIndex(i)
break

encChannels = settings.value("EncodingChannels", 2, type=int)

if encChannels == 1:
self.ui.rb_mono.setChecked(True)
elif encChannels == 2:
self.ui.rb_stereo.setChecked(True)
else:
self.ui.rb_outro.setChecked(True)
self.ui.sb_channels.setValue(encChannels)

self.ui.group_time.setChecked(settings.value("UseTransport", False, type=bool))
self.ui.te_start.setTime(settings.value("StartTime", self.ui.te_start.time(), type=QTime))
self.ui.te_end.setTime(settings.value("EndTime", self.ui.te_end.time(), type=QTime))

def closeEvent(self, event): def closeEvent(self, event):
if self.fJackClient: if self.fJackClient:
jacklib.client_close(self.fJackClient) jacklib.client_close(self.fJackClient)
self.saveSettings()
QDialog.closeEvent(self, event) QDialog.closeEvent(self, event)


def done(self, r): def done(self, r):


Loading…
Cancel
Save