krusader-commits

[Krusader-commits] krusader_kde3/krusader/Locate locate.cpp,1.2,1.3 locate.h,1.1,1.2

[Karai C. <ck...@us...>]

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

Modified Files:
	locate.cpp locate.h 
Log Message:

FIXED: show only the existing files must work in every system


Index: locate.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Locate/locate.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** locate.h	12 Feb 2004 08:11:31 -0000	1.1
--- locate.h	19 Mar 2004 06:49:07 -0000	1.2
***************
*** 65,68 ****
--- 65,69 ----
  
    bool              stopping;
+   bool              onlyExist;
  
    KHistoryCombo    *locateSearchFor;

Index: locate.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Locate/locate.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** locate.cpp	7 Mar 2004 22:48:47 -0000	1.2
--- locate.cpp	19 Mar 2004 06:49:07 -0000	1.3
***************
*** 176,180 ****
  void LocateDlg::slotUser3()   /* The locate button */
  {
!   bool isCs, onlyExist;
    
    locateSearchFor->addToHistory(locateSearchFor->currentText());
--- 176,180 ----
  void LocateDlg::slotUser3()   /* The locate button */
  {
!   bool isCs;
    
    locateSearchFor->addToHistory(locateSearchFor->currentText());
***************
*** 199,202 ****
--- 199,204 ----
    enableButton( KDialogBase::User1, true );   /* enable the stop button */
  
+   qApp->processEvents();
+ 
    stopping = false;
    
***************
*** 208,213 ****
    if( !isCs )
      locateProc << "-i";
-   if( onlyExist )
-     locateProc << "-e";
    locateProc << locateSearchFor->currentText();
    
--- 210,213 ----
***************
*** 235,242 ****
      if( --items == 0 && buffer[length-1] != '\n' )
        remaining = *it;
-     else if( lastItem )    
-       lastItem = new KListViewItem( resultList, lastItem, *it );
      else
!       lastItem = new KListViewItem( resultList, *it );
    }
  
--- 235,252 ----
      if( --items == 0 && buffer[length-1] != '\n' )
        remaining = *it;
      else
!     {
!       if( onlyExist )
!       {
!         KFileItem file(KFileItem::Unknown, KFileItem::Unknown, (*it).stripWhiteSpace() );
!         if( !file.isReadable() )
!           continue;
!       }
!       
!       if( lastItem )    
!         lastItem = new KListViewItem( resultList, lastItem, *it );
!       else
!         lastItem = new KListViewItem( resultList, *it );
!     }
    }
  

[Krusader-commits] krusader_kde3/krusader/Synchronizer synchronizer.cpp,1.10,1.11

[Karai C. <ck...@us...>]

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

Modified Files:
	synchronizer.cpp 
Log Message:

FIXED: compare by content bug


Index: synchronizer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** synchronizer.cpp	28 Dec 2003 17:11:48 -0000	1.10
--- synchronizer.cpp	18 Mar 2004 08:35:38 -0000	1.11
***************
*** 988,992 ****
    
    if( otherJob == 0 )
!     abortContentComparing();
    else
    {    
--- 988,995 ----
    
    if( otherJob == 0 )
!   {
!     if( compareArray.size() )
!       abortContentComparing();
!   }
    else
    {    

[Krusader-commits] krusader_kde3/krusader/Konfigurator konfiguratoritems.cpp,1.5,1.6 konfiguratoritems.h,1.3,1.4 konfiguratorpage.cpp,1.5,1.6 konfiguratorpage.h,1.4,1.5

[Karai C. <ck...@us...>]

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

Modified Files:
	konfiguratoritems.cpp konfiguratoritems.h konfiguratorpage.cpp 
	konfiguratorpage.h 
Log Message:

ADDED: konfigurator, color chooser object


Index: konfiguratoritems.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** konfiguratoritems.cpp	5 Feb 2004 22:26:52 -0000	1.5
--- konfiguratoritems.cpp	17 Mar 2004 20:47:37 -0000	1.6
***************
*** 31,35 ****
  #include "konfiguratoritems.h"
  #include "../krusader.h"
!  
  KonfiguratorExtension::KonfiguratorExtension( QObject *obj, QString cfgClass, QString cfgName, bool rst) :
        QObject(), objectPtr( obj ), applyConnected( false ), setDefaultsConnected( false ),
--- 31,39 ----
  #include "konfiguratoritems.h"
  #include "../krusader.h"
! #include <klocale.h>
! #include <qpainter.h>
! #include <qpen.h>
! #include <qcolordialog.h>
!   
  KonfiguratorExtension::KonfiguratorExtension( QObject *obj, QString cfgClass, QString cfgName, bool rst) :
        QObject(), objectPtr( obj ), applyConnected( false ), setDefaultsConnected( false ),
***************
*** 588,590 ****
--- 592,738 ----
  }
  
+ 
+ // KonfiguratorColorChooser class
+ ///////////////////////////////
+ 
+ KonfiguratorColorChooser::KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
+     QWidget *parent, const char *widgetName, bool rst ) : QComboBox ( parent, widgetName ),
+     defaultValue( dflt ), disableColorChooser( true )
+ {
+   ext = new KonfiguratorExtension( this, cls, name, rst );
+   
+   connect( ext, SIGNAL( applyAuto(QObject *,QString, QString) ), this, SLOT( slotApply(QObject *,QString, QString) ) );
+   connect( ext, SIGNAL( setDefaultsAuto(QObject *) ), this, SLOT( slotSetDefaults(QObject *) ) );
+   connect( ext, SIGNAL( setInitialValue(QObject *) ), this, SLOT( loadInitialValue() ) );
+ 
+   addColor( i18n("Custom color" ),  QColor( 255, 255, 255 ) );
+   addColor( i18n("KDE default" ),   defaultValue );
+   addColor( i18n("Red" ),           Qt::red );
+   addColor( i18n("Green" ),         Qt::green );
+   addColor( i18n("Blue" ),          Qt::blue );
+   addColor( i18n("Cyan" ),          Qt::cyan );
+   addColor( i18n("Magenta" ),       Qt::magenta );
+   addColor( i18n("Yellow" ),        Qt::yellow );
+   addColor( i18n("Dark Red" ),      Qt::darkRed );
+   addColor( i18n("Dark Green" ),    Qt::darkGreen );
+   addColor( i18n("Dark Blue" ),     Qt::darkBlue );
+   addColor( i18n("Dark Cyan" ),     Qt::darkCyan );
+   addColor( i18n("Dark Magenta" ),  Qt::darkMagenta );
+   addColor( i18n("Dark Yellow" ),   Qt::darkYellow );
+   addColor( i18n("White" ),         Qt::white );
+   addColor( i18n("Light Gray" ),    Qt::lightGray );
+   addColor( i18n("Gray" ),          Qt::gray );
+   addColor( i18n("Dark Gray" ),     Qt::darkGray );
+   addColor( i18n("Black" ),         Qt::black );
+ 
+   connect( this, SIGNAL( highlighted(int) ), ext,  SLOT( setChanged() ) );
+   connect( this, SIGNAL( activated(int) ),   this, SLOT( slotCurrentChanged( int ) ) );
+ 
+   loadInitialValue();
+ }
+ 
+ KonfiguratorColorChooser::~KonfiguratorColorChooser()
+ {
+   delete ext;
+ }
+ 
+ QPixmap KonfiguratorColorChooser::createPixmap( QColor color )
+ {
+   QPainter painter;
+   QPen pen;
+   int size = QFontMetrics(font()).height()*3/4;
+   QRect rect( 0, 0, size, size );
+   QPixmap pixmap( rect.width(), rect.height() );
+ 
+   pen.setColor( Qt::black );
+   
+   painter.begin( &pixmap );
+   QBrush brush( color );
+   painter.fillRect( rect, brush );
+   painter.setPen( pen );
+   painter.drawRect( rect );
+   painter.end();
+ 
+   pixmap.detach();
+   return pixmap;
+ }
+ 
+ void KonfiguratorColorChooser::addColor( QString text, QColor color )
+ {
+   insertItem( createPixmap(color), text );
+   palette.push_back( color );
+ }
+ 
+ void KonfiguratorColorChooser::loadInitialValue()
+ {
+   disableColorChooser = true;
+   
+   krConfig->setGroup( ext->getCfgClass() );
+   QString selected = krConfig->readEntry( ext->getCfgName(), "" );
+   if( selected.isEmpty() )
+   {
+     setCurrentItem( 1 );
+     customValue = defaultValue;
+   }
+   else
+   {
+     QColor color = krConfig->readColorEntry( ext->getCfgName(), &defaultValue );
+     customValue = color;
+ 
+     setCurrentItem( 0 );
+     for( int i=2; i != palette.size(); i++ )
+       if( palette[i] == color )
+       {
+         setCurrentItem( i );
+         break;
+       }
+   }
+ 
+   palette[0] = customValue;
+   changeItem( createPixmap( customValue ), text( 0 ), 0 );
+       
+   ext->setChanged( false );
+   disableColorChooser = false;
+ }
+ 
+ void KonfiguratorColorChooser::setDefaultColor( QColor dflt )
+ {
+   defaultValue = dflt;
+   palette[1] = defaultValue;
+   changeItem( createPixmap( defaultValue ), text( 1 ), 1 );
+ }
+ 
+ void KonfiguratorColorChooser::slotApply(QObject *,QString cls, QString name)
+ {
+   krConfig->setGroup( cls );
+   
+   QColor color = palette[ currentItem() ];
+   if( currentItem() == 1 )    /* it's the default value? */
+     krConfig->writeEntry( name, "" );   /* set nothing */
+   else
+     krConfig->writeEntry( name, color );
+ }
+ 
+ void KonfiguratorColorChooser::slotSetDefaults(QObject *)
+ {
+   setCurrentItem( 1 );
+ }
+ 
+ void KonfiguratorColorChooser::slotCurrentChanged( int number )
+ {
+   ext->setChanged();
+   if( number == 0 && !disableColorChooser )
+   {
+     QColor color = QColorDialog::getColor ( customValue, this, "ColorDialog" );
+     if( color.isValid() )
+     {
+       disableColorChooser = true;
+       customValue = color;
+       palette[0] = customValue;
+       changeItem( createPixmap( customValue ), text( 0 ), 0 );
+       disableColorChooser = false;
+     }
+   }
+ }
+ 
  #include "konfiguratoritems.moc"

