summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-02 09:10:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-02 09:10:13 -0600
commit7287466fa162d84bf6febb3faeb5b91ba3951112 (patch)
tree112ae45bb853bc3170a2a4fae69b493e092e8178
parent32d2354445ec376e6e213fa9cc7dd7e796badbc7 (diff)
downloadtdemultimedia-7287466fa162d84bf6febb3faeb5b91ba3951112.tar.gz
tdemultimedia-7287466fa162d84bf6febb3faeb5b91ba3951112.zip
Rename most device icons to comply with XDG standards
-rw-r--r--juk/tageditor.cpp2
-rw-r--r--kaudiocreator/kaudiocreator.cpp4
-rw-r--r--kaudiocreator/kaudiocreatorui.rc2
-rw-r--r--libkcddb/kcmcddb/libkcddb.desktop2
-rw-r--r--tdeioslave/audiocd/audiocd.protocol2
-rw-r--r--tdeioslave/audiocd/kcmaudiocd/audiocd.desktop2
6 files changed, 7 insertions, 7 deletions
diff --git a/juk/tageditor.cpp b/juk/tageditor.cpp
index aa86393e..2a3c384b 100644
--- a/juk/tageditor.cpp
+++ b/juk/tageditor.cpp
@@ -506,7 +506,7 @@ void TagEditor::setupLayout()
m_albumNameBox = new KComboBox(true, this, "albumNameBox");
m_albumNameBox->setCompletionMode(TDEGlobalSettings::CompletionAuto);
- addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "cdrom_unmount");
+ addItem(i18n("Album &name:"), m_albumNameBox, leftColumnLayout, "media-optical-cdrom");
m_genreBox = new KComboBox(true, this, "genreBox");
addItem(i18n("&Genre:"), m_genreBox, leftColumnLayout, "knotify");
diff --git a/kaudiocreator/kaudiocreator.cpp b/kaudiocreator/kaudiocreator.cpp
index 4fc6f89b..d7e96842 100644
--- a/kaudiocreator/kaudiocreator.cpp
+++ b/kaudiocreator/kaudiocreator.cpp
@@ -55,7 +55,7 @@ KAudioCreator::KAudioCreator( TQWidget* parent, const char* name) :
janusWidget = new KJanusWidget(this, name, KJanusWidget::Tabbed);
setCentralWidget(janusWidget);
- TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("cdaudio_unmount", 32));
+ TQVBox *frame = janusWidget->addVBoxPage(i18n("&CD Tracks"), TQString(), SmallIcon("media-optical-cdaudio", 32));
tracks = new TracksImp(frame, "Tracks");
ripper = new Ripper ( TQT_TQOBJECT(frame), "Rip" );
@@ -252,7 +252,7 @@ SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkele
if (cddb)
{
cddb->load();
- addPage(cddb, i18n("CDDB"), "cdaudio_mount", i18n("CDDB Configuration"), false);
+ addPage(cddb, i18n("CDDB"), "media-optical-cdaudio-mounted", i18n("CDDB Configuration"), false);
connect(cddb, TQT_SIGNAL(changed(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCddbChanged(bool)));
}
}
diff --git a/kaudiocreator/kaudiocreatorui.rc b/kaudiocreator/kaudiocreatorui.rc
index 597eda1d..146816c7 100644
--- a/kaudiocreator/kaudiocreatorui.rc
+++ b/kaudiocreator/kaudiocreatorui.rc
@@ -7,7 +7,7 @@
<Action name="clear_done_jobs" icon="edittrash"/>
<Action name="eject" icon="player_eject"/>
<Action name="edit_cd" icon="edit"/>
- <Action name="cddb_now" icon="cdaudio_mount"/>
+ <Action name="cddb_now" icon="media-optical-cdaudio-mounted"/>
</ActionProperties>
<MenuBar>
diff --git a/libkcddb/kcmcddb/libkcddb.desktop b/libkcddb/kcmcddb/libkcddb.desktop
index 9527268b..35d14081 100644
--- a/libkcddb/kcmcddb/libkcddb.desktop
+++ b/libkcddb/kcmcddb/libkcddb.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=tdecmshell libkcddb
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
Type=Application
X-TDE-ModuleType=Library
X-TDE-Library=cddb
diff --git a/tdeioslave/audiocd/audiocd.protocol b/tdeioslave/audiocd/audiocd.protocol
index 425240a5..f8aa30f5 100644
--- a/tdeioslave/audiocd/audiocd.protocol
+++ b/tdeioslave/audiocd/audiocd.protocol
@@ -10,7 +10,7 @@ makedir=false
deleting=false
linking=false
moving=false
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
X-DocPath=tdeioslave/audiocd/index.html
Class=:local
ShowPreviews=false
diff --git a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
index 9bed429e..aa009793 100644
--- a/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
+++ b/tdeioslave/audiocd/kcmaudiocd/audiocd.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Exec=tdecmshell audiocd
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
Type=Application
X-DocPath=kcontrol/audiocd/index.html
X-TDE-ModuleType=Library