krusader-commits Mailing List for Krusader (Page 186)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/krusader/krusader_kde3/krusader/Panel
In directory sc8-pr-cvs1:/tmp/cvs-serv19471/krusader/Panel

Modified Files:
	listpanel.cpp listpanel.h panelfunc.cpp panelfunc.h 
Log Message:
Major code clean up and re-write of the refresh mechanism

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** listpanel.cpp	9 Dec 2003 23:05:57 -0000	1.44
--- listpanel.cpp	25 Dec 2003 23:55:35 -0000	1.45
***************
*** 271,281 ****

  void ListPanel::slotStartUpdate() {
-   // if the vfs couldn't make it  - go back
-   if ( func->files() ->vfs_error() ) {
-     func->inRefresh = false;
-     func->dirUp();
-     return ;
-   }
- 
    while ( func->inRefresh ); // wait until the last refresh finish
    func->inRefresh = true;  // make sure the next refresh wait for this one
--- 271,274 ----
***************
*** 292,298 ****
    emit pathChanged( this );
    emit cmdLineUpdate( realPath );	// update the command line
- }

- void ListPanel::slotEndUpdate() {
    slotGetStats( virtualPath );
    slotUpdate();
--- 285,289 ----

Index: listpanel.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** listpanel.h	6 Dec 2003 13:10:55 -0000	1.13
--- listpanel.h	25 Dec 2003 23:55:35 -0000	1.14
***************
*** 88,92 ****
    void slotUpdateTotals();
  	void slotStartUpdate();                   // internal
- 	void slotEndUpdate();                     // internal
  	void slotGetStats(QString path);          // get the disk-free stats
  	void setFilter(KrView::FilterSpec f);
--- 88,91 ----

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** panelfunc.cpp	9 Dec 2003 23:05:57 -0000	1.45
--- panelfunc.cpp	25 Dec 2003 23:55:35 -0000	1.46
***************
*** 58,61 ****
--- 58,62 ----
  #include "../VFS/krarchandler.h"
  #include "../VFS/krpermhandler.h"
+ #include "../VFS/krvfshandler.h"
  #include "../Dialogs/packgui.h"
  #include "../Dialogs/krdialogs.h"
***************
*** 194,201 ****

  ListPanelFunc::ListPanelFunc( ListPanel *parent ) :
! panel( parent ), inRefresh( false ) {
!   vfsStack.setAutoDelete( true );
!   vfsStack.push( new normal_vfs( "/", panel ) );
!   //files() ->vfs_refresh();
  }

--- 195,200 ----

  ListPanelFunc::ListPanelFunc( ListPanel *parent ) :
! panel( parent ), inRefresh( false ), vfsP(0){
!   urlStack.push( "file:/" );
  }

***************
*** 206,209 ****
--- 205,226 ----

  void ListPanelFunc::openUrl( const KURL& url,const QString& nameToMakeCurrent) {
+   kdDebug() << "openUrl: " << url.url() << endl;
+ 
+ 	// check for special cases:
+   if( !url.isValid() ){
+ 		if( url.url() == "~" ){
+ 			openUrl(QDir::homeDirPath());
+     }
+     else if( !url.url().startsWith("/") ){  // possible relative URL
+ 			KURL u = files()->vfs_getOrigin();
+ 			u.addPath(url.url());
+ 			openUrl(u);
+ 		}
+ 		else panel->slotStartUpdate();  // refresh the panel
+ 		return;
+   }
+ 	// change the cursor to busy
+   krApp->setCursor( KCursor::waitCursor() );
+ 
    panel->slotFocusOnMe();

***************
*** 214,296 ****
    }

!   // remote file systems
!   if ( !url.isLocalFile() ) {
!     // first close all open archives / remote connections
!     while ( files() ->vfs_getType() != vfs::NORMAL ) vfsStack.remove();
!     vfs* v = new ftp_vfs(url,panel);
!     if ( v->vfs_error() ) {
!       kdWarning() << "Failed to create vfs: " << url.prettyURL() << endl;
!       delete v;
!       refresh();
!       return ;
!     }
!     // save the current vfs
!     files() ->blockSignals( true );
!     vfsStack.push( v );
!   } else { // local directories
!     // first close all open archives / remote connections
!     while ( files() ->vfs_getType() != vfs::NORMAL )
!       vfsStack.remove();
!     // now we have a normal vfs- refresh it.
!     QString mypath = url.path(-1);
!     if( mypath == "~" ) mypath = QDir::homeDirPath();
!     //if( !mypath.startsWith("/") ) mypath = files()->vfs_getOrigin().prettyURL(1)+mypath;
! 
!     mypath = QDir::cleanDirPath(mypath);
! 
!     while ( !KRpermHandler::dirExist(mypath) ) {
!       panel->view->setNameToMakeCurrent( mypath.mid(mypath.findRev('/')+1 ) );
!       mypath = mypath.left( mypath.findRev( '/' ) );
!       if ( mypath.isEmpty() )
!         mypath = "/";
!     }
! 
!     chdir( mypath.latin1() );
!     refresh( KURL::fromPathOrURL(mypath) );
    }
  }