Index: konfiguratorpage.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratorpage.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** konfiguratorpage.cpp	10 Feb 2004 23:07:32 -0000	1.5
--- konfiguratorpage.cpp	17 Mar 2004 20:47:37 -0000	1.6
***************
*** 306,308 ****
--- 306,318 ----
  }
  
+ KonfiguratorColorChooser *KonfiguratorPage::createColorChooser( QString cls, QString name, QColor dflt,
+                                                                 QWidget *parent, bool rst )
+ {
+   KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser( cls, name, dflt,  parent,
+                                         QString(cls + "/" + name).ascii(), rst );
+ 
+   registerObject( colorChooser->extension() );
+   return colorChooser;
+ }
+ 
  #include "konfiguratorpage.moc"

Index: konfiguratoritems.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratoritems.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** konfiguratoritems.h	3 Feb 2004 00:41:04 -0000	1.3
--- konfiguratoritems.h	17 Mar 2004 20:47:37 -0000	1.4
***************
*** 313,316 ****
--- 313,351 ----
  };
  
+ 
+ // KonfiguratorColorChooser class
+ ///////////////////////////////
+ 
+ class KonfiguratorColorChooser : public QComboBox
+ {
+   Q_OBJECT
+ 
+ public:
+   KonfiguratorColorChooser( QString cls, QString name, QColor dflt,
+                             QWidget *parent=0, const char *widgetName=0, bool rst=false );
+   ~KonfiguratorColorChooser();
+ 
+   inline KonfiguratorExtension *extension()   {return ext;}
+ 
+   void          setDefaultColor( QColor dflt );
+ 
+ public slots:
+   virtual void  loadInitialValue();
+   void          slotApply(QObject *,QString, QString);
+   void          slotSetDefaults(QObject *);
+   void          slotCurrentChanged( int number );
+ 
+ private:
+   void          addColor( QString text, QColor color );
+   QPixmap       createPixmap( QColor color );
+   
+ protected:
+   QColor                        defaultValue;
+   QColor                        customValue;
+   QValueVector<QColor>          palette;
+   KonfiguratorExtension        *ext;
+   bool                          disableColorChooser;
+ };
+ 
  #endif /* __KONFIGURATOR_ITEMS_H__ */
  

Index: konfiguratorpage.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfiguratorpage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** konfiguratorpage.h	3 Feb 2004 00:41:04 -0000	1.4
--- konfiguratorpage.h	17 Mar 2004 20:47:37 -0000	1.5
***************
*** 416,419 ****
--- 416,437 ----
    void                    removeObject( KonfiguratorExtension *item );
  
