Make marking songs unavailable optional

src/settings/collectionsettingspage.cpp

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2018-2019, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -111,8 +112,8 @@ void CollectionSettingsPage::Load() {
   ui_->show_dividers->setChecked(s.value("show_dividers", true).toBool());
   ui_->startup_scan->setChecked(s.value("startup_scan", true).toBool());
   ui_->monitor->setChecked(s.value("monitor", true).toBool());
+  ui_->mark_songs_unavailable->setChecked(s.value("mark_songs_unavailable", false).toBool());
   ui_->live_scanning->setChecked(s.value("live_scanning", false).toBool());
-  ui_->prevent_delete->setChecked(s.value("prevent_delete", false).toBool());
 
   QStringList filters = s.value("cover_art_patterns", QStringList() << "front" << "cover").toStringList();
   ui_->cover_art_patterns->setText(filters.join(","));
@@ -143,8 +144,8 @@ void CollectionSettingsPage::Save() {
   s.setValue("show_dividers", ui_->show_dividers->isChecked());
   s.setValue("startup_scan", ui_->startup_scan->isChecked());
   s.setValue("monitor", ui_->monitor->isChecked());
+  s.setValue("mark_songs_unavailable", ui_->mark_songs_unavailable->isChecked());
   s.setValue("live_scanning", ui_->live_scanning->isChecked());
-  s.setValue("prevent_delete", ui_->prevent_delete->isChecked());
 
   QString filter_text = ui_->cover_art_patterns->text();
   QStringList filters = filter_text.split(',', QString::SkipEmptyParts);

src/settings/collectionsettingspage.h

@@ -2,6 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
+ * Copyright 2018-2019, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,19 +19,16 @@
  *
  */
 
-#ifndef LIBRARYSETTINGSPAGE_H
-#define LIBRARYSETTINGSPAGE_H
+#ifndef COLLECTIONSETTINGSPAGE_H
+#define COLLECTIONSETTINGSPAGE_H
 
 #include "config.h"
 
 #include <stdbool.h>
 #include <QObject>
-#include <QString>
 
 #include "settingspage.h"
 
-class QModelIndex;
-
 class SettingsDialog;
 class Ui_CollectionSettingsPage;
 
@@ -63,4 +61,4 @@ private:
   bool initialised_model_;
 };
 
-#endif // LIBRARYSETTINGSPAGE_H
+#endif  // COLLECTIONSETTINGSPAGE_H

src/settings/collectionsettingspage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>509</width>
-    <height>697</height>
+    <height>746</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -93,16 +93,16 @@
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="live_scanning">
+       <widget class="QCheckBox" name="mark_songs_unavailable">
         <property name="text">
-         <string>Use live scanning</string>
+         <string>Mark disappeared songs unavailable</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QCheckBox" name="prevent_delete">
+       <widget class="QCheckBox" name="live_scanning">
         <property name="text">
-         <string>Never delete songs from the collection</string>
+         <string>Use live scanning</string>
         </property>
        </widget>
       </item>