Branch: master

d0f177af 2019-06-26 14:57:45 Michele Calgaro
Adjusted to new normalized device icon names in tdelibs.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M krusader/MountMan/kmountmangui.cpp
M krusader/useraction_examples.xml

krusader/MountMan/kmountmangui.cpp

diff --git a/krusader/MountMan/kmountmangui.cpp b/krusader/MountMan/kmountmangui.cpp
index ceb9d92..91732d6 100644
--- a/krusader/MountMan/kmountmangui.cpp
+++ b/krusader/MountMan/kmountmangui.cpp
@@ -212,12 +212,12 @@
 	TQString id = fs.name().left(7); // only works assuming devices start with  "/dev/XX"
    TQPixmap *icon = 0;
    if ( id == "/dev/fd") {
-      icon = new TQPixmap( LOADICON( mtd ? "media-floppy-3_5-mounted" : "media-floppy-3_5" ) );
+      icon = new TQPixmap( LOADICON( mtd ? "media-floppy-3_5-mounted" : "media-floppy-3_5-unmounted" ) );
 	} else if ( id == "/dev/cd" || fs.type() == "iso9660" ) {
-		icon = new TQPixmap( LOADICON( mtd ? "media-optical-cdrom-mounted" : "media-optical-cdrom" ) );
+		icon = new TQPixmap( LOADICON( mtd ? "media-optical-cdrom-mounted" : "media-optical-cdrom-unmounted" ) );
    } else if ( fs.type() == "nfs" || fs.type() == "smbfs" ) {
-		icon = new TQPixmap( LOADICON( mtd ? "nfs_mount" : "nfs_unmount" ) );
-	} else icon = new TQPixmap( LOADICON( mtd ? "drive-harddisk-mounted" : "drive-harddisk" ) );
+		icon = new TQPixmap( LOADICON( mtd ? "nfs-mounted" : "nfs-unmounted" ) );
+	} else icon = new TQPixmap( LOADICON( mtd ? "drive-harddisk-mounted" : "drive-harddisk-unmounted" ) );
 
    item->setPixmap( 0, *icon );
    delete icon;

krusader/useraction_examples.xml

diff --git a/krusader/useraction_examples.xml b/krusader/useraction_examples.xml
index 443f12f..0e9107d 100644
--- a/krusader/useraction_examples.xml
+++ b/krusader/useraction_examples.xml
@@ -84,7 +84,7 @@
  <action name="sample_newmount" >
   <title>Mount</title>
   <tooltip>Mount a new filesystem.</tooltip>
-  <icon>hdd_mount</icon>
+  <icon>hdd-mounted</icon>
   <category>System</category>
   <command run_as="root" executionmode="collect_output" >mount -t %_Ask(&quot;Filesystem Type?&quot;)% %_Ask(&quot;Device ?&quot;)% %_Ask(&quot;Mount Point ?&quot;)%</command>
   <defaultshortcut>Alt+Ctrl+M</defaultshortcut>
@@ -296,7 +296,7 @@
  <action name="Jscript_root-mount" >
   <title>Javascript, mount as root</title>
   <tooltip>Mounts a device with root-privileges</tooltip>
-  <icon>hdd_mount</icon>
+  <icon>hdd-mounted</icon>
   <category>System</category>
   <description>Requirements:
 You need krusader compiled with javascript support.</description>