|
|
|
|
@ -46,10 +46,10 @@ void DiskEntry::init()
|
|
|
|
|
size=0;
|
|
|
|
|
used=0;
|
|
|
|
|
avail=0;
|
|
|
|
|
isMounted=FALSE;
|
|
|
|
|
isMounted=false;
|
|
|
|
|
mntcmd="";
|
|
|
|
|
umntcmd="";
|
|
|
|
|
iconSetByUser=FALSE;
|
|
|
|
|
iconSetByUser=false;
|
|
|
|
|
icoName="";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -60,7 +60,7 @@ void DiskEntry::init()
|
|
|
|
|
this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
|
|
|
|
|
connect( sysProc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int) ),
|
|
|
|
|
this, TQ_SLOT (receivedSysStdErrOut(TDEProcess *, char *, int)) );
|
|
|
|
|
readingSysStdErrOut=FALSE;
|
|
|
|
|
readingSysStdErrOut=false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
@ -114,7 +114,7 @@ int DiskEntry::mount()
|
|
|
|
|
|
|
|
|
|
kdDebug() << "mount-cmd: [" << cmdS << "]" << endl;
|
|
|
|
|
int e=sysCall(cmdS);
|
|
|
|
|
if (!e) setMounted(TRUE);
|
|
|
|
|
if (!e) setMounted(true);
|
|
|
|
|
kdDebug() << "mount-cmd: e=" << e << endl;
|
|
|
|
|
return e;
|
|
|
|
|
}
|
|
|
|
|
@ -131,7 +131,7 @@ int DiskEntry::umount()
|
|
|
|
|
|
|
|
|
|
kdDebug() << "umount-cmd: [" << cmdS << "]" << endl;
|
|
|
|
|
int e=sysCall(cmdS);
|
|
|
|
|
if (!e) setMounted(FALSE);
|
|
|
|
|
if (!e) setMounted(false);
|
|
|
|
|
kdDebug() << "umount-cmd: e=" << e << endl;
|
|
|
|
|
|
|
|
|
|
return e;
|
|
|
|
|
@ -169,7 +169,7 @@ void DiskEntry::setUmountCommand(const TQString & umnt)
|
|
|
|
|
|
|
|
|
|
void DiskEntry::setIconName(const TQString & iconName)
|
|
|
|
|
{
|
|
|
|
|
iconSetByUser=TRUE;
|
|
|
|
|
iconSetByUser=true;
|
|
|
|
|
icoName=iconName;
|
|
|
|
|
if (icoName.right(6) == "_mount")
|
|
|
|
|
icoName.truncate(icoName.length()-6);
|
|
|
|
|
@ -193,23 +193,23 @@ TQString DiskEntry::guessIconName()
|
|
|
|
|
{
|
|
|
|
|
TQString iconName;
|
|
|
|
|
// try to be intelligent
|
|
|
|
|
if (-1!=mountPoint().find("cdrom",0,FALSE)) iconName+="cdrom";
|
|
|
|
|
else if (-1!=deviceName().find("cdrom",0,FALSE)) iconName+="cdrom";
|
|
|
|
|
else if (-1!=mountPoint().find("writer",0,FALSE)) iconName+="cdwriter";
|
|
|
|
|
else if (-1!=deviceName().find("writer",0,FALSE)) iconName+="cdwriter";
|
|
|
|
|
else if (-1!=mountPoint().find("mo",0,FALSE)) iconName+="mo";
|
|
|
|
|
else if (-1!=deviceName().find("mo",0,FALSE)) iconName+="mo";
|
|
|
|
|
else if (-1!=deviceName().find("fd",0,FALSE)) {
|
|
|
|
|
if (-1!=deviceName().find("360",0,FALSE)) iconName+="5floppy";
|
|
|
|
|
if (-1!=deviceName().find("1200",0,FALSE)) iconName+="5floppy";
|
|
|
|
|
if (-1!=mountPoint().find("cdrom",0,false)) iconName+="cdrom";
|
|
|
|
|
else if (-1!=deviceName().find("cdrom",0,false)) iconName+="cdrom";
|
|
|
|
|
else if (-1!=mountPoint().find("writer",0,false)) iconName+="cdwriter";
|
|
|
|
|
else if (-1!=deviceName().find("writer",0,false)) iconName+="cdwriter";
|
|
|
|
|
else if (-1!=mountPoint().find("mo",0,false)) iconName+="mo";
|
|
|
|
|
else if (-1!=deviceName().find("mo",0,false)) iconName+="mo";
|
|
|
|
|
else if (-1!=deviceName().find("fd",0,false)) {
|
|
|
|
|
if (-1!=deviceName().find("360",0,false)) iconName+="5floppy";
|
|
|
|
|
if (-1!=deviceName().find("1200",0,false)) iconName+="5floppy";
|
|
|
|
|
else iconName+="3floppy";
|
|
|
|
|
}
|
|
|
|
|
else if (-1!=mountPoint().find("floppy",0,FALSE)) iconName+="3floppy";
|
|
|
|
|
else if (-1!=mountPoint().find("zip",0,FALSE)) iconName+="zip";
|
|
|
|
|
else if (-1!=fsType().find("nfs",0,FALSE)) iconName+="nfs";
|
|
|
|
|
else if (-1!=mountPoint().find("floppy",0,false)) iconName+="3floppy";
|
|
|
|
|
else if (-1!=mountPoint().find("zip",0,false)) iconName+="zip";
|
|
|
|
|
else if (-1!=fsType().find("nfs",0,false)) iconName+="nfs";
|
|
|
|
|
else iconName+="hdd";
|
|
|
|
|
mounted() ? iconName+="_mount" : iconName+="_unmount";
|
|
|
|
|
// if ( -1==mountOptions().find("user",0,FALSE) )
|
|
|
|
|
// if ( -1==mountOptions().find("user",0,false) )
|
|
|
|
|
// iconName.prepend("root_"); // special root icon, normal user can´t mount
|
|
|
|
|
|
|
|
|
|
//debug("device %s is %s",deviceName().latin1(),iconName.latin1());
|
|
|
|
|
|