krusader-commits

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.20,1.21

[<er...@pr...>]

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

Modified Files:
	krdetailedviewitem.cpp 
Log Message:
fix: sort by EXT did not obey the 'case sensative sort' flag 

Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** krdetailedviewitem.cpp	17 Jan 2004 18:38:37 -0000	1.20
--- krdetailedviewitem.cpp	30 Jan 2004 23:24:40 -0000	1.21
***************
*** 207,213 ****
--- 207,215 ----
  
    krConfig->setGroup("Look&Feel");
+ 	bool caseSensativeSort = false;
    if(!krConfig->readBoolEntry("Case Sensative Sort",_CaseSensativeSort)) {
      text0  = text0.lower();
      itext0 = itext0.lower();
+ 		caseSensativeSort = true;
    }
  
***************
*** 221,242 ****
      	result = QString::compare(num2qstring(size()),num2qstring(other->size()));
    } else if (col == _view->column(KrDetailedView::DateTime)) {
-       /*QString dt = dateTime();
-       QString dti = other->dateTime();
- 			QString  d = ((dt[6] < '7')? "20" : "19") +
-       		dt[6] + dt[7] + // year
- 					dt[3] + dt[4] + // month
- 					dt[0] + dt[1] + // day
-           dt[9] + dt[10]+ //	hour
- 					dt[12]+ dt[13]; // minute
- 			QString  id = ((dti[6] < '7')? "20" : "19")  +
-       		dti[6] + dti[7] + // year
- 					dti[3] + dti[4] + // month
- 					dti[0] + dti[1] + // day
-           dti[9] + dti[10]+ //	hour
- 					dti[12]+ dti[13]; // minute
-     	result = QString::compare(d,id);*/
        result = (getTime_t() > other->getTime_t() ? 1 : -1);
!   } else {
!     // Joker for extention and permissions (so far)
      result = QString::compare(text(col), i->text(col));
    }
--- 223,233 ----
      	result = QString::compare(num2qstring(size()),num2qstring(other->size()));
    } else if (col == _view->column(KrDetailedView::DateTime)) {
        result = (getTime_t() > other->getTime_t() ? 1 : -1);
! 	} else if (col == _view->column(KrDetailedView::Extention)) {
! 			QString e1 = (!caseSensativeSort ? text(col) : text(col).lower());
! 			QString e2 = (!caseSensativeSort ? i->text(col) : i->text(col).lower());
! 			result = QString::compare(e1, e2);
! 	} else {
!     // Joker
      result = QString::compare(text(col), i->text(col));
    }

[Krusader-commits] krusader_kde3 ChangeLog,1.170,1.171

[<er...@pr...>]

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.170
retrieving revision 1.171
diff -C2 -d -r1.170 -r1.171
*** ChangeLog	30 Jan 2004 22:56:21 -0000	1.170
--- ChangeLog	30 Jan 2004 23:13:58 -0000	1.171
***************
*** 10,13 ****
--- 10,14 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+ 		FIXED: 2 items on the view menu had the same shortcuts
  		FIXED: increased speed of search, by emitting less signals (thanks to Lars)
      FIXED: statusbar updated only on mouse clicks, not on keyboard

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.55,1.56

[<er...@pr...>]

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

Modified Files:
	krusader.cpp 
Log Message:
fix: 2 items on the view menu had the same shortcut 

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** krusader.cpp	14 Jan 2004 20:25:03 -0000	1.55
--- krusader.cpp	30 Jan 2004 23:13:43 -0000	1.56
***************
*** 367,371 ****
                                          SLOT( toggleCmdline() ), actionCollection(), "toggle command line" );
    actToggleCmdline->setChecked( true );
!   actToggleTerminal = new KToggleAction( i18n( "Show &Terminal Emulator" ), 0, SLOTS,
                                           SLOT( toggleTerminal() ), actionCollection(), "toggle terminal emulator" );
    actToggleTerminal->setChecked( false );
--- 367,371 ----
                                          SLOT( toggleCmdline() ), actionCollection(), "toggle command line" );
    actToggleCmdline->setChecked( true );
!   actToggleTerminal = new KToggleAction( i18n( "Show Terminal &Emulator" ), 0, SLOTS,
                                           SLOT( toggleTerminal() ), actionCollection(), "toggle terminal emulator" );
    actToggleTerminal->setChecked( false );

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.59,1.60

[<er...@pr...>]

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

Modified Files:
	krdetailedview.cpp 
