summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-24 23:06:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-07-09 10:19:35 +0900
commit21d09d5b23a8a639ab355b2563ba105bc1994364 (patch)
treeada2852c2023526f259c99040b00692486eae22e
parentd2da293eaecf382e2fd2b6517b90df62ae21e127 (diff)
downloadtdebase-21d09d5b23a8a639ab355b2563ba105bc1994364.zip
tdebase-21d09d5b23a8a639ab355b2563ba105bc1994364.tar.gz
Adjusted to new normalized device icon names in tdelibs.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--kcontrol/hwmanager/hwdevicetray.cpp8
-rw-r--r--kdesktop/init/Templates/CAMERA-Device.desktop4
-rw-r--r--kdesktop/init/Templates/CDROM-Device.desktop2
-rw-r--r--kdesktop/init/Templates/CDWRITER-Device.desktop4
-rw-r--r--kdesktop/init/Templates/DVDROM-Device.desktop2
-rw-r--r--kdesktop/init/Templates/Floppy.desktop2
-rw-r--r--kdesktop/init/Templates/HD.desktop2
-rw-r--r--kdesktop/init/Templates/MO-Device.desktop4
-rw-r--r--kdesktop/init/Templates/NFS.desktop4
-rw-r--r--kdesktop/init/Templates/ZIP-Device.desktop2
-rw-r--r--kdesktop/init/Templates/linkCAMERA.desktop2
-rw-r--r--kdesktop/init/Templates/linkCDROM.desktop2
-rw-r--r--kdesktop/init/Templates/linkCDWRITER.desktop2
-rw-r--r--kdesktop/init/Templates/linkDVDROM.desktop2
-rw-r--r--kdesktop/init/Templates/linkFloppy.desktop2
-rw-r--r--kdesktop/init/Templates/linkHD.desktop2
-rw-r--r--kdesktop/init/Templates/linkMO.desktop2
-rw-r--r--kdesktop/init/Templates/linkNFS.desktop2
-rw-r--r--kdesktop/init/Templates/linkZIP.desktop2
-rw-r--r--kicker/applets/media/mediaapplet.desktop2
-rw-r--r--konqueror/sidebar/trees/init/services/audiocd.desktop2
-rw-r--r--tdeioslave/media/mediamanager/halbackend.cpp22
-rw-r--r--tdeioslave/media/mediamanager/tdehardwarebackend.cpp60
-rw-r--r--tdeioslave/media/mimetypes/audiocd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/blankcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/blankdvd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/camera_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/camera_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvdvideo.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy5_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/gphoto2camera.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/nfs_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/nfs_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/smb_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/smb_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/svcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/vcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/zip_unmounted.desktop2
-rw-r--r--tdeioslave/nfs/nfs.protocol2
52 files changed, 96 insertions, 100 deletions
diff --git a/kcontrol/hwmanager/hwdevicetray.cpp b/kcontrol/hwmanager/hwdevicetray.cpp
index f8e6b89..fbc330d 100644
--- a/kcontrol/hwmanager/hwdevicetray.cpp
+++ b/kcontrol/hwmanager/hwdevicetray.cpp
@@ -224,7 +224,7 @@ void HwDeviceSystemTray::populateMenu(TDEPopupMenu* menu) {
unmountDiskActionMenu->popupMenu()->clear();
m_mountMenuIndexMap.clear();
- menu->insertTitle(SmallIcon("drive-harddisk"), i18n("Storage Devices"));
+ menu->insertTitle(SmallIcon("drive-harddisk-unmounted"), i18n("Storage Devices"));
// Find all storage devices and add them to the popup menu
lastMountIndex = 1;
@@ -352,7 +352,7 @@ void HwDeviceSystemTray::deviceAdded(TDEGenericDevice* device) {
}
m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been added!"),
- i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk"),
+ i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
0, 0, "ADD: " + uuid);
}
}
@@ -370,7 +370,7 @@ void HwDeviceSystemTray::deviceRemoved(TDEGenericDevice* device) {
}
m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been removed!"),
- i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk"),
+ i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
0, 0, "REMOVE: " + uuid);
}
}
@@ -388,7 +388,7 @@ void HwDeviceSystemTray::deviceChanged(TDEGenericDevice* device) {
}
m_hardwareNotifierContainer->displayMessage(
i18n("A disk device has been changed!"),
- i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk"),
+ i18n("%1 (%2)").arg(sdevice->friendlyName(), sdevice->deviceNode()), SmallIcon("drive-harddisk-unmounted"),
0, 0, "CHANGE: " + uuid);
}
}
diff --git a/kdesktop/init/Templates/CAMERA-Device.desktop b/kdesktop/init/Templates/CAMERA-Device.desktop
index 524436e..af68c39 100644
--- a/kdesktop/init/Templates/CAMERA-Device.desktop
+++ b/kdesktop/init/Templates/CAMERA-Device.desktop
@@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
-Icon=camera_mount
-UnmountIcon=camera_unmount
+Icon=camera-mounted
+UnmountIcon=camera-unmounted
diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop
index 5f0a8ee..bb1aa92 100644
--- a/kdesktop/init/Templates/CDROM-Device.desktop
+++ b/kdesktop/init/Templates/CDROM-Device.desktop
@@ -4,7 +4,7 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=media-optical-cdrom-mounted
-UnmountIcon=media-optical-cdrom
+UnmountIcon=media-optical-cdrom-unmounted
Actions=Eject;
X-TDE-Priority=TopLevel
[Desktop Action Eject]
diff --git a/kdesktop/init/Templates/CDWRITER-Device.desktop b/kdesktop/init/Templates/CDWRITER-Device.desktop
index 3dbb0a2..d802d8d 100644
--- a/kdesktop/init/Templates/CDWRITER-Device.desktop
+++ b/kdesktop/init/Templates/CDWRITER-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
Dev=
ReadOnly=0
Type=FSDevice
-Icon=media-optical-cdwriter-mounted
-UnmountIcon=media-optical-cdwriter
+Icon=cd-rw-mounted
+UnmountIcon=cd-rw-unmounted
Actions=Eject;
X-TDE-Priority=TopLevel
[Desktop Action Eject]
diff --git a/kdesktop/init/Templates/DVDROM-Device.desktop b/kdesktop/init/Templates/DVDROM-Device.desktop
index 335967e..f5e1e6d 100644
--- a/kdesktop/init/Templates/DVDROM-Device.desktop
+++ b/kdesktop/init/Templates/DVDROM-Device.desktop
@@ -4,7 +4,7 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=media-optical-dvd-mounted
-UnmountIcon=media-optical-dvd
+UnmountIcon=media-optical-dvd-unmounted
Actions=Eject;
X-TDE-Priority=TopLevel
[Desktop Action Eject]
diff --git a/kdesktop/init/Templates/Floppy.desktop b/kdesktop/init/Templates/Floppy.desktop
index 9182d28..727ef66 100644
--- a/kdesktop/init/Templates/Floppy.desktop
+++ b/kdesktop/init/Templates/Floppy.desktop
@@ -74,5 +74,5 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=media-floppy-3_5-mounted
-UnmountIcon=media-floppy-3_5
+UnmountIcon=media-floppy-3_5-unmounted
X-TDE-Priority=TopLevel
diff --git a/kdesktop/init/Templates/HD.desktop b/kdesktop/init/Templates/HD.desktop
index 69646a0..497ea03 100644
--- a/kdesktop/init/Templates/HD.desktop
+++ b/kdesktop/init/Templates/HD.desktop
@@ -4,4 +4,4 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=drive-harddisk-mounted
-UnmountIcon=drive-harddisk
+UnmountIcon=drive-harddisk-unmounted
diff --git a/kdesktop/init/Templates/MO-Device.desktop b/kdesktop/init/Templates/MO-Device.desktop
index 7ad78fd..fa4bb98 100644
--- a/kdesktop/init/Templates/MO-Device.desktop
+++ b/kdesktop/init/Templates/MO-Device.desktop
@@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
-Icon=mo_mount
-UnmountIcon=mo_unmount
+Icon=mo-mounted
+UnmountIcon=mo-unmounted
diff --git a/kdesktop/init/Templates/NFS.desktop b/kdesktop/init/Templates/NFS.desktop
index dcfc043..295abd0 100644
--- a/kdesktop/init/Templates/NFS.desktop
+++ b/kdesktop/init/Templates/NFS.desktop
@@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
-Icon=nfs_mount
-UnmountIcon=nfs_unmount
+Icon=nfs-mounted
+UnmountIcon=nfs-unmounted
diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop
index 8115f6e..4ec2bbe 100644
--- a/kdesktop/init/Templates/ZIP-Device.desktop
+++ b/kdesktop/init/Templates/ZIP-Device.desktop
@@ -4,7 +4,7 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=media-floppy-zip-mounted
-UnmountIcon=media-floppy-zip
+UnmountIcon=media-floppy-zip-unmounted
Actions=Eject;
X-TDE-Priority=TopLevel
[Desktop Action Eject]
diff --git a/kdesktop/init/Templates/linkCAMERA.desktop b/kdesktop/init/Templates/linkCAMERA.desktop
index 5d9dc9b..dc0522f 100644
--- a/kdesktop/init/Templates/linkCAMERA.desktop
+++ b/kdesktop/init/Templates/linkCAMERA.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建相机
Comment[zh_TW]=新增照相機
Type=Link
URL=.source/CAMERA-Device.desktop
-Icon=camera_unmount
+Icon=camera-unmounted
diff --git a/kdesktop/init/Templates/linkCDROM.desktop b/kdesktop/init/Templates/linkCDROM.desktop
index 98bd0dd..ea630d1 100644
--- a/kdesktop/init/Templates/linkCDROM.desktop
+++ b/kdesktop/init/Templates/linkCDROM.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 CD-ROM 设备
Comment[zh_TW]=新光碟機設備
Type=Link
URL=.source/CDROM-Device.desktop
-Icon=media-optical-cdrom
+Icon=media-optical-cdrom-unmounted
diff --git a/kdesktop/init/Templates/linkCDWRITER.desktop b/kdesktop/init/Templates/linkCDWRITER.desktop
index 5f9ecc4..0f0113e 100644
--- a/kdesktop/init/Templates/linkCDWRITER.desktop
+++ b/kdesktop/init/Templates/linkCDWRITER.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建刻录机设备
Comment[zh_TW]=新光碟燒錄機設備
Type=Link
URL=.source/CDWRITER-Device.desktop
-Icon=media-optical-cdwriter
+Icon=cr-rw-unmounted
diff --git a/kdesktop/init/Templates/linkDVDROM.desktop b/kdesktop/init/Templates/linkDVDROM.desktop
index 82e0429..f2edc79 100644
--- a/kdesktop/init/Templates/linkDVDROM.desktop
+++ b/kdesktop/init/Templates/linkDVDROM.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 DVD-ROM 设备
Comment[zh_TW]=新 DVD-ROM 設備
Type=Link
URL=.source/DVDROM-Device.desktop
-Icon=media-optical-dvd
+Icon=media-optical-dvd-unmounted
diff --git a/kdesktop/init/Templates/linkFloppy.desktop b/kdesktop/init/Templates/linkFloppy.desktop
index f4852ef..4b7b6c3 100644
--- a/kdesktop/init/Templates/linkFloppy.desktop
+++ b/kdesktop/init/Templates/linkFloppy.desktop
@@ -155,4 +155,4 @@ Comment[zh_TW]=新軟碟設備
Comment[zu]=Ithuluzi le-Floppy elisha
Type=Link
URL=.source/Floppy.desktop
-Icon=media-floppy-3_5
+Icon=media-floppy-3_5-unmounted
diff --git a/kdesktop/init/Templates/linkHD.desktop b/kdesktop/init/Templates/linkHD.desktop
index ee73bba..6c58dc3 100644
--- a/kdesktop/init/Templates/linkHD.desktop
+++ b/kdesktop/init/Templates/linkHD.desktop
@@ -154,4 +154,4 @@ Comment[zh_TW]=新硬碟設備
Comment[zu]=I-diski Elukhuni Entsha
Type=Link
URL=.source/HD.desktop
-Icon=drive-harddisk
+Icon=drive-harddisk-unmounted
diff --git a/kdesktop/init/Templates/linkMO.desktop b/kdesktop/init/Templates/linkMO.desktop
index 44f801e..35fd2bf 100644
--- a/kdesktop/init/Templates/linkMO.desktop
+++ b/kdesktop/init/Templates/linkMO.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 MO 设备
Comment[zh_TW]=新 MO 設備
Type=Link
URL=.source/MO-Device.desktop
-Icon=mo_unmount
+Icon=mo-unmounted
diff --git a/kdesktop/init/Templates/linkNFS.desktop b/kdesktop/init/Templates/linkNFS.desktop
index a7952c3..fee7669 100644
--- a/kdesktop/init/Templates/linkNFS.desktop
+++ b/kdesktop/init/Templates/linkNFS.desktop
@@ -88,4 +88,4 @@ Comment[zh_CN]=新建 NFS 链接
Comment[zh_TW]=新 NFS 鏈結
Type=Link
URL=.source/NFS.desktop
-Icon=nfs_unmount
+Icon=nfs-unmounted
diff --git a/kdesktop/init/Templates/linkZIP.desktop b/kdesktop/init/Templates/linkZIP.desktop
index 9615679..37f03bc 100644
--- a/kdesktop/init/Templates/linkZIP.desktop
+++ b/kdesktop/init/Templates/linkZIP.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 ZIP 设备
Comment[zh_TW]=新 ZIP 設備
Type=Link
URL=.source/ZIP-Device.desktop
-Icon=media-floppy-zip
+Icon=media-floppy-zip-unmounted
diff --git a/kicker/applets/media/mediaapplet.desktop b/kicker/applets/media/mediaapplet.desktop
index 8d5aa55..ad36a8d 100644
--- a/kicker/applets/media/mediaapplet.desktop
+++ b/kicker/applets/media/mediaapplet.desktop
@@ -126,5 +126,5 @@ Name[vi]=Ổ chứa Dữ liệu
Name[wa]=Sopoirts di wårdaedje
Name[zh_CN]=存储介质
Name[zh_TW]=儲存媒體
-Icon=media-floppy-3_5
+Icon=media-floppy-3_5-unmounted
X-TDE-Library=media_panelapplet
diff --git a/konqueror/sidebar/trees/init/services/audiocd.desktop b/konqueror/sidebar/trees/init/services/audiocd.desktop
index 58c307e..a9187a0 100644
--- a/konqueror/sidebar/trees/init/services/audiocd.desktop
+++ b/konqueror/sidebar/trees/init/services/audiocd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Link
URL=audiocd:/
-Icon=media-optical-cdaudio
+Icon=media-optical-cdaudio-unmounted
Name=Audio CD Browser
Name[af]=Musiek CD Blaaier
Name[ar]=متصفح الأقراص المدمجة الصوتية
diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp
index 9c1382b..b0cf54b 100644
--- a/tdeioslave/media/mediamanager/halbackend.cpp
+++ b/tdeioslave/media/mediamanager/halbackend.cpp
@@ -40,15 +40,13 @@
#include <kstandarddirs.h>
#include <kprocess.h>
-#define MOUNT_SUFFIX (medium->isEncrypted() ? \
+#define MOUNT_MEDIA_SUFFIX (medium->isEncrypted() ? \
(TQString("_encrypted") + (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "_unlocked" : "_locked")) : \
(medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")))
-#define MOUNT_ICON_SUFFIX (medium->isMounted() ? TQString("_mount") : TQString("_unmount"))
-
#define MOUNTED_ICON_SUFFIX (medium->isEncrypted() ? \
(sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "-unlocked" : "-locked") : \
- (medium->isMounted() ? TQString("-mounted") : TQString("")))
+ (medium->isMounted() ? TQString("-mounted") : TQString("-unmounted")))
/* Static instance of this class, for static HAL callbacks */
static HALBackend* s_HALBackend;
@@ -562,7 +560,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
TQString mimeType;
if (libhal_volume_is_disc(halVolume))
{
- mimeType = "media/cdrom" + MOUNT_SUFFIX;
+ mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
LibHalVolumeDiscType discType = libhal_volume_get_disc_type(halVolume);
if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) ||
@@ -574,7 +572,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
medium->unmountableState("");
}
else
- mimeType = "media/cdwriter" + MOUNT_SUFFIX;
+ mimeType = "media/cdwriter" + MOUNT_MEDIA_SUFFIX;
if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) ||
@@ -585,7 +583,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
medium->unmountableState("");
}
else
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
{
@@ -609,11 +607,11 @@ void HALBackend::setVolumeProperties(Medium* medium)
}
else
{
- mimeType = "media/hdd" + MOUNT_SUFFIX;
+ mimeType = "media/hdd" + MOUNT_MEDIA_SUFFIX;
medium->setIconName(TQString::null); // reset icon
if (libhal_drive_is_hotpluggable(halDrive))
{
- mimeType = "media/removable" + MOUNT_SUFFIX;
+ mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
medium->needMounting();
switch (libhal_drive_get_type(halDrive)) {
case LIBHAL_DRIVE_TYPE_COMPACT_FLASH:
@@ -630,7 +628,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
break;
case LIBHAL_DRIVE_TYPE_PORTABLE_AUDIO_PLAYER:
{
- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
+ medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
if (libhal_device_get_property_QString(m_halContext, driveUdi.latin1(), "info.product") == "iPod" &&
KProtocolInfo::isKnownProtocol( TQString("ipod") ) )
@@ -642,7 +640,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
}
case LIBHAL_DRIVE_TYPE_CAMERA:
{
- mimeType = "media/camera" + MOUNT_SUFFIX;
+ mimeType = "media/camera" + MOUNT_MEDIA_SUFFIX;
const char *physdev = libhal_drive_get_physical_device_udi(halDrive);
// get model from camera
if (physdev && libhal_device_query_capability(m_halContext, physdev, "camera", NULL))
@@ -663,7 +661,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (medium->isMounted() && TQFile::exists(medium->mountPoint() + "/dcim"))
{
- mimeType = "media/camera" + MOUNT_SUFFIX;
+ mimeType = "media/camera" + MOUNT_MEDIA_SUFFIX;
}
}
}
diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
index c16be64..ab03629 100644
--- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
+++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp
@@ -37,15 +37,13 @@
#include "dialog.h"
-#define MOUNT_SUFFIX (medium->isEncrypted() ? \
+#define MOUNT_MEDIA_SUFFIX (medium->isEncrypted() ? \
(TQString("_encrypted") + (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "_unlocked" : "_locked")) : \
(medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")))
-#define MOUNT_ICON_SUFFIX (medium->isMounted() ? TQString("_mount") : TQString("_unmount"))
-
#define MOUNTED_ICON_SUFFIX (medium->isEncrypted() ? \
(sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "-unlocked" : "-locked") : \
- (medium->isMounted() ? TQString("-mounted") : TQString("")))
+ (medium->isMounted() ? TQString("-mounted") : TQString("-unmounted")))
/* Constructor */
TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
@@ -517,13 +515,13 @@ void TDEBackend::setVolumeProperties(Medium* medium)
// This device is a CD drive of some sort
// Default
- mimeType = "media/cdrom" + MOUNT_SUFFIX;
+ mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
if (useDefaultLabel) {
diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDROM)) {
- mimeType = "media/cdrom" + MOUNT_SUFFIX;
+ mimeType = "media/cdrom" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -532,7 +530,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDR)) {
- mimeType = "media/cd-r" + MOUNT_SUFFIX;
+ mimeType = "media/cd-r" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -541,7 +539,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDRW)) {
- mimeType = "media/cd-rw" + MOUNT_SUFFIX;
+ mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -550,7 +548,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMO)) {
- mimeType = "media/cd-rw" + MOUNT_SUFFIX;
+ mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -559,7 +557,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRW)) {
- mimeType = "media/cd-rw" + MOUNT_SUFFIX;
+ mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -568,7 +566,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::CDMRRWW)) {
- mimeType = "media/cd-rw" + MOUNT_SUFFIX;
+ mimeType = "media/cd-rw" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankcd";
medium->unmountableState("");
@@ -577,7 +575,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDROM)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -586,7 +584,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRAM)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -595,7 +593,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDR)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -604,7 +602,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRW)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -613,7 +611,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRDL)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -622,7 +620,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDRWDL)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -631,7 +629,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSR)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -640,7 +638,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRW)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -649,7 +647,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRDL)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -658,7 +656,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::DVDPLUSRWDL)) {
- mimeType = "media/dvd" + MOUNT_SUFFIX;
+ mimeType = "media/dvd" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankdvd";
medium->unmountableState("");
@@ -667,7 +665,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDROM)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd";
medium->unmountableState("");
@@ -676,7 +674,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDR)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd";
medium->unmountableState("");
@@ -685,7 +683,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDRW)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd";
medium->unmountableState("");
@@ -694,7 +692,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd";
medium->unmountableState("");
@@ -703,7 +701,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd";
medium->unmountableState("");
@@ -712,7 +710,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW)) {
- mimeType = "media/bluray" + MOUNT_SUFFIX;
+ mimeType = "media/bluray" + MOUNT_MEDIA_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd";
medium->unmountableState("");
@@ -742,7 +740,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
// This device is a hard or flash disk of some kind
// Default
- mimeType = "media/hdd" + MOUNT_SUFFIX;
+ mimeType = "media/hdd" + MOUNT_MEDIA_SUFFIX;
if (useDefaultLabel) {
diskLabel = i18n("%1 Fixed Disk (%2)").arg(sdevice->deviceFriendlySize(), sdevice->deviceNode());
}
@@ -750,7 +748,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::USB)
|| sdevice->checkDiskStatus(TDEDiskDeviceStatus::Removable)
|| sdevice->checkDiskStatus(TDEDiskDeviceStatus::Hotpluggable)) {
- mimeType = "media/removable" + MOUNT_SUFFIX;
+ mimeType = "media/removable" + MOUNT_MEDIA_SUFFIX;
if (useDefaultLabel) {
diskLabel = i18n("%1 Removable Device").arg(sdevice->deviceFriendlySize());
}
@@ -769,7 +767,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
medium->setIconName("media-flash-sd_mmc" + MOUNTED_ICON_SUFFIX);
}
if (sdevice->isDiskOfType(TDEDiskDeviceType::MediaDevice)) {
- medium->setIconName("ipod" + MOUNT_ICON_SUFFIX);
+ medium->setIconName("ipod" + MOUNTED_ICON_SUFFIX);
if (sdevice->vendorModel().upper().contains("IPOD") && KProtocolInfo::isKnownProtocol( TQString("ipod") ) ) {
medium->unmountableState( "ipod:/" );
medium->mountableState(!sdevice->mountPath().isNull());
@@ -779,7 +777,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
medium->setIconName("media-tape" + MOUNTED_ICON_SUFFIX);
}
if (medium->isMounted() && TQFile::exists(medium->mountPoint() + "/dcim")) {
- mimeType = "media/camera" + MOUNT_SUFFIX;
+ mimeType = "media/camera" + MOUNT_MEDIA_SUFFIX;
}
}
diff --git a/tdeioslave/media/mimetypes/audiocd.desktop b/tdeioslave/media/mimetypes/audiocd.desktop
index de2e05b..61cb124 100644
--- a/tdeioslave/media/mimetypes/audiocd.desktop
+++ b/tdeioslave/media/mimetypes/audiocd.desktop
@@ -59,7 +59,7 @@ Comment[vi]=CD Nhạc
Comment[wa]=Plake lazer CD odio
Comment[zh_CN]=音频 CD
Comment[zh_TW]=音樂 CD
-Icon=media-optical-cdaudio
+Icon=media-optical-cdaudio-unmounted
X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/blankcd.desktop b/tdeioslave/media/mimetypes/blankcd.desktop
index 5903237..6083901 100644
--- a/tdeioslave/media/mimetypes/blankcd.desktop
+++ b/tdeioslave/media/mimetypes/blankcd.desktop
@@ -69,5 +69,5 @@ Comment[vi]=CD trống
Comment[wa]=Plake lazer CD sins rén dzo
Comment[zh_CN]=空 CD
Comment[zh_TW]=空白 CD
-Icon=media-optical-cdwriter
+Icon=cd-rw-unmounted
diff --git a/tdeioslave/media/mimetypes/blankdvd.desktop b/tdeioslave/media/mimetypes/blankdvd.desktop
index d2a288f..b95ee3b 100644
--- a/tdeioslave/media/mimetypes/blankdvd.desktop
+++ b/tdeioslave/media/mimetypes/blankdvd.desktop
@@ -69,4 +69,4 @@ Comment[vi]=DVD trống
Comment[wa]=Plake lazer DVD sins rén dzo
Comment[zh_CN]=空 DVD
Comment[zh_TW]=空白 DVD
-Icon=media-optical-dvd
+Icon=media-optical-dvd-unmounted
diff --git a/tdeioslave/media/mimetypes/camera_mounted.desktop b/tdeioslave/media/mimetypes/camera_mounted.desktop
index 1383e99..266531f 100644
--- a/tdeioslave/media/mimetypes/camera_mounted.desktop
+++ b/tdeioslave/media/mimetypes/camera_mounted.desktop
@@ -62,7 +62,7 @@ Comment[vi]=Máy chụp ảnh số đã kết nối
Comment[wa]=Montêye camera
Comment[zh_CN]=挂载的相机
Comment[zh_TW]=掛載的照相機
-Icon=camera_mount
+Icon=camera-mounted
X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/camera_unmounted.desktop b/tdeioslave/media/mimetypes/camera_unmounted.desktop
index 687bc1a..0c8e772 100644
--- a/tdeioslave/media/mimetypes/camera_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/camera_unmounted.desktop
@@ -62,7 +62,7 @@ Comment[vi]=Máy chụp ảnh số đã gỡ ra
Comment[wa]=Dismontêye camera
Comment[zh_CN]=未挂载的相机
Comment[zh_TW]=未掛載的照相機
-Icon=camera_unmount
+Icon=camera-unmounted
X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
index b0c6dad..89ca088 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Icon=media-optical-cdwriter-locked
+Icon=cd-r-locked
Type=MimeType
MimeType=media/cd-r_encrypted_locked
Comment=Encrypted Locked CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
index d886586..1957635 100644
--- a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Icon=media-optical-cdwriter-unlocked
+Icon=cd-r-unlocked
Type=MimeType
MimeType=media/cd-r_encrypted_unlocked
Comment=Encrypted Unlocked CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_mounted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
index bad9fec..26a49e1 100644
--- a/tdeioslave/media/mimetypes/cd-r_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-cdwriter-mounted
+Icon=cd-r-mounted
Type=MimeType
MimeType=media/cd-r_mounted
Comment=Mounted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
index ba15872..e79c36d 100644
--- a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-cdwriter
+Icon=cd-r-unmounted
Type=MimeType
MimeType=media/cd-r_unmounted
Comment=Unmounted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
index 72f4984..6199da4 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Icon=media-optical-cdwriter-locked
+Icon=cd-rw-locked
Type=MimeType
MimeType=media/cd-rw_encrypted_locked
Comment=Encrypted Locked CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
index b3f4050..21e7b3d 100644
--- a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Encoding=UTF-8
-Icon=media-optical-cdwriter-unlocked
+Icon=cd-rw-unlocked
Type=MimeType
MimeType=media/cd-rw_encrypted_unlocked
Comment=Encrypted Unlocked CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
index aa9a969..69e60e0 100644
--- a/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-cdwriter-mounted
+Icon=cd-rw-mounted
Type=MimeType
MimeType=media/cd-rw_mounted
Comment=Mounted CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
index 9ee0d62..1393d4c 100644
--- a/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-cdwriter
+Icon=cd-rw-unmounted
Type=MimeType
MimeType=media/cd-rw_unmounted
Comment=Unmounted CD-RW
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
index 984000c..4eaafd7 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-cdrom
+Icon=media-optical-cdrom-unmounted
Type=MimeType
MimeType=media/cdrom_unmounted
Comment=Unmounted CD-ROM
diff --git a/tdeioslave/media/mimetypes/dvd_unmounted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted.desktop
index 918416c..5270d13 100644
--- a/tdeioslave/media/mimetypes/dvd_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-optical-dvd
+Icon=media-optical-dvd-unmounted
Type=MimeType
MimeType=media/dvd_unmounted
Comment=Unmounted DVD
diff --git a/tdeioslave/media/mimetypes/dvdvideo.desktop b/tdeioslave/media/mimetypes/dvdvideo.desktop
index 047fdbe..9501aa5 100644
--- a/tdeioslave/media/mimetypes/dvdvideo.desktop
+++ b/tdeioslave/media/mimetypes/dvdvideo.desktop
@@ -68,6 +68,6 @@ Comment[vi]=Đĩa Video DVD
Comment[wa]=Plake videyo DVD
Comment[zh_CN]=DVD 影碟
Comment[zh_TW]=DVD 視訊光碟
-Icon=media-optical-dvd
+Icon=media-optical-dvd-unmounted
X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/floppy5_unmounted.desktop b/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
index 8eb8bde..a832c38 100644
--- a/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-floppy-5_14
+Icon=media-floppy-5_14-unmounted
Type=MimeType
MimeType=media/floppy5_unmounted
Comment=Unmounted 5¼" Floppy
diff --git a/tdeioslave/media/mimetypes/floppy_unmounted.desktop b/tdeioslave/media/mimetypes/floppy_unmounted.desktop
index 56afeb8..9ba67ce 100644
--- a/tdeioslave/media/mimetypes/floppy_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-floppy-3_5
+Icon=media-floppy-3_5-unmounted
Type=MimeType
MimeType=media/floppy_unmounted
Comment=Unmounted Floppy
diff --git a/tdeioslave/media/mimetypes/gphoto2camera.desktop b/tdeioslave/media/mimetypes/gphoto2camera.desktop
index a84f3ba..b0ad7ec 100644
--- a/tdeioslave/media/mimetypes/gphoto2camera.desktop
+++ b/tdeioslave/media/mimetypes/gphoto2camera.desktop
@@ -69,7 +69,7 @@ Comment[uz@cyrillic]=Фотоапарат
Comment[vi]=Máy chụp ảnh số
Comment[zh_CN]=相机
Comment[zh_TW]=相機
-Icon=camera_unmount
+Icon=camera-unmounted
X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/hdd_unmounted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted.desktop
index e5463e2..4136e6d 100644
--- a/tdeioslave/media/mimetypes/hdd_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=drive-harddisk
+Icon=drive-harddisk-unmounted
Type=MimeType
MimeType=media/hdd_unmounted
Comment=Unmounted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/nfs_mounted.desktop b/tdeioslave/media/mimetypes/nfs_mounted.desktop
index 3de6c03..1dfd47a 100644
--- a/tdeioslave/media/mimetypes/nfs_mounted.desktop
+++ b/tdeioslave/media/mimetypes/nfs_mounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=nfs_mount
+Icon=nfs-mounted
Type=MimeType
MimeType=media/nfs_mounted
Comment=Mounted NFS Share
diff --git a/tdeioslave/media/mimetypes/nfs_unmounted.desktop b/tdeioslave/media/mimetypes/nfs_unmounted.desktop
index d2bb456..a6529ad 100644
--- a/tdeioslave/media/mimetypes/nfs_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/nfs_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=nfs_unmount
+Icon=nfs-unmounted
Type=MimeType
MimeType=media/nfs_unmounted
Comment=Unmounted NFS Share
diff --git a/tdeioslave/media/mimetypes/removable_unmounted.desktop b/tdeioslave/media/mimetypes/removable_unmounted.desktop
index 2c87fa9..32c0367 100644
--- a/tdeioslave/media/mimetypes/removable_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/removable_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-flash-usb
+Icon=media-flash-usb-unmounted
Type=MimeType
MimeType=media/removable_unmounted
Comment=Unmounted Removable Medium
diff --git a/tdeioslave/media/mimetypes/smb_mounted.desktop b/tdeioslave/media/mimetypes/smb_mounted.desktop
index 16ee7c8..cb70387 100644
--- a/tdeioslave/media/mimetypes/smb_mounted.desktop
+++ b/tdeioslave/media/mimetypes/smb_mounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=nfs_mount
+Icon=nfs-mounted
Type=MimeType
MimeType=media/smb_mounted
Comment=Mounted Samba (Microsoft Network) Share
diff --git a/tdeioslave/media/mimetypes/smb_unmounted.desktop b/tdeioslave/media/mimetypes/smb_unmounted.desktop
index 98adf43..25ef6c8 100644
--- a/tdeioslave/media/mimetypes/smb_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/smb_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=nfs_unmount
+Icon=nfs-unmounted
Type=MimeType
MimeType=media/smb_unmounted
Comment=Unmounted Samba (Microsoft Network) Share
diff --git a/tdeioslave/media/mimetypes/svcd.desktop b/tdeioslave/media/mimetypes/svcd.desktop
index 29b8e1a..735a17f 100644
--- a/tdeioslave/media/mimetypes/svcd.desktop
+++ b/tdeioslave/media/mimetypes/svcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa siêu video CD
Comment[wa]=Super plake lazer CD videyo
Comment[zh_CN]=超级 VCD
Comment[zh_TW]=超級視訊 CD
-Icon=media-optical-cdrom
+Icon=media-optical-cdrom-unmounted
diff --git a/tdeioslave/media/mimetypes/vcd.desktop b/tdeioslave/media/mimetypes/vcd.desktop
index aedbeee..b55fef3 100644
--- a/tdeioslave/media/mimetypes/vcd.desktop
+++ b/tdeioslave/media/mimetypes/vcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa video CD
Comment[wa]=Plake lazer CD videyo
Comment[zh_CN]=VCD
Comment[zh_TW]=視訊 CD
-Icon=media-optical-cdrom
+Icon=media-optical-cdrom-unmounted
diff --git a/tdeioslave/media/mimetypes/zip_unmounted.desktop b/tdeioslave/media/mimetypes/zip_unmounted.desktop
index b717799..162cc5e 100644
--- a/tdeioslave/media/mimetypes/zip_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/zip_unmounted.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=media-floppy-zip
+Icon=media-floppy-zip-unmounted
Type=MimeType
MimeType=media/zip_unmounted
Comment=Unmounted Zip Disk
diff --git a/tdeioslave/nfs/nfs.protocol b/tdeioslave/nfs/nfs.protocol
index 743cf0e..c593977 100644
--- a/tdeioslave/nfs/nfs.protocol
+++ b/tdeioslave/nfs/nfs.protocol
@@ -11,4 +11,4 @@ deleting=true
linking=true
moving=true
X-DocPath=tdeioslave/nfs/index.html
-Icon=nfs_mount
+Icon=nfs-mounted