| d2da293e | 2019-07-09 01:19:34 | Michele Calgaro |
Adjusted to new icon names and renamed media types related to encrypted drives in a better way. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
|
A tdeioslave/media/mediamanager/unlockdialog.ui A tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop A tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop A tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop A tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop A tdeioslave/media/mimetypes/cdrom_encrypted_locked.desktop A tdeioslave/media/mimetypes/cdrom_encrypted_unlocked.desktop A tdeioslave/media/mimetypes/dvd_encrypted_locked.desktop A tdeioslave/media/mimetypes/dvd_encrypted_unlocked.desktop A tdeioslave/media/mimetypes/hdd_encrypted_locked.desktop A tdeioslave/media/mimetypes/hdd_encrypted_unlocked.desktop A tdeioslave/media/mimetypes/removable_encrypted_locked.desktop A tdeioslave/media/mimetypes/removable_encrypted_unlocked.desktop A tdeioslave/media/mounthelper/unlockdialog.ui M tdeioslave/media/libmediacommon/notifiersettings.cpp M tdeioslave/media/mediamanager/CMakeLists.txt M tdeioslave/media/mediamanager/dialog.cpp M tdeioslave/media/mediamanager/dialog.h M tdeioslave/media/mediamanager/halbackend.cpp M tdeioslave/media/mediamanager/medialist.cpp M tdeioslave/media/mediamanager/tdehardwarebackend.cpp M tdeioslave/media/mimetypes/CMakeLists.txt M tdeioslave/media/mimetypes/Makefile.am M tdeioslave/media/mounthelper/CMakeLists.txt M tdeioslave/media/mounthelper/Makefile.am M tdeioslave/media/mounthelper/dialog.cpp M tdeioslave/media/mounthelper/dialog.h M tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp M tdeioslave/media/propsdlgplugin/media_propsdlgplugin.desktop M tdeioslave/media/services/media_decrypt.desktop M tdeioslave/media/services/media_eject.desktop M tdeioslave/media/services/media_mount.desktop M tdeioslave/media/services/media_safelyremove.desktop M tdeioslave/media/services/media_unmount.desktop M tdeioslave/media/tdefile-plugin/tdefile_media.desktop M tdeioslave/media/tdefile-plugin/tdefilemediaplugin.cpp R tdeioslave/media/mediamanager/decryptdialog.ui R tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop R tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop R tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop R tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop R tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop R tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop R tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop R tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop R tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop R tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop R tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop R tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop R tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop R tdeioslave/media/mounthelper/decryptdialog.ui |
||
tdeioslave/media/libmediacommon/notifiersettings.cppdiff --git a/tdeioslave/media/libmediacommon/notifiersettings.cpp b/tdeioslave/media/libmediacommon/notifiersettings.cpp index a957c75..087e323 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" ); tdeioslave/media/mediamanager/CMakeLists.txtdiff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt index a285151..3216bb3 100644 --- a/tdeioslave/media/mediamanager/CMakeLists.txt +++ b/tdeioslave/media/mediamanager/CMakeLists.txt @@ -49,7 +49,7 @@ 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}
tdeioslave/media/mediamanager/decryptdialog.uidiff --git a/tdeioslave/media/mediamanager/decryptdialog.ui b/tdeioslave/media/mediamanager/decryptdialog.ui deleted file mode 100644 index 939f0a3..0000000 --- a/tdeioslave/media/mediamanager/decryptdialog.ui +++ /dev/null @@ -1,201 +0,0 @@ -<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> -<class>DecryptDialog</class> -<widget class="TQWidget"> - <property name="name"> - <cstring>DecryptDialog</cstring> - </property> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>207</width> - <height>172</height> - </rect> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="caption"> - <string>Decrypting Storage Device</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLayoutWidget" row="0" column="0"> - <property name="name"> - <cstring>layout5</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLayoutWidget"> - <property name="name"> - <cstring>layout4</cstring> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel"> - <property name="name"> - <cstring>encryptedIcon</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="minimumSize"> - <size> - <width>48</width> - <height>48</height> - </size> - </property> - <property name="maximumSize"> - <size> - <width>32</width> - <height>32</height> - </size> - </property> - <property name="scaledContents"> - <bool>true</bool> - </property> - <property name="alignment"> - <set>AlignTop</set> - </property> - </widget> - <spacer> - <property name="name"> - <cstring>spacer2_2</cstring> - </property> - <property name="orientation"> - <enum>Vertical</enum> - </property> - <property name="sizeType"> - <enum>Expanding</enum> - </property> - <property name="sizeHint"> - <size> - <width>31</width> - <height>41</height> - </size> - </property> - </spacer> - </vbox> - </widget> - <widget class="TQLabel"> - <property name="name"> - <cstring>descLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </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> - </property> - <property name="alignment"> - <set>WordBreak|AlignTop</set> - </property> - </widget> - </hbox> - </widget> - <widget class="TQLayoutWidget" row="1" column="0"> - <property name="name"> - <cstring>layout4</cstring> - </property> - <hbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel"> - <property name="name"> - <cstring>textLabel1</cstring> - </property> - <property name="text"> - <string>&Password:</string> - </property> - <property name="buddy" stdset="0"> - <cstring>passwordEdit</cstring> - </property> - </widget> - <widget class="TQLineEdit"> - <property name="name"> - <cstring>passwordEdit</cstring> - </property> - <property name="enabled"> - <bool>true</bool> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>1</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="echoMode"> - <enum>Password</enum> - </property> - </widget> - </hbox> - </widget> - <widget class="TQGroupBox" row="2" column="0"> - <property name="name"> - <cstring>errorBox</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype> - <vsizetype>3</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string>Error</string> - </property> - <grid> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="TQLabel" row="0" column="0"> - <property name="name"> - <cstring>errorLabel</cstring> - </property> - <property name="sizePolicy"> - <sizepolicy> - <hsizetype>3</hsizetype>** Diff limit reached (max: 250 lines) ** |
||
| 21d09d5b | 2019-07-09 01:19:35 | Michele Calgaro |
Adjusted to new normalized device icon names in tdelibs. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
|
M kcontrol/hwmanager/hwdevicetray.cpp M kdesktop/init/Templates/CAMERA-Device.desktop M kdesktop/init/Templates/CDROM-Device.desktop M kdesktop/init/Templates/CDWRITER-Device.desktop M kdesktop/init/Templates/DVDROM-Device.desktop M kdesktop/init/Templates/Floppy.desktop M kdesktop/init/Templates/HD.desktop M kdesktop/init/Templates/MO-Device.desktop M kdesktop/init/Templates/NFS.desktop M kdesktop/init/Templates/ZIP-Device.desktop M kdesktop/init/Templates/linkCAMERA.desktop M kdesktop/init/Templates/linkCDROM.desktop M kdesktop/init/Templates/linkCDWRITER.desktop M kdesktop/init/Templates/linkDVDROM.desktop M kdesktop/init/Templates/linkFloppy.desktop M kdesktop/init/Templates/linkHD.desktop M kdesktop/init/Templates/linkMO.desktop M kdesktop/init/Templates/linkNFS.desktop M kdesktop/init/Templates/linkZIP.desktop M kicker/applets/media/mediaapplet.desktop M konqueror/sidebar/trees/init/services/audiocd.desktop M tdeioslave/media/mediamanager/halbackend.cpp M tdeioslave/media/mediamanager/tdehardwarebackend.cpp M tdeioslave/media/mimetypes/audiocd.desktop M tdeioslave/media/mimetypes/blankcd.desktop M tdeioslave/media/mimetypes/blankdvd.desktop M tdeioslave/media/mimetypes/camera_mounted.desktop M tdeioslave/media/mimetypes/camera_unmounted.desktop M tdeioslave/media/mimetypes/cd-r_encrypted_locked.desktop M tdeioslave/media/mimetypes/cd-r_encrypted_unlocked.desktop M tdeioslave/media/mimetypes/cd-r_mounted.desktop M tdeioslave/media/mimetypes/cd-r_unmounted.desktop M tdeioslave/media/mimetypes/cd-rw_encrypted_locked.desktop M tdeioslave/media/mimetypes/cd-rw_encrypted_unlocked.desktop M tdeioslave/media/mimetypes/cd-rw_mounted.desktop M tdeioslave/media/mimetypes/cd-rw_unmounted.desktop M tdeioslave/media/mimetypes/cdrom_unmounted.desktop M tdeioslave/media/mimetypes/dvd_unmounted.desktop M tdeioslave/media/mimetypes/dvdvideo.desktop M tdeioslave/media/mimetypes/floppy5_unmounted.desktop M tdeioslave/media/mimetypes/floppy_unmounted.desktop M tdeioslave/media/mimetypes/gphoto2camera.desktop M tdeioslave/media/mimetypes/hdd_unmounted.desktop M tdeioslave/media/mimetypes/nfs_mounted.desktop M tdeioslave/media/mimetypes/nfs_unmounted.desktop M tdeioslave/media/mimetypes/removable_unmounted.desktop M tdeioslave/media/mimetypes/smb_mounted.desktop M tdeioslave/media/mimetypes/smb_unmounted.desktop M tdeioslave/media/mimetypes/svcd.desktop M tdeioslave/media/mimetypes/vcd.desktop M tdeioslave/media/mimetypes/zip_unmounted.desktop M tdeioslave/nfs/nfs.protocol |
||
|
** Diff limit reached (max: 250 lines) **
|
||
| f97e24f3 | 2019-07-09 01:42:50 | Michele Calgaro |
Fixed media type for cd rw type. Signed-off-by: Michele Calgaro <michele.calgaro@...> |
||
|
M tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp M tdeioslave/media/services/media_decrypt.desktop M tdeioslave/media/services/media_mount.desktop |
||
|
** Diff limit reached (max: 250 lines) **
|
||