Log Message:
removed caseSensative on quicksearch 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** krdetailedview.cpp	30 Jan 2004 22:56:02 -0000	1.59
--- krdetailedview.cpp	30 Jan 2004 22:59:38 -0000	1.60
***************
*** 748,752 ****
    KrViewItem * item = getCurrentKrViewItem();
    if ( !direction ) {
!     if ( item->name().startsWith( str, caseSensitive ) )
        return ;
      direction = 1;
--- 748,752 ----
    KrViewItem * item = getCurrentKrViewItem();
    if ( !direction ) {
!     if ( item->name().startsWith( str/*, caseSensitive*/ ) )
        return ;
      direction = 1;

[Krusader-commits] krusader_kde3 ChangeLog,1.169,1.170

[<er...@pr...>]

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** ChangeLog	28 Jan 2004 23:12:48 -0000	1.169
--- ChangeLog	30 Jan 2004 22:56:21 -0000	1.170
***************
*** 1,3 ****
!     ADDED: calculate occupied space prints the directory's size (wincmd-style) - thanks heiner!
      ADDED: current directory in history menu is checked
      ADDED: a working user menu (try alt+~), but a bit rough on the edges
--- 1,4 ----
! 	  ADDED: heiner's quicksearch patch
! 		ADDED: calculate occupied space prints the directory's size (wincmd-style) - thanks heiner!
      ADDED: current directory in history menu is checked
      ADDED: a working user menu (try alt+~), but a bit rough on the edges

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.58,1.59

[<er...@pr...>]

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

Modified Files:
	krdetailedview.cpp 
Log Message:
fix: heiner's quicksearch is working! 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** krdetailedview.cpp	28 Jan 2004 22:49:33 -0000	1.58
--- krdetailedview.cpp	30 Jan 2004 22:56:02 -0000	1.59
***************
*** 1,5 ****
  /***************************************************************************
!                         krdetailedview.cpp
!                        -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
--- 1,5 ----
  /***************************************************************************
!                      krdetailedview.cpp
!                     -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
[...1433 lines suppressed...]
*** 786,794 ****
  
  void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
!    KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
! }
  
  void KrDetailedView::slotMouseClicked( int button, QListViewItem * item, const QPoint&, int ) {
!    if ( button == Qt::MidButton )
!       emit middleButtonClicked( item );
! }
--- 783,791 ----
  
  void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
!   KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
!   }
  
  void KrDetailedView::slotMouseClicked( int button, QListViewItem * item, const QPoint&, int ) {
!   if ( button == Qt::MidButton )
!     emit middleButtonClicked( item );
!   }

[Krusader-commits] krusader_kde3/krusader/Panel krcalcspacedialog.cpp,1.1,1.2 krcalcspacedialog.h,1.1,1.2 krdetailedview.cpp,1.57,1.58 krdetailedview.h,1.19,1.20 krdetailedviewitem.h,1.11,1.12 listpanel.cpp,1.52,1.53 panelfunc.cpp,1.52,1.53 panelfunc.h,1.21,1.22

[<er...@pr...>]

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

Modified Files:
	krcalcspacedialog.cpp krcalcspacedialog.h krdetailedview.cpp 
	krdetailedview.h krdetailedviewitem.h listpanel.cpp 
	panelfunc.cpp panelfunc.h 
Log Message:
heiner's calc-space patch and quicksort cleanups

Index: krcalcspacedialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcalcspacedialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krcalcspacedialog.cpp	3 Jan 2004 21:37:55 -0000	1.1
--- krcalcspacedialog.cpp	28 Jan 2004 22:49:32 -0000	1.2
***************
*** 42,47 ****
  
  /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
! KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names)
! 	: m_totalSize(0), m_totalFiles(0), m_totalDirs(0), m_names(names), m_files(files), m_parent(parent)
          , m_threadInUse(true), m_stop(false) {}
  
--- 42,47 ----
  
  /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
! KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, vfs * files, const KrViewItemList & items)
! 	: m_totalSize(0), m_totalFiles(0), m_totalDirs(0), m_items(items), m_files(files), m_parent(parent)
          , m_threadInUse(true), m_stop(false) {}
  
***************
*** 64,70 ****
  
  void KrCalcSpaceDialog::CalcThread::run(){
! 	if ( !m_names.isEmpty() ) // if something to do: do the calculation
! 	for ( QStringList::ConstIterator name = m_names.begin(); name != m_names.end(); ++name )
! 		m_files->vfs_calcSpace( *name, &m_totalSize, &m_totalFiles, &m_totalDirs , & m_stop);
  	// synchronize to avoid race condition.
  	m_synchronizeUsageAccess.lock();
--- 64,81 ----
  
  void KrCalcSpaceDialog::CalcThread::run(){
! 	if ( !m_items.isEmpty() ) // if something to do: do the calculation
! 	for ( KrViewItemList::ConstIterator it = m_items.begin(); it != m_items.end(); ++it )
!         {
!                 KIO::filesize_t totalSize = 0;
! 		m_files->vfs_calcSpace( (*it)->name(), &totalSize, &m_totalFiles, &m_totalDirs , & m_stop);
!                 if (m_stop)
!                     break;
!                 m_totalSize += totalSize;
!                 KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( *it );
!                 if (viewItem){
!                      KrCalcSpaceDialog::setDirSize(viewItem, totalSize);
!                      //viewItem->repaintItem(); // crash in KrDetailedViewItem::repaintItem(): setPixmap(_view->column(KrDetailedView::Name),KrView::getIcon(_vf))
!                 }
!         }
  	// synchronize to avoid race condition.
  	m_synchronizeUsageAccess.lock();
***************
*** 77,86 ****
  }
  
! KrCalcSpaceDialog::KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose) :
  	KDialogBase(parent, "KrCalcSpaceDialog", true, "Calculate Occupied Space", Ok|Cancel),
  	m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){
  	// the dialog: The Ok button is hidden until it is needed
  	showButtonOK(false);
! 	m_thread = new CalcThread(this, files, names);
  	m_pollTimer = new QTimer(this);
  	QWidget * mainWidget = new QWidget( this );
--- 88,97 ----
  }
  
! KrCalcSpaceDialog::KrCalcSpaceDialog(QWidget *parent, vfs * files, const KrViewItemList & items, bool autoclose) :
  	KDialogBase(parent, "KrCalcSpaceDialog", true, "Calculate Occupied Space", Ok|Cancel),
  	m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){
  	// the dialog: The Ok button is hidden until it is needed
  	showButtonOK(false);
! 	m_thread = new CalcThread(this, files, items);
  	m_pollTimer = new QTimer(this);
  	QWidget * mainWidget = new QWidget( this );
***************
*** 129,133 ****
  	if (!m_thread) return;
  	QString msg;
! 	QString fileName = ( ( m_thread->getNames().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getNames().first() + "\n" ) : QString( "" ) );
  	msg = fileName + i18n( "Total occupied space: %1\nin %2 directories and %3 files" ).
  		arg( KIO::convertSize( m_thread->getTotalSize() ) ).arg( m_thread->getTotalDirs() ).arg( m_thread->getTotalFiles() );
--- 140,144 ----
  	if (!m_thread) return;
  	QString msg;
! 	QString fileName = ( ( m_thread->getItems().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getItems().first()->name() + "\n" ) : QString( "" ) );
  	msg = fileName + i18n( "Total occupied space: %1\nin %2 directories and %3 files" ).
  		arg( KIO::convertSize( m_thread->getTotalSize() ) ).arg( m_thread->getTotalDirs() ).arg( m_thread->getTotalFiles() );

Index: krcalcspacedialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcalcspacedialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** krcalcspacedialog.h	3 Jan 2004 21:37:55 -0000	1.1
--- krcalcspacedialog.h	28 Jan 2004 22:49:33 -0000	1.2
***************
*** 42,45 ****
--- 42,47 ----
  // Krusader Includes
  #include "../VFS/vfs.h"
+ #include "krdetailedviewitem.h"
+ #include "krview.h"
  
  
***************
*** 58,62 ****
  		unsigned long m_totalFiles;
  		unsigned long m_totalDirs;
! 		const QStringList m_names;
  		vfs * m_files;
  		KrCalcSpaceDialog * m_parent;
--- 60,64 ----
  		unsigned long m_totalFiles;
  		unsigned long m_totalDirs;
! 		const KrViewItemList m_items;
  		vfs * m_files;
  		KrCalcSpaceDialog * m_parent;
***************
*** 69,74 ****
  		unsigned long getTotalFiles() const {return m_totalFiles;} // the result
  		unsigned long getTotalDirs() const {return m_totalDirs;} // the result
! 		const QStringList & getNames() const {return m_names;} // list of directories to calculate
! 		CalcThread(KrCalcSpaceDialog * parent, vfs * files, const QStringList & names);
  		void deleteInstance(); // thread is no longer needed.
  		void run(); // start calculation
--- 71,76 ----
  		unsigned long getTotalFiles() const {return m_totalFiles;} // the result
  		unsigned long getTotalDirs() const {return m_totalDirs;} // the result
! 		const KrViewItemList & getItems() const {return m_items;} // list of directories to calculate
! 		CalcThread(KrCalcSpaceDialog * parent, vfs * files, const KrViewItemList & items);
  		void deleteInstance(); // thread is no longer needed.
  		void run(); // start calculation
***************
*** 83,86 ****
--- 85,89 ----
  	void calculationFinished(); // called if the calulation is done
  	void showResult(); // show the current result in teh dialog
+ 	static void setDirSize(KrDetailedViewItem * viewItem, KIO::filesize_t size) {viewItem->setSize(size);}
  protected slots:
  	void timer(); // poll timer was fired
***************
*** 88,92 ****
  public:
  	// autoclose: wait 3 sec. before showing the dialog. Close it, when done
! 	KrCalcSpaceDialog(QWidget *parent, vfs * files, const QStringList & names, bool autoclose);
  	~KrCalcSpaceDialog();
  	KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result
--- 91,95 ----
  public:
  	// autoclose: wait 3 sec. before showing the dialog. Close it, when done
! 	KrCalcSpaceDialog(QWidget *parent, vfs * files, const KrViewItemList & items, bool autoclose);
  	~KrCalcSpaceDialog();
  	KIO::filesize_t getTotalSize() const {return m_thread->getTotalSize();} // the result

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** krdetailedview.cpp	17 Jan 2004 16:24:43 -0000	1.57
--- krdetailedview.cpp	28 Jan 2004 22:49:33 -0000	1.58
***************
*** 79,83 ****
  KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) :
        KListView( parent, name ), KrView( cfg ), _focused( false ), _currDragItem( 0L ),
! _nameInKConfig( QString( "KrDetailedView" ) + QString( ( left ? "Left" : "Right" ) ) ), _left( left ) {
  
     if ( ColumnName[ 0 ].isEmpty() ) {
--- 79,83 ----
  KrDetailedView::KrDetailedView( QWidget *parent, bool left, KConfig *cfg, const char *name ) :
        KListView( parent, name ), KrView( cfg ), _focused( false ), _currDragItem( 0L ),
! _nameInKConfig( QString( "KrDetailedView" ) + QString( ( left ? "Left" : "Right" ) ) ), _left( left ), delayedQuickSearchEvent( 0 ) {
  
     if ( ColumnName[ 0 ].isEmpty() ) {
***************
*** 414,423 ****
  void KrDetailedView::prepareForPassive() {
     if ( !_ClassicQuicksearch ) {
!       if ( krApp )
!          if ( krApp->mainView )
!             if ( krApp->mainView->activePanel )
!                if ( krApp->mainView->activePanel->quickSearch )
!                   if ( krApp->mainView->activePanel->quickSearch->isShown() )
                       stopQuickSearch( 0 );
     }
     _focused = false;
--- 414,426 ----
  void KrDetailedView::prepareForPassive() {
     if ( !_ClassicQuicksearch ) {
!      if ( krApp ){
!        kdWarning() << "test1" << endl; if( krApp->mainView ){
!          kdWarning() << "test2" << endl; if( krApp->mainView->activePanel ){
!            kdWarning() << "test3" << endl; if( krApp->mainView->activePanel->quickSearch ){
!              kdWarning() << "test4" << endl; if( krApp->mainView->activePanel->quickSearch->isShown() ){
!                kdWarning() << "test5" << endl; stopQuickSearch(0); kdWarning() << "test6" << endl;
!        }}}}}
                       stopQuickSearch( 0 );
+        kdWarning() << "test7" << endl;
     }
     _focused = false;
***************
*** 597,603 ****
              KIO::filesize_t totalSize = 0;
              unsigned long totalFiles = 0, totalDirs = 0;
!             QStringList names;
!             names.push_back( viewItem->name() );
!             if ( krApp->mainView->activePanel->func->calcSpace( names, totalSize, totalFiles, totalDirs ) ) {
                 // did we succeed to calcSpace? we'll fail if we don't have permissions
                 if ( totalSize == 0 ) { // just mark it, and bail out
--- 600,606 ----
              KIO::filesize_t totalSize = 0;
              unsigned long totalFiles = 0, totalDirs = 0;
!             KrViewItemList items;
!             items.push_back( viewItem );
!             if ( krApp->mainView->activePanel->func->calcSpace( items, totalSize, totalFiles, totalDirs ) ) {
                 // did we succeed to calcSpace? we'll fail if we don't have permissions
                 if ( totalSize == 0 ) { // just mark it, and bail out
***************
*** 619,628 ****
           }
           default:
           // if the key is A..Z or 1..0 do quick search otherwise...
!          if ( ( e->key() >= Key_A && e->key() <= Key_Z ) ||
                 ( e->key() >= Key_0 && e->key() <= Key_9 ) ||
                 ( e->key() == Key_Backspace ) ||
                 ( e->key() == Key_Down ) ||
!                ( e->key() == Key_Period ) ) {
              // are we doing quicksearch? if not, send keys to panel
              if ( _config->readBoolEntry( "Do Quicksearch", _DoQuicksearch ) ) {
--- 622,635 ----
           }
           default:
+          if (e->key() == Key_Escape){
+                QListView::keyPressEvent( e );return; // otherwise the selection gets lost??!??
+          }
           // if the key is A..Z or 1..0 do quick search otherwise...
!          if (e->text().length() > 0 && e->text()[ 0 ].isPrint()) // better choice. Otherwise non-ascii characters like Ö can not be the first character of a filename
! /*         if ( ( e->key() >= Key_A && e->key() <= Key_Z ) ||
                 ( e->key() >= Key_0 && e->key() <= Key_9 ) ||
                 ( e->key() == Key_Backspace ) ||
                 ( e->key() == Key_Down ) ||
!                ( e->key() == Key_Period ) ) */{
              // are we doing quicksearch? if not, send keys to panel
              if ( _config->readBoolEntry( "Do Quicksearch", _DoQuicksearch ) ) {
***************
*** 638,642 ****
                    }
                    // now, send the key to the quicksearch
!                   krApp->mainView->activePanel->quickSearch->myKeyPressEvent( e );
                 }
              } else
--- 645,651 ----
                    }
                    // now, send the key to the quicksearch
