[Krusader-commits] krusader_kde3/krusader krservices.cpp,1.2,1.3 krservices.h,1.2,1.3 krslots.cpp,1.42,1.43 krusader.cpp,1.56,1.57

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

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

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

ADDED: dependencies for all KDE application


Index: krservices.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krservices.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krservices.cpp	5 Feb 2004 20:30:44 -0000	1.2
--- krservices.cpp	6 Feb 2004 20:10:16 -0000	1.3
***************
*** 61,71 ****
  }
  
! QString KrServices::fullPathName( QString name )
  {
    QString lastGroup = krConfig->group();
    QString supposedName;
  
    krConfig->setGroup( "Dependencies" );
!   if( QFile( supposedName = krConfig->readEntry( name, "" )).exists() )
    {
      krConfig->setGroup( lastGroup );
--- 61,74 ----
  }
  
! QString KrServices::fullPathName( QString name, QString confName )
  {
    QString lastGroup = krConfig->group();
    QString supposedName;
  
+   if( confName.isNull() )
+     confName = name;
+ 
    krConfig->setGroup( "Dependencies" );
!   if( QFile( supposedName = krConfig->readEntry( confName, "" )).exists() )
    {
      krConfig->setGroup( lastGroup );
***************
*** 79,83 ****
    }
  
!   krConfig->writeEntry( name, supposedName );
    krConfig->setGroup( lastGroup );
    return supposedName;
--- 82,86 ----
    }
  
!   krConfig->writeEntry( confName, supposedName );
    krConfig->setGroup( lastGroup );
    return supposedName;

Index: krservices.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krservices.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** krservices.h	5 Feb 2004 20:30:44 -0000	1.2
--- krservices.h	6 Feb 2004 20:10:17 -0000	1.3
***************
*** 32,36 ****
  	static bool     cmdExist(QString cmdName);
    static QString  detectFullPathName( QString name );
!   static QString  fullPathName( QString name );
  };
  
--- 32,36 ----
  	static bool     cmdExist(QString cmdName);
    static QString  detectFullPathName( QString name );
!   static QString  fullPathName( QString name, QString confName = QString::null );
  };
  

Index: krslots.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krslots.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** krslots.cpp	5 Feb 2004 20:30:44 -0000	1.42
--- krslots.cpp	6 Feb 2004 20:10:17 -0000	1.43
***************
*** 126,130 ****
    KShellProcess proc;
  
!   if (mailProg == "kmail") {
      proc << "kmail" << "--subject \""+i18n("Sending file: ")+
              filename.mid(filename.findRev('/')+1)+"\"" << QString::null +
--- 126,130 ----
    KShellProcess proc;
  
!   if ( vfs::fromPathOrURL( mailProg ).fileName() == "kmail") {
      proc << "kmail" << "--subject \""+i18n("Sending file: ")+
              filename.mid(filename.findRev('/')+1)+"\"" << QString::null +

Index: krusader.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/krusader.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** krusader.cpp	30 Jan 2004 23:13:43 -0000	1.56
--- krusader.cpp	6 Feb 2004 20:10:17 -0000	1.57
***************
*** 653,673 ****
    if ( KrServices::cmdExist( "kdiff" ) ) {
      tools.append( "DIFF" );
!     tools.append( "kdiff" );
    } else if ( KrServices::cmdExist( "kompare" ) ) {
      tools.append( "DIFF" );
!     tools.append( "kompare" );
    } else if ( KrServices::cmdExist( "xxdiff" ) ) {
      tools.append( "DIFF" );
!     tools.append( "xxdiff" );
    }
    // a mailer: kmail
    if ( KrServices::cmdExist( "kmail" ) ) {
      tools.append( "MAIL" );
!     tools.append( "kmail" );
    }
    // rename tool: krename
    if ( KrServices::cmdExist( "krename" ) ) {
      tools.append( "RENAME" );
!     tools.append( "krename" );
    }
  
--- 653,673 ----
    if ( KrServices::cmdExist( "kdiff" ) ) {
      tools.append( "DIFF" );
!     tools.append( KrServices::fullPathName( "kdiff", "kompare" ) );
    } else if ( KrServices::cmdExist( "kompare" ) ) {
      tools.append( "DIFF" );
!     tools.append( KrServices::fullPathName( "kompare" ) );
    } else if ( KrServices::cmdExist( "xxdiff" ) ) {
      tools.append( "DIFF" );
!     tools.append( KrServices::fullPathName( "xxdiff", "kompare" ) );
    }
    // a mailer: kmail
    if ( KrServices::cmdExist( "kmail" ) ) {
      tools.append( "MAIL" );
!     tools.append( KrServices::fullPathName( "kmail" ) );
    }
    // rename tool: krename
    if ( KrServices::cmdExist( "krename" ) ) {
      tools.append( "RENAME" );
!     tools.append( KrServices::fullPathName( "krename" ) );
    }