+   /**
+     * Adds a new color chooser combobox item to the page.
+     * <br>The chooser's widget's name is QString(cls + "/" + name).ascii()<br>
+     *
+     * Sample:<br><br>
+     * KonfiguratorColorChooser *myColorChooser = createColorChooser( "class", "name", QColor( 255, 0, 255 ), parentWidget );<br>
+     * myLayout->addWidget( myColorChooser, 0, 0 );
+     *
+     * @param  cls         The class name used in KConfig (ex. "Archives")
+     * @param  name        The item name used in KConfig (ex. "Do Tar")
+     * @param  dflt        The default value of the color chooser
+     * @param  parent      Reference to the parent widget
+     * @param  rst         The change of this parameter requires Krusader restart
+     *
+     * @return             reference to the newly created combobox
+     */
+   KonfiguratorColorChooser *createColorChooser(  QString cls, QString name, QColor dflt,
+                                                  QWidget *parent=0, bool rst=false );
  signals:
    /**

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.62,1.63

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

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

Modified Files:
	krusader.cpp 
Log Message:
fix: using relative paths in --left/--right would crash (thanks to lars)



Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** krusader.cpp	15 Mar 2004 14:52:35 -0000	1.62
--- krusader.cpp	17 Mar 2004 14:44:44 -0000	1.63
***************
*** 129,136 ****
--- 129,143 ----
    QString leftPath, rightPath;
  
+   // get command-line arguments
    if ( args->isSet( "left" ) ) leftPath = args->getOption( "left" );
    else leftPath = QString::null;
    if ( args->isSet( "right" ) ) rightPath = args->getOption( "right" );
    else rightPath = QString::null;
+   // make sure left or right are not relative paths
+   if (!leftPath.startsWith("/") && leftPath.find(":/")<0) // make sure we don't touch things like ftp://
+   	leftPath = QDir::currentDirPath() + "/" + leftPath;
+   if (!rightPath.startsWith("/") && rightPath.find(":/")<0) // make sure we don't touch things like ftp://
+   	rightPath = QDir::currentDirPath() + "/" + rightPath;	
+   
  
    // create the "krusader"

[Krusader-commits] krusader_kde3/krusader/KViewer krviewer.cpp,1.14,1.15

[Karai C. <ck...@us...>]

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

Modified Files:
	krviewer.cpp 
Log Message:

FIXED: edit new file bug on KDE 3.2


Index: krviewer.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/KViewer/krviewer.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** krviewer.cpp	10 Feb 2004 18:36:53 -0000	1.14
--- krviewer.cpp	17 Mar 2004 06:24:10 -0000	1.15
***************
*** 34,37 ****
--- 34,38 ----
  #include <khtml_part.h>
  #include <kprocess.h>
+ #include <kfileitem.h>
  // Krusader includes
  #include "krviewer.h"
***************
*** 72,75 ****
--- 73,83 ----
    KTrader::OfferList offers = KTrader::self()->query(mimetype);
    QString type = (readOnly ? "KParts::ReadOnlyPart" : "KParts::ReadWritePart");
+   
+   if( create )
+   {
+     KFileItem file( KFileItem::Unknown, KFileItem::Unknown, url );
+     if( file.isReadable() )
+       create = false;
+   }
  
    // in theory, we only care about the first one.. but let's try all
***************
*** 86,94 ****
                             ptr->name().latin1(), type.latin1() ));
        if( part )
!         if( ((KParts::ReadOnlyPart*)part)->openURL( url ) || create ) break;
!         else {
!           delete part;
!           part = 0L;
          }
      }
    }
--- 94,112 ----
                             ptr->name().latin1(), type.latin1() ));
        if( part )
!       {      
!         if( !create )
!         {
!           if( ((KParts::ReadOnlyPart*)part)->openURL( url ) ) break;
!           else {
!             delete part;
!             part = 0L;
!           }
          }
+         else
+         {
+           ((KParts::ReadWritePart*)part)->saveAs( url );
+ 	  break;
+         }
+       }
      }
    }

[Krusader-commits] krusader_kde3 ChangeLog,1.191,1.192

[Karai C. <ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

FIXED: edit new file bug on KDE 3.2


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -C2 -d -r1.191 -r1.192
*** ChangeLog	16 Mar 2004 08:23:17 -0000	1.191
--- ChangeLog	17 Mar 2004 06:24:10 -0000	1.192
***************
*** 20,23 ****
--- 20,24 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: edit new file on KDE 3.2
      FIXED: permission handling for FTP URL-s
      FIXED: calc space crash at vfs refresh (thanks to Heiner)

[Krusader-commits] krusader_kde3/krusader/VFS ftp_vfs.cpp,1.24,1.25 vfile.cpp,1.9,1.10 vfile.h,1.10,1.11

[Karai C. <ck...@us...>]

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

Modified Files:
	ftp_vfs.cpp vfile.cpp vfile.h 
Log Message:

FIXED: permission handling for FTP URL-s


Index: vfile.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** vfile.h	17 Jan 2004 18:34:41 -0000	1.10
--- vfile.h	16 Mar 2004 08:23:17 -0000	1.11
***************
*** 70,73 ****
--- 70,74 ----
  				QString	owner,
  				QString group,
+ 				QString userName,
  				QString mime,
  				QString symDest,
***************
*** 110,113 ****
--- 111,115 ----
    QString          vfile_owner;    //< file owner name
    QString          vfile_group;    //< file group name
+   QString          vfile_userName; //< the current username
  	QString          vfile_perm;     //< file permissions string
    time_t           vfile_time_t;   //< file modification in time_t format

Index: ftp_vfs.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/ftp_vfs.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ftp_vfs.cpp	27 Dec 2003 16:50:17 -0000	1.24
--- ftp_vfs.cpp	16 Mar 2004 08:23:17 -0000	1.25
***************
*** 90,94 ****
        temp=new vfile(name,size,perm,mtime,symLink,getuid(),getgid(),mime,symDest,mode);
      else
!       temp=new vfile(name,size,perm,mtime,symLink,kfi.user(),kfi.group(),mime,symDest,mode);
      addToList(temp);
  	}
--- 90,101 ----
        temp=new vfile(name,size,perm,mtime,symLink,getuid(),getgid(),mime,symDest,mode);
      else
!     {
!       QString currentUser = vfs_origin.user();
!       if( currentUser.contains("@") ) /* remove the FTP proxy tags from the username */
!         currentUser.truncate( currentUser.find( '@' ) );
!       if( currentUser.isEmpty() )
!         currentUser = KRpermHandler::uid2user(getuid());
!       temp=new vfile(name,size,perm,mtime,symLink,kfi.user(),kfi.group(),currentUser,mime,symDest,mode);
!     }
      addToList(temp);
  	}

Index: vfile.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/VFS/vfile.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** vfile.cpp	17 Jan 2004 18:34:41 -0000	1.9
--- vfile.cpp	16 Mar 2004 08:23:17 -0000	1.10
***************
*** 54,58 ****
  	vfile_name=name;
  	vfile_size=size;
! 	vfile_ownerId=owner;
  	vfile_groupId=group;
  	vfile_perm=perm;
--- 54,60 ----
  	vfile_name=name;
  	vfile_size=size;
!   vfile_owner=QString::null;
! 	vfile_ownerId=owner;  
!   vfile_group=QString::null;
  	vfile_groupId=group;
  	vfile_perm=perm;
***************
*** 73,76 ****
--- 75,79 ----
  						QString	owner,
  						QString group,
+             QString userName,
  						QString mime,
  						QString symDest,
***************
*** 80,83 ****
--- 83,87 ----
      vfile_owner=owner;
      vfile_group=group;
+     vfile_userName=userName;
  		vfile_ownerId=KRpermHandler::user2uid(owner) ;
  		vfile_groupId=KRpermHandler::group2gid(group);
***************
*** 93,105 ****
  
  char vfile::vfile_isReadable(){
! 	return KRpermHandler::readable(vfile_perm,vfile_groupId,vfile_ownerId);
  }
  
  char vfile::vfile_isWriteable(){
! 	return KRpermHandler::writeable(vfile_perm,vfile_groupId,vfile_ownerId);
  }
  
  char vfile::vfile_isExecutable(){
! 	return KRpermHandler::executable(vfile_perm,vfile_groupId,vfile_ownerId);
  }
  
--- 97,118 ----
  
  char vfile::vfile_isReadable(){
!   if( vfile_owner.isEmpty() )
!   	return KRpermHandler::readable(vfile_perm,vfile_groupId,vfile_ownerId);
!   else
!   	return KRpermHandler::ftpReadable(vfile_userName, vfile_owner, vfile_perm);
  }
  
  char vfile::vfile_isWriteable(){
!   if( vfile_owner.isEmpty() )
!   	return KRpermHandler::writeable(vfile_perm,vfile_groupId,vfile_ownerId);
!   else
!   	return KRpermHandler::ftpWriteable(vfile_userName, vfile_owner, vfile_perm);
  }
  
  char vfile::vfile_isExecutable(){
!   if( vfile_owner.isEmpty() )
!   	return KRpermHandler::executable(vfile_perm,vfile_groupId,vfile_ownerId);
!   else
!   	return KRpermHandler::ftpExecutable(vfile_userName, vfile_owner, vfile_perm);
  }
  