!                   //krApp->mainView->activePanel->quickSearch->myKeyPressEvent( e );
!                   delayedQuickSearchEvent = new QKeyEvent(*e);
!                   QTimer::singleShot ( 0, this, SLOT(delayedQuickSearchEventHandling()) );
                 }
              } else
***************
*** 726,733 ****
  }
  
! void KrDetailedView::quickSearch( const QString & str, int direction ) {
     KrViewItem * item = getCurrentKrViewItem();
!    if ( !direction ) {
!       if ( item->name().startsWith( str ) )
           return ;
        direction = 1;
--- 735,755 ----
  }
  
! void KrDetailedView::delayedQuickSearchEventHandling()
! {
!   if (delayedQuickSearchEvent)
!   {
!     krApp->mainView->activePanel->quickSearch->myKeyPressEvent( delayedQuickSearchEvent );
!     delete delayedQuickSearchEvent;
!     delayedQuickSearchEvent = 0;
!   }
! }
! 
! void KrDetailedView::quickSearch( const QString & str, int direction )
! {
!    bool caseSensitive = true; // make it configurable!!!!
     KrViewItem * item = getCurrentKrViewItem();
!    if (!direction)
!    {
!       if (item->name().startsWith(str, caseSensitive))
           return ;
        direction = 1;
***************
*** 740,744 ****
        if ( item == startItem )
           return ;
!       if ( item->name().startsWith( str ) ) {
           makeItemVisible( item );
           setCurrentItem( item->name() );
--- 762,766 ----
        if ( item == startItem )
           return ;
!       if ( item->name().startsWith( str, caseSensitive ) ) {
           makeItemVisible( item );
           setCurrentItem( item->name() );
***************
*** 749,757 ****
  
  void KrDetailedView::stopQuickSearch( QKeyEvent * e ) {
!    //krApp->mainView->activePanel->quickSearch->hide();
!    //krApp->mainView->activePanel->quickSearch->clear();
!    //krDirUp->setEnabled( true );
!    //if ( e )
!    //   keyPressEvent( e );
  }
  
--- 771,779 ----
  
  void KrDetailedView::stopQuickSearch( QKeyEvent * e ) {
!    krApp->mainView->activePanel->quickSearch->hide();
!    krApp->mainView->activePanel->quickSearch->clear();
!    krDirUp->setEnabled( true );
!    if ( e )
!       keyPressEvent( e );
  }
  

Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** krdetailedview.h	10 Jan 2004 14:49:50 -0000	1.19
--- krdetailedview.h	28 Jan 2004 22:49:33 -0000	1.20
***************
*** 111,114 ****
--- 111,115 ----
      void handleContextMenu( QListViewItem*, const QPoint&, int );
      void inplaceRenameFinished( QListViewItem *it, int col );
+     void delayedQuickSearchEventHandling();
      void quickSearch(const QString &, int = 0);
      void stopQuickSearch(QKeyEvent*);
***************
*** 126,129 ****
--- 127,131 ----
      QString _nameInKConfig;
      bool _left;
+     QKeyEvent * delayedQuickSearchEvent;
  };
  

Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** krdetailedviewitem.h	17 Jan 2004 18:38:37 -0000	1.11
--- krdetailedviewitem.h	28 Jan 2004 22:49:33 -0000	1.12
***************
*** 46,49 ****
--- 46,50 ----
  
  friend class KrDetailedView;
+ friend class KrCalcSpaceDialog;
  public:
    KrDetailedViewItem(KrDetailedView *parent, QListViewItem *after, vfile *vf);

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** listpanel.cpp	16 Jan 2004 16:35:48 -0000	1.52
--- listpanel.cpp	28 Jan 2004 22:49:33 -0000	1.53
***************
*** 89,93 ****
  /////////////////////////////////////////////////////
  ListPanel::ListPanel( QWidget *parent, bool left, const char *name ) :
! QWidget( parent, name ), colorMask( 255 ), compareMode( false ), currDragItem( 0 ), statsAgent( 0 ), _left( left ) {
  
    func = new ListPanelFunc( this );
--- 89,93 ----
  /////////////////////////////////////////////////////
  ListPanel::ListPanel( QWidget *parent, bool left, const char *name ) :
! QWidget( parent, name ), colorMask( 255 ), compareMode( false ), currDragItem( 0 ), statsAgent( 0 ), _left( left ), quickSearch(0) {
  
    func = new ListPanelFunc( this );

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** panelfunc.cpp	17 Jan 2004 18:40:57 -0000	1.52
--- panelfunc.cpp	28 Jan 2004 22:49:33 -0000	1.53
***************
*** 676,689 ****
  
  void ListPanelFunc::calcSpace() {
! 	QStringList names;
! 	panel->getSelectedNames( &names );
! 	if ( names.isEmpty() ) return ; // nothing to do
  
! 	KrCalcSpaceDialog calc(krApp, files(), names, false);
  	calc.exec();
  }
  
! bool ListPanelFunc::calcSpace(QStringList & names,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs) {
! 	KrCalcSpaceDialog calc(krApp, files(), names, true);
  	calc.exec();
  	totalSize = calc.getTotalSize();
--- 676,695 ----
  
  void ListPanelFunc::calcSpace() {
! 	KrViewItemList items;
! 	panel->view->getSelectedKrViewItems(&items);
! 	if ( items.isEmpty() ) return ; // nothing to do
  
! 	KrCalcSpaceDialog calc(krApp, files(), items, false);
  	calc.exec();
+ 	for ( KrViewItemList::ConstIterator it = items.begin(); it != items.end(); ++it )
+         {
+                 KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( *it );
+                 if (viewItem)
+                      viewItem->repaintItem();
+         }
  }
  
! bool ListPanelFunc::calcSpace(const KrViewItemList & items,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs) {
! 	KrCalcSpaceDialog calc(krApp, files(), items, true);
  	calc.exec();
  	totalSize = calc.getTotalSize();

Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** panelfunc.h	17 Jan 2004 18:39:43 -0000	1.21
--- panelfunc.h	28 Jan 2004 22:49:33 -0000	1.22
***************
*** 78,82 ****
  	// and disappears, if the calculation is done. Returns true, if the result is ok and false
  	// otherwise (Cancel was pressed).
! 	bool calcSpace(QStringList & names,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs);
  	void FTPDisconnect();
  	void newFTPconnection();
--- 78,82 ----
  	// and disappears, if the calculation is done. Returns true, if the result is ok and false
  	// otherwise (Cancel was pressed).
! 	bool calcSpace(const KrViewItemList & items,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs);
  	void FTPDisconnect();
  	void newFTPconnection();

[Krusader-commits] krusader_kde3 ChangeLog,1.168,1.169

[<er...@pr...>]

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.168
retrieving revision 1.169
diff -C2 -d -r1.168 -r1.169
*** ChangeLog	28 Jan 2004 22:46:23 -0000	1.168
--- ChangeLog	28 Jan 2004 23:12:48 -0000	1.169
***************
*** 9,13 ****
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
!     FIXED: statusbar updated only on mouse clicks, not on keyboard 
      FIXED: translation: forcing non-english languages with a strange structure
      FIXED: freeze at modal dialogs and icon tray
--- 9,14 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
! 		FIXED: increased speed of search, by emitting less signals (thanks to Lars)
!     FIXED: statusbar updated only on mouse clicks, not on keyboard
      FIXED: translation: forcing non-english languages with a strange structure
      FIXED: freeze at modal dialogs and icon tray

[Krusader-commits] krusader_kde3/krusader/GUI dirhistoryqueue.cpp,1.2,1.3

[<er...@pr...>]

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

Modified Files:
	dirhistoryqueue.cpp 
Log Message:
current folder is checked 

Index: dirhistoryqueue.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistoryqueue.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dirhistoryqueue.cpp	16 Jan 2004 16:37:24 -0000	1.2
--- dirhistoryqueue.cpp	27 Jan 2004 23:44:12 -0000	1.3
***************
*** 49,54 ****
      pathQueue.remove(path);
    }
!   // prevent non file paths from occuring in the list: prevent
!   // infinite loop when calling such a path from the history menu
  //  KURL url(path);
  //  if (url.protocol() == "file")
--- 49,54 ----
      pathQueue.remove(path);
    }
! 
! // prevent non file paths from occuring in the list
  //  KURL url(path);
  //  if (url.protocol() == "file")
***************
*** 66,70 ****
      pathQueue.remove(it);
    }
!       
  }
  
--- 66,89 ----
      pathQueue.remove(it);
    }
! }
! 
! bool DirHistoryQueue::checkPath(const QString& path)
! {
!   KURL url(path);
! 
!   QString p = url.path();
! //  kdDebug() << "url:" << p <<  ", file: " << url.fileName() << ", dir: " << url.directory() <<  endl;
!   if (url.protocol() == "file")
!   {
!     QDir dir(path);
!     if (!dir.exists())
!     {
!       RemovePath(path);
!       return false;
!     }
!   }
!     
!   return true;
!   
  }
  

[Krusader-commits] krusader_kde3/krusader/GUI dirhistoryqueue.h,1.2,1.3

[<er...@pr...>]

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

Modified Files:
	dirhistoryqueue.h 
Log Message:
current folder is checked 

Index: dirhistoryqueue.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistoryqueue.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dirhistoryqueue.h	16 Jan 2004 16:37:45 -0000	1.2
--- dirhistoryqueue.h	27 Jan 2004 23:43:56 -0000	1.3
***************
*** 34,42 ****
  	~DirHistoryQueue();
    QStringList pathQueue;
! 
    void RemovePath(const QString& path);
  private:
    void AddPath(const QString& path);
-   
    void DumpQueue();
  
--- 34,42 ----
  	~DirHistoryQueue();
    QStringList pathQueue;
!   bool checkPath(const QString& path);
    void RemovePath(const QString& path);
+ 
  private:
    void AddPath(const QString& path);
    void DumpQueue();
  

[Krusader-commits] krusader_kde3/krusader/GUI dirhistorybutton.cpp,1.2,1.3

[<er...@pr...>]

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

Modified Files:
	dirhistorybutton.cpp 
Log Message:
current folder is checked 

Index: dirhistorybutton.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistorybutton.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dirhistorybutton.cpp	16 Jan 2004 16:36:10 -0000	1.2
--- dirhistorybutton.cpp	27 Jan 2004 23:43:36 -0000	1.3
***************
*** 41,47 ****
    Q_CHECK_PTR(popupMenu);
    
- //  popupMenu->insertItem("Test", this, SLOT(slotPopup()));
- //  popupMenu->insertItem("Test2", this, SLOT(slotPopup()));
    setPopup(popupMenu);
  
    historyQueue = hQ;
--- 41,46 ----
    Q_CHECK_PTR(popupMenu);
    
    setPopup(popupMenu);
+   popupMenu->setCheckable(true);
  
    historyQueue = hQ;
***************
*** 50,53 ****
--- 49,53 ----
    connect(popupMenu, SIGNAL(activated(int)), this, SLOT(slotPopupActivated(int)));
  }
+ 
  DirHistoryButton::~DirHistoryButton(){
  }
***************
*** 60,64 ****
      popup()->exec(mapToGlobal(QPoint(0, height())));
    }
