diff options
| author | Anton Khirnov <wyskas@gmail.com> | 2010-08-27 17:40:05 +0200 |
|---|---|---|
| committer | Anton Khirnov <wyskas@gmail.com> | 2010-08-27 19:30:34 +0200 |
| commit | f5ddba600352836ed4e3ca97559aa4cecb3374b1 (patch) | |
| tree | 1bbae2d54222ea7ed1fc000bfe8e2d7dda5bdeff | |
| parent | 83d1d6389783293970c4da3ab50c11ac2a3a06f6 (diff) | |
move crossfade control from settings widget to PlayControl plugin
maybe it should be hidden under an icon for extra prettiness
| -rw-r--r-- | nephilim/plugins/PlayControl.py | 9 | ||||
| -rw-r--r-- | nephilim/settings_wg.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py index 5fad0e8..4bba711 100644 --- a/nephilim/plugins/PlayControl.py +++ b/nephilim/plugins/PlayControl.py @@ -38,6 +38,7 @@ class wgPlayControl(QtGui.QToolBar): outputs_menu = None p = None logger = None + xfade = None class VolumeSlider(QtGui.QSlider): @@ -108,12 +109,20 @@ class wgPlayControl(QtGui.QToolBar): self.p.mpclient.consume_changed.connect(self.consume.setChecked) self.consume.toggled.connect(self.p.mpclient.consume) + self.xfade = QtGui.QSpinBox(self) + self.xfade.setValue(self.p.mpclient.status['xfade']) + self.p.mpclient.crossfade_changed.connect(self.xfade.setValue) + self.xfade.valueChanged.connect(self.p.mpclient.crossfade) + self.xfade.setToolTip('Set crossfade between songs in seconds.') + self.addWidget(self.xfade) + self.outputs_menu = QtGui.QMenu('Audio outputs') outputs = self.addAction(QtGui.QIcon(':icons/outputs.png'), 'Audio outputs') outputs.triggered.connect(lambda : self.outputs_menu.popup(QtGui.QCursor.pos())) self.__update_outputs() self.p.mpclient.connect_changed.connect(self.__update_outputs) + self.orientationChanged.connect(self.vol_slider.setOrientation) self.p.mpclient.state_changed.connect(self.onStateChange) diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py index 85a046e..1194c41 100644 --- a/nephilim/settings_wg.py +++ b/nephilim/settings_wg.py @@ -71,9 +71,6 @@ class SettingsWidget(QtGui.QWidget): output.state_changed.connect(box.setChecked) outputs.layout().addWidget(box) - self.xfade = QtGui.QSpinBox() - self.xfade.setValue(int(self.mpclient.status['xfade'])) - self.xfade.valueChanged.connect(self.mpclient.crossfade) self.setLayout(QtGui.QVBoxLayout()) self._add_widget(self.host_txt, 'Host', 'Host or socket to connect to') @@ -82,7 +79,6 @@ class SettingsWidget(QtGui.QWidget): self._add_widget(self.lib_txt, 'Music library', 'Path to music library') self.layout().addWidget(self.update) self.layout().addWidget(outputs) - self._add_widget(self.xfade, 'Crossfade', 'Set crossfade between songs (in seconds).') def save_settings(self): reconnect = False |