[Krusader-commits] krusader_kde3/krusader/Synchronizer synchronizergui.cpp,1.20,1.21 synchronizergui.h,1.11,1.12

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

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

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

FIXED: compare content error at remote URL-s (problem with sleep 2)


Index: synchronizergui.h
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** synchronizergui.h	17 Aug 2004 12:31:17 -0000	1.11
--- synchronizergui.h	31 Aug 2004 20:51:29 -0000	1.12
***************
*** 118,123 ****
    void    saveProfile( QString, int );
    
-   void    rightMenuCompareFiles( KURL url1, KURL url2 );
- 
  protected:
    virtual void keyPressEvent( QKeyEvent * );
--- 118,121 ----

Index: synchronizergui.cpp
===================================================================
RCS file: /cvsroot/krusader/krusader_kde3/krusader/Synchronizer/synchronizergui.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** synchronizergui.cpp	18 Aug 2004 11:35:35 -0000	1.20
--- synchronizergui.cpp	31 Aug 2004 20:51:29 -0000	1.21
***************
*** 36,39 ****
--- 36,40 ----
  #include "../Dialogs/krspwidgets.h"
  #include "../krservices.h"
+ #include "../krslots.h"
  #include "synchronizedialog.h"
  #include <qlayout.h>
***************
*** 1640,1644 ****
        break;
      case COMPARE_FILES_ID:
!       rightMenuCompareFiles( leftURL, rightURL );
        break;
      case SELECT_ITEMS_ID:
--- 1641,1645 ----
        break;
      case COMPARE_FILES_ID:
!       SLOTS->compareContent( leftURL, rightURL );
        break;
      case SELECT_ITEMS_ID:
***************
*** 1967,2009 ****
  }
  
- void SynchronizerGUI::rightMenuCompareFiles( KURL url1, KURL url2 )
- {
-   QString diffProg;
-   QStringList lst = Krusader::supportedTools();
-   if (lst.contains("DIFF")) diffProg=lst[lst.findIndex("DIFF") + 1];
-   else {
-     KMessageBox::error(0,i18n("Krusader can't find any of the supported diff-frontends. Please install one to your path. Hint: Krusader supports kdiff and xxdiff."));
-     return;
-   }
- 
-   // else implied: all ok, let's call kdiff
-   // but if one of the files isn't local, download them first
- 
-   QString tmp1 = QString::null, tmp2 = QString::null;
-   if (!url1.isLocalFile()) {
-     if( !KIO::NetAccess::download( url1, tmp1 ) ){
-       KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url1.prettyURL(0,KURL::StripFileProtocol));
-       return;
-     }
-   } else tmp1 = url1.path();
-   if (!url2.isLocalFile()) {
-     if( !KIO::NetAccess::download( url2, tmp2 ) ){
-       KMessageBox::sorry(krApp,i18n("Krusader is unable to download: ")+url2.prettyURL(0,KURL::StripFileProtocol));
-       return;
-     }
-   } else tmp2 = url2.path();
- 
-   KProcess p;
-   p << diffProg << tmp1 << tmp2;
-   if (!p.start(KProcess::DontCare))
-     KMessageBox::error(0,i18n("Error executing ")+diffProg+" !");
-   else
-     p.detach();
-   sleep(3);
- 
-   if( tmp1 != url1.path() ) KIO::NetAccess::removeTempFile( tmp1 );
-   if( tmp2 != url2.path() ) KIO::NetAccess::removeTempFile( tmp2 );
- }
- 
  void SynchronizerGUI::swapSides()
  {
--- 1968,1971 ----