- //  kdDebug() << "History popup" << endl;
  }
  /** No descriptions */
--- 60,63 ----
***************
*** 75,81 ****
    for (it=historyQueue->pathQueue.begin(); it!=historyQueue->pathQueue.end(); ++it)
    {
- //    popupMenu->insertItem(*it, this, SLOT(slotPopup()), 0, id++);
      popupMenu->insertItem(*it, id++);
    }
  }  
  /** No descriptions */
--- 74,83 ----
    for (it=historyQueue->pathQueue.begin(); it!=historyQueue->pathQueue.end(); ++it)
    {
      popupMenu->insertItem(*it, id++);
    }
+   if (id > 0)
+   {
+     popupMenu->setItemChecked(0, true);
+   }
  }  
  /** No descriptions */
***************
*** 83,97 ****
  //  kdDebug() << "popup activated" << endl;
    KURL url(historyQueue->pathQueue[id]);
!   QString p = url.path();
!   kdDebug() << p <<  "file: " << url.fileName() << ", dir: " << url.directory() <<  endl;
!   if (url.protocol() == "file")
    {
!     QDir dir(historyQueue->pathQueue[id]);
!     if (!dir.exists())
!     {
!       historyQueue->RemovePath(historyQueue->pathQueue[id]);
!     }
    }
