comparison kdiff3/src/directorymergewindow.h @ 66:efe33e938730

0.9.86

 #include <qdir.h>
 #include <list>
 #include <map>
 #include "common.h"
 #include "fileaccess.h"
+#include "diff.h" //TotalDiffStatus
 
 class OptionDialog;
 class KIconLoader;
 class StatusMessageBox;
 class StatusInfo;

 class OneDirectoryInfo;
 class QLabel;
 class KAction;
 class KToggleAction;
 class KActionCollection;
+class TotalDiffStatus;
 
 enum e_MergeOperation
 {
    eTitleId,
    eNoOperation,

    bool m_bConflictingAges;       // Equal age but files are not!
 
    FileAccess m_fileInfoA;
    FileAccess m_fileInfoB;
    FileAccess m_fileInfoC;
+
+   TotalDiffStatus m_totalDiffStatus;   
 };
 
 class DirMergeItem : public QListViewItem
 {
 public:
    DirMergeItem( QListView* pParent, const QString&, MergeFileInfos*);
    DirMergeItem( DirMergeItem* pParent, const QString&, MergeFileInfos*);
    ~DirMergeItem();
    MergeFileInfos* m_pMFI;
 #if QT_VERSION!=230
-   virtual int compare(QListViewItem *i, int col, bool ascending) const
-   {
-      DirMergeItem* pDMI = static_cast<DirMergeItem*>(i);
-      bool bDir1 =  m_pMFI->m_bDirA || m_pMFI->m_bDirB || m_pMFI->m_bDirC;
-      bool bDir2 =  pDMI->m_pMFI->m_bDirA || pDMI->m_pMFI->m_bDirB || pDMI->m_pMFI->m_bDirC;
-      if ( m_pMFI==0 || pDMI->m_pMFI==0 || bDir1 == bDir2 )
-         return QListViewItem::compare( i, col, ascending );
-      else
-         return bDir1 ? -1 : 1;
-   }
+   virtual int compare(QListViewItem *i, int col, bool ascending) const;
 #endif
+   void init(MergeFileInfos* pMFI);
 };
 
 class DirectoryMergeWindow : public QListView
 {
    Q_OBJECT

    bool isFileSelected();
    void allowResizeEvents(bool bAllowResizeEvents);
    bool isDirectoryMergeInProgress() { return m_bRealMergeStarted; }
    int totalColumnWidth();
    bool isSyncMode() { return m_bSyncMode; }
+   bool isScanning() { return m_bScanning; }
    void initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac );
    void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible,
       KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC );
 
    virtual void keyPressEvent( QKeyEvent* e );

 protected:
    void mergeContinue( bool bStart, bool bVerbose );
    void resizeEvent(QResizeEvent* e);
    bool m_bAllowResizeEvents;
 
-   void prepareListView();
+   void prepareListView(ProgressProxy& pp);
    void calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultOperation );
    void setAllMergeOperations( e_MergeOperation eDefaultOperation );
    friend class MergeFileInfos;
 
    bool canContinue();

    bool m_bSimulatedMergeStarted;
    bool m_bRealMergeStarted;
    bool m_bError;
    bool m_bSyncMode;
    bool m_bDirectoryMerge; // if true, then merge is the default operation, otherwise it's diff.
+   
+   bool m_bScanning; // true while in init()
 
    OptionDialog* m_pOptions;
    KIconLoader* m_pIconLoader;
    StatusMessageBox* m_pStatusMessageBox;
    DirectoryMergeInfo* m_pDirectoryMergeInfo;

    KAction* dirCurrentSyncDeleteAAndB;
    KAction* dirCurrentSyncMergeToA;
    KAction* dirCurrentSyncMergeToB;
    KAction* dirCurrentSyncMergeToAAndB;
 signals:
-   void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString);
+   void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*);
    void checkIfCanContinue( bool* pbContinue );
    void updateAvailabilities();
+   void statusBarMessage( const QString& msg );
 protected slots:
    void onDoubleClick( QListViewItem* lvi );
    void onClick( QListViewItem* lvi, const QPoint&, int c );
    void onSelectionChanged(QListViewItem* lvi);
 };

       const FileAccess& BPath,
       const FileAccess& CPath,
       const FileAccess& DestPath,
       MergeFileInfos& mfi );
    QListView* getInfoList() {return m_pInfoList;}
+   virtual bool eventFilter( QObject* o, QEvent* e );
+signals:
+   void gotFocus();
 private:
    QLabel* m_pInfoA;
    QLabel* m_pInfoB;
    QLabel* m_pInfoC;
    QLabel* m_pInfoDest;