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

Improved support for bluray discs.

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 32381684a2)
pull/182/head
Michele Calgaro 4 years ago
parent ec4f0efe77
commit cbbf46ebb6
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
12 changed files with 120 additions and 66 deletions
Show Stats Download Patch File Download Diff File

19
tdeioslave/media/libmediacommon/notifiersettings.cpp
Unescape View File

@ -39,16 +39,16 @@ NotifierSettings::NotifierSettings()
m_supportedMimetypes.append( "media/camera_unmounted" ); m_supportedMimetypes.append( "media/camera_unmounted" );
m_supportedMimetypes.append( "media/camera_mounted" ); m_supportedMimetypes.append( "media/camera_mounted" );
m_supportedMimetypes.append( "media/gphoto2camera" ); m_supportedMimetypes.append( "media/gphoto2camera" );
m_supportedMimetypes.append( "media/bluray_unmounted" );
m_supportedMimetypes.append( "media/bluray_unmounted_encrypted" );
m_supportedMimetypes.append( "media/bluray_unmounted_decrypted" );
m_supportedMimetypes.append( "media/bluray_mounted" );
m_supportedMimetypes.append( "media/bluray_mounted_decrypted" );
m_supportedMimetypes.append( "media/cdrom_unmounted" ); m_supportedMimetypes.append( "media/cdrom_unmounted" );
m_supportedMimetypes.append( "media/cdrom_unmounted_encrypted" ); m_supportedMimetypes.append( "media/cdrom_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cdrom_unmounted_decrypted" ); m_supportedMimetypes.append( "media/cdrom_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cdrom_mounted" ); m_supportedMimetypes.append( "media/cdrom_mounted" );
m_supportedMimetypes.append( "media/cdrom_mounted_decrypted" ); m_supportedMimetypes.append( "media/cdrom_mounted_decrypted" );
m_supportedMimetypes.append( "media/dvd_unmounted" );
m_supportedMimetypes.append( "media/dvd_unmounted_encrypted" );
m_supportedMimetypes.append( "media/dvd_unmounted_decrypted" );
m_supportedMimetypes.append( "media/dvd_mounted" );
m_supportedMimetypes.append( "media/dvd_mounted_decrypted" );
m_supportedMimetypes.append( "media/cd-r_unmounted" ); m_supportedMimetypes.append( "media/cd-r_unmounted" );
m_supportedMimetypes.append( "media/cd-r_unmounted_encrypted" ); m_supportedMimetypes.append( "media/cd-r_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cd-r_unmounted_decrypted" ); m_supportedMimetypes.append( "media/cd-r_unmounted_decrypted" );
@ -59,12 +59,19 @@ NotifierSettings::NotifierSettings()
m_supportedMimetypes.append( "media/cd-rw_unmounted_decrypted" ); m_supportedMimetypes.append( "media/cd-rw_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cd-rw_mounted" ); m_supportedMimetypes.append( "media/cd-rw_mounted" );
m_supportedMimetypes.append( "media/cd-rw_mounted_decrypted" ); m_supportedMimetypes.append( "media/cd-rw_mounted_decrypted" );
m_supportedMimetypes.append( "media/dvd_unmounted" );
m_supportedMimetypes.append( "media/dvd_unmounted_encrypted" );
m_supportedMimetypes.append( "media/dvd_unmounted_decrypted" );
m_supportedMimetypes.append( "media/dvd_mounted" );
m_supportedMimetypes.append( "media/dvd_mounted_decrypted" );
m_supportedMimetypes.append( "media/blankbluray" );
m_supportedMimetypes.append( "media/blankcd" ); m_supportedMimetypes.append( "media/blankcd" );
m_supportedMimetypes.append( "media/blankdvd" ); m_supportedMimetypes.append( "media/blankdvd" );
m_supportedMimetypes.append( "media/audiocd" ); m_supportedMimetypes.append( "media/audiocd" );
m_supportedMimetypes.append( "media/blurayvideo" );
m_supportedMimetypes.append( "media/dvdvideo" ); m_supportedMimetypes.append( "media/dvdvideo" );
m_supportedMimetypes.append( "media/vcd" );
m_supportedMimetypes.append( "media/svcd" ); m_supportedMimetypes.append( "media/svcd" );
m_supportedMimetypes.append( "media/vcd" );
reload(); reload();
} }

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

