Branch: master

acca8e0d 2019-06-26 07:39:17 Michele Calgaro 
Adjusted to new normalized device icon names in tdelibs.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M smb4k/browser/smb4knetworkbrowser_part.cpp
M smb4k/iconview/smb4ksharesiconview_part.cpp
M smb4k/listview/smb4kshareslistview_part.cpp
M smb4k/smb4ksystemtray.cpp

smb4k/browser/smb4knetworkbrowser_part.cpp

diff --git a/smb4k/browser/smb4knetworkbrowser_part.cpp b/smb4k/browser/smb4knetworkbrowser_part.cpp
index 15e3c46..856854e 100644
--- a/smb4k/browser/smb4knetworkbrowser_part.cpp
+++ b/smb4k/browser/smb4knetworkbrowser_part.cpp
@@ -200,7 +200,7 @@
   // is also needed:
   if ( m_mode == KonqPlugin )
   {
-    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+    TDEAction *unmount =     new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
                                         this, TQT_SLOT( slotUnmount() ),
                                         actionCollection(), "konq_umount_action" );

smb4k/iconview/smb4ksharesiconview_part.cpp

diff --git a/smb4k/iconview/smb4ksharesiconview_part.cpp b/smb4k/iconview/smb4ksharesiconview_part.cpp
index 51686ae..32f8695 100644
--- a/smb4k/iconview/smb4ksharesiconview_part.cpp
+++ b/smb4k/iconview/smb4ksharesiconview_part.cpp
@@ -105,11 +105,11 @@
 void Smb4KSharesIconViewPart::setupActions()
 {
   // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif

smb4k/listview/smb4kshareslistview_part.cpp

diff --git a/smb4k/listview/smb4kshareslistview_part.cpp b/smb4k/listview/smb4kshareslistview_part.cpp
index 967cfec..7fc9a98 100644
--- a/smb4k/listview/smb4kshareslistview_part.cpp
+++ b/smb4k/listview/smb4kshareslistview_part.cpp
@@ -108,11 +108,11 @@
 void Smb4KSharesListViewPart::setupActions()
 {
   // Create the actions:
-  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut( CTRL+Key_U ),
+  TDEAction *unmount =   new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_U ),
                                     this, TQT_SLOT( slotUnmountShare() ),
                                     actionCollection(), "unmount_action" );
 #ifdef __linux__
-  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut( CTRL+Key_F ),
+  TDEAction *force =     new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut( CTRL+Key_F ),
                                     this, TQT_SLOT( slotForceUnmountShare() ),
                                     actionCollection(), "force_unmount_action" );
 #endif

smb4k/smb4ksystemtray.cpp

diff --git a/smb4k/smb4ksystemtray.cpp b/smb4k/smb4ksystemtray.cpp
index 75b418f..1e84db3 100644
--- a/smb4k/smb4ksystemtray.cpp
+++ b/smb4k/smb4ksystemtray.cpp
@@ -787,11 +787,11 @@
 
         // Define the actions that can be performed on a share from within
         // the system tray widget:
-        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *umount       = new TDEAction( i18n( "&Unmount" ), "drive-harddisk-unmounted", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotUnmountShare() ), actionCollection(), "st_[unmount]_"+(*it)->canonicalPath() );
         umount->setGroup( "ShareActions" );
 #ifdef __linux__
-        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk", TDEShortcut::null(), TQT_TQOBJECT(this),
+        TDEAction *force_umount = new TDEAction( i18n( "&Force Unmounting" ), "drive-harddisk-unmounted", TDEShortcut::null(), TQT_TQOBJECT(this),
                                 TQT_SLOT( slotForceUnmountShare() ), actionCollection(), "st_[force]_"+(*it)->canonicalPath() );
         force_umount->setGroup( "ShareActions" );
         force_umount->setEnabled( Smb4KSettings::useForceUnmount() );