Browse Source

Adjusted to new icon names and renamed media types related to encrypted drives in a better way.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/39/head
Michele Calgaro 3 months ago
parent
commit
d2da293eae
Signed by: Michele Calgaro <michele.calgaro@yahoo.it> GPG Key ID: 2A75B7CA8ADED5CF
54 changed files with 272 additions and 335 deletions
  1. 10
    15
      tdeioslave/media/libmediacommon/notifiersettings.cpp
  2. 1
    1
      tdeioslave/media/mediamanager/CMakeLists.txt
  3. 13
    13
      tdeioslave/media/mediamanager/dialog.cpp
  4. 2
    2
      tdeioslave/media/mediamanager/dialog.h
  5. 12
    15
      tdeioslave/media/mediamanager/halbackend.cpp
  6. 1
    1
      tdeioslave/media/mediamanager/medialist.cpp
  7. 18
    14
      tdeioslave/media/mediamanager/tdehardwarebackend.cpp
  8. 4
    4
      tdeioslave/media/mediamanager/unlockdialog.ui
  9. 12
    12
      tdeioslave/media/mimetypes/CMakeLists.txt
  10. 10
    10
      tdeioslave/media/mimetypes/Makefile.am
  11. 12
    0
      tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop
  12. 12
    0
      tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop
  13. 0
    11
      tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
  14. 0
    11
      tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
  15. 0
    11
      tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
  16. 12
    0
      tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop
  17. 12
    0
      tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop
  18. 0
    11
      tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
  19. 0
    11
      tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
  20. 0
    11
      tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
  21. 12
    0
      tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop
  22. 12
    0
      tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop
  23. 0
    11
      tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
  24. 0
    11
      tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
  25. 0
    11
      tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
  26. 12
    0
      tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop
  27. 12
    0
      tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop
  28. 0
    11
      tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
  29. 0
    11
      tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
  30. 0
    11
      tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
  31. 12
    0
      tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop
  32. 12
    0
      tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop
  33. 0
    11
      tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
  34. 0
    11
      tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
  35. 0
    11
      tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
  36. 12
    0
      tdeioslave/media/mimetypes/removable_encrypted_locked.desktop
  37. 12
    0
      tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop
  38. 0
    11
      tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
  39. 0
    11
      tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
  40. 0
    11
      tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
  41. 1
    1
      tdeioslave/media/mounthelper/CMakeLists.txt
  42. 1
    1
      tdeioslave/media/mounthelper/Makefile.am
  43. 13
    13
      tdeioslave/media/mounthelper/dialog.cpp
  44. 2
    2
      tdeioslave/media/mounthelper/dialog.h
  45. 5
    5
      tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp
  46. 2
    2
      tdeioslave/media/mounthelper/unlockdialog.ui
  47. 1
    1
      tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop
  48. 9
    8
      tdeioslave/media/services/media_decrypt.desktop
  49. 1
    1
      tdeioslave/media/services/media_eject.desktop
  50. 1
    1
      tdeioslave/media/services/media_mount.desktop
  51. 1
    1
      tdeioslave/media/services/media_safelyremove.desktop
  52. 1
    1
      tdeioslave/media/services/media_unmount.desktop
  53. 1
    1
      tdeioslave/media/tdefile-plugin/tdefile_media.desktop
  54. 6
    12
      tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp

+ 10
- 15
tdeioslave/media/libmediacommon/notifiersettings.cpp View File