@ -571,24 +571,45 @@ void HALBackend::setVolumeProperties(Medium* medium)
if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) || if ((discType == LIBHAL_VOLUME_DISC_TYPE_CDROM) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_CDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_CDR) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_CDRW)) (discType == LIBHAL_VOLUME_DISC_TYPE_CDRW))
{
if (libhal_volume_disc_is_blank(halVolume)) if (libhal_volume_disc_is_blank(halVolume))
{ {
mimeType = "media/blankcd"; mimeType = "media/blankcd";
medium->unmountableState(""); medium->unmountableState("");
} }
else else
{
mimeType = "media/cdwriter" + MOUNT_SUFFIX; mimeType = "media/cdwriter" + MOUNT_SUFFIX;
}
if ((discType == LIBHAL_VOLUME_DISC_TYPE_DVDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRAM) || else 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) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDRW) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) ) (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSR) || (discType == LIBHAL_VOLUME_DISC_TYPE_DVDPLUSRW) )
{
if (libhal_volume_disc_is_blank(halVolume)) if (libhal_volume_disc_is_blank(halVolume))
{ {
mimeType = "media/blankdvd"; mimeType = "media/blankdvd";
medium->unmountableState(""); medium->unmountableState("");
} }
else else
{
mimeType = "media/dvd" + MOUNT_SUFFIX; mimeType = "media/dvd" + MOUNT_SUFFIX;
}
}
else if ((discType == LIBHAL_VOLUME_DISC_TYPE_BDROM) || (discType == LIBHAL_VOLUME_DISC_TYPE_BDR) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_BDRE) || (discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDROM) ||
(discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDR) || (discType == LIBHAL_VOLUME_DISC_TYPE_HDDVDRW) )
{
if (libhal_volume_disc_is_blank(halVolume))
{
mimeType = "media/blankbluray";
medium->unmountableState("");
}
else
{
mimeType = "media/bluray" + MOUNT_SUFFIX;
}
}
if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume)) if (libhal_volume_disc_has_audio(halVolume) && !libhal_volume_disc_has_data(halVolume))
{ {
@ -599,13 +620,16 @@ void HALBackend::setVolumeProperties(Medium* medium)
medium->setIconName(TQString::null); medium->setIconName(TQString::null);
/* check if the disc id a vcd or a video dvd */ /* check if the disc id a vcd or a video dvd */
if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL)) { if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
{
mimeType = "media/vcd"; mimeType = "media/vcd";
} }
else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL)) { else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
{
mimeType = "media/svcd"; mimeType = "media/svcd";
} }
else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL)) { else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
{
mimeType = "media/dvdvideo"; mimeType = "media/dvdvideo";
} }

46
tdeioslave/media/mediamanager/linuxcdpolling.cpp
Unescape View File

