10 files changed, 47 insertions, 26 deletions
diff --git a/tdeioslave/media/services/CMakeLists.txt b/tdeioslave/media/services/CMakeLists.txt
index b550409ba..932188725 100644
--- a/tdeioslave/media/services/CMakeLists.txt
+++ b/tdeioslave/media/services/CMakeLists.txt
@@ -13,8 +13,10 @@
 
 tde_create_translated_desktop(
   SOURCE
-    media_decrypt.desktop media_mount.desktop media_unmount.desktop
+    media_mount.desktop media_unmount.desktop
+    media_unlock.desktop media_lock.desktop
     media_eject.desktop media_safelyremove.desktop
+    media_realfolder.desktop
   DESTINATION ${DATA_INSTALL_DIR}/konqueror/servicemenus
   PO_DIR tdeioslave-desktops
 )
diff --git a/tdeioslave/media/services/Makefile.am b/tdeioslave/media/services/Makefile.am
index c744934f2..e08b06be8 100644
--- a/tdeioslave/media/services/Makefile.am
+++ b/tdeioslave/media/services/Makefile.am
@@ -1,3 +1,3 @@
 servicesdir = $(kde_datadir)/konqueror/servicemenus
-services_DATA = media_decrypt.desktop media_mount.desktop media_unmount.desktop media_eject.desktop media_safelyremove.desktop
+services_DATA = media_mount.desktop media_unmount.desktop media_unlock.desktop media_lock.desktop media_eject.desktop media_safelyremove.desktop media_realfolder.desktop
 
diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop
deleted file mode 100644
index ee48f2e63..000000000
--- a/tdeioslave/media/services/media_decrypt.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-X-TDE-ServiceTypes=media/removable_encrypted_locked,media/hdd_encrypted_locked,media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked
-Actions=MediaUnlock;
-X-TDE-Priority=TopLevel
-X-TDE-MediaNotifierHide=true
-
-[Desktop Action MediaUnlock]
-Name=Unlock
-
-Exec=tdeio_media_mounthelper -k %u
-Icon=decrypted
diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop
index ad289fd33..0bb128656 100644
--- a/tdeioslave/media/services/media_eject.desktop
+++ b/tdeioslave/media/services/media_eject.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_unlocked,media/bluray_encrypted_locked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdrom_encrypted_locked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-r_encrypted_locked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/cd-rw_encrypted_locked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/dvd_encrypted_locked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaEject;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaEject]
-Name=Eject
-
 Exec=tdeio_media_mounthelper -e %u
+Icon=player_eject
+Name=Eject
diff --git a/tdeioslave/media/services/media_lock.desktop b/tdeioslave/media/services/media_lock.desktop
new file mode 100644
index 000000000..d57565312
--- /dev/null
+++ b/tdeioslave/media/services/media_lock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_unlocked,media/cdrom_encrypted_unlocked,media/cd-r_encrypted_unlocked,media/cd-rw_encrypted_unlocked,media/dvd_encrypted_unlocked,media/hdd_encrypted_unlocked,media/removable_encrypted_unlocked
+Actions=MediaLock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=true
+
+[Desktop Action MediaLock]
+Exec=tdeio_media_mounthelper -l %u
+Icon=encrypted
+Name=Lock
diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop
index d0f164bb9..f018cfd18 100644
--- a/tdeioslave/media/services/media_mount.desktop
+++ b/tdeioslave/media/services/media_mount.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/bluray_unmounted,media/bluray_encrypted_unlocked,media/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cd-r_unmounted,media/cd-r_encrypted_unlocked,media/cd-rw_unmounted,media/cd-rw_encrypted_unlocked,media/dvd_unmounted,media/dvd_encrypted_unlocked,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,media/nfs_unmounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/smb_unmounted,media/zip_unmounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaMount;
 X-TDE-Priority=TopLevel
-X-TDE-MediaNotifierHide=true
+X-TDE-MediaNotifierHide=false
 
 [Desktop Action MediaMount]