@@ -32,33 +32,28 @@
NotifierSettings::NotifierSettings()
{
m_supportedMimetypes.append( "media/removable_unmounted" );
m_supportedMimetypes.append( "media/removable_unmounted_encrypted" );
m_supportedMimetypes.append( "media/removable_unmounted_decrypted" );
m_supportedMimetypes.append( "media/removable_encrypted_locked" );
m_supportedMimetypes.append( "media/removable_encrypted_unlocked" );
m_supportedMimetypes.append( "media/removable_mounted" );
m_supportedMimetypes.append( "media/removable_mounted_decrypted" );
m_supportedMimetypes.append( "media/camera_unmounted" );
m_supportedMimetypes.append( "media/camera_mounted" );
m_supportedMimetypes.append( "media/gphoto2camera" );
m_supportedMimetypes.append( "media/cdrom_unmounted" );
m_supportedMimetypes.append( "media/cdrom_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cdrom_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cdrom_encrypted_locked" );
m_supportedMimetypes.append( "media/cdrom_encrypted_unlocked" );
m_supportedMimetypes.append( "media/cdrom_mounted" );
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_encrypted_locked" );
m_supportedMimetypes.append( "media/dvd_encrypted_unlocked" );
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_encrypted" );
m_supportedMimetypes.append( "media/cd-r_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cd-r_encrypted_locked" );
m_supportedMimetypes.append( "media/cd-r_encrypted_unlocked" );
m_supportedMimetypes.append( "media/cd-r_mounted" );
m_supportedMimetypes.append( "media/cd-r_mounted_decrypted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted_encrypted" );
m_supportedMimetypes.append( "media/cd-rw_unmounted_decrypted" );
m_supportedMimetypes.append( "media/cd-rw_encrypted_locked" );
m_supportedMimetypes.append( "media/cd-rw_encrypted_unlocked" );
m_supportedMimetypes.append( "media/cd-rw_mounted" );
m_supportedMimetypes.append( "media/cd-rw_mounted_decrypted" );
m_supportedMimetypes.append( "media/blankcd" );
m_supportedMimetypes.append( "media/blankdvd" );
m_supportedMimetypes.append( "media/audiocd" );

+ 1
- 1
tdeioslave/media/mediamanager/CMakeLists.txt View File

@@ -49,7 +49,7 @@ tde_add_kpart( ${target} AUTOMOC
SOURCES
mediamanager.cpp mediamanager.skel medialist.cpp
backendbase.cpp fstabbackend.cpp removablebackend.cpp
decryptdialog.ui dialog.cpp
unlockdialog.ui dialog.cpp
mediadirnotify.cpp mediadirnotify.skel
${HAL_MEDIA_BACKEND} ${TDEHWBACKEND}
LINK mediacommon-static tdeinit_kded-shared ${HAL_MEDIA_LIBRARIES}

+ 13
- 13
tdeioslave/media/mediamanager/dialog.cpp View File

@@ -23,41 +23,41 @@
#include "dialog.h"

Dialog::Dialog(TQString url, TQString iconName) :
KDialogBase(NULL, "Dialog", true, "Decrypt Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Decrypt"), "decrypted" ))
KDialogBase(NULL, "Unlock", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
{
decryptDialog = new DecryptDialog(this);
unlockDialog = new UnlockDialog(this);

decryptDialog->errorBox->hide();
decryptDialog->descLabel->setText(decryptDialog->descLabel->text().arg(url));
decryptDialog->descLabel->adjustSize();
decryptDialog->adjustSize();
unlockDialog->errorBox->hide();
unlockDialog->descLabel->setText(unlockDialog->descLabel->text().arg(url));
unlockDialog->descLabel->adjustSize();
unlockDialog->adjustSize();

enableButton( User1, false );

TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
unlockDialog->encryptedIcon->setPixmap( pixmap );

connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

setMainWidget(decryptDialog);
setMainWidget(unlockDialog);
}

Dialog::~Dialog()
{
delete decryptDialog;
delete unlockDialog;
}

TQString Dialog::getPassword()
{
return decryptDialog->passwordEdit->text();
return unlockDialog->passwordEdit->text();
}

void Dialog::slotDialogError(TQString errorMsg)
{
kdDebug() << __func__ << "(" << errorMsg << " )" << endl;

decryptDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
decryptDialog->errorBox->show();
unlockDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
unlockDialog->errorBox->show();
}

void Dialog::slotPasswordChanged(const TQString &text)

+ 2
- 2
tdeioslave/media/mediamanager/dialog.h View File

@@ -34,7 +34,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>

#include "decryptdialog.h"
#include "unlockdialog.h"

class KryptoMedia;

@@ -54,7 +54,7 @@ public slots:
void slotPasswordChanged(const TQString &text);

private:
DecryptDialog *decryptDialog;
UnlockDialog *unlockDialog;
};

#endif // DIALOG_H_

+ 12
- 15
tdeioslave/media/mediamanager/halbackend.cpp View File

@@ -40,18 +40,15 @@
#include <kstandarddirs.h>
#include <kprocess.h>

#define MOUNT_SUFFIX ( \
(medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")) + \
(medium->isEncrypted() ? (halClearVolume ? "_decrypted" : "_encrypted") : "" ) \
)
#define MOUNT_ICON_SUFFIX ( \
(medium->isMounted() ? TQString("_mount") : TQString("_unmount")) + \
(medium->isEncrypted() ? (halClearVolume ? "_decrypt" : "_encrypt") : "" ) \
)
#define MOUNTED_ICON_SUFFIX ( \
(medium->isMounted() ? TQString("-mounted") : TQString("")) + \
(medium->isEncrypted() ? (halClearVolume ? "-decrypted" : "-encrypted") : "" ) \
)
#define MOUNT_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("")))