-   emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
- //  emit openUrl(historyQueue->pathQueue[id]);
  }
--- 85,91 ----
  //  kdDebug() << "popup activated" << endl;
    KURL url(historyQueue->pathQueue[id]);
!   if (historyQueue->checkPath(historyQueue->pathQueue[id]))
    {
!     emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
    }
  }

[Krusader-commits] krusader_kde3 ChangeLog,1.166,1.167

[<er...@pr...>]

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -C2 -d -r1.166 -r1.167
*** ChangeLog	16 Jan 2004 17:18:41 -0000	1.166
--- ChangeLog	27 Jan 2004 23:43:07 -0000	1.167
***************
*** 1,2 ****
--- 1,3 ----
+     ADDED: current directory in history menu is checked
      ADDED: a working user menu (try alt+~), but a bit rough on the edges
      ADDED: KrSearch edit/view file in the result list window (F3, F4, right click)

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.cpp,1.51,1.52

[<ya...@us...>]

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

Modified Files:
	panelfunc.cpp 
Log Message:
removed the refresh(KURL) function

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** panelfunc.cpp	3 Jan 2004 13:53:03 -0000	1.51
--- panelfunc.cpp	17 Jan 2004 18:40:57 -0000	1.52
***************
*** 32,35 ****
--- 32,36 ----
  #include <qdir.h>
  #include <qtextstream.h>
+ #include <qeventloop.h>
  // KDE Includes
  #include <klocale.h>
***************
*** 73,77 ****
  panel( parent ), inRefresh( false ), vfsP(0){
    urlStack.push( "file:/" );
- 
    connect( &delayTimer, SIGNAL(timeout()), this, SLOT(doOpenUrl()));
  }
--- 74,77 ----
***************
*** 81,85 ****
  }
  