@ -216,7 +216,7 @@ void LinuxCDPolling::slotMediumAdded(const TQString &id)
TQString mime = medium->mimeType(); TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl; kdDebug(1219) << "mime == " << mime << endl;
if (mime.find("dvd")==-1 && mime.find("cd")==-1) return; if (mime.find("dvd")==-1 && mime.find("cd")==-1 && mime.find("bluray")==-1) return;
if (!medium->isMounted()) if (!medium->isMounted())
{ {
@ -255,7 +255,7 @@ void LinuxCDPolling::slotMediumStateChanged(const TQString &id)
TQString mime = medium->mimeType(); TQString mime = medium->mimeType();
kdDebug(1219) << "mime == " << mime << endl; kdDebug(1219) << "mime == " << mime << endl;
if (mime.find("dvd")==-1 && mime.find("cd")==-1) return; if (mime.find("dvd")==-1 && mime.find("cd")==-1 && mime.find("bluray")==-1) return;
if (!m_threads.contains(id) && !medium->isMounted()) if (!m_threads.contains(id) && !medium->isMounted())
{ {
@ -319,7 +319,12 @@ static TQString baseType(const Medium *medium)
FstabBackend::guess(devNode, mountPoint, fsType, mounted, FstabBackend::guess(devNode, mountPoint, fsType, mounted,
mimeType, iconName, label); mimeType, iconName, label);
if (devNode.find("dvd")!=-1) if (devNode.find("bluray")!=-1)
{
kdDebug(1219) << "=> bluray" << endl;
return "bluray";
}
else if (devNode.find("dvd")!=-1)
{ {
kdDebug(1219) << "=> dvd" << endl; kdDebug(1219) << "=> dvd" << endl;
return "dvd"; return "dvd";
@ -373,25 +378,30 @@ void LinuxCDPolling::applyType(DiscType type, const Medium *medium)
m_mediaList.changeMediumState(id, "audiocd:/?device="+dev, m_mediaList.changeMediumState(id, "audiocd:/?device="+dev,
notify, "media/audiocd"); notify, "media/audiocd");
break; break;
case DiscType::VCD: case DiscType::BLURAY:
m_mediaList.changeMediumState(id, false, notify, "media/vcd"); m_mediaList.changeMediumState(id, false, notify, "media/blurayvideo");
break;
case DiscType::DVD:
m_mediaList.changeMediumState(id, false, notify, "media/dvdvideo");
break; break;
case DiscType::SVCD: case DiscType::SVCD:
m_mediaList.changeMediumState(id, false, notify, "media/svcd"); m_mediaList.changeMediumState(id, false, notify, "media/svcd");
break; break;
case DiscType::DVD: case DiscType::VCD:
m_mediaList.changeMediumState(id, false, notify, "media/dvdvideo"); m_mediaList.changeMediumState(id, false, notify, "media/vcd");
break; break;
case DiscType::Blank: case DiscType::Blank:
if (baseType(medium)=="dvd") if (baseType(medium)=="bluray")
{ {
m_mediaList.changeMediumState(id, false, m_mediaList.changeMediumState(id, false, notify, "media/blankbluray");
notify, "media/blankdvd"); }
else if (baseType(medium)=="dvd")
{
m_mediaList.changeMediumState(id, false, notify, "media/blankdvd");
} }
else else
{ {
m_mediaList.changeMediumState(id, false, m_mediaList.changeMediumState(id, false, notify, "media/blankcd");
notify, "media/blankcd");
} }
break; break;
case DiscType::None: case DiscType::None:
@ -444,18 +454,22 @@ DiscType LinuxCDPolling::identifyDiscType(const TQCString &devNode,
return DiscType::Audio; return DiscType::Audio;
case CDS_DATA_1: case CDS_DATA_1:
case CDS_DATA_2: case CDS_DATA_2:
if (hasDirectory(devNode, "video_ts")) if (hasDirectory(devNode, "BDMV"))
{ {
return DiscType::DVD; return DiscType::BLURAY;
} }
else if (hasDirectory(devNode, "vcd")) else if (hasDirectory(devNode, "video_ts"))
{ {
return DiscType::VCD; return DiscType::DVD;
} }
else if (hasDirectory(devNode, "svcd")) else if (hasDirectory(devNode, "svcd"))
{ {
return DiscType::SVCD; return DiscType::SVCD;
} }
else if (hasDirectory(devNode, "vcd"))
{
return DiscType::VCD;
}
else else
{ {
return DiscType::Data; return DiscType::Data;

4
tdeioslave/media/mediamanager/linuxcdpolling.h
Unescape View File

@ -1,5 +1,5 @@
/* This file is part of the KDE Project /* This file is part of the KDE Project
Copyright (c) 2004 Kévin Ottens <ervin ipsquad net> Copyright (c) 2004 Kévin Ottens <ervin ipsquad net>
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public modify it under the terms of the GNU Library General Public
@ -30,7 +30,7 @@ class DiscType
{ {
public: public:
enum Type { None, Unknown, Audio, Data, DVD, Mixed, enum Type { None, Unknown, Audio, Data, DVD, Mixed,
Blank, VCD, SVCD, UnknownType, Broken }; Blank, VCD, SVCD, BLURAY, UnknownType, Broken };
DiscType(Type type = Unknown); DiscType(Type type = Unknown);

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

@ -656,34 +656,34 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDROM)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::BDROM)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank BD-ROM"); diskLabel = i18n("Blank BLURAY-ROM");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDR)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::BDR)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank BD-R"); diskLabel = i18n("Blank BLURAY-R");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDRW)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::BDRW)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankbd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank BD-RW"); diskLabel = i18n("Blank BLURAY-RW");
} }
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDROM)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-ROM"); diskLabel = i18n("Blank HDDVD-ROM");
} }
@ -692,7 +692,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDR)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-R"); diskLabel = i18n("Blank HDDVD-R");
} }
@ -701,7 +701,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::HDDVDRW)) {
mimeType = "media/bluray" + MOUNT_SUFFIX; mimeType = "media/bluray" + MOUNT_SUFFIX;
if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) { if (sdevice->checkDiskStatus(TDEDiskDeviceStatus::Blank)) {
mimeType = "media/blankhddvd"; mimeType = "media/blankbluray";
medium->unmountableState(""); medium->unmountableState("");
diskLabel = i18n("Blank HDDVD-RW"); diskLabel = i18n("Blank HDDVD-RW");
} }
@ -720,7 +720,7 @@ void TDEBackend::setVolumeProperties(Medium* medium)
mimeType = "media/dvdvideo"; mimeType = "media/dvdvideo";
} }
if (sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo)) { if (sdevice->isDiskOfType(TDEDiskDeviceType::BDVideo)) {
mimeType = "media/bdvideo"; mimeType = "media/blurayvideo";
} }
medium->setIconName(TQString::null); medium->setIconName(TQString::null);

2
tdeioslave/media/medianotifier/medianotifier.cpp
Unescape View File

@ -146,7 +146,7 @@ bool MediaNotifier::autostart( const KFileItem &medium )
{ {
TQString mimetype = medium.mimetype(); TQString mimetype = medium.mimetype();
bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" ); bool is_cdrom = mimetype.startsWith( "media/cd" ) || mimetype.startsWith( "media/dvd" ) || mimetype.startsWith( "media/bluray" );
bool is_mounted = mimetype.contains( "_mounted" ); bool is_mounted = mimetype.contains( "_mounted" );
// We autorun only on CD/DVD or removable disks (USB, Firewire) // We autorun only on CD/DVD or removable disks (USB, Firewire)

5
tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
Unescape View File

@ -1,5 +1,8 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
X-TDE-Library=media_propsdlgplugin
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/blankcd,media/blankbluray,media/blankdvd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/bluray_mounted,media/bluray_unmounted,media/bluray_mounted_decrypted,media/bluray_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/nfs_mounted,media/cd-r_unmounted,media/cd-r_unmounted_decrypted,media/cd-rw_unmounted,media/cd-rw_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/blurayvideo,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted
Name=Media Properties Page Name=Media Properties Page
Name[bg]=Страница с информация за носителя Name[bg]=Страница с информация за носителя
Name[bn]=মিডিয়া বৈশিষ্ট্যাবলী পৃষ্ঠা Name[bn]=মিডিয়া বৈশিষ্ট্যাবলী পৃষ্ঠা
@ -98,5 +101,3 @@ Comment[vi]=bổ sung hộp thoại tài sản Konqueror để cấu hình ứng
Comment[wa]=Tchôke-divins di dvize di prôpietés Konqueror po-z apontyî l' dujhance do montaedje Comment[wa]=Tchôke-divins di dvize di prôpietés Konqueror po-z apontyî l' dujhance do montaedje
Comment[zh_CN]=配置挂载行为的 Konqueror 属性对话框插件 Comment[zh_CN]=配置挂载行为的 Konqueror 属性对话框插件
Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為 Comment[zh_TW]=Konqueror 內容對話框外掛程式，用於設定掛載的行為
X-TDE-Library=media_propsdlgplugin
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_mounted_decrypted,media/hdd_unmounted_decrypted,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/nfs_mounted,media/cd-r_unmounted,media/cd-r_unmounted_decrypted,media/cd-rw_unmounted,media/cd-rw_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted

2
tdeioslave/media/services/media_decrypt.desktop
Unescape View File

@ -6,4 +6,4 @@ Name[de]=Entschlüsseln
[Desktop Entry] [Desktop Entry]
Actions=Decrypt Actions=Decrypt
X-TDE-ServiceTypes=media/removable_unmounted_encrypted,media/hdd_unmounted_encrypted,media/cdrom_unmounted_encrypted,media/cdwriter_unmounted_encrypted,media/dvd_unmounted_encrypted X-TDE-ServiceTypes=media/removable_unmounted_encrypted,media/hdd_unmounted_encrypted,media/bluray_unmounted_encrypted,media/cdrom_unmounted_encrypted,media/cdwriter_unmounted_encrypted,media/dvd_unmounted_encrypted

2
tdeioslave/media/services/media_mount.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
X-TDE-ServiceTypes=media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/nfs_unmounted,media/removable_unmounted,media/removable_unmounted_decrypted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted X-TDE-ServiceTypes=media/bluray_unmounted,media/bluray_unmounted_decrypted,media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cdwriter_unmounted,media/cdwriter_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/nfs_unmounted,media/removable_unmounted,media/removable_unmounted_decrypted,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
Actions=MediaMount; Actions=MediaMount;
X-TDE-Priority=TopLevel X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true X-TDE-MediaNotifierHide=true

2
tdeioslave/media/services/media_unmount.desktop
Unescape View File

@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/dvdvideo,media/camera_mounted X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/bluray_mounted,media/bluray_mounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/hdd_mounted_decrypted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/vcd,media/svcd,media/blurayvideo,media/dvdvideo,media/camera_mounted
Actions=MediaUnmount; Actions=MediaUnmount;
X-TDE-Priority=TopLevel X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true X-TDE-MediaNotifierHide=true

8
tdeioslave/media/tdefile-plugin/tdefile_media.desktop
Unescape View File

@ -1,5 +1,10 @@
[Desktop Entry] [Desktop Entry]
Type=Service Type=Service
X-TDE-ServiceTypes=KFilePlugin,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/hdd_mounted,media/hdd_mounted_decrypted,media/hdd_unmounted,media/hdd_unmounted_decrypted,media/bluray_mounted,media/bluray_mounted_decrypted,media/bluray_unmounted,media/bluray_unmounted_decrypted,media/cdrom_mounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted,media/cdrom_unmounted_decrypted,media/cd-r_mounted,media/cd-r_mounted_decrypted,media/cd-rw_mounted,media/cd-rw_mounted_decrypted,media/nfs_mounted,media/cd-r_unmounted,media/cd-r_unmounted_decrypted,media/cd-rw_unmounted,media/cd-rw_unmounted_decrypted,media/nfs_unmounted,media/removable_mounted,media/removable_mounted_decrypted,media/dvd_mounted,media/dvd_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/dvd_unmounted,media/dvd_unmounted_decrypted,media/smb_mounted,media/blurayvideo,media/dvdvideo,media/smb_unmounted,media/floppy5_mounted,media/svcd,media/floppy5_unmounted,media/vcd,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/gphoto2camera,media/camera_mounted,media/camera_unmounted
X-TDE-Library=tdefile_media
Name=Medium Information Name=Medium Information
Name[af]=Medium Informasie Name[af]=Medium Informasie
Name[ar]=معلومات عن الوسيط Name[ar]=معلومات عن الوسيط
@ -70,6 +75,3 @@ Name[vi]=Thông tin về Ổ lưu trữ
Name[wa]=Informåcions sol mediom Name[wa]=Informåcions sol mediom
Name[zh_CN]=介质信息 Name[zh_CN]=介质信息
Name[zh_TW]=媒體資訊 Name[zh_TW]=媒體資訊
X-TDE-ServiceTypes=KFilePlugin
X-TDE-Library=tdefile_media
MimeType=media/audiocd;media/hdd_mounted;media/hdd_mounted_decrypted;media/blankcd;media/hdd_unmounted;media/hdd_unmounted_decrypted;media/blankdvd;media/cdrom_mounted;media/cdrom_mounted_decrypted;media/cdrom_unmounted;media/cdrom_unmounted_decrypted;media/cd-r_mounted;media/cd-r_mounted_decrypted;media/cd-rw_mounted;media/cd-rw_mounted_decrypted;media/nfs_mounted;media/cd-r_unmounted;media/cd-r_unmounted_decrypted;media/cd-rw_unmounted;media/cd-rw_unmounted_decrypted;media/nfs_unmounted;media/removable_mounted;media/removable_mounted_decrypted;media/dvd_mounted;media/dvd_mounted_decrypted;media/removable_unmounted;media/removable_unmounted_decrypted;media/dvd_unmounted;media/dvd_unmounted_decrypted;media/smb_mounted;media/dvdvideo;media/smb_unmounted;media/floppy5_mounted;media/svcd;media/floppy5_unmounted;media/vcd;media/floppy_mounted;media/zip_mounted;media/floppy_unmounted;media/zip_unmounted;media/gphoto2camera;media/camera_mounted;media/camera_unmounted

44
tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp
Unescape View File

@ -49,48 +49,54 @@ KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name,
: KFilePlugin(parent, name, args) : KFilePlugin(parent, name, args)
{ {
addMimeType( "media/audiocd" ); addMimeType( "media/audiocd" );
addMimeType( "media/hdd_mounted" ); addMimeType( "media/blankbluray" );
addMimeType( "media/hdd_mounted_decrypted" );
addMimeType( "media/blankcd" ); addMimeType( "media/blankcd" );
addMimeType( "media/hdd_unmounted" );
addMimeType( "media/hdd_unmounted_decrypted" );
addMimeType( "media/blankdvd" ); addMimeType( "media/blankdvd" );
addMimeType( "media/bluray_mounted" );
addMimeType( "media/bluray_mounted_decrypted" );
addMimeType( "media/bluray_unmounted" );
addMimeType( "media/bluray_unmounted_decrypted" );
addMimeType( "media/cdrom_mounted" ); addMimeType( "media/cdrom_mounted" );
addMimeType( "media/cdrom_mounted_decrypted" ); addMimeType( "media/cdrom_mounted_decrypted" );
addMimeType( "media/cdrom_unmounted" ); addMimeType( "media/cdrom_unmounted" );
addMimeType( "media/cdrom_unmounted_decrypted" ); addMimeType( "media/cdrom_unmounted_decrypted" );
addMimeType( "media/cd-r_mounted" ); addMimeType( "media/cd-r_mounted" );
addMimeType( "media/cd-r_mounted_decrypted" ); addMimeType( "media/cd-r_mounted_decrypted" );
addMimeType( "media/cd-rw_mounted" );
addMimeType( "media/cd-rw_mounted_decrypted" );
addMimeType( "media/nfs_mounted" );
addMimeType( "media/cd-r_unmounted" ); addMimeType( "media/cd-r_unmounted" );
addMimeType( "media/cd-r_unmounted_decrypted" ); addMimeType( "media/cd-r_unmounted_decrypted" );
addMimeType( "media/cd-rw_mounted" );
addMimeType( "media/cd-rw_mounted_decrypted" );
addMimeType( "media/cd-rw_unmounted" ); addMimeType( "media/cd-rw_unmounted" );
addMimeType( "media/cd-rw_unmounted_decrypted" ); addMimeType( "media/cd-rw_unmounted_decrypted" );
addMimeType( "media/nfs_unmounted" );
addMimeType( "media/removable_mounted" );
addMimeType( "media/removable_mounted_decrypted" );
addMimeType( "media/dvd_mounted" ); addMimeType( "media/dvd_mounted" );
addMimeType( "media/dvd_mounted_decrypted" ); addMimeType( "media/dvd_mounted_decrypted" );
addMimeType( "media/removable_unmounted" );
addMimeType( "media/removable_unmounted_decrypted" );
addMimeType( "media/dvd_unmounted" ); addMimeType( "media/dvd_unmounted" );
addMimeType( "media/dvd_unmounted_decrypted" ); addMimeType( "media/dvd_unmounted_decrypted" );
addMimeType( "media/hdd_mounted" );
addMimeType( "media/hdd_mounted_decrypted" );
addMimeType( "media/hdd_unmounted" );
addMimeType( "media/hdd_unmounted_decrypted" );
addMimeType( "media/removable_mounted" );
addMimeType( "media/removable_mounted_decrypted" );
addMimeType( "media/removable_unmounted" );
addMimeType( "media/removable_unmounted_decrypted" );
addMimeType( "media/nfs_mounted" );
addMimeType( "media/nfs_unmounted" );
addMimeType( "media/smb_mounted" ); addMimeType( "media/smb_mounted" );
addMimeType( "media/dvdvideo" );
addMimeType( "media/smb_unmounted" ); addMimeType( "media/smb_unmounted" );
addMimeType( "media/floppy_mounted" );
addMimeType( "media/floppy_unmounted" );
addMimeType( "media/floppy5_mounted" ); addMimeType( "media/floppy5_mounted" );
addMimeType( "media/svcd" );
addMimeType( "media/floppy5_unmounted" ); addMimeType( "media/floppy5_unmounted" );
addMimeType( "media/vcd" );
addMimeType( "media/floppy_mounted" );
addMimeType( "media/zip_mounted" ); addMimeType( "media/zip_mounted" );
addMimeType( "media/floppy_unmounted" );
addMimeType( "media/zip_unmounted" ); addMimeType( "media/zip_unmounted" );
addMimeType( "media/gphoto2camera" ); addMimeType( "media/blurayvideo" );
addMimeType( "media/dvdvideo" );
addMimeType( "media/svcd" );
addMimeType( "media/vcd" );
addMimeType( "media/camera_mounted" ); addMimeType( "media/camera_mounted" );
addMimeType( "media/camera_unmounted" ); addMimeType( "media/camera_unmounted" );
addMimeType( "media/gphoto2camera" );
} }
bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/) bool KFileMediaPlugin::readInfo(KFileMetaInfo &info, uint /*what*/)

Write Preview
Loading…
Cancel
Save