Remove disabling repeat and shuffle buttons

It's more confusing than helpful
This commit is contained in:
Jonas Kvinge 2020-11-20 21:48:10 +01:00
parent 47754951f0
commit 91e5cafe76
5 changed files with 10 additions and 20 deletions

View File

@ -847,7 +847,6 @@ void Playlist::InsertSmartPlaylist(PlaylistGeneratorPtr generator, const int pos
void Playlist::TurnOnDynamicPlaylist(PlaylistGeneratorPtr gen) {
dynamic_playlist_ = gen;
playlist_sequence_->SetUsingDynamicPlaylist(true);
ShuffleModeChanged(PlaylistSequence::Shuffle_Off);
emit DynamicModeChanged(true);
Save();
@ -2197,7 +2196,6 @@ void Playlist::TurnOffDynamicPlaylist() {
dynamic_playlist_.reset();
if (playlist_sequence_) {
playlist_sequence_->SetUsingDynamicPlaylist(false);
ShuffleModeChanged(playlist_sequence_->shuffle_mode());
}

View File

@ -118,7 +118,9 @@ void PlaylistManager::PlaylistLoaded() {
if (!playlist) return;
disconnect(playlist, SIGNAL(PlaylistLoaded()), this, SLOT(PlaylistLoaded()));
--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());
sequence_->SetUsingDynamicPlaylist(active()->is_dynamic());
sequence_->set_dynamic(active()->is_dynamic());
}

View File

@ -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 {
return dynamic_ ? Shuffle_Off : shuffle_mode_;
}

View File

@ -67,12 +67,13 @@ class PlaylistSequence : public QWidget {
QMenu *repeat_menu() const { return repeat_menu_; }
QMenu *shuffle_menu() const { return shuffle_menu_; }
void set_dynamic(const bool dynamic) { dynamic_ = dynamic; }
public slots:
void SetRepeatMode(const PlaylistSequence::RepeatMode mode);
void SetShuffleMode(const PlaylistSequence::ShuffleMode mode);
void CycleShuffleMode();
void CycleRepeatMode();
void SetUsingDynamicPlaylist(const bool dynamic);
signals:
void RepeatModeChanged(const PlaylistSequence::RepeatMode mode);

View File

@ -1465,13 +1465,13 @@ void PlaylistView::focusInEvent(QFocusEvent *event) {
void PlaylistView::DynamicModeChanged(bool dynamic) {
if (!dynamic) {
dynamic_controls_->hide();
}
else {
if (dynamic) {
RepositionDynamicControls();
dynamic_controls_->show();
}
else {
dynamic_controls_->hide();
}
}