Replace the Favorites window Update button by standard OK Cancel buttons

Cancel also restores the favorites when opening the Favorites window
again.

Author: tbertels

favoriteswindow.cpp

@@ -14,8 +14,6 @@ FavoritesWindow::FavoritesWindow(QWidget *parent) :
     streamList = new FavoritesList(this);
     ui->filesTab->layout()->addWidget(fileList);
     ui->streamsTab->layout()->addWidget(streamList);
-    connect(ui->update, &QPushButton::clicked,
-            this, &FavoritesWindow::updateFavoriteTracks);
 }
 
 FavoritesWindow::~FavoritesWindow()
@@ -54,6 +52,17 @@ void FavoritesWindow::on_remove_clicked()
         delete i;
 }
 
+void FavoritesWindow::on_buttonBox_clicked(QAbstractButton *button)
+{
+    QDialogButtonBox::ButtonRole buttonRole;
+    buttonRole = ui->buttonBox->buttonRole(button);
+    if (buttonRole == QDialogButtonBox::AcceptRole)
+        updateFavoriteTracks();
+    if (buttonRole == QDialogButtonBox::RejectRole)
+        emit favoriteTracksCancel();
+    close();
+}
+
 //---------------------------------------------------------------------------
 
 FavoritesList::FavoritesList(QWidget *parent)

favoriteswindow.h

@@ -1,6 +1,7 @@
 #ifndef FAVORITESWINDOW_H
 #define FAVORITESWINDOW_H
 
+#include <QAbstractButton>
 #include <QListWidget>
 #include <QStyledItemDelegate>
 #include <QWidget>
@@ -24,13 +25,16 @@ class FavoritesWindow : public QWidget
 
 signals:
     void favoriteTracks(QList<TrackInfo> files, QList<TrackInfo> streams);
+    void favoriteTracksCancel();
 
 public slots:
     void setFiles(const QList<TrackInfo> &tracks);
     void setStreams(const QList<TrackInfo> &tracks);
     void addTrack(const TrackInfo &track);
     void updateFavoriteTracks();
 
+    void on_buttonBox_clicked(QAbstractButton *button);
+
 private slots:
     void on_remove_clicked();
 

favoriteswindow.ui

@@ -54,9 +54,9 @@
     </spacer>
    </item>
    <item row="1" column="2">
-    <widget class="QPushButton" name="update">
-     <property name="text">
-      <string>&amp;Update</string>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
      </property>
     </widget>
    </item>

main.cpp

@@ -829,6 +829,8 @@ void Flow::setupFlowConnections()
     // favorites -> this.favorite*
     connect(favoritesWindow, &FavoritesWindow::favoriteTracks,
             this, &Flow::favoriteswindow_favoriteTracks);
+    connect(favoritesWindow, &FavoritesWindow::favoriteTracksCancel,
+            this, &Flow::favoriteswindow_favoriteTracksCancel);
 
     // this.screensaver -> this
     connect(screenSaver, &ScreenSaver::systemShutdown,
@@ -1430,6 +1432,13 @@ void Flow::favoriteswindow_favoriteTracks(const QList<TrackInfo> &files, const Q
     favoriteStreams = streams;
 }
 
+void Flow::favoriteswindow_favoriteTracksCancel()
+{
+    // Reset the favoritesWindow files and stream to previous ones
+    favoritesWindow->setFiles(favoriteFiles);
+    favoritesWindow->setStreams(favoriteStreams);
+}
+
 // Update the position of the current file
 void Flow::updateRecentPosition(bool resetPosition)
 {

main.h

@@ -94,6 +94,7 @@ private slots:
     void settingswindow_encodeTemplate(const QString &fmt);
     void settingswindow_screenshotFormat(const QString &fmt);
     void favoriteswindow_favoriteTracks(const QList<TrackInfo> &files, const QList<TrackInfo> &streams);
+    void favoriteswindow_favoriteTracksCancel();
 
     void endProgram();
     void importPlaylist(QString fname);