- 
  void ListPanelFunc::openUrl( const KURL& url,const QString& nameToMakeCurrent) {
    //kdDebug() << "openUrl: " << url.url() << endl;
--- 81,84 ----
***************
*** 105,108 ****
--- 104,108 ----
    // clear the view - to avoid a repaint crash
    panel->view->clear();
+ 
    if( !nameToMakeCurrent.isEmpty() ){
  		panel->view->setNameToMakeCurrent( nameToMakeCurrent );
***************
*** 141,149 ****
  }
  
- void ListPanelFunc::refresh( const KURL& url ) {
- 	openUrl(url);
- }
- 
- 
  void ListPanelFunc::goBack() {
    if ( urlStack.isEmpty() ) return ;
--- 141,144 ----
***************
*** 540,544 ****
      origin.addPath(name);
      panel->view->setNameToMakeCurrent( QString::null );
!     refresh( origin );
    } else if ( KRarcHandler::arcHandled( type ) && origin.isLocalFile() ) {
      KURL path = files()->vfs_getFile(vf->vfile_getName());
--- 535,539 ----
      origin.addPath(name);
      panel->view->setNameToMakeCurrent( QString::null );
!     openUrl( origin );
    } else if ( KRarcHandler::arcHandled( type ) && origin.isLocalFile() ) {
      KURL path = files()->vfs_getFile(vf->vfile_getName());

[Krusader-commits] krusader_kde3/krusader/Panel panelfunc.h,1.20,1.21

[<ya...@us...>]

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

Modified Files:
	panelfunc.h 
Log Message:
removed the refresh(KURL) function

Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** panelfunc.h	3 Jan 2004 13:52:32 -0000	1.20
--- panelfunc.h	17 Jan 2004 18:39:43 -0000	1.21
***************
*** 47,51 ****
     void delayedOpenUrl( const KURL& path);
     void doOpenUrl();
! 	void refresh(){ refresh(panel->virtualPath); } // re-read the files
  	void rename(const QString &oldname, const QString &newname);
  
--- 47,51 ----
     void delayedOpenUrl( const KURL& path);
     void doOpenUrl();
! 	void refresh(){ openUrl(panel->virtualPath); } // re-read the files
  	void rename(const QString &oldname, const QString &newname);
  
***************
*** 84,89 ****
  
  protected:
- 	void refresh(const KURL& url);
- 
  	ListPanel*           panel;     // our ListPanel
  	QValueStack<KURL>    urlStack;  // Path stack for the "back" button
--- 84,87 ----

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.19,1.20 krdetailedviewitem.h,1.10,1.11

[<ya...@us...>]

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

Modified Files:
	krdetailedviewitem.cpp krdetailedviewitem.h 
Log Message:
Change _vf to a guareded pointer and fixed a bug in the icon() function - and not a good fix ! rather an ugly hack... 

Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** krdetailedviewitem.cpp	16 Jan 2004 17:43:10 -0000	1.19
--- krdetailedviewitem.cpp	17 Jan 2004 18:38:37 -0000	1.20
***************
*** 48,62 ****
    QObject(parent), KListViewItem(parent, after), KrViewItem(),_vf(vf), _view(parent) {
    repaintItem();
-   if( _vf ) {
-     connect( _vf, SIGNAL( vfile_destructed() ), this, SLOT( remove() ) );
-   }
- }
- 
- void KrDetailedViewItem::remove(){  
-   _vf = 0;
  }
  
  void KrDetailedViewItem::repaintItem() {
!     if (_vf == 0L) return;
      // set text in columns, according to what columns are available
      int id = KrDetailedView::Unused;
--- 48,55 ----
    QObject(parent), KListViewItem(parent, after), KrViewItem(),_vf(vf), _view(parent) {
    repaintItem();
  }
  
  void KrDetailedViewItem::repaintItem() {
!     if ( !_vf ) return;
      // set text in columns, according to what columns are available
      int id = KrDetailedView::Unused;
***************
*** 187,194 ****
    QPixmap *p;
  
!   if( _vf == 0 )
!     return *p;
!   
!   if (_view->_withIcons)
      p = new QPixmap(*(pixmap(_view->column(KrDetailedView::Name))));
    else p = new QPixmap(KrView::getIcon(_vf));
--- 180,187 ----
    QPixmap *p;
  
!   // This is bad - very bad. the function must return a valid reference,
!   // This is an interface flow - shie please fix it with a function that return QPixmap*
!   // this way we can return 0 - and do our error checking...
!   if ( !_vf || _view->_withIcons)
      p = new QPixmap(*(pixmap(_view->column(KrDetailedView::Name))));
    else p = new QPixmap(KrView::getIcon(_vf));

Index: krdetailedviewitem.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** krdetailedviewitem.h	7 Jan 2004 20:04:15 -0000	1.10
--- krdetailedviewitem.h	17 Jan 2004 18:38:37 -0000	1.11
***************
*** 36,39 ****
--- 36,40 ----
  #include "../VFS/vfile.h"
  #include <klistview.h>
+ #include <qguardedptr.h>
  #include <qobject.h>
  
***************
*** 72,78 ****
    void renameCancelled(KrDetailedViewItem *);
  
- public slots:
-   void remove();
- 
  protected:
    // text() was made protected in order to catch every place where text(x) is used
--- 73,76 ----
***************
*** 84,88 ****
    inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); }
  
!   vfile *_vf;
    KrDetailedView *_view;
  };
--- 82,86 ----
    inline void setSize(KIO::filesize_t size) { _vf->vfile_setSize(size); }
  
!   QGuardedPtr<vfile> _vf;
    KrDetailedView *_view;
  };

[Krusader-commits] krusader_kde3/krusader/VFS vfile.cpp,1.8,1.9 vfile.h,1.9,1.10

[<ya...@us...>]

Update of /cvsroot/krusader/krusader_kde3/krusader/VFS
In directory sc8-pr-cvs1:/tmp/cvs-serv32104/krusader/VFS

Modified Files:
	vfile.cpp vfile.h 
Log Message:
Removed the destructed signal

Index: vfile.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** vfile.cpp	7 Jan 2004 20:04:15 -0000	1.8
--- vfile.cpp	17 Jan 2004 18:34:41 -0000	1.9
***************
*** 165,167 ****
  }
  
! #include "vfile.moc"
\ No newline at end of file
--- 165,167 ----
  }
  
! #include "vfile.moc"

Index: vfile.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vfile.h	7 Jan 2004 20:04:15 -0000	1.9
--- vfile.h	17 Jan 2004 18:34:41 -0000	1.10
***************
*** 99,107 ****
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
  
!   virtual ~vfile(){emit vfile_destructed();}
  
- signals:
-   void             vfile_destructed();  /* signal of the destruction */
-     
  protected:
    // the file information list
--- 99,104 ----
  	inline void             vfile_setSize(KIO::filesize_t size) {vfile_size = size;}
  
!   virtual ~vfile(){}
  
  protected:
    // the file information list

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.56,1.57

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

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

Modified Files:
	krdetailedview.cpp 