/* Static instance of this class, for static HAL callbacks */
static HALBackend* s_HALBackend;
@@ -515,7 +512,7 @@ void HALBackend::setVolumeProperties(Medium* medium)
if (clearUdi != NULL) {
kdDebug(1219) << "HALBackend::setVolumeProperties : crypto clear volume avail - " << clearUdi << endl;
halClearVolume = libhal_volume_from_udi(m_halContext, clearUdi);
// ignore if halClearVolume is NULL -> just not decrypted in this case
// ignore if halClearVolume is NULL -> just not unlocked in this case
clearUdiString = clearUdi;
libhal_free_string(clearUdi);
}
@@ -928,7 +925,7 @@ TQStringList HALBackend::mountoptions(const TQString &name)
volume_udi = clearUdi;
libhal_free_string(clearUdi);
} else {
// if not decrypted yet then no mountoptions
// if not unlocked yet then no mountoptions
return TQStringList();
}
libhal_volume_free(halVolume);
@@ -1569,7 +1566,7 @@ TQStringVariantMap HALBackend::mount(const Medium *medium)
qerror = mount_priv(medium->id().latin1(), mount_point.utf8(), options, noptions, dbus_connection);
} else {
// see if we have a clear volume
error = i18n("Cannot mount encrypted drives!");
error = i18n("Cannot mount encrypted locked drives!");
LibHalVolume* halVolume = libhal_volume_from_udi(m_halContext, medium->id().latin1());
if (halVolume) {
char* clearUdi = libhal_volume_crypto_get_clear_volume_udi(m_halContext, halVolume);

+ 1
- 1
tdeioslave/media/mediamanager/medialist.cpp View File

@@ -126,7 +126,7 @@ bool MediaList::removeMedium(const TQString &id, bool allowNotification)

bool MediaList::changeMediumState(const Medium &medium, bool allowNotification)
{
kdDebug(1219) << "MediaList::changeMediumState(const Medium &)" << endl;
kdDebug(1219) << "MediaList::changeMediumState(const Medium &) for id " << medium.id() << endl;

if ( !m_idMap.contains(medium.id()) ) return false;


+ 18
- 14
tdeioslave/media/mediamanager/tdehardwarebackend.cpp View File

@@ -37,19 +37,15 @@

#include "dialog.h"

#define MOUNT_SUFFIX ( \
(medium->isMounted() ? TQString("_mounted") : TQString("_unmounted")) + \
(medium->isEncrypted() ? (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "_decrypted" : "_encrypted") : "" ) \
)
#define MOUNT_ICON_SUFFIX ( \
(medium->isMounted() ? TQString("_mount") : TQString("_unmount")) + \
(medium->isEncrypted() ? (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "_decrypt" : "_encrypt") : "" ) \
)
#define MOUNTED_ICON_SUFFIX ( \
(medium->isMounted() ? TQString("-mounted") : TQString("")) + \
(medium->isEncrypted() ? (sdevice->isDiskOfType(TDEDiskDeviceType::UnlockedCrypt) ? "-decrypted" : "-encrypted") : "" ) \
)
#define MOUNT_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("")))

