From d2da293eaecf382e2fd2b6517b90df62ae21e127 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 16 Jun 2019 22:55:14 +0900 Subject: Adjusted to new icon names and renamed media types related to encrypted drives in a better way. Signed-off-by: Michele Calgaro --- tdeioslave/media/tdefile-plugin/tdefile_media.desktop | 2 +- tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) (limited to 'tdeioslave/media/tdefile-plugin') diff --git a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop index 4b70c62e7..514124a51 100644 --- a/tdeioslave/media/tdefile-plugin/tdefile_media.desktop +++ b/tdeioslave/media/tdefile-plugin/tdefile_media.desktop @@ -72,4 +72,4 @@ Name[zh_CN]=介质信息 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 +MimeType=media/audiocd;media/hdd_mounted;media/blankcd;media/hdd_unmounted;media/hdd_encrypted_unlocked;media/blankdvd;media/cdrom_mounted;media/cdrom_unmounted;media/cdrom_encrypted_unlocked;media/cd-r_mounted;media/cd-rw_mounted;media/nfs_mounted;media/cd-r_unmounted;media/cd-r_encrypted_unlocked;media/cd-rw_unmounted;media/cd-rw_encrypted_unlocked;media/nfs_unmounted;media/removable_mounted;media/dvd_mounted;media/removable_unmounted;media/removable_encrypted_unlocked;media/dvd_unmounted;media/dvd_encrypted_unlocked;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 diff --git a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp index 3d6c16cf3..7ca1d311d 100644 --- a/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp +++ b/tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp @@ -50,33 +50,27 @@ KFileMediaPlugin::KFileMediaPlugin(TQObject *parent, const char *name, { addMimeType( "media/audiocd" ); addMimeType( "media/hdd_mounted" ); - addMimeType( "media/hdd_mounted_decrypted" ); addMimeType( "media/blankcd" ); addMimeType( "media/hdd_unmounted" ); - addMimeType( "media/hdd_unmounted_decrypted" ); + addMimeType( "media/hdd_encrypted_unlocked" ); addMimeType( "media/blankdvd" ); addMimeType( "media/cdrom_mounted" ); - addMimeType( "media/cdrom_mounted_decrypted" ); addMimeType( "media/cdrom_unmounted" ); - addMimeType( "media/cdrom_unmounted_decrypted" ); + addMimeType( "media/cdrom_encrypted_unlocked" ); addMimeType( "media/cd-r_mounted" ); - 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_decrypted" ); + addMimeType( "media/cd-r_encrypted_unlocked" ); addMimeType( "media/cd-rw_unmounted" ); - addMimeType( "media/cd-rw_unmounted_decrypted" ); + addMimeType( "media/cd-rw_encrypted_unlocked" ); addMimeType( "media/nfs_unmounted" ); addMimeType( "media/removable_mounted" ); - addMimeType( "media/removable_mounted_decrypted" ); addMimeType( "media/dvd_mounted" ); - addMimeType( "media/dvd_mounted_decrypted" ); addMimeType( "media/removable_unmounted" ); - addMimeType( "media/removable_unmounted_decrypted" ); + addMimeType( "media/removable_encrypted_unlocked" ); addMimeType( "media/dvd_unmounted" ); - addMimeType( "media/dvd_unmounted_decrypted" ); + addMimeType( "media/dvd_encrypted_unlocked" ); addMimeType( "media/smb_mounted" ); addMimeType( "media/dvdvideo" ); addMimeType( "media/smb_unmounted" ); -- cgit v1.2.1