diff options
54 files changed, 272 insertions, 335 deletions
diff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index a957c75c9..087e323bb 100644 --- a/tdeioslave/media/libmediacommon/notifiersettings.cpp +++ b/tdeioslave/media/libmediacommon/notifiersettings.cpp @@ -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" ); diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt index a28515188..3216bb34f 100644 --- a/tdeioslave/media/mediamanager/CMakeLists.txt +++ b/tdeioslave/media/mediamanager/CMakeLists.txt @@ -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} diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp index ffa97b3b7..5f655ccce 100644 --- a/tdeioslave/media/mediamanager/dialog.cpp +++ b/tdeioslave/media/mediamanager/dialog.cpp @@ -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) diff --git a/tdeioslave/media/mediamanager/dialog.h b/tdeioslave/media/mediamanager/dialog.h index 6a164b8e8..8444ec7dd 100644 --- a/tdeioslave/media/mediamanager/dialog.h +++ b/tdeioslave/media/mediamanager/dialog.h @@ -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_ diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index ae14a580f..9c1382bf8 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/tdeioslave/media/mediamanager/halbackend.cpp @@ -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); diff --git a/tdeioslave/media/mediamanager/medialist.cpp b/tdeioslave/media/mediamanager/medialist.cpp index fa7aef5f5..b06824d0c 100644 --- a/tdeioslave/media/mediamanager/medialist.cpp +++ b/tdeioslave/media/mediamanager/medialist.cpp @@ -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; diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 02971639d..c16be644c 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp @@ -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); diff --git a/tdeioslave/media/mounthelper/decryptdialog.ui b/tdeioslave/media/mediamanager/unlockdialog.ui index 939f0a36a..b5b3b78bd 100644 --- a/tdeioslave/media/mounthelper/decryptdialog.ui +++ b/tdeioslave/media/mediamanager/unlockdialog.ui @@ -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><p><b>%1</b> is an encrypted storage device.</p> -<p>Please enter the password to decrypt the storage device.</p></string> + <string><p><b>%1</b> is an encrypted locked storage device.</p> +<p>Please enter the password to unlock the storage device.</p></string> </property> <property name="alignment"> <set>WordBreak|AlignTop</set> diff --git a/tdeioslave/media/mimetypes/CMakeLists.txt b/tdeioslave/media/mimetypes/CMakeLists.txt index 732441766..96ff7963e 100644 --- a/tdeioslave/media/mimetypes/CMakeLists.txt +++ b/tdeioslave/media/mimetypes/CMakeLists.txt @@ -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 diff --git a/tdeioslave/media/mimetypes/Makefile.am b/tdeioslave/media/mimetypes/Makefile.am index 7b821303b..6acfac4c0 100644 --- a/tdeioslave/media/mimetypes/Makefile.am +++ b/tdeioslave/media/mimetypes/Makefile.am @@ -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 \ diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop new file mode 100644 index 000000000..b0c6dad7b --- /dev/null +++ b/tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop new file mode 100644 index 000000000..d886586fc --- /dev/null +++ b/tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop deleted file mode 100644 index c098988ca..000000000 --- a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop deleted file mode 100644 index d2ba23d15..000000000 --- a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop deleted file mode 100644 index 8d6f1fdfd..000000000 --- a/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop new file mode 100644 index 000000000..72f4984ae --- /dev/null +++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop new file mode 100644 index 000000000..b3f405094 --- /dev/null +++ b/tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop deleted file mode 100644 index da56ad3e7..000000000 --- a/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop deleted file mode 100644 index 9f497575f..000000000 --- a/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop deleted file mode 100644 index f3fd47060..000000000 --- a/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop new file mode 100644 index 000000000..317f1aa54 --- /dev/null +++ b/tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop new file mode 100644 index 000000000..0cca2978a --- /dev/null +++ b/tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop deleted file mode 100644 index 3b333feb3..000000000 --- a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop deleted file mode 100644 index 32abeeaf1..000000000 --- a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop deleted file mode 100644 index d5c024a0a..000000000 --- a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop new file mode 100644 index 000000000..8beccf83a --- /dev/null +++ b/tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop new file mode 100644 index 000000000..25c70272c --- /dev/null +++ b/tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop deleted file mode 100644 index 941f38e2b..000000000 --- a/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop deleted file mode 100644 index a84b26242..000000000 --- a/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop deleted file mode 100644 index ce2c5310c..000000000 --- a/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop new file mode 100644 index 000000000..5a22db5f8 --- /dev/null +++ b/tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop new file mode 100644 index 000000000..d0d24b25e --- /dev/null +++ b/tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop deleted file mode 100644 index 68eefd2f6..000000000 --- a/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop deleted file mode 100644 index 1722ae3a8..000000000 --- a/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop deleted file mode 100644 index 599fd08af..000000000 --- a/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop new file mode 100644 index 000000000..84d4a47a7 --- /dev/null +++ b/tdeioslave/media/mimetypes/removable_encrypted_locked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop new file mode 100644 index 000000000..81f4f0609 --- /dev/null +++ b/tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop @@ -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 diff --git a/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop deleted file mode 100644 index 882f407f4..000000000 --- a/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop deleted file mode 100644 index 3e76bb323..000000000 --- a/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop deleted file mode 100644 index 8428dddd4..000000000 --- a/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop +++ /dev/null @@ -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 diff --git a/tdeioslave/media/mounthelper/CMakeLists.txt b/tdeioslave/media/mounthelper/CMakeLists.txt index 766fe3def..90afad33f 100644 --- a/tdeioslave/media/mounthelper/CMakeLists.txt +++ b/tdeioslave/media/mounthelper/CMakeLists.txt @@ -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 diff --git a/tdeioslave/media/mounthelper/Makefile.am b/tdeioslave/media/mounthelper/Makefile.am index ce226f728..60f9dc809 100644 --- a/tdeioslave/media/mounthelper/Makefile.am +++ b/tdeioslave/media/mounthelper/Makefile.am @@ -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) diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp index ffa97b3b7..f2cdb6b53 100644 --- a/tdeioslave/media/mounthelper/dialog.cpp +++ b/tdeioslave/media/mounthelper/dialog.cpp @@ -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) diff --git a/tdeioslave/media/mounthelper/dialog.h b/tdeioslave/media/mounthelper/dialog.h index 6a164b8e8..8444ec7dd 100644 --- a/tdeioslave/media/mounthelper/dialog.h +++ b/tdeioslave/media/mounthelper/dialog.h @@ -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_ diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 75d703b95..f32268855 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp @@ -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()) { diff --git a/tdeioslave/media/mediamanager/decryptdialog.ui b/tdeioslave/media/mounthelper/unlockdialog.ui index 939f0a36a..99a46a9ac 100644 --- a/tdeioslave/media/mediamanager/decryptdialog.ui +++ b/tdeioslave/media/mounthelper/unlockdialog.ui @@ -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> diff --git a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop index 86afb6f87..cd2f352d2 100644 --- a/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop +++ b/tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop @@ -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 diff --git a/tdeioslave/media/services/media_decrypt.desktop b/tdeioslave/media/services/media_decrypt.desktop index a3b331ac7..e4a552e29 100644 --- a/tdeioslave/media/services/media_decrypt.desktop +++ b/tdeioslave/media/services/media_decrypt.desktop @@ -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 diff --git a/tdeioslave/media/services/media_eject.desktop b/tdeioslave/media/services/media_eject.desktop index 1ecea21ce..81585520a 100644 --- a/tdeioslave/media/services/media_eject.desktop +++ b/tdeioslave/media/services/media_eject.desktop @@ -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 diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop index 9b23f6526..aa9afe960 100644 --- a/tdeioslave/media/services/media_mount.desktop +++ b/tdeioslave/media/services/media_mount.desktop @@ -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 diff --git a/tdeioslave/media/services/media_safelyremove.desktop b/tdeioslave/media/services/media_safelyremove.desktop index d5a928df9..1f5558f01 100644 --- a/tdeioslave/media/services/media_safelyremove.desktop +++ b/tdeioslave/media/services/media_safelyremove.desktop @@ -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 diff --git a/tdeioslave/media/services/media_unmount.desktop b/tdeioslave/media/services/media_unmount.desktop index 652680330..e96be5e94 100644 --- a/tdeioslave/media/services/media_unmount.desktop +++ b/tdeioslave/media/services/media_unmount.desktop @@ -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 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" ); |