From 21d09d5b23a8a639ab355b2563ba105bc1994364 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 24 Jun 2019 23:06:46 +0900 Subject: Adjusted to new normalized device icon names in tdelibs. Signed-off-by: Michele Calgaro --- tdeioslave/media/mediamanager/halbackend.cpp | 22 ++++---- .../media/mediamanager/tdehardwarebackend.cpp | 60 +++++++++++----------- tdeioslave/media/mimetypes/audiocd.desktop | 2 +- tdeioslave/media/mimetypes/blankcd.desktop | 2 +- tdeioslave/media/mimetypes/blankdvd.desktop | 2 +- tdeioslave/media/mimetypes/camera_mounted.desktop | 2 +- .../media/mimetypes/camera_unmounted.desktop | 2 +- .../media/mimetypes/cd-r_encrypted_locked.desktop | 2 +- .../mimetypes/cd-r_encrypted_unlocked.desktop | 2 +- tdeioslave/media/mimetypes/cd-r_mounted.desktop | 2 +- tdeioslave/media/mimetypes/cd-r_unmounted.desktop | 2 +- .../media/mimetypes/cd-rw_encrypted_locked.desktop | 2 +- .../mimetypes/cd-rw_encrypted_unlocked.desktop | 2 +- tdeioslave/media/mimetypes/cd-rw_mounted.desktop | 2 +- tdeioslave/media/mimetypes/cd-rw_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/cdrom_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/dvd_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/dvdvideo.desktop | 2 +- .../media/mimetypes/floppy5_unmounted.desktop | 2 +- .../media/mimetypes/floppy_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/gphoto2camera.desktop | 2 +- tdeioslave/media/mimetypes/hdd_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/nfs_mounted.desktop | 2 +- tdeioslave/media/mimetypes/nfs_unmounted.desktop | 2 +- .../media/mimetypes/removable_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/smb_mounted.desktop | 2 +- tdeioslave/media/mimetypes/smb_unmounted.desktop | 2 +- tdeioslave/media/mimetypes/svcd.desktop | 2 +- tdeioslave/media/mimetypes/vcd.desktop | 2 +- tdeioslave/media/mimetypes/zip_unmounted.desktop | 2 +- 30 files changed, 67 insertions(+), 71 deletions(-) (limited to 'tdeioslave/media') diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index 9c1382bf8..b0cf54b6e 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -40,15 +40,13 @@ #include #include -#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 c16be644c..ab03629bc 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 de2e05b13..61cb124f5 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 59032377f..6083901d9 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 d2a288fa6..b95ee3bbc 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 1383e998b..266531f6e 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 687bc1af4..0c8e7723e 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 b0c6dad7b..89ca0883f 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 d886586fc..1957635cf 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 bad9fecd9..26a49e1e2 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 ba15872bb..e79c36d9a 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 72f4984ae..6199da40c 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 b3f405094..21e7b3d21 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 aa9a96949..69e60e0cf 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 9ee0d6238..1393d4c44 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 984000c52..4eaafd7ee 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 918416c42..5270d13d7 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 047fdbe7c..9501aa522 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 8eb8bdeaa..a832c3826 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 56afeb8f1..9ba67ce48 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 a84f3baf5..b0ad7eccc 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 e5463e21e..4136e6d4c 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 3de6c0303..1dfd47abb 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 d2bb456b6..a6529ad7e 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 2c87fa941..32c036775 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 16ee7c815..cb70387a3 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 98adf4332..25ef6c838 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 29b8e1a57..735a17f20 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 aedbeeec7..b55fef30e 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 b71779996..162cc5e4e 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 -- cgit v1.2.3