Fix last merge

This commit is contained in:
Jon Tibble 2010-07-13 17:31:19 +01:00
parent 44506f2c84
commit 022935fe58
1 changed files with 5 additions and 4 deletions

View File

@ -332,10 +332,11 @@ class SlideController(QtGui.QWidget):
# Signals # Signals
QtCore.QObject.connect(self.PreviewListWidget, QtCore.QObject.connect(self.PreviewListWidget,
QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected) QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
if QtCore.QSettings().value(u'advanced/double click live', if not self.isLive:
QtCore.QVariant(False)).toBool(): if QtCore.QSettings().value(u'advanced/double click live',
QtCore.QObject.connect(self.PreviewListWidget, QtCore.QVariant(False)).toBool():
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onGoLive) QtCore.QObject.connect(self.PreviewListWidget,
QtCore.SIGNAL(u'doubleClicked(QModelIndex)'), self.onGoLive)
if isLive: if isLive:
QtCore.QObject.connect(Receiver.get_receiver(), QtCore.QObject.connect(Receiver.get_receiver(),
QtCore.SIGNAL(u'slidecontroller_live_spin_delay'), QtCore.SIGNAL(u'slidecontroller_live_spin_delay'),