- void ListPanelFunc::refresh( const KURL& url ) {
-   // change the cursor to busy
-   krApp->setCursor( KCursor::waitCursor() );

!   // if we could not refresh try to dir up
!   QString origin = url.prettyURL(-1);
!   if ( !files() ->vfs_refresh( origin ) ) {
!     panel->virtualPath = origin;
!     dirUp();
!     return ; // dirUp() calls refresh again...
!   }
!   // update the backStack
!   if ( backStack.last() != panel->realPath ) {
!     krBack->setEnabled( true );
!     backStack.append( panel->realPath );
!     //the size of the backStack is hard coded - 30
!     if ( backStack.count() > 30 )
!       backStack.remove( backStack.begin() );
!   }
  }

- void ListPanelFunc::goBack() {
-   if ( backStack.isEmpty() )
-     return ;

!   if ( backStack.last() == "//WARNING//" ) {
!     KMessageBox::information( 0, i18n( "Can't re-enter archive. Going to the nearest path" ), QString::null, "BackArchiveWarning" );
!     backStack.remove( backStack.fromLast() ); //remove the //WARNING// entry
!   }
!   // avoid going back to the same place
!   while ( !backStack.isEmpty() && backStack.last() == panel->realPath )
!     backStack.remove( backStack.fromLast() );
! 
!   if ( backStack.isEmpty() )
!     return ;
!   QString path = backStack.last();

!   refresh( path );
!   backStack.remove( backStack.fromLast() );

!   if ( backStack.isEmpty() )
!     krBack->setEnabled( false );
  }

--- 231,270 ----
    }

!   vfs* v = 0;
!   if( !urlStack.top().equals(url) ) urlStack.push( url );
!   while( true ){
! 		KURL u = urlStack.pop();
! 		u.adjustPath(-1); // remove trailing "/"
! 		u.cleanPath(); // Resolves "." and ".." components in path.
! 		v = KrVfsHandler::getVfs(u,panel,files());
!     if( !v ) continue; //this should not happen !
! 		if( v != vfsP ){
!       delete vfsP;
! 			vfsP = v; // v != 0 so this is safe
! 		} 
!     if( vfsP->vfs_refresh(u) ) break; // we have a valid refreshed URL now
    }
+ 	// update the urls stack
+ 	if( !files()->vfs_getOrigin().equals(urlStack.top()) ){
+ 		urlStack.push( files()->vfs_getOrigin() );
+ 	}
+ 	// on local file system change the working directory
+ 	if( files()->vfs_getType() == vfs::NORMAL )
+ 		chdir( files()->vfs_getOrigin().path().latin1() );
  }

! void ListPanelFunc::refresh( const KURL& url ) {
! 	openUrl(url);
  }

! void ListPanelFunc::goBack() {
!   if ( urlStack.isEmpty() ) return ;

!   urlStack.pop();
!   openUrl( urlStack.top() );

!   if ( urlStack.isEmpty() ) krBack->setEnabled( false );
  }

***************
*** 686,690 ****
  			path.setProtocol("tar");
  		} else {
! 			path.setProtocol("krarc:");
      }
      openUrl( path );
--- 660,664 ----
  			path.setProtocol("tar");
  		} else {
! 			path.setProtocol("krarc");
      }
      openUrl( path );
***************
*** 696,737 ****

  void ListPanelFunc::dirUp() {
!   QString origin = panel->virtualPath;
! 	QString newOrigin = origin;
!   // remove one dir from the new path
!   newOrigin.truncate( newOrigin.findRev('/') );
! 
!   // Do we need to change vfs ?
!   bool changeVFS = files()->vfs_error();
! 
! 	if( origin.contains(":/") ){ // ftp_vfs
!     if( QFileInfo(origin.mid(origin.find(":/")+1)).exists() ){
! 			changeVFS = true;
! 			// make the current archive the current item on the new list
! 			panel->view->setNameToMakeCurrent(origin.mid(origin.findRev('/')+1) );
! 	  }
! 	}
! 
!   // clear the view - to avoid a repaint crash
!   panel->view->clear();
!   
! 	if( changeVFS ){
!     vfsStack.remove();
!     files()->blockSignals( false );
!     files()->vfs_refresh();
!     return ;
! 	}
! 
!   // make the current dir the current item on the new list
!   panel->view->setNameToMakeCurrent(origin.mid(origin.findRev("/")+1));
! 
! 
!   // check the '/' case
!   if ( newOrigin == "" ) newOrigin = "/";
!   // and the '/' case for urls
!   if ( newOrigin.contains( ":/" ) && newOrigin.find( "/", newOrigin.find( ":/" ) + 3 ) == -1 )
!     newOrigin = newOrigin + "/";
! 
!   // change dir..
!   refresh( newOrigin );
  }

