Add a UI option to control clear playqueue prompt.

BUG: 318

ChangeLog

@@ -63,7 +63,7 @@
     see README for details.
 32. Slimmer toolbar - song times are now at the ends of the time slider.
 33. Custom time slider and volume control.
-34. Prompt before clearing playqueue.
+34. Optionally, prompt before clearing playqueue.
 35. Only show config pages, and tabs, that are relevant to the enabled views.
 36. Show action short-cuts in tooltips.
 37. When filtering (i.e. searching) Jamendo, Maganatue, and stream providers

README

@@ -307,10 +307,6 @@ albumViewLoadAll=<Bool - true/false>
     covers immediately - rather than waiting for the cover to be displayed.
     Default is false.
 
-promptClearPlayQueue=<Bool - true/false>
-    Determines whether the user should be prompted before clearing playqueue.
-    Default is true.
-
 e.g.
 [General]
 iconTheme=oxygen
@@ -319,7 +315,6 @@ maxCoverUpdatePerIteration=5
 cueFileCodecs=GBK, big5-0
 networkAccessEnabled=false
 albumViewLoadAll=true
-promptClearPlayQueue=false
 
 
 7. CUE Files
@@ -812,3 +807,4 @@ TagLib
 Windows version of taglib was built from TagLib 1.8, using the following cmake command:
     cmake .. -G "MinGW Makefiles" -DWITH_ASF=1 -DWITH_MP4=1 -DCMAKE_INSTALL_PREFIX=z:\dev\taglib
 
+

gui/interfacesettings.cpp

@@ -240,6 +240,7 @@ void InterfaceSettings::load()
     playQueueStartClosed->setChecked(Settings::self()->playQueueStartClosed());
     playQueueScroll->setChecked(Settings::self()->playQueueScroll());
     playQueueBackground->setChecked(Settings::self()->playQueueBackground());
+    playQueueConfirmClear->setChecked(Settings::self()->playQueueConfirmClear());
     if (enabledViews&V_Albums) {
         albumsViewChanged();
         albumsCoverSizeChanged();
@@ -298,6 +299,7 @@ void InterfaceSettings::save()
     Settings::self()->savePlayQueueStartClosed(playQueueStartClosed->isChecked());
     Settings::self()->savePlayQueueScroll(playQueueScroll->isChecked());
     Settings::self()->savePlayQueueBackground(playQueueBackground->isChecked());
+    Settings::self()->savePlayQueueConfirmClear(playQueueConfirmClear->isChecked());
     Settings::self()->saveForceSingleClick(forceSingleClick->isChecked());
     Settings::self()->saveUseSystemTray(systemTrayCheckBox->isChecked());
     Settings::self()->saveShowPopups(systemTrayPopup->isChecked());

gui/interfacesettings.ui

@@ -391,6 +391,19 @@ within the folder of the current track, or within its parent folder. If no image
        <item row="4" column="1">
         <widget class="OnOffButton" name="playQueueBackground"/>
        </item>
+       <item row="5" column="0">
+        <widget class="BuddyLabel" name="playQueueConfirmClearLabel">
+         <property name="text">
+          <string>Prompt before clearing:</string>
+         </property>
+         <property name="buddy">
+          <cstring>playQueueConfirmClear</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <widget class="OnOffButton" name="playQueueConfirmClear"/>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_7">

gui/mainwindow.cpp

@@ -2004,7 +2004,7 @@ void MainWindow::playQueueItemActivated(const QModelIndex &index)
 
 void MainWindow::promptClearPlayQueue()
 {
-    if (Settings::self()->confirmClearPlayQueue()) {
+    if (Settings::self()->playQueueConfirmClear()) {
         if (QDialogButtonBox::GnomeLayout==style()->styleHint(QStyle::SH_DialogButtonLayout)) {
             messageWidget->setActions(QList<QAction*>() << cancelAction << clearPlayQueueAction);
         } else {

gui/settings.cpp

@@ -632,6 +632,11 @@ bool Settings::playQueueBackground()
     return GET_BOOL("playQueueBackground", false);
 }
 
+bool Settings::playQueueConfirmClear()
+{
+    return GET_BOOL("playQueueConfirmClear", true);
+}
+
 bool Settings::playListsStartClosed()
 {
     return GET_BOOL("playListsStartClosed", true);
@@ -770,11 +775,6 @@ bool Settings::albumViewLoadAll()
     return GET_BOOL("albumViewLoadAll", false);
 }
 
-bool Settings::confirmClearPlayQueue()
-{
-    return GET_BOOL("confirmClearPlayQueue", true);
-}
-
 void Settings::removeConnectionDetails(const QString &v)
 {
     if (v==currentConnection()) {
@@ -1116,6 +1116,11 @@ void Settings::savePlayQueueBackground(bool v)
     SET_VALUE_MOD(playQueueBackground)
 }
 
+void Settings::savePlayQueueConfirmClear(bool v)
+{
+    SET_VALUE_MOD(playQueueConfirmClear);
+}
+
 void Settings::savePlayListsStartClosed(bool v)
 {
     SET_VALUE_MOD(playListsStartClosed)

gui/settings.h

@@ -157,6 +157,7 @@ public:
     bool playQueueStartClosed();
     bool playQueueScroll();
     bool playQueueBackground();
+    bool playQueueConfirmClear();
     bool playListsStartClosed();
     #ifdef ENABLE_HTTP_STREAM_PLAYBACK
     bool playStream();
@@ -191,7 +192,6 @@ public:
     QStringList cueFileCodecs();
     bool networkAccessEnabled();
     bool albumViewLoadAll();
-    bool confirmClearPlayQueue();
 
     void removeConnectionDetails(const QString &v);
     void saveConnectionDetails(const MPDConnectionDetails &v);
@@ -254,6 +254,7 @@ public:
     void savePlayQueueStartClosed(bool v);
     void savePlayQueueScroll(bool v);
     void savePlayQueueBackground(bool v);
+    void savePlayQueueConfirmClear(bool v);
     void savePlayListsStartClosed(bool v);
     #ifdef ENABLE_HTTP_STREAM_PLAYBACK
     void savePlayStream(bool v);