Branch: master

1d9a2240 2019-06-26 03:25:16 Michele Calgaro
Adjusted to new normalized device icon names in tdelibs.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M juk/tageditor.cpp
M kaudiocreator/kaudiocreator.cpp
M libkcddb/kcmcddb/libkcddb.desktop
M tdeioslave/audiocd/audiocd.protocol
M tdeioslave/audiocd/kcmaudiocd/audiocd.desktop

juk/tageditor.cpp

diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index 2a3c384..e4073d2 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -506,7 +506,7 @@
 
 	m_albumNameBox = new KComboBox(true, this, "albumNameBox");
 	m_albumNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);
-	addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "media-optical-cdrom");
+	addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "media-optical-cdrom-unmounted");
 
         m_genreBox = new KComboBox(true, this, "genreBox");
 	addItem(i18n("&Genre:"), m_genreBox, leftColumnLayout, "knotify");

kaudiocreator/kaudiocreator.cpp

diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index d7e9684..8c75233 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -55,7 +55,7 @@
     janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
     setCentralWidget(janusWidget);
 
-    TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio", 32));
+    TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio-unmounted", 32));
     tracks = new TracksImp(frame, "Tracks");
 
     ripper  = new Ripper ( TQT_TQOBJECT(frame), "Rip" );

libkcd

diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index 35d1408..e3bce93 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell libkcddb
-Icon=media-optical-cdaudio
+Icon=media-optical-cdaudio-unmounted
 Type=Application
 X-TDE-ModuleType=Library
 X-TDE-Library=cddb

tdeioslave/audiocd/audiocd.protocol

diff --git a/tdeioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol
index f8aa30f..6c30dba 100644
--- a/tdeioslave/audiocd/audiocd.protocol
+++ b/tdeioslave/audiocd/audiocd.protocol
@@ -10,7 +10,7 @@
 deleting=false
 linking=false
 moving=false
-Icon=media-optical-cdaudio
+Icon=media-optical-cdaudio-unmounted
 X-DocPath=tdeioslave/audiocd/index.html
 Class=:local
 ShowPreviews=false

tdeioslave/audiocd/kcmaudiocd/audiocd.desktop

diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
index aa00979..43d1dbc 100644
--- a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
+++ b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=tdecmshell audiocd
-Icon=media-optical-cdaudio
+Icon=media-optical-cdaudio-unmounted
 Type=Application
 X-DocPath=kcontrol/audiocd/index.html
 X-TDE-ModuleType=Library