[Krusader-commits] krusader_kde3 ChangeLog,1.190,1.191

[Karai C. <ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

FIXED: permission handling for FTP URL-s


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -C2 -d -r1.190 -r1.191
*** ChangeLog	15 Mar 2004 14:40:28 -0000	1.190
--- ChangeLog	16 Mar 2004 08:23:17 -0000	1.191
***************
*** 20,23 ****
--- 20,24 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: permission handling for FTP URL-s
      FIXED: calc space crash at vfs refresh (thanks to Heiner)
      FIXED: krarc created non-executable directories (0666)

[Krusader-commits] krusader_kde3/krusader krusader.cpp,1.61,1.62

[<ck...@us...>]

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

Modified Files:
	krusader.cpp 
Log Message:

FIXED: usermenu places an empty box onto the widget


Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** krusader.cpp	7 Mar 2004 18:35:36 -0000	1.61
--- krusader.cpp	15 Mar 2004 14:52:35 -0000	1.62
***************
*** 184,187 ****
--- 184,188 ----
    // create the user menu
    userMenu = new UserMenu( this );
+   userMenu->hide();
  
    // setup keyboard accelerators

[Krusader-commits] krusader_kde3/krusader/Panel krcalcspacedialog.cpp,1.3,1.4 krcalcspacedialog.h,1.3,1.4 krdetailedview.cpp,1.65,1.66 krdetailedview.h,1.21,1.22 krview.h,1.11,1.12 panelfunc.cpp,1.59,1.60 panelfunc.h,1.24,1.25

[<ck...@us...>]

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

Modified Files:
	krcalcspacedialog.cpp krcalcspacedialog.h krdetailedview.cpp 
	krdetailedview.h krview.h panelfunc.cpp panelfunc.h 
Log Message:

FIXED: calc space crash at vfs refresh (Heiner's first patch)


Index: krcalcspacedialog.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcalcspacedialog.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krcalcspacedialog.cpp	12 Feb 2004 17:23:29 -0000	1.3
--- krcalcspacedialog.cpp	15 Mar 2004 14:40:29 -0000	1.4
***************
*** 39,49 ****
  // Krusader Includes
  #include "krcalcspacedialog.h"
  #include "../krusader.h"
  #include "../VFS/krpermhandler.h"
  
  /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
! KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, vfs * files, const KrViewItemList & items)
! 	: m_totalSize(0), m_currentSize(0), m_totalFiles(0), m_totalDirs(0), m_items(items), m_files(files), m_parent(parent)
!         , m_threadInUse(true), m_stop(false) {}
  
  void KrCalcSpaceDialog::CalcThread::cleanUp(){
--- 39,51 ----
  // Krusader Includes
  #include "krcalcspacedialog.h"
+ #include "listpanel.h"
+ #include "panelfunc.h"
  #include "../krusader.h"
  #include "../VFS/krpermhandler.h"
  
  /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
! KrCalcSpaceDialog::CalcThread::CalcThread(KrCalcSpaceDialog * parent, ListPanel * panel, const QStringList & items)
! 	: m_totalSize(0), m_currentSize(0), m_totalFiles(0), m_totalDirs(0), m_items(items), m_files(panel->func->files()),
! 	  m_parent(parent), m_view(panel->view) , m_threadInUse(true), m_stop(false) {}
  
  void KrCalcSpaceDialog::CalcThread::cleanUp(){
***************
*** 66,76 ****
  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 )
          {
                  m_currentSize = 0;
!                 m_files->vfs_calcSpace( (*it)->name(), &m_currentSize, &m_totalFiles, &m_totalDirs , & m_stop);
                  if (m_stop)
                      break;
!                 KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( *it );
                  if (viewItem){
                       KrCalcSpaceDialog::setDirSize(viewItem, m_currentSize);
--- 68,78 ----
  void KrCalcSpaceDialog::CalcThread::run(){
  	if ( !m_items.isEmpty() ) // if something to do: do the calculation
! 	for ( QStringList::ConstIterator it = m_items.begin(); it != m_items.end(); ++it )
          {
                  m_currentSize = 0;
!                 m_files->vfs_calcSpace( *it, &m_currentSize, &m_totalFiles, &m_totalDirs , & m_stop);
                  if (m_stop)
                      break;
!                 KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *>(m_view->findItemByName ( *it ) );
                  if (viewItem){
                       KrCalcSpaceDialog::setDirSize(viewItem, m_currentSize);
***************
*** 90,94 ****
  }
  
! 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){
--- 92,96 ----
  }
  
! KrCalcSpaceDialog::KrCalcSpaceDialog(QWidget *parent, ListPanel * files, const QStringList & items, bool autoclose) :
  	KDialogBase(parent, "KrCalcSpaceDialog", true, "Calculate Occupied Space", Ok|Cancel),
  	m_autoClose(autoclose), m_canceled(false), m_timerCounter(0){
***************
*** 142,146 ****
  	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").arg( KIO::convertSize( m_thread->getTotalSize() ) );
  	if (m_thread->getTotalSize() >= 1024)
--- 144,148 ----
  	if (!m_thread) return;
  	QString msg;
! 	QString fileName = ( ( m_thread->getItems().count() == 1 ) ? ( i18n( "Name: " ) + m_thread->getItems().first() + "\n" ) : QString( "" ) );
  	msg = fileName + i18n( "Total occupied space: %1").arg( KIO::convertSize( m_thread->getTotalSize() ) );
  	if (m_thread->getTotalSize() >= 1024)

Index: krcalcspacedialog.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krcalcspacedialog.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krcalcspacedialog.h	12 Feb 2004 17:23:30 -0000	1.3
--- krcalcspacedialog.h	15 Mar 2004 14:40:29 -0000	1.4
***************
*** 43,47 ****
  #include "../VFS/vfs.h"
  #include "krdetailedviewitem.h"
! #include "krview.h"
  
  
--- 43,48 ----
  #include "../VFS/vfs.h"
  #include "krdetailedviewitem.h"
! class ListPanel;
! class KrView;
  
  
***************
*** 60,65 ****
  		unsigned long m_totalFiles;
  		unsigned long m_totalDirs;
! 		const KrViewItemList m_items;
  		vfs * m_files;
  		KrCalcSpaceDialog * m_parent;
  		QMutex m_synchronizeUsageAccess;
--- 61,67 ----
  		unsigned long m_totalFiles;
  		unsigned long m_totalDirs;
! 		const QStringList m_items;
  		vfs * m_files;
+ 		KrView *m_view;
  		KrCalcSpaceDialog * m_parent;
  		QMutex m_synchronizeUsageAccess;
***************
*** 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
--- 73,78 ----
  		unsigned long getTotalFiles() const {return m_totalFiles;} // the result
  		unsigned long getTotalDirs() const {return m_totalDirs;} // the result
! 		const QStringList & getItems() const {return m_items;} // list of directories to calculate
! 		CalcThread(KrCalcSpaceDialog * parent, ListPanel * panel, const QStringList & items);
  		void deleteInstance(); // thread is no longer needed.
  		void run(); // start calculation
***************
*** 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
--- 93,97 ----
  public:
  	// autoclose: wait 3 sec. before showing the dialog. Close it, when done
! 	KrCalcSpaceDialog(QWidget *parent, ListPanel * panel, const QStringList & 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.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** krdetailedview.cpp	28 Feb 2004 15:53:59 -0000	1.65
--- krdetailedview.cpp	15 Mar 2004 14:40:29 -0000	1.66
***************
*** 727,732 ****
          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
--- 727,732 ----
          KIO::filesize_t totalSize = 0;
          unsigned long totalFiles = 0, totalDirs = 0;
!         QStringList items;
!         items.push_back( viewItem->name() );
          if ( krApp->mainView->activePanel->func->calcSpace( items, totalSize, totalFiles, totalDirs ) ) {
            // did we succeed to calcSpace? we'll fail if we don't have permissions

Index: krdetailedview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krdetailedview.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** krdetailedview.h	7 Feb 2004 11:51:13 -0000	1.21
--- krdetailedview.h	15 Mar 2004 14:40:29 -0000	1.22
***************
*** 66,69 ****
--- 66,70 ----
      virtual KrViewItem *getCurrentKrViewItem() { return dynamic_cast<KrViewItem*>( currentItem() ); }
      virtual KrViewItem *getKrViewItemAt( const QPoint &vp );
+     virtual KrViewItem *findItemByName(const QString &name) { return dynamic_cast<KrViewItem*>( findItem(name, 0) ); }
      virtual void addItems( vfs *v, bool addUpDir = true );
      virtual QString getCurrentItem() const;

Index: krview.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/krview.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** krview.h	12 Feb 2004 17:23:30 -0000	1.11
--- krview.h	15 Mar 2004 14:40:29 -0000	1.12
***************
*** 85,88 ****
--- 85,89 ----
    virtual KrViewItem *getCurrentKrViewItem() = 0;
    virtual KrViewItem *getKrViewItemAt(const QPoint &vp) = 0;
+   virtual KrViewItem *findItemByName(const QString &name) = 0;
    virtual void addItems(vfs* v, bool addUpDir = true) = 0;
    virtual QString getCurrentItem() const = 0;

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** panelfunc.cpp	8 Mar 2004 21:40:49 -0000	1.59
--- panelfunc.cpp	15 Mar 2004 14:40:29 -0000	1.60
***************
*** 49,52 ****
--- 49,53 ----
  #include "panelfunc.h"
  #include "krcalcspacedialog.h"
+ #include "krdetailedview.h"
  #include "../krusader.h"
  #include "../krslots.h"
***************
*** 388,392 ****
  void ListPanelFunc::copyFiles() {
    QStringList fileNames;
- 
    panel->getSelectedNames( &fileNames );
    if ( fileNames.isEmpty() )
--- 389,392 ----
***************
*** 680,697 ****
  
  void ListPanelFunc::calcSpace() {
! 	KrViewItemList items;
! 	panel->view->getSelectedKrViewItems(&items);
  	if ( items.isEmpty() )
  	{
  	  panel->view->selectAllIncludingDirs();
! 	  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();
--- 680,700 ----
  
  void ListPanelFunc::calcSpace() {
! 	QStringList items;
! 	panel->view->getSelectedItems(&items);
  	if ( items.isEmpty() )
  	{
  	  panel->view->selectAllIncludingDirs();
! 	  panel->view->getSelectedItems(&items);
  	  if ( items.isEmpty() ) return ; // nothing to do
  	}
  
! 	KrCalcSpaceDialog calc(krApp, panel, items, false);
  	calc.exec();
!         KrDetailedView * view = dynamic_cast<KrDetailedView *> ( panel->view );
!         if (!view)
!                 return;
!         for ( QStringList::ConstIterator it = items.begin(); it != items.end(); ++it )
          {
!                 KrDetailedViewItem * viewItem = dynamic_cast<KrDetailedViewItem *> ( view->findItemByName(*it) );
                  if (viewItem)
                       viewItem->repaintItem();
***************
*** 699,704 ****
  }
  
! 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();
--- 702,707 ----
  }
  
! bool ListPanelFunc::calcSpace(const QStringList & items,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs) {
! 	KrCalcSpaceDialog calc(krApp, panel, items, true);
  	calc.exec();
  	totalSize = calc.getTotalSize();

Index: panelfunc.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** panelfunc.h	4 Mar 2004 07:27:02 -0000	1.24
--- panelfunc.h	15 Mar 2004 14:40:29 -0000	1.25
***************
*** 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();
--- 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 QStringList & items,KIO::filesize_t & totalSize,unsigned long & totalFiles,unsigned long & totalDirs);
  	void FTPDisconnect();
  	void newFTPconnection();

[Krusader-commits] krusader_kde3 ChangeLog,1.189,1.190

[<ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

FIXED: calc space crash at vfs refresh (Heiner's first patch)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.189
retrieving revision 1.190
diff -C2 -d -r1.189 -r1.190
*** ChangeLog	10 Mar 2004 21:46:22 -0000	1.189
--- ChangeLog	15 Mar 2004 14:40:28 -0000	1.190
***************
*** 20,23 ****
--- 20,24 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: calc space crash at vfs refresh (thanks to Heiner)
      FIXED: krarc created non-executable directories (0666)
      FIXED: reimplementing the 'allow move into archive' setting

[Krusader-commits] krusader_kde3/krArc krarc.cpp,1.13,1.14

[<ck...@us...>]

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

Modified Files:
	krarc.cpp 
Log Message:

FIXED: krarc created non-executable directories (0666), which caused problems


Index: krarc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krArc/krarc.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** krarc.cpp	1 Feb 2004 12:06:54 -0000	1.13
--- krarc.cpp	10 Mar 2004 21:46:23 -0000	1.14
***************
*** 117,121 ****
    if( tmpDir.right(1) != "/" ) tmpDir = tmpDir+"/";
      
!   if( permissions == -1 ) permissions = 0666; //set default permissions
    for( unsigned int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.find("/",i+1)){
      ::mkdir(tmpDir.left(i).latin1(),permissions);
--- 117,121 ----
    if( tmpDir.right(1) != "/" ) tmpDir = tmpDir+"/";
      
!   if( permissions == -1 ) permissions = 0777; //set default permissions
    for( unsigned int i=arcTempDir.length();i<tmpDir.length(); i=tmpDir.find("/",i+1)){
      ::mkdir(tmpDir.left(i).latin1(),permissions);

[Krusader-commits] krusader_kde3 ChangeLog,1.188,1.189

[<ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

FIXED: krarc created non-executable directories (0666), which caused problems


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.188
retrieving revision 1.189
diff -C2 -d -r1.188 -r1.189
*** ChangeLog	9 Mar 2004 22:59:51 -0000	1.188
--- ChangeLog	10 Mar 2004 21:46:22 -0000	1.189
***************
*** 20,23 ****
--- 20,24 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: krarc created non-executable directories (0666)
      FIXED: reimplementing the 'allow move into archive' setting
      FIXED: no restart at changing the icon tray's state in konfigurator

[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.49,1.50 panelmanager.cpp,1.5,1.6 panelmanager.h,1.5,1.6

[<ck...@us...>]

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

Modified Files:
	krslots.cpp panelmanager.cpp panelmanager.h 
Log Message:

ADDED: krusader restart is not necessary after changing the configuration


Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** krslots.cpp	7 Mar 2004 23:15:51 -0000	1.49
--- krslots.cpp	9 Mar 2004 22:59:52 -0000	1.50
***************
*** 34,37 ****
--- 34,38 ----
  #include <qprogressdialog.h>
  #include <qlistview.h>
+ #include <qpixmapcache.h>
  // KDE includes
  #include <klocale.h>
***************
*** 286,290 ****
  
  // run external modules / programs
! void KRslots::runKonfigurator(bool firstTime) { delete new Konfigurator(firstTime); }
  
  void KRslots::toggleHidden(){
--- 287,309 ----
  
  // run external modules / programs
! void KRslots::runKonfigurator(bool firstTime) {
! 
!   krConfig->setGroup( "Look&Feel" );
!   int size = (krConfig->readEntry("Filelist Icon Size",_FilelistIconSize)).toInt();
!   
!   Konfigurator *konfigurator = new Konfigurator(firstTime);
! 
!   if( konfigurator->isGUIRestartNeeded() )
!   {
!     krConfig->setGroup( "Look&Feel" );
!     if((krConfig->readEntry("Filelist Icon Size",_FilelistIconSize)).toInt() != size )
!       QPixmapCache::clear();
! 
!     MAIN_VIEW->leftMng->recreatePanels();
!     MAIN_VIEW->rightMng->recreatePanels();
!   }
!   
!   delete konfigurator;
! }
  
  void KRslots::toggleHidden(){

Index: panelmanager.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** panelmanager.cpp	26 Nov 2003 17:45:48 -0000	1.5
--- panelmanager.cpp	9 Mar 2004 22:59:52 -0000	1.6
***************
*** 124,125 ****
--- 124,150 ----
    krCloseTab->setEnabled(_tabbar->count() > 1);
  }
+ 
+ void PanelManager::recreatePanels() {
+   int panelCount = _tabbar->count(), identifier = 0;
+   ListPanel *oldCurrent = _self, *newCurrent = 0;
+   
+   while( panelCount -- )
+   {
+     ListPanel *panel = dynamic_cast<PanelTab*>( _tabbar->tabAt( 0 ) )->panel;
+     slotNewTab( panel->virtualPath );
+ 
+     if( panel == oldCurrent )
+       newCurrent = _self, identifier = _tabbar->currentTab();
+ 
+     _tabbar->setCurrentTab( _tabbar->tabAt( 0 ) );
+     slotChangePanel( panel );
+ 
+     slotCloseTab();
+   }
+ 
+   if( newCurrent )
+   {
+     _tabbar->setCurrentTab( identifier );
+     slotChangePanel( newCurrent );
+   }
+ }

Index: panelmanager.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/panelmanager.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** panelmanager.h	18 Oct 2003 12:39:46 -0000	1.5
--- panelmanager.h	9 Mar 2004 22:59:52 -0000	1.6
***************
*** 33,36 ****
--- 33,37 ----
       */
      void startPanel(ListPanel *panel, QString path);
+     void recreatePanels();
  
    public slots:

[Krusader-commits] krusader_kde3/krusader/Konfigurator kgstartup.cpp,1.6,1.7 konfigurator.cpp,1.8,1.9 konfigurator.h,1.2,1.3

[<ck...@us...>]

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

Modified Files:
	kgstartup.cpp konfigurator.cpp konfigurator.h 
Log Message:

ADDED: krusader restart is not necessary after changing the configuration


Index: kgstartup.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/kgstartup.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kgstartup.cpp	3 Feb 2004 00:41:04 -0000	1.6
--- kgstartup.cpp	9 Mar 2004 22:59:53 -0000	1.7
***************
*** 92,100 ****
    //   cfg_class  cfg_name                default               text                                      restart ToolTip
      {{"Startup","UI Save Settings",      _UiSave,               i18n( "Save settings on exit" ),          false,  ""},
!      {"Startup","Show tool bar",         _ShowToolBar,          i18n( "Toolbar visible" ),                true ,  ""},
!      {"Startup","Show status bar",       _ShowStatusBar,        i18n( "Statusbar visible" ),              true ,  ""},
!      {"Startup","Show FN Keys",          _ShowFNkeys,           i18n( "Function keys visible" ),          true ,  ""},
!      {"Startup","Show Cmd Line",         _ShowCmdline,          i18n( "Command-line visible" ),           true ,  ""},
!      {"Startup","Show Terminal Emulator",_ShowTerminalEmulator, i18n( "Terminal Emulator visible" ),      true ,  ""},
       {"Startup","Show FN Keys",          _ShowFNkeys,           i18n( "Restore last position and size" ), false,  ""}};
  
--- 92,100 ----
    //   cfg_class  cfg_name                default               text                                      restart ToolTip
      {{"Startup","UI Save Settings",      _UiSave,               i18n( "Save settings on exit" ),          false,  ""},
!      {"Startup","Show tool bar",         _ShowToolBar,          i18n( "Toolbar visible" ),                false,  ""},
!      {"Startup","Show status bar",       _ShowStatusBar,        i18n( "Statusbar visible" ),              false,  ""},
!      {"Startup","Show FN Keys",          _ShowFNkeys,           i18n( "Function keys visible" ),          false,  ""},
!      {"Startup","Show Cmd Line",         _ShowCmdline,          i18n( "Command-line visible" ),           false,  ""},
!      {"Startup","Show Terminal Emulator",_ShowTerminalEmulator, i18n( "Terminal Emulator visible" ),      false,  ""},
       {"Startup","Show FN Keys",          _ShowFNkeys,           i18n( "Restore last position and size" ), false,  ""}};
  

Index: konfigurator.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfigurator.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** konfigurator.cpp	5 Feb 2004 20:30:45 -0000	1.8
--- konfigurator.cpp	9 Mar 2004 22:59:53 -0000	1.9
***************
*** 55,59 ****
  Konfigurator::Konfigurator(bool f) : KDialogBase(0,0,true,"Konfigurator",
        KDialogBase::User1 | KDialogBase::Apply | KDialogBase::Cancel,
!       KDialogBase::User1, false, i18n("Defaults") ), firstTime(f), internalCall( false )
  {
    setPlainCaption(i18n("Konfigurator - Creating Your Own Krusader"));
--- 55,60 ----
  Konfigurator::Konfigurator(bool f) : KDialogBase(0,0,true,"Konfigurator",
        KDialogBase::User1 | KDialogBase::Apply | KDialogBase::Cancel,
!       KDialogBase::User1, false, i18n("Defaults") ), firstTime(f), internalCall( false ),
!       restartGUI( false )
  {
    setPlainCaption(i18n("Konfigurator - Creating Your Own Krusader"));
***************
*** 119,124 ****
    if( kgFrames.at( ndx )->apply() )
    {
!     KMessageBox::information(this,i18n("Changes to the GUI will be updated next time you run Krusader."),
!      QString::null,"konfigGUInotify");
    }
  }
--- 120,126 ----
    if( kgFrames.at( ndx )->apply() )
    {
!     restartGUI = true;
! //    KMessageBox::information(this,i18n("Changes to the GUI will be updated next time you run Krusader."),
! //     QString::null,"konfigGUInotify");
    }
  }
***************
*** 176,181 ****
        if( currentPage->apply() )
        {
!         KMessageBox::information(this,i18n("Changes to the GUI will be updated next time you run Krusader."),
!           QString::null,"konfigGUInotify");
        }
        break;
--- 178,184 ----
        if( currentPage->apply() )
        {
!         restartGUI = true;
! //        KMessageBox::information(this,i18n("Changes to the GUI will be updated next time you run Krusader."),
! //          QString::null,"konfigGUInotify");
        }
        break;

Index: konfigurator.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Konfigurator/konfigurator.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** konfigurator.h	31 Jan 2004 11:22:25 -0000	1.2
--- konfigurator.h	9 Mar 2004 22:59:53 -0000	1.3
***************
*** 51,54 ****
--- 51,56 ----
    ~Konfigurator() {};
  
+   bool isGUIRestartNeeded() { return restartGUI; }
+ 
  protected:
    void newContent(KonfiguratorPage *widget);// adds widget into newPage and connects to slot
***************
*** 73,76 ****
--- 75,79 ----
    bool                        internalCall;
    QTimer                      restoreTimer;
+   bool                        restartGUI;
  };
  

[Krusader-commits] krusader_kde3 ChangeLog,1.187,1.188

[<ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

ADDED: krusader restart is not necessary after changing the configuration


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.187
retrieving revision 1.188
diff -C2 -d -r1.187 -r1.188
*** ChangeLog	8 Mar 2004 21:40:49 -0000	1.187
--- ChangeLog	9 Mar 2004 22:59:51 -0000	1.188
***************
*** 1,2 ****
--- 1,3 ----
+     ADDED: krusader restart is not necessary from now after changing the configuration
      ADDED: ability to give arguments for the terminal
      ADDED: enable/disable icons in the filenames

[Krusader-commits] krusader_kde3 ChangeLog,1.186,1.187

[<ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

FIXED: checking move into archive setting


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.186
retrieving revision 1.187
diff -C2 -d -r1.186 -r1.187
*** ChangeLog	7 Mar 2004 23:15:51 -0000	1.186
--- ChangeLog	8 Mar 2004 21:40:49 -0000	1.187
***************
*** 19,22 ****
--- 19,23 ----
      ADDED: file splitter
      ADDED: a missing credit for Frank in the about box
+     FIXED: reimplementing the 'allow move into archive' setting
      FIXED: no restart at changing the icon tray's state in konfigurator
      FIXED: krusader freezes if the `df` process does not terminate (at network errors, IO wait)

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

[<ck...@us...>]

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

Modified Files:
	panelfunc.cpp 
Log Message:

FIXED: checking move into archive setting


Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** panelfunc.cpp	7 Mar 2004 23:15:51 -0000	1.58
--- panelfunc.cpp	8 Mar 2004 21:40:49 -0000	1.59
***************
*** 286,289 ****
--- 286,301 ----
    QString dest = panel->otherPanel->getPath();
                   /* --=={ Patch by Heiner <h.e...@gm...> }==-- */
+ 
+   krConfig->setGroup( "Archives" );
+   if ( !krConfig->readBoolEntry( "Allow Move Into Archive", _MoveIntoArchive ) )
+   {  
+     QString destProtocol = panel->otherPanel->func->files()->vfs_getOrigin().protocol();
+     if( destProtocol == "krarc" || destProtocol == "tar" || destProtocol == "zip" )
+     {
+       KMessageBox::sorry( krApp, i18n( "Moving into archive is disabled in Konfigurator!" ) );
+       return ;
+     }
+   }
+                  
    krConfig->setGroup( "Advanced" );
    if ( krConfig->readBoolEntry( "Confirm Move", _ConfirmMove ) ) {

[Krusader-commits] krusader_kde3/krusader krservices.cpp,1.4,1.5

[<ck...@us...>]

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

Modified Files:
	krservices.cpp 
Log Message:

FIXED: fully handling ' " and \ in KrServices::separateArgs


Index: krservices.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krservices.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** krservices.cpp	7 Mar 2004 22:48:44 -0000	1.4
--- krservices.cpp	8 Mar 2004 07:02:14 -0000	1.5
***************
*** 90,94 ****
    QStringList argList;
    int   pointer = 0, tokenStart, len = args.length();
!   bool  quoted = false;
  
    do{
--- 90,95 ----
    QStringList argList;
    int   pointer = 0, tokenStart, len = args.length();
!   bool  quoted = false, slashed = false;
!   QChar quoteCh;
  
    do{
***************
*** 100,112 ****
  
        tokenStart = pointer;
        
!       while( pointer < len && ( quoted || !args[ pointer ].isSpace()) )
        {
!         if( args[pointer] == '"' )
!           quoted = !quoted;
          pointer++;
        }
  
!       argList.append( args.mid( tokenStart, pointer-tokenStart ) );
        
      }while( pointer < len );
--- 101,134 ----
  
        tokenStart = pointer;
+ 
+       QString result="";
        
!       while( pointer < len && ( quoted || slashed || !args[ pointer ].isSpace()) )
        {
!         slashed = false;
!         
!         if( !quoted && ( args[pointer] == '"' || args[pointer] == '\'' ) )
!           quoted = true, quoteCh = args[pointer];
!         else if( quoted && args[pointer] == quoteCh )
!           quoted = false;
!         else if( !quoted && args[pointer] == '\\' )
!         {
!           pointer++;
!           slashed = true;
!           continue;
!         }
! 
!         result += args[pointer];        
          pointer++;
        }
  
!       result = result.stripWhiteSpace();
!       if( result.startsWith( "'" ) && result.endsWith( "'" ) )
!         result = result.mid( 1, result.length()-2 );
!       else if( result.startsWith( "\"" ) && result.endsWith( "\"" ) )
!         result = result.mid( 1, result.length()-2 );
! 
!       if( !result.isEmpty() )
!         argList.append( result );
        
      }while( pointer < len );

[Krusader-commits] krusader_kde3/krusader/Panel listpanel.cpp,1.55,1.56 panelfunc.cpp,1.57,1.58

[<ck...@us...>]

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

Modified Files:
	listpanel.cpp panelfunc.cpp 
Log Message:

ADDED: adding arguments to the terminal (like: konsole --noframe)


Index: listpanel.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/listpanel.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** listpanel.cpp	4 Mar 2004 07:27:02 -0000	1.55
--- listpanel.cpp	7 Mar 2004 23:15:51 -0000	1.56
***************
*** 82,85 ****
--- 82,86 ----
  #include "../GUI/dirhistorybutton.h"
  #include "../GUI/dirhistoryqueue.h"
+ #include "../krservices.h"
  
  typedef QValueList<KServiceOffer> OfferList;
***************
*** 758,762 ****
        krConfig->setGroup( "General" );
        QString term = krConfig->readEntry( "Terminal", _Terminal );
!       proc << term;
        if ( !item->isDir() )
          proc << "-e" << item->name();
--- 759,763 ----
        krConfig->setGroup( "General" );
        QString term = krConfig->readEntry( "Terminal", _Terminal );
!       proc << KrServices::separateArgs( term );
        if ( !item->isDir() )
          proc << "-e" << item->name();

Index: panelfunc.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Panel/panelfunc.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** panelfunc.cpp	4 Mar 2004 07:27:02 -0000	1.57
--- panelfunc.cpp	7 Mar 2004 23:15:51 -0000	1.58
***************
*** 66,69 ****
--- 66,70 ----
  #include "../MountMan/kmountman.h"
  #include "../resources.h"
+ #include "../krservices.h"
  
  //////////////////////////////////////////////////////////
***************
*** 252,256 ****
    krConfig->setGroup( "General" );
    QString term = krConfig->readEntry( "Terminal", _Terminal );
!   proc << term;
    if ( !proc.start( KProcess::DontCare ) )
      KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + term + "\"" );
--- 253,257 ----
    krConfig->setGroup( "General" );
    QString term = krConfig->readEntry( "Terminal", _Terminal );
!   proc << KrServices::separateArgs( term );
    if ( !proc.start( KProcess::DontCare ) )
      KMessageBox::sorry( krApp, i18n( "Can't open " ) + "\"" + term + "\"" );

[Krusader-commits] krusader_kde3 ChangeLog,1.185,1.186

[<ck...@us...>]

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

Modified Files:
	ChangeLog 
Log Message:

ADDED: adding arguments to the terminal (like: konsole --noframe)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/ChangeLog,v
retrieving revision 1.185
retrieving revision 1.186
diff -C2 -d -r1.185 -r1.186
*** ChangeLog	7 Mar 2004 18:35:36 -0000	1.185
--- ChangeLog	7 Mar 2004 23:15:51 -0000	1.186
***************
*** 1,2 ****
--- 1,3 ----
+     ADDED: ability to give arguments for the terminal
      ADDED: enable/disable icons in the filenames
      ADDED: ability to configure the fields of the panel (Ext, Size, Perm, ...)

[Krusader-commits] krusader_kde3/krusader krslots.cpp,1.48,1.49

[<ck...@us...>]

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

Modified Files:
	krslots.cpp 
Log Message:

ADDED: adding arguments to the terminal (like: konsole --noframe)


Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** krslots.cpp	4 Mar 2004 22:56:58 -0000	1.48
--- krslots.cpp	7 Mar 2004 23:15:51 -0000	1.49
***************
*** 365,369 ****
  	krConfig->setGroup("General");
  	QString term = krConfig->readEntry("Terminal",_Terminal);
! 	proc <<  term;
  	if(!proc.start(KProcess::DontCare))
  	  KMessageBox::sorry(krApp,i18n("Can't open ")+"\""+term+"\"");
--- 365,369 ----
  	krConfig->setGroup("General");
  	QString term = krConfig->readEntry("Terminal",_Terminal);
! 	proc << KrServices::separateArgs( term );
  	if(!proc.start(KProcess::DontCare))
  	  KMessageBox::sorry(krApp,i18n("Can't open ")+"\""+term+"\"");

[Krusader-commits] krusader_kde3/krusader/GUI kcmdline.cpp,1.18,1.19

[<ck...@us...>]

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

Modified Files:
	kcmdline.cpp 
Log Message:

ADDED: adding arguments to the terminal (like: konsole --noframe)


Index: kcmdline.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/GUI/kcmdline.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** kcmdline.cpp	25 Dec 2003 20:14:09 -0000	1.18
--- kcmdline.cpp	7 Mar 2004 23:15:51 -0000	1.19
***************
*** 45,48 ****
--- 45,49 ----
  #include "../krusaderview.h"
  #include "../Panel/listpanel.h"
+ #include "../krservices.h"
  #include <qdir.h>
  #include <klocale.h>
***************
*** 150,154 ****
      if ( terminal->isOn() ) {
        QString terminal = krConfig->readEntry( "Terminal", _Terminal );
!       proc << terminal;
        // if the terminal support is - don't close when the command finish
        //if( terminal == "konsole" ) proc << "--noclose ";
--- 151,155 ----
      if ( terminal->isOn() ) {
        QString terminal = krConfig->readEntry( "Terminal", _Terminal );
!       proc << KrServices::separateArgs( terminal );
        // if the terminal support is - don't close when the command finish
        //if( terminal == "konsole" ) proc << "--noclose ";

[Krusader-commits] krusader_kde3/krusader/Locate locate.cpp,1.1,1.2

[<ck...@us...>]

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

Modified Files:
	locate.cpp 
Log Message:

FIXED: ability to add arguments for updatedb (Locate)


Index: locate.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Locate/locate.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** locate.cpp	12 Feb 2004 08:11:31 -0000	1.1
--- locate.cpp	7 Mar 2004 22:48:47 -0000	1.2
***************
*** 155,161 ****
    if( !updateProcess )
    {
      updateProcess = new KProcess();
      *updateProcess << KrServices::fullPathName( "updatedb" );
!     /* TODO TODO TODO TODO */
      connect( updateProcess, SIGNAL(processExited(KProcess *)), this, SLOT(updateFinished()));
      updateProcess->start(KProcess::NotifyOnExit);
--- 155,164 ----
    if( !updateProcess )
    {
+     krConfig->setGroup("Locate");
+ 
      updateProcess = new KProcess();
      *updateProcess << KrServices::fullPathName( "updatedb" );
!     *updateProcess << KrServices::separateArgs( krConfig->readEntry( "UpdateDB Arguments", "" ) );
!     
      connect( updateProcess, SIGNAL(processExited(KProcess *)), this, SLOT(updateFinished()));
      updateProcess->start(KProcess::NotifyOnExit);

[Krusader-commits] krusader_kde3/krusader krservices.cpp,1.3,1.4 krservices.h,1.3,1.4

[<ck...@us...>]

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

Modified Files:
	krservices.cpp krservices.h 
Log Message:

FIXED: ability to add arguments for updatedb (Locate)


Index: krservices.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krservices.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krservices.cpp	6 Feb 2004 20:10:16 -0000	1.3
--- krservices.cpp	7 Mar 2004 22:48:44 -0000	1.4
***************
*** 19,23 ****
  #include <unistd.h>
  // QT includes
- #include <qstringlist.h>
  #include <qdir.h>
  // KDE includes
--- 19,22 ----
***************
*** 86,87 ****
--- 85,115 ----
    return supposedName;
  }
+ 
+ QStringList KrServices::separateArgs( QString args )
+ {
+   QStringList argList;
+   int   pointer = 0, tokenStart, len = args.length();
+   bool  quoted = false;
+ 
+   do{
+       while( pointer < len && args[ pointer ].isSpace() )
+         pointer++;
+ 
+       if( pointer >= len )
+         break;
+ 
+       tokenStart = pointer;
+       
+       while( pointer < len && ( quoted || !args[ pointer ].isSpace()) )
+       {
+         if( args[pointer] == '"' )
+           quoted = !quoted;
+         pointer++;
+       }
+ 
+       argList.append( args.mid( tokenStart, pointer-tokenStart ) );
+       
+     }while( pointer < len );
+     
+   return argList;
+ }

Index: krservices.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krservices.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** krservices.h	6 Feb 2004 20:10:17 -0000	1.3
--- krservices.h	7 Mar 2004 22:48:47 -0000	1.4
***************
*** 20,23 ****
--- 20,24 ----
  
  #include <qstring.h>
+ #include <qstringlist.h>
  
  /**
***************
*** 30,36 ****
  	~KrServices(){}
  
! 	static bool     cmdExist(QString cmdName);
!   static QString  detectFullPathName( QString name );
!   static QString  fullPathName( QString name, QString confName = QString::null );
  };
  
--- 31,38 ----
  	~KrServices(){}
  
! 	static bool         cmdExist(QString cmdName);
!   static QString      detectFullPathName( QString name );
!   static QString      fullPathName( QString name, QString confName = QString::null );
!   static QStringList  separateArgs( QString args );
  };