-Name=Mount
-
 Exec=tdeio_media_mounthelper -m %u
+Icon=drive-harddisk-mounted
+Name=Mount
diff --git a/tdeioslave/media/services/media_realfolder.desktop b/tdeioslave/media/services/media_realfolder.desktop
new file mode 100644
index 000000000..a89066c53
--- /dev/null
+++ b/tdeioslave/media/services/media_realfolder.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/camera_mounted,media/camera_unmounted,media/cdrom_mounted,media/cdrom_unmounted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-rw_mounted,media/cd-rw_unmounted,media/dvd_mounted,media/dvd_unmounted,media/floppy5_mounted,media/floppy5_unmounted,media/floppy_mounted,media/floppy_unmounted,media/hdd_mounted,media/hdd_unmounted,media/nfs_mounted,media/nfs_unmounted,media/removable_mounted,media/removable_unmounted,media/smb_mounted,media/smb_unmounted,media/zip_mounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
+Actions=MediaRealFolder
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=false
+
+[Desktop Action MediaRealFolder]
+Exec=tdeio_media_mounthelper -f %u
+Icon=folder_red
+Name=Open Medium System Folder
diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop
index 5abfdcd85..cf7191c8b 100644
--- a/tdeioslave/media/services/media_safelyremove.desktop
+++ b/tdeioslave/media/services/media_safelyremove.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/camera_mounted,media/camera_unmounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/bluray_unmounted,media/bluray_encrypted_locked,media/bluray_encrypted_unlocked,media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_encrypted_locked,media/cdrom_encrypted_unlocked,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_encrypted_locked,media/cd-r_encrypted_unlocked,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_encrypted_locked,media/cd-rw_encrypted_unlocked,media/dvd_mounted,media/dvd_unmounted,media/dvd_encrypted_locked,media/dvd_encrypted_unlocked,media/audiocd,media/blankbluray,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted,media/camera_unmounted,media/removable_mounted,media/removable_unmounted,media/removable_encrypted_locked,media/removable_encrypted_unlocked
 Actions=MediaSafelyRemove;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaSafelyRemove]
-Name=Safely Remove
-
 Exec=tdeio_media_mounthelper -s %u
+Icon=player_safe_removal
+Name=Safely Remove
diff --git a/tdeioslave/media/services/media_unlock.desktop b/tdeioslave/media/services/media_unlock.desktop
new file mode 100644
index 000000000..8d15cd46e
--- /dev/null
+++ b/tdeioslave/media/services/media_unlock.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,media/cd-r_encrypted_locked,media/cd-rw_encrypted_locked,media/dvd_encrypted_locked,media/hdd_encrypted_locked,media/removable_encrypted_locked
+Actions=MediaUnlock;
+X-TDE-Priority=TopLevel
+X-TDE-MediaNotifierHide=false
+
+[Desktop Action MediaUnlock]
+Exec=tdeio_media_mounthelper -k %u
+Icon=decrypted
+Name=Unlock
diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop
index 32bd58406..38370dd25 100644
--- a/tdeioslave/media/services/media_unmount.desktop
+++ b/tdeioslave/media/services/media_unmount.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
-X-TDE-ServiceTypes=media/removable_mounted,media/bluray_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/smb_mounted,media/zip_mounted,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd,media/camera_mounted
+X-TDE-ServiceTypes=media/bluray_mounted,media/camera_mounted,media/cdrom_mounted,media/cd-r_mounted,media/cd-rw_mounted,media/dvd_mounted,media/floppy5_mounted,media/floppy_mounted,media/hdd_mounted,media/nfs_mounted,media/removable_mounted,media/smb_mounted,media/zip_mounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd
 Actions=MediaUnmount;
 X-TDE-Priority=TopLevel
 X-TDE-MediaNotifierHide=true
 
 [Desktop Action MediaUnmount]
-Name=Unmount
-
 Exec=tdeio_media_mounthelper -u %u
+Icon=drive-harddisk-unmounted
+Name=Unmount