Remove disabling repeat and shuffle buttons
It's more confusing than helpful
This commit is contained in:
parent
47754951f0
commit
91e5cafe76
@ -847,7 +847,6 @@ void Playlist::InsertSmartPlaylist(PlaylistGeneratorPtr generator, const int pos
|
|||||||
void Playlist::TurnOnDynamicPlaylist(PlaylistGeneratorPtr gen) {
|
void Playlist::TurnOnDynamicPlaylist(PlaylistGeneratorPtr gen) {
|
||||||
|
|
||||||
dynamic_playlist_ = gen;
|
dynamic_playlist_ = gen;
|
||||||
playlist_sequence_->SetUsingDynamicPlaylist(true);
|
|
||||||
ShuffleModeChanged(PlaylistSequence::Shuffle_Off);
|
ShuffleModeChanged(PlaylistSequence::Shuffle_Off);
|
||||||
emit DynamicModeChanged(true);
|
emit DynamicModeChanged(true);
|
||||||
Save();
|
Save();
|
||||||
@ -2197,7 +2196,6 @@ void Playlist::TurnOffDynamicPlaylist() {
|
|||||||
dynamic_playlist_.reset();
|
dynamic_playlist_.reset();
|
||||||
|
|
||||||
if (playlist_sequence_) {
|
if (playlist_sequence_) {
|
||||||
playlist_sequence_->SetUsingDynamicPlaylist(false);
|
|
||||||
ShuffleModeChanged(playlist_sequence_->shuffle_mode());
|
ShuffleModeChanged(playlist_sequence_->shuffle_mode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -118,7 +118,9 @@ void PlaylistManager::PlaylistLoaded() {
|
|||||||
if (!playlist) return;
|
if (!playlist) return;
|
||||||
disconnect(playlist, SIGNAL(PlaylistLoaded()), this, SLOT(PlaylistLoaded()));
|
disconnect(playlist, SIGNAL(PlaylistLoaded()), this, SLOT(PlaylistLoaded()));
|
||||||
--playlists_loading_;
|
--playlists_loading_;
|
||||||
if (playlists_loading_ == 0) emit AllPlaylistsLoaded();
|
if (playlists_loading_ == 0) {
|
||||||
|
emit AllPlaylistsLoaded();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -396,7 +398,7 @@ void PlaylistManager::SetActivePlaylist(const int id) {
|
|||||||
|
|
||||||
emit ActiveChanged(active());
|
emit ActiveChanged(active());
|
||||||
|
|
||||||
sequence_->SetUsingDynamicPlaylist(active()->is_dynamic());
|
sequence_->set_dynamic(active()->is_dynamic());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -205,17 +205,6 @@ void PlaylistSequence::SetShuffleMode(const ShuffleMode mode) {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlaylistSequence::SetUsingDynamicPlaylist(const bool dynamic) {
|
|
||||||
|
|
||||||
dynamic_ = dynamic;
|
|
||||||
const QString not_available(tr("Not available while using a dynamic playlist"));
|
|
||||||
|
|
||||||
setEnabled(!dynamic);
|
|
||||||
ui_->shuffle->setToolTip(dynamic ? not_available : tr("Shuffle"));
|
|
||||||
ui_->repeat->setToolTip(dynamic ? not_available : tr("Repeat"));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
PlaylistSequence::ShuffleMode PlaylistSequence::shuffle_mode() const {
|
PlaylistSequence::ShuffleMode PlaylistSequence::shuffle_mode() const {
|
||||||
return dynamic_ ? Shuffle_Off : shuffle_mode_;
|
return dynamic_ ? Shuffle_Off : shuffle_mode_;
|
||||||
}
|
}
|
||||||
|
@ -67,12 +67,13 @@ class PlaylistSequence : public QWidget {
|
|||||||
QMenu *repeat_menu() const { return repeat_menu_; }
|
QMenu *repeat_menu() const { return repeat_menu_; }
|
||||||
QMenu *shuffle_menu() const { return shuffle_menu_; }
|
QMenu *shuffle_menu() const { return shuffle_menu_; }
|
||||||
|
|
||||||
|
void set_dynamic(const bool dynamic) { dynamic_ = dynamic; }
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void SetRepeatMode(const PlaylistSequence::RepeatMode mode);
|
void SetRepeatMode(const PlaylistSequence::RepeatMode mode);
|
||||||
void SetShuffleMode(const PlaylistSequence::ShuffleMode mode);
|
void SetShuffleMode(const PlaylistSequence::ShuffleMode mode);
|
||||||
void CycleShuffleMode();
|
void CycleShuffleMode();
|
||||||
void CycleRepeatMode();
|
void CycleRepeatMode();
|
||||||
void SetUsingDynamicPlaylist(const bool dynamic);
|
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void RepeatModeChanged(const PlaylistSequence::RepeatMode mode);
|
void RepeatModeChanged(const PlaylistSequence::RepeatMode mode);
|
||||||
|
@ -1465,13 +1465,13 @@ void PlaylistView::focusInEvent(QFocusEvent *event) {
|
|||||||
|
|
||||||
void PlaylistView::DynamicModeChanged(bool dynamic) {
|
void PlaylistView::DynamicModeChanged(bool dynamic) {
|
||||||
|
|
||||||
if (!dynamic) {
|
if (dynamic) {
|
||||||
dynamic_controls_->hide();
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
RepositionDynamicControls();
|
RepositionDynamicControls();
|
||||||
dynamic_controls_->show();
|
dynamic_controls_->show();
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
dynamic_controls_->hide();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user