Log Message:
fix: disable new quicksearch for now. 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** krdetailedview.cpp	16 Jan 2004 18:47:54 -0000	1.56
--- krdetailedview.cpp	17 Jan 2004 16:24:43 -0000	1.57
***************
*** 1,5 ****
  /***************************************************************************
!                          krdetailedview.cpp
!                         -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
--- 1,5 ----
  /***************************************************************************
!                         krdetailedview.cpp
!                        -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
***************
*** 18,22 ****
  YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                 S o u r c e    F i l e
  
  ***************************************************************************
--- 18,22 ----
  YP   YD 88   YD ~Y8888P' `8888Y' YP   YP Y8888D' Y88888P 88   YD
  
!                                                S o u r c e    F i l e
  
  ***************************************************************************
***************
*** 72,76 ****
  #define _DoQuicksearch      true 
  // Classic Quicksearch
! #define _ClassicQuicksearch false
  //////////////////////////////////////////////////////////////////////////
  
--- 72,76 ----
  #define _DoQuicksearch      true 
  // Classic Quicksearch
! #define _ClassicQuicksearch true 
  //////////////////////////////////////////////////////////////////////////
  
***************
*** 413,419 ****
  
  void KrDetailedView::prepareForPassive() {
!    if ( krApp && krApp->mainView && krApp->mainView->activePanel &&
!        krApp->mainView->activePanel->quickSearch && krApp->mainView->activePanel->quickSearch->isShown() )
!      stopQuickSearch(0);
     _focused = false;
  }
--- 413,424 ----
  
  void KrDetailedView::prepareForPassive() {
!    if ( !_ClassicQuicksearch ) {
!       if ( krApp )
!          if ( krApp->mainView )
!             if ( krApp->mainView->activePanel )
!                if ( krApp->mainView->activePanel->quickSearch )
!                   if ( krApp->mainView->activePanel->quickSearch->isShown() )
!                      stopQuickSearch( 0 );
!    }
     _focused = false;
  }
***************
*** 523,527 ****
           case Key_Enter :
           case Key_Return : {
!             if ( e->state() & ControlButton )  // let the panel handle it
                 e->ignore();
              else {
--- 528,532 ----
           case Key_Enter :
           case Key_Return : {
!             if ( e->state() & ControlButton )   // let the panel handle it
                 e->ignore();
              else {
***************
*** 532,536 ****
              break;
           }
!          case Key_QuoteLeft :   // Terminal Emulator bugfix
           if ( e->state() == ControlButton ) { // let the panel handle it
              e->ignore();
--- 537,541 ----
              break;
           }
!          case Key_QuoteLeft :    // Terminal Emulator bugfix
           if ( e->state() == ControlButton ) { // let the panel handle it
              e->ignore();
***************
*** 557,561 ****
              return ; // safety
           }
!          case Key_Backspace :                  // Terminal Emulator bugfix
           case Key_Left :
           if ( e->state() == ControlButton ) { // let the panel handle it
--- 562,566 ----
              return ; // safety
           }
!          case Key_Backspace :                   // Terminal Emulator bugfix
           case Key_Left :
           if ( e->state() == ControlButton ) { // let the panel handle it
***************
*** 576,580 ****
              KListView::keyPressEvent( e );
           break;
!          case Key_Delete :              // kill file
           SLOTS->deleteFiles();
           return ;
--- 581,585 ----
              KListView::keyPressEvent( e );
           break;
!          case Key_Delete :               // kill file
           SLOTS->deleteFiles();
           return ;
***************
*** 607,611 ****
           }
           break;
!          case Key_A :          // mark all
           if ( e->state() == ControlButton ) {
              KListView::keyPressEvent( e );
--- 612,616 ----
           }
           break;
!          case Key_A :           // mark all
           if ( e->state() == ControlButton ) {
              KListView::keyPressEvent( e );
***************
*** 705,709 ****
     }
     // check if the item was indeed renamed
!    if ( it->text( column( Name ) ) != dynamic_cast<KrDetailedViewItem*>( it ) ->name() )     // was renamed
        emit renameItem( dynamic_cast<KrDetailedViewItem*>( it ) ->name(), it->text( column( Name ) ) );
     else if ( column( Extention ) != -1 ) { // nothing happened, restore the view (if needed)
--- 710,714 ----
     }
     // check if the item was indeed renamed
!    if ( it->text( column( Name ) ) != dynamic_cast<KrDetailedViewItem*>( it ) ->name() )      // was renamed
        emit renameItem( dynamic_cast<KrDetailedViewItem*>( it ) ->name(), it->text( column( Name ) ) );
     else if ( column( Extention ) != -1 ) { // nothing happened, restore the view (if needed)
***************
*** 744,752 ****
  
  void KrDetailedView::stopQuickSearch( QKeyEvent * e ) {
!    krApp->mainView->activePanel->quickSearch->hide();
!    krApp->mainView->activePanel->quickSearch->clear();
!    krDirUp->setEnabled( true );
!    if ( e )
!       keyPressEvent( e );
  }
  
--- 749,757 ----
  
  void KrDetailedView::stopQuickSearch( QKeyEvent * e ) {
!    //krApp->mainView->activePanel->quickSearch->hide();
!    //krApp->mainView->activePanel->quickSearch->clear();
!    //krDirUp->setEnabled( true );
!    //if ( e )
!    //   keyPressEvent( e );
  }
  

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.55,1.56

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

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

Modified Files:
	krdetailedview.cpp 
Log Message:
heiner's new quicksearch. please try to play with it 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** krdetailedview.cpp	16 Jan 2004 17:18:23 -0000	1.55
--- krdetailedview.cpp	16 Jan 2004 18:47:54 -0000	1.56
***************
*** 72,76 ****
  #define _DoQuicksearch      true 
  // Classic Quicksearch
! #define _ClassicQuicksearch true 
  //////////////////////////////////////////////////////////////////////////
  
--- 72,76 ----
  #define _DoQuicksearch      true 
  // Classic Quicksearch
! #define _ClassicQuicksearch false
  //////////////////////////////////////////////////////////////////////////
  
***************
*** 413,419 ****
  
  void KrDetailedView::prepareForPassive() {
!    //if ( krApp && krApp->mainView && krApp->mainView->activePanel &&
!    //    krApp->mainView->activePanel->quickSearch && krApp->mainView->activePanel->quickSearch->isShown() )
!    //  stopQuickSearch(0);
     _focused = false;
  }
--- 413,419 ----
  
  void KrDetailedView::prepareForPassive() {
!    if ( krApp && krApp->mainView && krApp->mainView->activePanel &&
!        krApp->mainView->activePanel->quickSearch && krApp->mainView->activePanel->quickSearch->isShown() )
!      stopQuickSearch(0);
     _focused = false;
  }

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedviewitem.cpp,1.18,1.19

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

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

Modified Files:
	krdetailedviewitem.cpp 
Log Message:
changed paintCell to use KListViewItem::paintCell and not QListViewItem's. why was this changed anyway? 

Index: krdetailedviewitem.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedviewitem.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** krdetailedviewitem.cpp	10 Jan 2004 22:05:11 -0000	1.18
--- krdetailedviewitem.cpp	16 Jan 2004 17:43:10 -0000	1.19
***************
*** 175,184 ****
    // center the <DIR> thing if needed
    if(column != _view->column(KrDetailedView::Size))
!    QListViewItem::paintCell(p, _cg, column, width, align);
    else if (_vf) {
      if (_vf->vfile_isDir() && _vf->vfile_getSize()<=0)
!       QListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter);
!     else QListViewItem::paintCell(p, _cg, column, width, align); // size
!   } else QListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter); // updir
  }
  
--- 175,184 ----
    // center the <DIR> thing if needed
    if(column != _view->column(KrDetailedView::Size))
!    KListViewItem::paintCell(p, _cg, column, width, align);
    else if (_vf) {
      if (_vf->vfile_isDir() && _vf->vfile_getSize()<=0)
!       KListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter);
!     else KListViewItem::paintCell(p, _cg, column, width, align); // size
!   } else KListViewItem::paintCell(p, _cg, column, width, Qt::AlignHCenter); // updir
  }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.165,1.166

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

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

Modified Files:
	ChangeLog 
Log Message:
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -d -r1.165 -r1.166
*** ChangeLog	10 Jan 2004 21:40:42 -0000	1.165
--- ChangeLog	16 Jan 2004 17:18:41 -0000	1.166
***************
*** 1,10 ****
      ADDED: KrSearch edit/view file in the result list window (F3, F4, right click)
      ADDED: a folder-history button, a-la-total commander. thanks to Hans Loffler!
      ADDED: selectall at rename
-     ADDED: a paritialy working user menu (try alt+~)
      ADDED: new shortcuts to search dialog (heiner)
      ADDED: directory synchronizer
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
      FIXED: translation: forcing non-english languages with a strange structure
      FIXED: freeze at modal dialogs and icon tray
--- 1,11 ----
+     ADDED: a working user menu (try alt+~), but a bit rough on the edges
      ADDED: KrSearch edit/view file in the result list window (F3, F4, right click)
      ADDED: a folder-history button, a-la-total commander. thanks to Hans Loffler!
      ADDED: selectall at rename
      ADDED: new shortcuts to search dialog (heiner)
      ADDED: directory synchronizer
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: statusbar updated only on mouse clicks, not on keyboard 
      FIXED: translation: forcing non-english languages with a strange structure
      FIXED: freeze at modal dialogs and icon tray
***************
*** 31,34 ****
--- 32,36 ----
      UPDATED: Krename url   http://www.krename.net
      REMOVED: arc_vfs support completly replaced with KIO:Slave technolegy.
+ 
  1.30
  ======================

[Krusader-commits] krusader_kde3/krusader/Panel krdetailedview.cpp,1.54,1.55

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

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

Modified Files:
	krdetailedview.cpp 
Log Message:
fix: statusbar updated only on mouseclicks but not on keyboard 

Index: krdetailedview.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** krdetailedview.cpp	10 Jan 2004 14:49:50 -0000	1.54
--- krdetailedview.cpp	16 Jan 2004 17:18:23 -0000	1.55
***************
*** 1,5 ****
  /***************************************************************************
!                           krdetailedview.cpp
!                          -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
  e-mail               : kru...@us...
--- 1,5 ----
  /***************************************************************************
!                          krdetailedview.cpp
!                         -------------------
  copyright            : (C) 2000-2002 by Shie Erlich & Rafi Yanai
[...1434 lines suppressed...]
*** 765,773 ****
  
  void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
!   KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
  }
  
! void KrDetailedView::slotMouseClicked( int button, QListViewItem * item, const QPoint&,int) {
!   if (button == Qt::MidButton)
!     emit middleButtonClicked(item);
  }
--- 759,767 ----
  
  void KrDetailedView::setNameToMakeCurrent( QListViewItem * it ) {
!    KrView::setNameToMakeCurrent( dynamic_cast<KrViewItem*>( it ) ->name() );
  }
  
! void KrDetailedView::slotMouseClicked( int button, QListViewItem * item, const QPoint&, int ) {
!    if ( button == Qt::MidButton )
!       emit middleButtonClicked( item );
  }

[Krusader-commits] krusader_kde3/krusader/GUI dirhistoryqueue.h,1.1,1.2

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

Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv10571/krusader/GUI

Modified Files:
	dirhistoryqueue.h 
Log Message:
fix: history button now handles archives 

Index: dirhistoryqueue.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistoryqueue.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dirhistoryqueue.h	10 Jan 2004 00:02:07 -0000	1.1
--- dirhistoryqueue.h	16 Jan 2004 16:37:45 -0000	1.2
***************
*** 35,38 ****
--- 35,39 ----
    QStringList pathQueue;
  
+   void RemovePath(const QString& path);
  private:
    void AddPath(const QString& path);

[Krusader-commits] krusader_kde3/krusader/GUI dirhistoryqueue.cpp,1.1,1.2

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

Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv10496/krusader/GUI

Modified Files:
	dirhistoryqueue.cpp 
Log Message:
fix: history button now handles archives 

Index: dirhistoryqueue.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistoryqueue.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dirhistoryqueue.cpp	10 Jan 2004 00:02:07 -0000	1.1
--- dirhistoryqueue.cpp	16 Jan 2004 16:37:24 -0000	1.2
***************
*** 31,35 ****
  /** No descriptions */
  void DirHistoryQueue::slotPathChanged(ListPanel* p){
!   int dummy = 1;
    AddPath(p->getPath());
  }