/* Constructor */
TDEBackend::TDEBackend(MediaList &list, TQObject* parent)
@@ -463,6 +459,8 @@ void TDEBackend::ResetProperties(TDEStorageDevice * sdevice, bool allowNotificat

void TDEBackend::setVolumeProperties(Medium* medium)
{
kdDebug(1219) << "TDEBackend::setVolumeProperties for " << medium->id() << endl;

TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices();

TDEStorageDevice * sdevice = hwdevices->findDiskByUID(medium->id());
@@ -1188,6 +1186,8 @@ void TDEBackend::slotPasswordCancel() {

TQStringVariantMap TDEBackend::mount(const Medium *medium)
{
kdDebug(1219) << "TDEBackend::mount for medium " << medium->name() << endl;

TQStringVariantMap result;
if (medium->isMounted()) {
result["result"] = true;
@@ -1301,7 +1301,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
if (mountedPath.isEmpty()) {
if (mountResult.contains("retCode") && mountResult["retCode"].toInt() == 0) {
// Mounting was successful
// Because the TDE hardware backend is event driven it might take a little while for the new unencrypted mapped device to show up
// Because the TDE hardware backend is event driven it might take a little while for the new enlock mapped device to show up
// Wait up to 30 seconds for it to appear...
for (int i=0;i<300;i++) {
mountedPath = sdevice->mountPath();
@@ -1321,7 +1321,7 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)
continue_trying_to_decrypt = true;
}
else {
qerror = i18n("Cannot mount encrypted drives!");
qerror = i18n("Cannot mount encrypted locked drives!");
qerror = i18n("Unable to mount this device.");
TQString errStr = mountResult.contains("errStr") ? mountResult["errStr"].toString() : TQString::null;
if (!errStr.isEmpty()) {
@@ -1357,6 +1357,8 @@ TQStringVariantMap TDEBackend::mount(const Medium *medium)

TQStringVariantMap TDEBackend::mount(const TQString &id)
{
kdDebug(1219) << "TDEBackend::mount for id " << id << endl;

const Medium *medium = m_mediaList.findById(id);
if (!medium) {
TQStringVariantMap result;
@@ -1369,6 +1371,8 @@ TQStringVariantMap TDEBackend::mount(const TQString &id)

TQStringVariantMap TDEBackend::unmount(const TQString &id)
{
kdDebug(1219) << "TDEBackend::unmount for id " << id << endl;

TQStringVariantMap result;

const Medium* medium = m_mediaList.findById(id);

tdeioslave/media/mounthelper/decryptdialog.ui → tdeioslave/media/mediamanager/unlockdialog.ui View File

@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DecryptDialog</class>
<class>UnlockDialog</class>
<widget class="TQWidget">
<property name="name">
<cstring>DecryptDialog</cstring>
<cstring>UnlockDialog</cstring>
</property>
<property name="geometry">
<rect>
@@ -106,8 +106,8 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted storage device.&lt;/p&gt;
&lt;p&gt;Please enter the password to decrypt the storage device.&lt;/p&gt;</string>
<string>&lt;p&gt;&lt;b&gt;%1&lt;/b&gt; is an encrypted locked storage device.&lt;/p&gt;
&lt;p&gt;Please enter the password to unlock the storage device.&lt;/p&gt;</string>
</property>
<property name="alignment">
<set>WordBreak|AlignTop</set>

+ 12
- 12
tdeioslave/media/mimetypes/CMakeLists.txt View File

@@ -16,18 +16,18 @@ install( FILES
floppy5_unmounted.desktop floppy5_mounted.desktop
zip_mounted.desktop zip_unmounted.desktop
hdd_mounted.desktop hdd_unmounted.desktop
hdd_mounted_decrypted.desktop hdd_unmounted_encrypted.desktop
hdd_unmounted_decrypted.desktop removable_mounted.desktop
removable_unmounted.desktop removable_mounted_decrypted.desktop
removable_unmounted_encrypted.desktop removable_unmounted_decrypted.desktop
cdrom_mounted.desktop cdrom_unmounted.desktop cdrom_mounted_decrypted.desktop
cdrom_unmounted_encrypted.desktop cdrom_unmounted_decrypted.desktop
dvd_mounted.desktop dvd_unmounted.desktop dvd_mounted_decrypted.desktop
dvd_unmounted_encrypted.desktop dvd_unmounted_decrypted.desktop
cd-r_mounted.desktop cd-r_unmounted.desktop cd-r_mounted_decrypted.desktop
cd-r_unmounted_encrypted.desktop cd-r_unmounted_decrypted.desktop
cd-rw_mounted.desktop cd-rw_unmounted.desktop cd-rw_mounted_decrypted.desktop
cd-rw_unmounted_encrypted.desktop cd-rw_unmounted_decrypted.desktop smb_mounted.desktop
hdd_encrypted_locked.desktop
hdd_encrypted_unlocked.desktop removable_mounted.desktop
removable_unmounted.desktop
removable_encrypted_locked.desktop removable_encrypted_unlocked.desktop
cdrom_mounted.desktop cdrom_unmounted.desktop
cdrom_encrypted_locked.desktop cdrom_encrypted_unlocked.desktop
dvd_mounted.desktop dvd_unmounted.desktop
dvd_encrypted_locked.desktop dvd_encrypted_unlocked.desktop
cd-r_mounted.desktop cd-r_unmounted.desktop
cd-r_encrypted_locked.desktop cd-r_encrypted_unlocked.desktop
cd-rw_mounted.desktop cd-rw_unmounted.desktop
cd-rw_encrypted_locked.desktop cd-rw_encrypted_unlocked.desktop smb_mounted.desktop
smb_unmounted.desktop nfs_mounted.desktop nfs_unmounted.desktop
audiocd.desktop dvdvideo.desktop blankcd.desktop blankdvd.desktop
svcd.desktop vcd.desktop gphoto2camera.desktop camera_mounted.desktop

+ 10
- 10
tdeioslave/media/mimetypes/Makefile.am View File

@@ -4,20 +4,20 @@ mimetype_DATA = floppy_mounted.desktop floppy_unmounted.desktop \
floppy5_unmounted.desktop floppy5_mounted.desktop \
zip_mounted.desktop zip_unmounted.desktop \
hdd_mounted.desktop hdd_unmounted.desktop \
hdd_mounted_decrypted.desktop hdd_unmounted_encrypted.desktop \
hdd_unmounted_decrypted.desktop \
hdd_encrypted_locked.desktop \
hdd_encrypted_unlocked.desktop \
removable_mounted.desktop removable_unmounted.desktop \
removable_mounted_decrypted.desktop removable_unmounted_encrypted.desktop \
removable_unmounted_decrypted.desktop \
removable_encrypted_locked.desktop \
removable_encrypted_unlocked.desktop \
cdrom_mounted.desktop cdrom_unmounted.desktop \
cdrom_mounted_decrypted.desktop cdrom_unmounted_encrypted.desktop \
cdrom_unmounted_decrypted.desktop \
cdrom_encrypted_locked.desktop \
cdrom_encrypted_unlocked.desktop \
dvd_mounted.desktop dvd_unmounted.desktop \
dvd_mounted_decrypted.desktop dvd_unmounted_encrypted.desktop \
dvd_unmounted_decrypted.desktop \
dvd_encrypted_locked.desktop \
dvd_encrypted_unlocked.desktop \
cdwriter_mounted.desktop cdwriter_unmounted.desktop \
cdwriter_mounted_decrypted.desktop cdwriter_unmounted_encrypted.desktop \
cdwriter_unmounted_decrypted.desktop \
cdwriter_encrypted_locked.desktop \
cdwriter_encrypted_unlocked.desktop \
smb_mounted.desktop smb_unmounted.desktop \
nfs_mounted.desktop nfs_unmounted.desktop \
audiocd.desktop \

+ 12
- 0
tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-locked
Type=MimeType
MimeType=media/cd-r_encrypted_locked
Comment=Encrypted Locked CD-R
Comment[de]=Verschlüsselte gesperrte CD-R
Comment[it]=CD-R criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-unlocked
Type=MimeType
MimeType=media/cd-r_encrypted_unlocked
Comment=Encrypted Unlocked CD-R
Comment[de]=Verschlüsselte entsperrte CD-R
Comment[it]=CD-R criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-decrypted-mounted
Type=MimeType
MimeType=media/cd-r_mounted_decrypted
Comment=Mounted Decrypted CD-R
Comment[de]=Eingebundener, entschlüsselter CD-R
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-decrypted
Type=MimeType
MimeType=media/cd-r_unmounted_decrypted
Comment=Unmounted Decrypted CD-R
Comment[de]=Nicht eingebundener, entschlüsselter CD-R
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-encrypted
Type=MimeType
MimeType=media/cd-r_unmounted_encrypted
Comment=Unmounted Encrypted CD-R
Comment[de]=Nicht eingebundener, entschlüsselter CD-R
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-locked
Type=MimeType
MimeType=media/cd-rw_encrypted_locked
Comment=Encrypted Locked CD-RW
Comment[de]=Verschlüsselte gesperrte CD-RW
Comment[it]=CD-RW criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-unlocked
Type=MimeType
MimeType=media/cd-rw_encrypted_unlocked
Comment=Encrypted Unlocked CD-RW
Comment[de]=Verschlüsselte entsperrte CD-RW
Comment[it]=CD-RW criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-decrypted-mounted
Type=MimeType
MimeType=media/cd-rw_mounted_decrypted
Comment=Mounted Decrypted CD-RW
Comment[de]=Eingebundener, entschlüsselter CD-RW
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-decrypted
Type=MimeType
MimeType=media/cd-rw_unmounted_decrypted
Comment=Unmounted Decrypted CD-RW
Comment[de]=Nicht eingebundener, entschlüsselter CD-RW
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdwriter-encrypted
Type=MimeType
MimeType=media/cd-rw_unmounted_encrypted
Comment=Unmounted Encrypted CD-RW
Comment[de]=Nicht eingebundener, entschlüsselter CD-RW
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdrom-locked
Type=MimeType
MimeType=media/cdrom_encrypted_locked
Comment=Encrypted Locked CD-ROM
Comment[de]=Verschlüsselte gesperrte CD-ROM
Comment[it]=CD-ROM criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdrom-unlocked
Type=MimeType
MimeType=media/cdrom_encrypted_unlocked
Comment=Encrypted Unlocked CD-ROM
Comment[de]=Verschlüsselte entsperrte CD-ROM
Comment[it]=CD-ROM criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdrom-decrypted-mounted
Type=MimeType
MimeType=media/cdrom_mounted_decrypted
Comment=Mounted Decrypted CD-ROM
Comment[de]=Eingebundene, entschlüsselte CD-ROM
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdrom-decrypted
Type=MimeType
MimeType=media/cdrom_unmounted_decrypted
Comment=Unmounted Decrypted CD-ROM
Comment[de]=Nicht eingebundene, entschlüsselte CD-ROM
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-cdrom-encrypted
Type=MimeType
MimeType=media/cdrom_unmounted_encrypted
Comment=Unmounted Encrypted CD-ROM
Comment[de]=Nicht eingebundene, verschlüsselte CD-ROM
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-dvd-locked
Type=MimeType
MimeType=media/dvd_encrypted_locked
Comment=Encrypted Locked DVD
Comment[de]=Verschlüsselte gesperrte DVD
Comment[it]=DVD criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-dvd-unlocked
Type=MimeType
MimeType=media/dvd_encrypted_unlocked
Comment=Encrypted Unlocked DVD
Comment[de]=Verschlüsselte entsperrte DVD
Comment[it]=DVD criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-dvd-decrypted-mounted
Type=MimeType
MimeType=media/dvd_mounted_decrypted
Comment=Mounted Decrypted DVD
Comment[de]=Eingebundene, entschlüsselte DVD
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-dvd-decrypted
Type=MimeType
MimeType=media/dvd_unmounted_decrypted
Comment=Unmounted Decrypted DVD
Comment[de]=Nicht eingebundene, entschlüsselte DVD
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-optical-dvd-encrypted
Type=MimeType
MimeType=media/dvd_unmounted_encrypted
Comment=Unmounted Encrypted DVD
Comment[de]=Nicht eingebundene, verschlüsselte DVD
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=drive-harddisk-locked
Type=MimeType
MimeType=media/hdd_encrypted_locked
Comment=Encrypted Locked Hard Disk Volume
Comment[de]=Verschlüsselte gesperrte Festplattenpartition
Comment[it]=Disco criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=drive-harddisk-unlocked
Type=MimeType
MimeType=media/hdd_encrypted_unlocked
Comment=Encrypted Unlocked Hard Disk Volume
Comment[de]=Verschlüsselte entsperrte Festplattenpartition
Comment[it]=Disco criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=drive-harddisk-decrypted-mounted
Type=MimeType
MimeType=media/hdd_mounted_decrypted
Comment=Mounted Decrypted Hard Disk Volume
Comment[de]=Eingebundene, entschlüsselte Festplattenpartition
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=drive-harddisk-decrypted
Type=MimeType
MimeType=media/hdd_unmounted_decrypted
Comment=Unmounted Decrypted Hard Disk Volume
Comment[de]=Nicht eingebundene, entschlüsselte Festplattenpartition
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=drive-harddisk-encrypted
Type=MimeType
MimeType=media/hdd_unmounted_encrypted
Comment=Unmounted Encrypted Hard Disk Volume
Comment[de]=Nicht eingebundene, verschlüsselte Festplattenpartition
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/removable_encrypted_locked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-flash-usb-locked
Type=MimeType
MimeType=media/removable_encrypted_locked
Comment=Encrypted Locked Removable Medium
Comment[de]=Verschlüsselte gesperrte Wechsellaufwerk
Comment[it]=Disco rimovibile criptato protetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 12
- 0
tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop View File

@@ -0,0 +1,12 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-flash-usb-unlocked
Type=MimeType
MimeType=media/removable_encrypted_unlocked
Comment=Encrypted Unlocked Removable Medium
Comment[de]=Verschlüsselte entsperrte Wechsellaufwerk
Comment[it]=Disco rimovibile criptato sprotetto
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-flash-usb-decrypted-mounted
Type=MimeType
MimeType=media/removable_mounted_decrypted
Comment=Mounted Decrypted Removable Medium
Comment[de]=Eingebundenes, entschlüsseltes Wechsellaufwerk
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-flash-usb-decrypted
Type=MimeType
MimeType=media/removable_unmounted_decrypted
Comment=Unmounted Decrypted Removable Medium
Comment[de]=Nicht eingebundenes, entschlüsseltes Wechsellaufwerk
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 0
- 11
tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop View File

@@ -1,11 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Icon=media-flash-usb-encrypted
Type=MimeType
MimeType=media/removable_unmounted_encrypted
Comment=Unmounted Encrypted Removable Medium
Comment[de]=Nicht eingebundenes, verschlüsseltes Wechsellaufwerk
Patterns=

X-TDE-AutoEmbed=true
X-TDE-IsAlso=inode/directory

+ 1
- 1
tdeioslave/media/mounthelper/CMakeLists.txt View File

@@ -26,7 +26,7 @@ link_directories(
set( target tdeio_media_mounthelper )

set( ${target}_SRCS
tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
tdeio_media_mounthelper.cpp unlockdialog.ui dialog.cpp
)

tde_add_executable( ${target} AUTOMOC

+ 1
- 1
tdeioslave/media/mounthelper/Makefile.am View File

@@ -3,7 +3,7 @@ bin_PROGRAMS = tdeio_media_mounthelper
INCLUDES = -I$(srcdir)/../libmediacommon $(all_includes)
AM_LDFLAGS = $(all_libraries)

tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp decryptdialog.ui dialog.cpp
tdeio_media_mounthelper_SOURCES = tdeio_media_mounthelper.cpp unlockdialog.ui dialog.cpp

tdeio_media_mounthelper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_TDEIO) $(LIB_TDEUI)

+ 13
- 13
tdeioslave/media/mounthelper/dialog.cpp View File

@@ -23,41 +23,41 @@
#include "dialog.h"

Dialog::Dialog(TQString url, TQString iconName) :
KDialogBase(NULL, "Dialog", true, "Decrypt Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Decrypt"), "decrypted" ))
KDialogBase(NULL, "Dialog", true, "Unlock Storage Device", (Cancel|User1), User1, false, KGuiItem(i18n("Unlock"), "unlocked" ))
{
decryptDialog = new DecryptDialog(this);
unlockDialog = new UnlockDialog(this);

decryptDialog->errorBox->hide();
decryptDialog->descLabel->setText(decryptDialog->descLabel->text().arg(url));
decryptDialog->descLabel->adjustSize();
decryptDialog->adjustSize();
unlockDialog->errorBox->hide();
unlockDialog->descLabel->setText(unlockDialog->descLabel->text().arg(url));
unlockDialog->descLabel->adjustSize();
unlockDialog->adjustSize();

enableButton( User1, false );

TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
unlockDialog->encryptedIcon->setPixmap( pixmap );

connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
connect(unlockDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));

setMainWidget(decryptDialog);
setMainWidget(unlockDialog);
}

Dialog::~Dialog()
{
delete decryptDialog;
delete unlockDialog;
}

TQString Dialog::getPassword()
{
return decryptDialog->passwordEdit->text();
return unlockDialog->passwordEdit->text();
}

void Dialog::slotDialogError(TQString errorMsg)
{
kdDebug() << __func__ << "(" << errorMsg << " )" << endl;

decryptDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
decryptDialog->errorBox->show();
unlockDialog->errorLabel->setText(TQString("<b>%1</b>").arg(errorMsg));
unlockDialog->errorBox->show();
}

void Dialog::slotPasswordChanged(const TQString &text)

+ 2
- 2
tdeioslave/media/mounthelper/dialog.h View File

@@ -34,7 +34,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>

#include "decryptdialog.h"
#include "unlockdialog.h"

class KryptoMedia;

@@ -54,7 +54,7 @@ public slots:
void slotPasswordChanged(const TQString &text);

private:
DecryptDialog *decryptDialog;
UnlockDialog *unlockDialog;
};

#endif // DIALOG_H_

+ 5
- 5
tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp View File

@@ -104,8 +104,8 @@ MountHelper::MountHelper() : TDEApplication()
}
if (!medium.needDecryption())
{
m_errorStr = i18n("%1 is already decrypted.").arg(url.prettyURL());
TQTimer::singleShot(0, this, TQT_SLOT(error()) );
m_errorStr = i18n("%1 is already unlocked.").arg(url.prettyURL());
TQTimer::singleShot(0, this, TQT_SLOT(error()));
return;
}

@@ -166,9 +166,9 @@ MountHelper::MountHelper() : TDEApplication()
}
}

/* If this is a decrypted volume and there is no error yet
* we try to teardown the decryption */
if (m_errorStr.isNull() && medium.isEncrypted() && !medium.clearDeviceUdi().isNull())
// If this is an unlocked encrypted volume and there is no error yet, we try to lock it
if (unmountResult.contains("result") && unmountResult["result"].toBool() &&
medium.isEncrypted() && !medium.clearDeviceUdi().isNull())
{
DCOPReply reply = mediamanager.call( "undecrypt", medium.id());
if (reply.isValid()) {

tdeioslave/media/mediamanager/decryptdialog.ui → tdeioslave/media/mounthelper/unlockdialog.ui View File

@@ -1,8 +1,8 @@
<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
<class>DecryptDialog</class>
<class>UnlockDialog</class>
<widget class="TQWidget">
<property name="name">
<cstring>DecryptDialog</cstring>
<cstring>UnlockDialog</cstring>
</property>
<property name="geometry">
<rect>

+ 1
- 1
tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop View File

@@ -99,4 +99,4 @@ Comment[wa]=Tchôke-divins di dvize di prôpietés Konqueror po-z apontyî l' du
Comment[zh_CN]=配置挂载行为的 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
X-TDE-ServiceTypes=KPropsDlg/Plugin,media/audiocd,media/hdd_mounted,media/hdd_unmounted,media/hdd_encrypted_unlocked,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/floppy5_unmounted,media/floppy_mounted,media/zip_mounted,media/floppy_unmounted,media/zip_unmounted,media/camera_mounted,media/camera_unmounted

+ 9
- 8
tdeioslave/media/services/media_decrypt.desktop View File

@@ -1,9 +1,10 @@
[Desktop Action Decrypt]
Exec=tdeio_media_mounthelper -d %u
Icon=decrypted
Name=Decrypt
Name[de]=Entschlüsseln

[Desktop Entry]
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_encrypted_locked,media/hdd_encrypted_locked,media/cdrom_encrypted_locked,media/cdwriter_encrypted_locked,media/dvd_encrypted_locked
Actions=MediaUnlock;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

[Desktop Action MediaUnlock]
Exec=tdeio_media_mounthelper -k %u
Icon=decrypted
Name=Unlock

+ 1
- 1
tdeioslave/media/services/media_eject.desktop View File

@@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/cdrom_mounted,media/cdrom_unmounted,media/cdrom_mounted_decrypted,media/cdrom_unmounted_decrypted,media/cdrom_unmounted_encrypted,media/cd-r_mounted,media/cd-r_unmounted,media/cd-r_mounted_decrypted,media/cd-r_unmounted_decrypted,media/cd-r_unmounted_encrypted,media/cd-rw_mounted,media/cd-rw_unmounted,media/cd-rw_mounted_decrypted,media/cd-rw_unmounted_decrypted,media/cd-rw_unmounted_encrypted,media/dvd_mounted,media/dvd_unmounted,media/dvd_mounted_decrypted,media/dvd_unmounted_decrypted,media/dvd_unmounted_encrypted,media/audiocd,media/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
X-TDE-ServiceTypes=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/blankcd,media/blankdvd,media/dvdvideo,media/svcd,media/vcd
Actions=MediaEject;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

+ 1
- 1
tdeioslave/media/services/media_mount.desktop View File

@@ -1,5 +1,5 @@
[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/cdrom_unmounted,media/cdrom_encrypted_unlocked,media/cdwriter_unmounted,media/cdwriter_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
Actions=MediaMount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

+ 1
- 1
tdeioslave/media/services/media_safelyremove.desktop View File

@@ -1,5 +1,5 @@
[Desktop Entry]
X-TDE-ServiceTypes=media/removable_mounted,media/removable_mounted_decrypted,media/removable_unmounted,media/removable_unmounted_decrypted,media/camera_mounted,media/camera_unmounted
X-TDE-ServiceTypes=media/removable_mounted,media/removable_unmounted,media/removable_encrypted_unlocked,media/camera_mounted,media/camera_unmounted
Actions=MediaSafelyRemove;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

+ 1
- 1
tdeioslave/media/services/media_unmount.desktop View File

@@ -1,5 +1,5 @@
[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/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/vcd,media/svcd,media/dvdvideo,media/camera_mounted
Actions=MediaUnmount;
X-TDE-Priority=TopLevel
X-TDE-MediaNotifierHide=true

+ 1
- 1
tdeioslave/media/tdefile-plugin/tdefile_media.desktop View File

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

+ 6
- 12
tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp View File

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

Loading…
Cancel
Save