From 5d9c67399944e7ee9584b1844533e8a0bf6cc66e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 16 Feb 2021 10:27:22 +0900 Subject: Added 'mount' and 'unlock' actions to notifier dialog and fixed size of icons in same dialog. Signed-off-by: Michele Calgaro --- tdeioslave/media/libmediacommon/notifieraction.cpp | 3 +-- tdeioslave/media/services/media_mount.desktop | 2 +- tdeioslave/media/services/media_unlock.desktop | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tdeioslave/media/libmediacommon/notifieraction.cpp b/tdeioslave/media/libmediacommon/notifieraction.cpp index 5222b9e65..8eaafcd81 100644 --- a/tdeioslave/media/libmediacommon/notifieraction.cpp +++ b/tdeioslave/media/libmediacommon/notifieraction.cpp @@ -57,8 +57,7 @@ TQPixmap NotifierAction::pixmap() const } else { - TQString path = TDEGlobal::iconLoader()->iconPath( m_iconName, -32 ); - return TQPixmap( path ); + return TDEGlobal::iconLoader()->loadIcon(m_iconName, TDEIcon::NoGroup, TDEIcon::SizeSmall); } } diff --git a/tdeioslave/media/services/media_mount.desktop b/tdeioslave/media/services/media_mount.desktop index d6fe01dcc..f018cfd18 100644 --- a/tdeioslave/media/services/media_mount.desktop +++ b/tdeioslave/media/services/media_mount.desktop @@ -2,7 +2,7 @@ X-TDE-ServiceTypes=media/bluray_unmounted,media/camera_unmounted,media/cdrom_unmounted,media/cd-r_unmounted,media/cd-rw_unmounted,media/dvd_unmounted,media/floppy5_unmounted,media/floppy_unmounted,media/hdd_unmounted,media/nfs_unmounted,media/removable_unmounted,media/smb_unmounted,media/zip_unmounted,media/audiocd,media/blurayvideo,media/dvdvideo,media/svcd,media/vcd Actions=MediaMount; X-TDE-Priority=TopLevel -X-TDE-MediaNotifierHide=true +X-TDE-MediaNotifierHide=false [Desktop Action MediaMount] Exec=tdeio_media_mounthelper -m %u diff --git a/tdeioslave/media/services/media_unlock.desktop b/tdeioslave/media/services/media_unlock.desktop index 85b25199e..f52de81ba 100644 --- a/tdeioslave/media/services/media_unlock.desktop +++ b/tdeioslave/media/services/media_unlock.desktop @@ -3,7 +3,7 @@ X-TDE-ServiceTypes=media/bluray_encrypted_locked,media/cdrom_encrypted_locked,me Actions=MediaLock; Actions=MediaUnlock; X-TDE-Priority=TopLevel -X-TDE-MediaNotifierHide=true +X-TDE-MediaNotifierHide=false [Desktop Action MediaUnlock] Exec=tdeio_media_mounthelper -k %u -- cgit v1.2.1