From e7a7ac2233a773dda61f059384ec0045656ebc59 Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Thu, 27 Jun 2013 15:54:27 +0000
Subject: [PATCH] Strip accelarators from button text before using in help
 dialog

---
 devices/filenameschemedialog.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/devices/filenameschemedialog.cpp b/devices/filenameschemedialog.cpp
index e0f1a4515..eeffe494b 100644
--- a/devices/filenameschemedialog.cpp
+++ b/devices/filenameschemedialog.cpp
@@ -88,6 +88,11 @@ void FilenameSchemeDialog::slotButtonClicked(int button)
     Dialog::slotButtonClicked(button);
 }
 
+static QString stripAccelerator(QString str)
+{
+    return str.replace("&&", "____").replace("&", "").replace("____", "&");
+}
+
 void FilenameSchemeDialog::showHelp()
 {
     MessageBox::information(this,
@@ -105,15 +110,15 @@ void FilenameSchemeDialog::showHelp()
                                "<tr><td>%15</td><td>%16</td><td>The year of the album's release.</td></tr>"
                                "<tr><td>%17</td><td>%18</td><td>The genre of the album.</td></tr>"
                                "</table></p>")
-                               .arg(albumArtist->text()).arg(DeviceOptions::constAlbumArtist)
-                               .arg(albumTitle->text()).arg(DeviceOptions::constAlbumTitle)
-                               .arg(trackArtist->text()).arg(DeviceOptions::constTrackArtist)
-                               .arg(trackTitle->text()).arg(DeviceOptions::constTrackTitle)
-                               .arg(trackArtistAndTitle->text()).arg(DeviceOptions::constTrackArtistAndTitle)
-                               .arg(trackNo->text()).arg(DeviceOptions::constTrackNumber)
-                               .arg(cdNo->text()).arg(DeviceOptions::constCdNumber)
-                               .arg(year->text()).arg(DeviceOptions::constYear)
-                               .arg(genre->text()).arg(DeviceOptions::constGenre));
+                               .arg(stripAccelerator(albumArtist->text())).arg(DeviceOptions::constAlbumArtist)
+                               .arg(stripAccelerator(albumTitle->text())).arg(DeviceOptions::constAlbumTitle)
+                               .arg(stripAccelerator(trackArtist->text())).arg(DeviceOptions::constTrackArtist)
+                               .arg(stripAccelerator(trackTitle->text())).arg(DeviceOptions::constTrackTitle)
+                               .arg(stripAccelerator(trackArtistAndTitle->text())).arg(DeviceOptions::constTrackArtistAndTitle)
+                               .arg(stripAccelerator(trackNo->text())).arg(DeviceOptions::constTrackNumber)
+                               .arg(stripAccelerator(cdNo->text())).arg(DeviceOptions::constCdNumber)
+                               .arg(stripAccelerator(year->text())).arg(DeviceOptions::constYear)
+                               .arg(stripAccelerator(genre->text())).arg(DeviceOptions::constGenre));
 }
 
 void FilenameSchemeDialog::enableOkButton()