--- 670,674 ----

  void ListPanelFunc::dirUp() {
! 	openUrl(files()->vfs_getOrigin().upURL());
  }

***************
*** 876,891 ****

  void ListPanelFunc::FTPDisconnect() {
-   // clear the view - to avoid a repaint crash
-   panel->view->clear();
- 
    // you can disconnect only if connected !
    if ( files() ->vfs_getType() == vfs::FTP ) {
!     vfsStack.remove();
!     files() ->blockSignals( false );
!     if ( files() ->vfs_getType() != vfs::FTP )
!       krFTPDiss->setEnabled( false );
!     krFTPNew->setEnabled( true );
      panel->view->setNameToMakeCurrent( QString::null );
!     files() ->vfs_refresh();
    }
  }
--- 813,821 ----

  void ListPanelFunc::FTPDisconnect() {
    // you can disconnect only if connected !
    if ( files() ->vfs_getType() == vfs::FTP ) {
!     krFTPDiss->setEnabled( false );
      panel->view->setNameToMakeCurrent( QString::null );
!     openUrl(panel->realPath); // open the last local URL
    }
  }
***************
*** 948,960 ****
    // clear the view - to avoid a repaint crash
    panel->view->clear();
!   while ( vfsStack.remove() ); // delete all vfs objects
  }

  vfs* ListPanelFunc::files() {
!   // make sure we return a valid VFS*
!   if ( vfsStack.isEmpty() ) {
!     vfsStack.push( new normal_vfs( "/", panel ) );
!   }
!   return vfsStack.top();
  }

--- 878,887 ----
    // clear the view - to avoid a repaint crash
    panel->view->clear();
!   delete files(); // delete all vfs objects
  }

  vfs* ListPanelFunc::files() {
! 	if( !vfsP ) vfsP = new normal_vfs(panel);
! 	return vfsP;
  }

Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** panelfunc.h	9 Dec 2003 23:05:57 -0000	1.16
--- panelfunc.h	25 Dec 2003 23:55:35 -0000	1.17
***************
*** 35,39 ****
  #include "listpanel.h"
  #include <qobject.h>
! #include <qptrstack.h>
  #include <qthread.h>

--- 35,39 ----
  #include "listpanel.h"
  #include <qobject.h>
! #include <qvaluestack.h>
  #include <qthread.h>

***************
*** 140,147 ****
  	void refresh(const KURL& url);

! 	ListPanel	     *panel;    // our ListPanel
! 	QStringList    backStack; // Path stack for the "back" button
! 	bool           inRefresh; // true when we are in refresh()
! 	QPtrStack<vfs> vfsStack; // the vfs stack.
  };

--- 140,147 ----
  	void refresh(const KURL& url);

! 	ListPanel*           panel;     // our ListPanel
! 	QValueStack<KURL>    urlStack;  // Path stack for the "back" button
! 	bool                 inRefresh; // true when we are in refresh()
! 	vfs*                 vfsP;      // pointer to vfs.
  };

2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (98)	Sep (138)	Oct (100)	Nov (49)	Dec (131)
2004	Jan (94)	Feb (65)	Mar (100)	Apr (83)	May (72)	Jun (29)	Jul (167)	Aug (127)	Sep (131)	Oct (269)	Nov (122)	Dec (100)
2005	Jan (228)	Feb (266)	Mar (63)	Apr (135)	May (157)	Jun (52)	Jul (25)	Aug (49)	Sep (184)	Oct (159)	Nov (75)	Dec (37)
2006	Jan (60)	Feb (129)	Mar (110)	Apr (34)	May (31)	Jun (42)	Jul (72)	Aug (90)	Sep (57)	Oct (66)	Nov (42)	Dec (90)
2007	Jan (106)	Feb (54)	Mar (93)	Apr (27)	May (21)	Jun (17)	Jul (19)	Aug (22)	Sep (25)	Oct (2)	Nov (1)	Dec (1)
2008	Jan (65)	Feb (70)	Mar (29)	Apr (45)	May (91)	Jun (20)	Jul (11)	Aug (24)	Sep (23)	Oct (13)	Nov (23)	Dec (39)
2009	Jan (23)	Feb (39)	Mar (15)	Apr (56)	May (5)	Jun	Jul	Aug	Sep	Oct	Nov	Dec