TDE
/
tdebase
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase
0
0
Fork 0
Code Issues Releases Wiki Activity

Adjusted to new normalized device icon names in tdelibs.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/39/head
Michele Calgaro 5 years ago
parent d2da293eae
commit 21d09d5b23
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
52 changed files with 96 additions and 100 deletions
Show Stats Download Patch File Download Diff File

8
kcontrol/hwmanager/hwdevicetray.cpp
Unescape View File

@ -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);
}
}

4
kdesktop/init/Templates/CAMERA-Device.desktop
Unescape View File

@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=camera_mount
UnmountIcon=camera_unmount
Icon=camera-mounted
UnmountIcon=camera-unmounted

2
kdesktop/init/Templates/CDROM-Device.desktop
Unescape View File

@ -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]

4
kdesktop/init/Templates/CDWRITER-Device.desktop
Unescape View File

@ -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]

2
kdesktop/init/Templates/DVDROM-Device.desktop
Unescape View File

@ -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]

2
kdesktop/init/Templates/Floppy.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/HD.desktop
Unescape View File

@ -4,4 +4,4 @@ Dev=
ReadOnly=false
Type=FSDevice
Icon=drive-harddisk-mounted
UnmountIcon=drive-harddisk
UnmountIcon=drive-harddisk-unmounted

4
kdesktop/init/Templates/MO-Device.desktop
Unescape View File

@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=mo_mount
UnmountIcon=mo_unmount
Icon=mo-mounted
UnmountIcon=mo-unmounted

4
kdesktop/init/Templates/NFS.desktop
Unescape View File

@ -3,5 +3,5 @@ MountPoint=
Dev=
ReadOnly=false
Type=FSDevice
Icon=nfs_mount
UnmountIcon=nfs_unmount
Icon=nfs-mounted
UnmountIcon=nfs-unmounted

2
kdesktop/init/Templates/ZIP-Device.desktop
Unescape View File

@ -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]

2
kdesktop/init/Templates/linkCAMERA.desktop
Unescape View File

@ -147,4 +147,4 @@ Comment[zh_CN]=新建相机
Comment[zh_TW]=新增照相機
Type=Link
URL=.source/CAMERA-Device.desktop
Icon=camera_unmount
Icon=camera-unmounted

2
kdesktop/init/Templates/linkCDROM.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkCDWRITER.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkDVDROM.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkFloppy.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkHD.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkMO.desktop
Unescape View File

@ -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

2
kdesktop/init/Templates/linkNFS.desktop
Unescape View File

@ -88,4 +88,4 @@ Comment[zh_CN]=新建 NFS 链接
Comment[zh_TW]=新 NFS 鏈結
Type=Link
URL=.source/NFS.desktop
Icon=nfs_unmount
Icon=nfs-unmounted

2
kdesktop/init/Templates/linkZIP.desktop
Unescape View File

@ -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

2
kicker/applets/media/mediaapplet.desktop
Unescape View File

@ -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

2
konqueror/sidebar/trees/init/services/audiocd.desktop
Unescape View File

@ -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]=متصفح الأقراص المدمجة الصوتية

22
tdeioslave/media/mediamanager/halbackend.cpp
Unescape View File

@ -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;
}
}
}

60
tdeioslave/media/mediamanager/tdehardwarebackend.cpp
Unescape View File

@ -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;
}
}

2
tdeioslave/media/mimetypes/audiocd.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/blankcd.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/blankdvd.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/camera_mounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/camera_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-r_mounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-r_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-rw_mounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/cdrom_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/dvd_unmounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=media-optical-dvd
Icon=media-optical-dvd-unmounted
Type=MimeType
MimeType=media/dvd_unmounted
Comment=Unmounted DVD

2
tdeioslave/media/mimetypes/dvdvideo.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/floppy5_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/floppy_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/gphoto2camera.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/hdd_unmounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=drive-harddisk
Icon=drive-harddisk-unmounted
Type=MimeType
MimeType=media/hdd_unmounted
Comment=Unmounted Hard Disk Volume

2
tdeioslave/media/mimetypes/nfs_mounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=nfs_mount
Icon=nfs-mounted
Type=MimeType
MimeType=media/nfs_mounted
Comment=Mounted NFS Share

2
tdeioslave/media/mimetypes/nfs_unmounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=nfs_unmount
Icon=nfs-unmounted
Type=MimeType
MimeType=media/nfs_unmounted
Comment=Unmounted NFS Share

2
tdeioslave/media/mimetypes/removable_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/smb_mounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=nfs_mount
Icon=nfs-mounted
Type=MimeType
MimeType=media/smb_mounted
Comment=Mounted Samba (Microsoft Network) Share

2
tdeioslave/media/mimetypes/smb_unmounted.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry]
Icon=nfs_unmount
Icon=nfs-unmounted
Type=MimeType
MimeType=media/smb_unmounted
Comment=Unmounted Samba (Microsoft Network) Share

2
tdeioslave/media/mimetypes/svcd.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/vcd.desktop
Unescape View File

@ -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

2
tdeioslave/media/mimetypes/zip_unmounted.desktop
Unescape View File

@ -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

2
tdeioslave/nfs/nfs.protocol
Unescape View File

@ -11,4 +11,4 @@ deleting=true
linking=true
moving=true
X-DocPath=tdeioslave/nfs/index.html
Icon=nfs_mount
Icon=nfs-mounted

Write Preview
Loading…
Cancel
Save