--- 31,35 ----
  /** No descriptions */
  void DirHistoryQueue::slotPathChanged(ListPanel* p){
! //  int dummy = 1;
    AddPath(p->getPath());
  }
***************
*** 51,56 ****
    // prevent non file paths from occuring in the list: prevent
    // infinite loop when calling such a path from the history menu
!   KURL url(path);
!   if (url.protocol() == "file")
    {
      pathQueue.push_front(path);
--- 51,56 ----
    // prevent non file paths from occuring in the list: prevent
    // infinite loop when calling such a path from the history menu
! //  KURL url(path);
! //  if (url.protocol() == "file")
    {
      pathQueue.push_front(path);
***************
*** 58,61 ****
--- 58,72 ----
  }
  
+ void DirHistoryQueue::RemovePath(const QString& path)
+ {
+   QStringList::iterator it;
+   it = pathQueue.find(path);
+   if (it != pathQueue.end())
+   {
+     pathQueue.remove(it);
+   }
+       
+ }
+ 
  void DirHistoryQueue::DumpQueue()
  {

[Krusader-commits] krusader_kde3/krusader/GUI dirhistorybutton.cpp,1.1,1.2

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

Update of /cvsroot/krusader/krusader_kde3/krusader/GUI
In directory sc8-pr-cvs1:/tmp/cvs-serv10247/krusader/GUI

Modified Files:
	dirhistorybutton.cpp 
Log Message:
fix: history button now handles archives 

Index: dirhistorybutton.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/dirhistorybutton.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dirhistorybutton.cpp	10 Jan 2004 00:02:07 -0000	1.1
--- dirhistorybutton.cpp	16 Jan 2004 16:36:10 -0000	1.2
***************
*** 21,24 ****
--- 21,25 ----
  #include "../VFS/vfs.h"
  #include <qpopupmenu.h>
+ #include <qdir.h>
  #include <klocale.h>
  #include <kiconloader.h>
***************
*** 59,71 ****
      popup()->exec(mapToGlobal(QPoint(0, height())));
    }
!   kdDebug() << "History popup" << endl;
  }
  /** No descriptions */
  void DirHistoryButton::slotPopup(){
!   kdDebug() << "History slot" << endl;
  }
  /** No descriptions */
  void DirHistoryButton::slotAboutToShow(){
!   kdDebug() << "about to show" << endl;
    popupMenu->clear();
    QStringList::iterator it;
--- 60,72 ----
      popup()->exec(mapToGlobal(QPoint(0, height())));
    }
! //  kdDebug() << "History popup" << endl;
  }
  /** No descriptions */
  void DirHistoryButton::slotPopup(){
! //  kdDebug() << "History slot" << endl;
  }
  /** No descriptions */
  void DirHistoryButton::slotAboutToShow(){
! //  kdDebug() << "about to show" << endl;
    popupMenu->clear();
    QStringList::iterator it;
***************
*** 80,85 ****
  /** No descriptions */
  void DirHistoryButton::slotPopupActivated(int id){
!   kdDebug() << "popup activated" << endl;
    KURL url(historyQueue->pathQueue[id]);
    emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
  //  emit openUrl(historyQueue->pathQueue[id]);
--- 81,96 ----
  /** No descriptions */
  void DirHistoryButton::slotPopupActivated(int id){
! //  kdDebug() << "popup activated" << endl;
    KURL url(historyQueue->pathQueue[id]);
+   QString p = url.path();
+   kdDebug() << p <<  "file: " << url.fileName() << ", dir: " << url.directory() <<  endl;
+   if (url.protocol() == "file")
+   {
+     QDir dir(historyQueue->pathQueue[id]);
+     if (!dir.exists())
+     {
+       historyQueue->RemovePath(historyQueue->pathQueue[id]);
+     }
+   }
    emit openUrl( vfs::fromPathOrURL( url.prettyURL() ) );
  //  emit openUrl(historyQueue->pathQueue[id]);

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.51,1.52

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

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

Modified Files:
	listpanel.cpp 
Log Message:
fix: history button now handles archives 

Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** listpanel.cpp	10 Jan 2004 00:03:24 -0000	1.51
--- listpanel.cpp	16 Jan 2004 16:35:48 -0000	1.52
***************
*** 114,118 ****
    historyButton = new DirHistoryButton(dirHistoryQueue, this, "historyButton");
    connect(historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) );
!   connect(historyButton, SIGNAL(openUrl(const KURL&)), func, SLOT( openUrl( const KURL& ) ) );  
  
    // ... create the bookmark list
--- 114,118 ----
    historyButton = new DirHistoryButton(dirHistoryQueue, this, "historyButton");
    connect(historyButton, SIGNAL( pressed() ), this, SLOT( slotFocusOnMe() ) );
!   connect(historyButton, SIGNAL(openUrl(const KURL&)), func, SLOT( delayedOpenUrl( const KURL& ) ) );  
  
    // ... create the bookmark list