Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown

6 files changed, 10 insertions, 10 deletions

diff --git a/src/audiocd_extract_with_soundkonverter.desktop b/src/audiocd_extract_with_soundkonverter.desktop
index 6233551..7f4d656 100755
--- a/src/audiocd_extract_with_soundkonverter.desktop
+++ b/src/audiocd_extract_with_soundkonverter.desktop
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Actions=ExtractSoundKonverter
 X-TDE-ServiceTypes=media/audiocd
-Icon=soundkonverter
+Icon=audio-x-generickonverter
 X-TDE-Priority=TopLevel
 
 [Desktop Action ExtractSoundKonverter]
 Exec=soundkonverter --rip %u
-Icon=soundkonverter
+Icon=audio-x-generickonverter
 Name=Extract with soundKonverter
 Name[de]=Mit soundKonverter auslesen
diff --git a/src/dirdialog.cpp b/src/dirdialog.cpp
index 8b6a51a..82d3772 100755
--- a/src/dirdialog.cpp
+++ b/src/dirdialog.cpp
@@ -60,13 +60,13 @@ DirDialog::DirDialog( Config* config, Mode mode, TQWidget *parent, const char *n
     TQVBoxLayout* fileTypesButtonsBox = new TQVBoxLayout();
     fileTypesBox->addLayout( fileTypesButtonsBox );
 
-    pSelectAll = new KPushButton( iconLoader->loadIcon("font",TDEIcon::Small), i18n("Select all"), this, "pSelectAll" );
+    pSelectAll = new KPushButton( iconLoader->loadIcon(""font-x-generic",TDEIcon::Small), i18n("Select all"), this, "pSelectAll" );
     fileTypesButtonsBox->addWidget( pSelectAll );
     connect( pSelectAll, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectAllClicked())
              );
 
-    pSelectNone = new KPushButton( iconLoader->loadIcon("empty",TDEIcon::Small), i18n("Select none"), this, "pSelectNone" );
+    pSelectNone = new KPushButton( iconLoader->loadIcon(""application-x-zerosize",TDEIcon::Small), i18n("Select none"), this, "pSelectNone" );
     fileTypesButtonsBox->addWidget( pSelectNone );
     connect( pSelectNone, TQT_SIGNAL(clicked()),
                this, TQT_SLOT(selectNoneClicked())
diff --git a/src/plugins/mime_types/x-flv.soundkonverter.desktop b/src/plugins/mime_types/x-flv.soundkonverter.desktop
index d006033..08e67c6 100755
--- a/src/plugins/mime_types/x-flv.soundkonverter.desktop
+++ b/src/plugins/mime_types/x-flv.soundkonverter.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment=Flash Video
 Hidden=false
-Icon=video
+Icon=video-x-generic
 MimeType=video/x-flv
 Patterns=*.flv;*.FLV
 Type=MimeType
diff --git a/src/replaygainscanner.cpp b/src/replaygainscanner.cpp
index af997f0..272e121 100755
--- a/src/replaygainscanner.cpp
+++ b/src/replaygainscanner.cpp
@@ -41,7 +41,7 @@ ReplayGainScanner::ReplayGainScanner( TagEngine* _tagEngine, Config* _config, Lo
 
     cAdd = new ComboButton( this, "cAdd" );
     cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Small),i18n("Add Folder ...") );
-    cAdd->insertItem( iconLoader->loadIcon("sound",TDEIcon::Small),i18n("Add Files ...") );
+    cAdd->insertItem( iconLoader->loadIcon(""audio-x-generic",TDEIcon::Small),i18n("Add Files ...") );
     filterBox->addWidget( cAdd );
     connect( cAdd, TQT_SIGNAL(clicked(int)),
                this, TQT_SLOT(addClicked(int))
diff --git a/src/soundkonverter.cpp b/src/soundkonverter.cpp
index 7e87a2d..c716280 100755
--- a/src/soundkonverter.cpp
+++ b/src/soundkonverter.cpp
@@ -151,8 +151,8 @@ soundKonverter::soundKonverter()
     priorityActionMenu->insert(veryLowPriorityAction);*/
     //priorityChanged();
 
-    new TDEAction( i18n("A&dd Files ..."), "sound", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
-    new TDEAction( i18n("Add &Folder ..."), "folder", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
+    new TDEAction( i18n("A&dd Files ..."), "audio-x-generic", CTRL+Key_D, TQT_TQOBJECT(this), TQT_SLOT(showFileDialog()), actionCollection(), "add_files" );
+    new TDEAction( i18n("Add &Folder ..."), "audio-x-generic", CTRL+Key_F, TQT_TQOBJECT(this), TQT_SLOT(showDirDialog()), actionCollection(), "add_folder" );
     new TDEAction( i18n("Add CD &tracks ..."), "cdaudio_unmount", CTRL+Key_T, TQT_TQOBJECT(this), TQT_SLOT(showCdDialog()), actionCollection(), "add_audiocd" );
     new TDEAction( i18n("Add &URL ..."), "browser", CTRL+Key_U, TQT_TQOBJECT(this), TQT_SLOT(showUrlDialog()), actionCollection(), "add_url" );
     KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
@@ -232,7 +232,7 @@ soundKonverter::soundKonverter()
     //font.setWeight( TQFont::DemiBold );
     font.setPointSize( font.pointSize() + 1 );
     cAdd->setFont( font );
-    cAdd->insertItem( iconLoader->loadIcon("sound",TDEIcon::Toolbar), i18n("Add files ...") );
+    cAdd->insertItem( iconLoader->loadIcon(""audio-x-generic",TDEIcon::Toolbar), i18n("Add files ...") );
     cAdd->insertItem( iconLoader->loadIcon("folder",TDEIcon::Toolbar), i18n("Add folder ...") );
     cAdd->insertItem( iconLoader->loadIcon("cdaudio_unmount",TDEIcon::Toolbar), i18n("Add CD tracks ...") );
     cAdd->insertItem( iconLoader->loadIcon("browser",TDEIcon::Toolbar), i18n("Add URL ...") );
diff --git a/src/soundkonverter.desktop b/src/soundkonverter.desktop
index 1f22255..31fdd0d 100755
--- a/src/soundkonverter.desktop
+++ b/src/soundkonverter.desktop
@@ -3,7 +3,7 @@ Categories=Qt;TDE;AudioVideo;AudioVideoEditing
 Encoding=UTF-8
 Name=soundKonverter
 Exec=soundkonverter
-Icon=soundkonverter
+Icon=audio-x-generickonverter
 Type=Application
 X-DCOP-ServiceType=Unique
 Comment=Audio Converter and CD Ripper