[Krusader-commits] krusader_kde3/krusader/MountMan kmountman.cpp,1.35,1.36 kmountman.h,1.15,1.16 kmountmangui.cpp,1.12,1.13 kmountmangui.h,1.6,1.7

[Shie E. <er...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/MountMan
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4717

Modified Files:
	kmountman.cpp kmountman.h kmountmangui.cpp kmountmangui.h 
Log Message:
mountman shows all filesystem now. both modes of mountman handles only the 'legal' filesystems


Index: kmountmangui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountmangui.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** kmountmangui.cpp	19 Sep 2004 11:47:45 -0000	1.12
--- kmountmangui.cpp	20 Sep 2004 21:10:14 -0000	1.13
***************
*** 56,69 ****
  KMountManGUI::KMountManGUI() : KDialogBase( krApp, 0, true, "Mount.Man" ),
  info( 0 ), mountList( 0 ) {
-    // list of file systems we don't want to touch ----------------
- 	invalid_fs << "swap" << "/dev/pts" << "tmpfs" << "supermount";
- #if defined(BSD)
- 	invalid_fs << "procfs";
- #else
- 	invalid_fs << "proc";
- #endif
- 	
- 	// -------------------------------------------------------------
- 	
  	watcher = new QTimer( this );
     connect( watcher, SIGNAL( timeout() ), this, SLOT( checkMountChange() ) );
--- 56,59 ----
***************
*** 222,231 ****
  
  void KMountManGUI::updateList() {
- #define INVALID_FS(TYPE) (invalid_fs.contains(TYPE) > 0)
- 
     mountList->clear();
     // this handles the mounted ones
  	for ( QValueList<fsData>::iterator it = fileSystems.begin(); it != fileSystems.end() ; ++it ) {
! 		if (INVALID_FS((*it).type())) continue;
        addItemToMountList( mountList, *it );
     }
--- 212,219 ----
  
  void KMountManGUI::updateList() {
     mountList->clear();
     // this handles the mounted ones
  	for ( QValueList<fsData>::iterator it = fileSystems.begin(); it != fileSystems.end() ; ++it ) {
! 		if (krMtMan.invalidFilesystem((*it).type())) continue;
        addItemToMountList( mountList, *it );
     }
***************
*** 244,248 ****
  			fileSystems.append(data);
  			
! 			if (INVALID_FS(data.type())) continue;
  			addItemToMountList(mountList, data);
  		}
--- 232,236 ----
  			fileSystems.append(data);
  			
! 			if (krMtMan.invalidFilesystem(data.type())) continue;
  			addItemToMountList(mountList, data);
  		}
***************
*** 327,333 ****
     KPopupMenu popup;
     popup.insertTitle( i18n( "MountMan" ) );
!    if ( !system->mounted() )
        popup.insertItem( i18n( "Mount" ), MOUNT_ID );
!    else popup.insertItem( i18n( "Unmount" ), UNMOUNT_ID );
     if ( krMtMan.ejectable( system->mntPoint() ) )
        //  if (system->type()=="iso9660" || krMtMan.followLink(system->name()).left(2)=="cd")
--- 315,325 ----
     KPopupMenu popup;
     popup.insertTitle( i18n( "MountMan" ) );
!    if ( !system->mounted() ) {
        popup.insertItem( i18n( "Mount" ), MOUNT_ID );
! 		popup.setItemEnabled( MOUNT_ID, !krMtMan.nonmountFilesystem(system->type()));
! 	} else {
! 		popup.insertItem( i18n( "Unmount" ), UNMOUNT_ID );
! 		popup.setItemEnabled( UNMOUNT_ID, !krMtMan.nonmountFilesystem(system->type()));
! 	}
     if ( krMtMan.ejectable( system->mntPoint() ) )
        //  if (system->type()=="iso9660" || krMtMan.followLink(system->name()).left(2)=="cd")

Index: kmountman.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** kmountman.h	17 Sep 2004 17:42:12 -0000	1.15
--- kmountman.h	20 Sep 2004 21:10:14 -0000	1.16
***************
*** 65,68 ****
--- 65,70 ----
     bool ejectable( QString path );
     QString convertSize( KIO::filesize_t size );
+ 	bool invalidFilesystem(QString type);
+ 	bool nonmountFilesystem(QString type);
  
     KMountMan();
***************
*** 87,90 ****
--- 89,94 ----
     bool Operational;   // if false, something went terribly wrong on startup
     KMountManGUI *mountManGui;
+ 	QStringList invalid_fs;
+ 	QStringList nonmount_fs;
  };
  

Index: kmountman.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountman.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** kmountman.cpp	17 Sep 2004 17:42:49 -0000	1.35
--- kmountman.cpp	20 Sep 2004 21:10:13 -0000	1.36
***************
*** 61,68 ****
--- 61,86 ----
  	}
  
+ 	// list of FS that we don't manage at all
+ 	invalid_fs << "swap" << "/dev/pts" << "tmpfs";
+ #if defined(BSD)
+ 	invalid_fs << "procfs";
+ #else
+ 	invalid_fs << "proc";
+ #endif
+ 
+ 	// list of FS that we don't allow to mount/unmount
+ 	nonmount_fs << "supermount";
  }
  
  KMountMan::~KMountMan() {}
  
+ bool KMountMan::invalidFilesystem(QString type) {
+ 	return (invalid_fs.contains(type) > 0);
+ }
+ 
+ bool KMountMan::nonmountFilesystem(QString type) {
+ 	return (nonmount_fs.contains(type) > 0);
+ }
+ 
  void KMountMan::mainWindow() {
     mountManGui = new KMountManGUI();
***************
*** 221,224 ****
--- 239,245 ----
     for ( it = possible.begin(), idx = 0; it != possible.end(); ++it, ++idx ) {
        m = *it;
+ 		// skip nonmountable file systems
+ 		if (nonmountFilesystem(m->mountType()) || invalidFilesystem(m->mountType()))
+ 			continue;
        // does the mountpoint exist in current list? if so, it can only
        // be umounted, otherwise, it can be mounted

Index: kmountmangui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/MountMan/kmountmangui.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kmountmangui.h	17 Sep 2004 17:34:40 -0000	1.6
--- kmountmangui.h	20 Sep 2004 21:10:14 -0000	1.7
***************
*** 91,95 ****
     QListView *mountList;
     QTimer *watcher;
- 	QStringList invalid_fs;
     QDateTime lastMtab;
  	// used for the getSpace - gotSpace functions
--- 91,94 ----