From 1eac9453d347dea9a1d6490ff6a538291f5d3999 Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Wed, 1 Mar 2017 16:19:03 +0000
Subject: Remove support for selecting custom notification sounds

Test-Information:

Tested on macOS 10.12.3 with Qt 5.7.1 that the custom
sound menu item was gone.

Change-Id: I75186d1a3b74db751fbdd5aaf54402f23f74661b

diff --git a/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp b/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
index c4e64ab..19274a2 100644
--- a/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
+++ b/Swift/QtUI/QtHighlightNotificationConfigDialog.cpp
@@ -133,7 +133,7 @@ HighlightConfiguration QtHighlightNotificationConfigDialog::getHighlightConfigur
             action.setSoundFilePath(boost::optional<std::string>());
         }
         else {
-            action.setSoundFilePath(boost::optional<std::string>(soundFilePath));
+            action.setSoundFilePath(boost::optional<std::string>(""));
         }
 
         action.setSystemNotificationEnabled(item->data(startingColumn + 3, QtCheckBoxStyledItemDelegate::DATA_ROLE).toBool());
diff --git a/Swift/QtUI/QtSoundSelectionStyledItemDelegate.cpp b/Swift/QtUI/QtSoundSelectionStyledItemDelegate.cpp
index 3811004..03af455 100644
--- a/Swift/QtUI/QtSoundSelectionStyledItemDelegate.cpp
+++ b/Swift/QtUI/QtSoundSelectionStyledItemDelegate.cpp
@@ -83,25 +83,15 @@ bool QtSoundSelectionStyledItemDelegate::editorEvent(QEvent* event, QAbstractIte
             selectedAction->setCheckable(true);
             selectedAction->setChecked(true);
         }
-        auto chooseSoundFile = popUpMenu->addAction(tr("Choose sound file…"));
 
         selectedAction = popUpMenu->exec(mouseEvent->globalPos(), selectedAction);
 
         if (selectedAction == defaultSound) {
             model->setData(index, "defaultSound", Qt::EditRole);
         }
-        else if (customSoundFile && (selectedAction == customSoundFile)) {
-            model->setData(index, customSoundFile->text(), Qt::EditRole);
-        }
         else if (selectedAction == noSound) {
             model->setData(index, "", Qt::EditRole);
         }
-        else if (selectedAction == chooseSoundFile) {
-            auto newPath = QFileDialog::getOpenFileName(0, tr("Choose notification sound file"), "", tr("WAV Files (*.wav)"));
-            if (!newPath.isEmpty()) {
-                model->setData(index, newPath, Qt::EditRole);
-            }
-        }
 
         delete popUpMenu;
     }
-- 
cgit v0.10.2-6-g49f6