annotate kdiff3/src/directorymergewindow.h @ 69:8febbfb1148c

KDiff3 0.9.89
author joachim99
date Mon, 10 Apr 2006 08:40:51 +0000
parents efe33e938730
children 5bbfe4784324
rev   line source
joachim99@8 1 /***************************************************************************
joachim99@8 2 directorymergewindow.h
joachim99@8 3 -------------------
joachim99@8 4 begin : Sat Oct 19 2002
joachim99@69 5 copyright : (C) 2002-2005 by Joachim Eibl
joachim99@69 6 email : joachim.eibl at gmx.de
joachim99@8 7 ***************************************************************************/
joachim99@8 8
joachim99@8 9 /***************************************************************************
joachim99@8 10 * *
joachim99@8 11 * This program is free software; you can redistribute it and/or modify *
joachim99@8 12 * it under the terms of the GNU General Public License as published by *
joachim99@8 13 * the Free Software Foundation; either version 2 of the License, or *
joachim99@8 14 * (at your option) any later version. *
joachim99@8 15 * *
joachim99@8 16 ***************************************************************************/
joachim99@8 17
joachim99@8 18 #ifndef DIRECTORY_MERGE_WINDOW_H
joachim99@8 19 #define DIRECTORY_MERGE_WINDOW_H
joachim99@8 20
joachim99@8 21 #include <qfileinfo.h>
joachim99@8 22 #include <qlistview.h>
joachim99@8 23 #include <qtimer.h>
joachim99@8 24 #include <qdir.h>
joachim99@8 25 #include <list>
joachim99@8 26 #include <map>
joachim99@8 27 #include "common.h"
joachim99@8 28 #include "fileaccess.h"
joachim99@66 29 #include "diff.h" //TotalDiffStatus
joachim99@8 30
joachim99@8 31 class OptionDialog;
joachim99@8 32 class KIconLoader;
joachim99@8 33 class StatusInfo;
joachim99@8 34 class DirectoryMergeInfo;
joachim99@8 35 class OneDirectoryInfo;
joachim99@8 36 class QLabel;
joachim99@51 37 class KAction;
joachim99@51 38 class KToggleAction;
joachim99@51 39 class KActionCollection;
joachim99@66 40 class TotalDiffStatus;
joachim99@8 41
joachim99@8 42 enum e_MergeOperation
joachim99@8 43 {
joachim99@8 44 eTitleId,
joachim99@8 45 eNoOperation,
joachim99@8 46 // Operations in sync mode (with only two directories):
joachim99@8 47 eCopyAToB, eCopyBToA, eDeleteA, eDeleteB, eDeleteAB, eMergeToA, eMergeToB, eMergeToAB,
joachim99@8 48
joachim99@8 49 // Operations in merge mode (with two or three directories)
joachim99@8 50 eCopyAToDest, eCopyBToDest, eCopyCToDest, eDeleteFromDest, eMergeABCToDest,
joachim99@8 51 eMergeABToDest,
joachim99@8 52 eConflictingFileTypes, // Error
joachim99@8 53 eConflictingAges // Equal age but files are not!
joachim99@8 54 };
joachim99@8 55
joachim99@8 56 class DirMergeItem;
joachim99@8 57
joachim99@8 58 enum e_Age { eNew, eMiddle, eOld, eNotThere, eAgeEnd };
joachim99@8 59
joachim99@8 60 class MergeFileInfos
joachim99@8 61 {
joachim99@8 62 public:
joachim99@8 63 MergeFileInfos(){ m_bEqualAB=false; m_bEqualAC=false; m_bEqualBC=false;
joachim99@8 64 m_pDMI=0; m_pParent=0;
joachim99@8 65 m_bExistsInA=false;m_bExistsInB=false;m_bExistsInC=false;
joachim99@8 66 m_bDirA=false; m_bDirB=false; m_bDirC=false;
joachim99@8 67 m_bLinkA=false; m_bLinkB=false; m_bLinkC=false;
joachim99@8 68 m_bOperationComplete=false; m_bSimOpComplete = false;
joachim99@8 69 m_eMergeOperation=eNoOperation;
joachim99@8 70 m_ageA = eNotThere; m_ageB=eNotThere; m_ageC=eNotThere;
joachim99@8 71 m_bConflictingAges=false; }
joachim99@8 72 bool operator>( const MergeFileInfos& );
joachim99@8 73 QString m_subPath;
joachim99@8 74
joachim99@8 75 bool m_bExistsInA;
joachim99@8 76 bool m_bExistsInB;
joachim99@8 77 bool m_bExistsInC;
joachim99@8 78 bool m_bEqualAB;
joachim99@8 79 bool m_bEqualAC;
joachim99@8 80 bool m_bEqualBC;
joachim99@8 81 DirMergeItem* m_pDMI;
joachim99@8 82 MergeFileInfos* m_pParent;
joachim99@8 83 e_MergeOperation m_eMergeOperation;
joachim99@8 84 void setMergeOperation( e_MergeOperation eMOp );
joachim99@8 85 bool m_bDirA;
joachim99@8 86 bool m_bDirB;
joachim99@8 87 bool m_bDirC;
joachim99@8 88 bool m_bLinkA;
joachim99@8 89 bool m_bLinkB;
joachim99@8 90 bool m_bLinkC;
joachim99@8 91 bool m_bOperationComplete;
joachim99@8 92 bool m_bSimOpComplete;
joachim99@8 93 e_Age m_ageA;
joachim99@8 94 e_Age m_ageB;
joachim99@8 95 e_Age m_ageC;
joachim99@8 96 bool m_bConflictingAges; // Equal age but files are not!
joachim99@8 97
joachim99@8 98 FileAccess m_fileInfoA;
joachim99@8 99 FileAccess m_fileInfoB;
joachim99@8 100 FileAccess m_fileInfoC;
joachim99@66 101
joachim99@66 102 TotalDiffStatus m_totalDiffStatus;
joachim99@8 103 };
joachim99@8 104
joachim99@8 105 class DirMergeItem : public QListViewItem
joachim99@8 106 {
joachim99@8 107 public:
joachim99@8 108 DirMergeItem( QListView* pParent, const QString&, MergeFileInfos*);
joachim99@8 109 DirMergeItem( DirMergeItem* pParent, const QString&, MergeFileInfos*);
joachim99@8 110 ~DirMergeItem();
joachim99@8 111 MergeFileInfos* m_pMFI;
joachim99@66 112 virtual int compare(QListViewItem *i, int col, bool ascending) const;
joachim99@69 113 virtual void paintCell(QPainter * p, const QColorGroup & cg, int column, int width, int align );
joachim99@66 114 void init(MergeFileInfos* pMFI);
joachim99@8 115 };
joachim99@8 116
joachim99@8 117 class DirectoryMergeWindow : public QListView
joachim99@8 118 {
joachim99@8 119 Q_OBJECT
joachim99@8 120 public:
joachim99@8 121 DirectoryMergeWindow( QWidget* pParent, OptionDialog* pOptions, KIconLoader* pIconLoader );
joachim99@8 122 ~DirectoryMergeWindow();
joachim99@8 123 void setDirectoryMergeInfo(DirectoryMergeInfo* p){ m_pDirectoryMergeInfo=p; }
joachim99@8 124 bool init(
joachim99@8 125 FileAccess& dirA,
joachim99@8 126 FileAccess& dirB,
joachim99@8 127 FileAccess& dirC,
joachim99@8 128 FileAccess& dirDest,
joachim99@8 129 bool bDirectoryMerge
joachim99@8 130 );
joachim99@8 131 bool isFileSelected();
joachim99@8 132 void allowResizeEvents(bool bAllowResizeEvents);
joachim99@8 133 bool isDirectoryMergeInProgress() { return m_bRealMergeStarted; }
joachim99@8 134 int totalColumnWidth();
joachim99@8 135 bool isSyncMode() { return m_bSyncMode; }
joachim99@66 136 bool isScanning() { return m_bScanning; }
joachim99@51 137 void initDirectoryMergeActions( QObject* pKDiff3App, KActionCollection* ac );
joachim99@53 138 void updateAvailabilities( bool bDirCompare, bool bDiffWindowVisible,
joachim99@53 139 KToggleAction* chooseA, KToggleAction* chooseB, KToggleAction* chooseC );
joachim99@69 140 void updateFileVisibilities();
joachim99@51 141
joachim99@51 142 virtual void keyPressEvent( QKeyEvent* e );
joachim99@53 143 virtual void focusInEvent( QFocusEvent* e );
joachim99@53 144 virtual void focusOutEvent( QFocusEvent* e );
joachim99@8 145
joachim99@8 146 public slots:
joachim99@8 147 void reload();
joachim99@8 148 void mergeCurrentFile();
joachim99@8 149 void compareCurrentFile();
joachim99@51 150 void slotRunOperationForAllItems();
joachim99@51 151 void slotRunOperationForCurrentItem();
joachim99@8 152 void mergeResultSaved(const QString& fileName);
joachim99@8 153 void slotChooseAEverywhere();
joachim99@8 154 void slotChooseBEverywhere();
joachim99@8 155 void slotChooseCEverywhere();
joachim99@8 156 void slotAutoChooseEverywhere();
joachim99@8 157 void slotNoOpEverywhere();
joachim99@8 158 void slotFoldAllSubdirs();
joachim99@8 159 void slotUnfoldAllSubdirs();
joachim99@69 160 void slotShowIdenticalFiles();
joachim99@69 161 void slotShowDifferentFiles();
joachim99@69 162 void slotShowFilesOnlyInA();
joachim99@69 163 void slotShowFilesOnlyInB();
joachim99@69 164 void slotShowFilesOnlyInC();
joachim99@69 165
joachim99@69 166 void slotSynchronizeDirectories();
joachim99@69 167 void slotChooseNewerFiles();
joachim99@69 168
joachim99@69 169 void slotCompareExplicitlySelectedFiles();
joachim99@69 170 void slotMergeExplicitlySelectedFiles();
joachim99@69 171
joachim99@51 172 // Merge current item (merge mode)
joachim99@51 173 void slotCurrentDoNothing();
joachim99@51 174 void slotCurrentChooseA();
joachim99@51 175 void slotCurrentChooseB();
joachim99@51 176 void slotCurrentChooseC();
joachim99@51 177 void slotCurrentMerge();
joachim99@51 178 void slotCurrentDelete();
joachim99@51 179 // Sync current item
joachim99@51 180 void slotCurrentCopyAToB();
joachim99@51 181 void slotCurrentCopyBToA();
joachim99@51 182 void slotCurrentDeleteA();
joachim99@51 183 void slotCurrentDeleteB();
joachim99@51 184 void slotCurrentDeleteAAndB();
joachim99@51 185 void slotCurrentMergeToA();
joachim99@51 186 void slotCurrentMergeToB();
joachim99@51 187 void slotCurrentMergeToAAndB();
joachim99@8 188
joachim99@69 189 void slotSaveMergeState();
joachim99@69 190 void slotLoadMergeState();
joachim99@69 191
joachim99@8 192 protected:
joachim99@51 193 void mergeContinue( bool bStart, bool bVerbose );
joachim99@8 194 void resizeEvent(QResizeEvent* e);
joachim99@8 195 bool m_bAllowResizeEvents;
joachim99@8 196
joachim99@66 197 void prepareListView(ProgressProxy& pp);
joachim99@8 198 void calcSuggestedOperation( MergeFileInfos& mfi, e_MergeOperation eDefaultOperation );
joachim99@8 199 void setAllMergeOperations( e_MergeOperation eDefaultOperation );
joachim99@8 200 friend class MergeFileInfos;
joachim99@8 201
joachim99@8 202 bool canContinue();
joachim99@51 203 void prepareMergeStart( QListViewItem* pBegin, QListViewItem* pEnd, bool bVerbose );
joachim99@51 204 bool executeMergeOperation( MergeFileInfos& mfi, bool& bSingleFileMerge );
joachim99@8 205
joachim99@8 206 void scanDirectory( const QString& dirName, t_DirectoryList& dirList );
joachim99@8 207 void scanLocalDirectory( const QString& dirName, t_DirectoryList& dirList );
joachim99@8 208 void fastFileComparison( FileAccess& fi1, FileAccess& fi2,
joachim99@8 209 bool& bEqual, bool& bError, QString& status );
joachim99@8 210 void compareFilesAndCalcAges( MergeFileInfos& mfi );
joachim99@8 211
joachim99@8 212 QString fullNameA( const MergeFileInfos& mfi )
joachim99@41 213 { return m_dirA.absFilePath() + "/" + mfi.m_subPath; }
joachim99@8 214 QString fullNameB( const MergeFileInfos& mfi )
joachim99@41 215 { return m_dirB.absFilePath() + "/" + mfi.m_subPath; }
joachim99@8 216 QString fullNameC( const MergeFileInfos& mfi )
joachim99@41 217 { return m_dirC.absFilePath() + "/" + mfi.m_subPath; }
joachim99@8 218 QString fullNameDest( const MergeFileInfos& mfi )
joachim99@8 219 { return m_dirDestInternal.absFilePath() + "/" + mfi.m_subPath; }
joachim99@8 220
joachim99@8 221 bool copyFLD( const QString& srcName, const QString& destName );
joachim99@8 222 bool deleteFLD( const QString& name, bool bCreateBackup );
joachim99@8 223 bool makeDir( const QString& name, bool bQuiet=false );
joachim99@8 224 bool renameFLD( const QString& srcName, const QString& destName );
joachim99@8 225 bool mergeFLD( const QString& nameA,const QString& nameB,const QString& nameC,
joachim99@8 226 const QString& nameDest, bool& bSingleFileMerge );
joachim99@8 227
joachim99@8 228 FileAccess m_dirA;
joachim99@8 229 FileAccess m_dirB;
joachim99@8 230 FileAccess m_dirC;
joachim99@8 231 FileAccess m_dirDest;
joachim99@8 232 FileAccess m_dirDestInternal;
joachim99@8 233
joachim99@69 234 QString m_dirMergeStateFilename;
joachim99@69 235
joachim99@8 236 std::map<QString, MergeFileInfos> m_fileMergeMap;
joachim99@8 237
joachim99@8 238 bool m_bFollowDirLinks;
joachim99@8 239 bool m_bFollowFileLinks;
joachim99@8 240 bool m_bSimulatedMergeStarted;
joachim99@8 241 bool m_bRealMergeStarted;
joachim99@8 242 bool m_bError;
joachim99@8 243 bool m_bSyncMode;
joachim99@8 244 bool m_bDirectoryMerge; // if true, then merge is the default operation, otherwise it's diff.
joachim99@69 245 bool m_bCaseSensitive;
joachim99@66 246
joachim99@66 247 bool m_bScanning; // true while in init()
joachim99@8 248
joachim99@8 249 OptionDialog* m_pOptions;
joachim99@8 250 KIconLoader* m_pIconLoader;
joachim99@8 251 DirectoryMergeInfo* m_pDirectoryMergeInfo;
joachim99@8 252 StatusInfo* m_pStatusInfo;
joachim99@51 253
joachim99@51 254 typedef std::list<DirMergeItem*> MergeItemList;
joachim99@51 255 MergeItemList m_mergeItemList;
joachim99@51 256 MergeItemList::iterator m_currentItemForOperation;
joachim99@51 257
joachim99@69 258 DirMergeItem* m_pSelection1Item;
joachim99@69 259 int m_selection1Column;
joachim99@69 260 DirMergeItem* m_pSelection2Item;
joachim99@69 261 int m_selection2Column;
joachim99@69 262 DirMergeItem* m_pSelection3Item;
joachim99@69 263 int m_selection3Column;
joachim99@69 264 void selectItemAndColumn(DirMergeItem* pDMI, int c, bool bContextMenu);
joachim99@69 265 friend class DirMergeItem;
joachim99@51 266
joachim99@69 267 KAction* m_pDirStartOperation;
joachim99@69 268 KAction* m_pDirRunOperationForCurrentItem;
joachim99@69 269 KAction* m_pDirCompareCurrent;
joachim99@69 270 KAction* m_pDirMergeCurrent;
joachim99@69 271 KAction* m_pDirRescan;
joachim99@69 272 KAction* m_pDirChooseAEverywhere;
joachim99@69 273 KAction* m_pDirChooseBEverywhere;
joachim99@69 274 KAction* m_pDirChooseCEverywhere;
joachim99@69 275 KAction* m_pDirAutoChoiceEverywhere;
joachim99@69 276 KAction* m_pDirDoNothingEverywhere;
joachim99@69 277 KAction* m_pDirFoldAll;
joachim99@69 278 KAction* m_pDirUnfoldAll;
joachim99@51 279
joachim99@69 280 KToggleAction* m_pDirShowIdenticalFiles;
joachim99@69 281 KToggleAction* m_pDirShowDifferentFiles;
joachim99@69 282 KToggleAction* m_pDirShowFilesOnlyInA;
joachim99@69 283 KToggleAction* m_pDirShowFilesOnlyInB;
joachim99@69 284 KToggleAction* m_pDirShowFilesOnlyInC;
joachim99@69 285
joachim99@69 286 KToggleAction* m_pDirSynchronizeDirectories;
joachim99@69 287 KToggleAction* m_pDirChooseNewerFiles;
joachim99@69 288
joachim99@69 289 KAction* m_pDirCompareExplicit;
joachim99@69 290 KAction* m_pDirMergeExplicit;
joachim99@69 291
joachim99@69 292 KAction* m_pDirCurrentDoNothing;
joachim99@69 293 KAction* m_pDirCurrentChooseA;
joachim99@69 294 KAction* m_pDirCurrentChooseB;
joachim99@69 295 KAction* m_pDirCurrentChooseC;
joachim99@69 296 KAction* m_pDirCurrentMerge;
joachim99@69 297 KAction* m_pDirCurrentDelete;
joachim99@69 298
joachim99@69 299 KAction* m_pDirCurrentSyncDoNothing;
joachim99@69 300 KAction* m_pDirCurrentSyncCopyAToB;
joachim99@69 301 KAction* m_pDirCurrentSyncCopyBToA;
joachim99@69 302 KAction* m_pDirCurrentSyncDeleteA;
joachim99@69 303 KAction* m_pDirCurrentSyncDeleteB;
joachim99@69 304 KAction* m_pDirCurrentSyncDeleteAAndB;
joachim99@69 305 KAction* m_pDirCurrentSyncMergeToA;
joachim99@69 306 KAction* m_pDirCurrentSyncMergeToB;
joachim99@69 307 KAction* m_pDirCurrentSyncMergeToAAndB;
joachim99@69 308
joachim99@69 309 KAction* m_pDirSaveMergeState;
joachim99@69 310 KAction* m_pDirLoadMergeState;
joachim99@8 311 signals:
joachim99@66 312 void startDiffMerge(QString fn1,QString fn2, QString fn3, QString ofn, QString,QString,QString,TotalDiffStatus*);
joachim99@8 313 void checkIfCanContinue( bool* pbContinue );
joachim99@8 314 void updateAvailabilities();
joachim99@66 315 void statusBarMessage( const QString& msg );
joachim99@8 316 protected slots:
joachim99@8 317 void onDoubleClick( QListViewItem* lvi );
joachim99@69 318 void onClick( int button, QListViewItem* lvi, const QPoint&, int c );
joachim99@69 319 void slotShowContextMenu(QListViewItem* lvi,const QPoint &,int c);
joachim99@8 320 void onSelectionChanged(QListViewItem* lvi);
joachim99@8 321 };
joachim99@8 322
joachim99@8 323 class DirectoryMergeInfo : public QFrame
joachim99@8 324 {
joachim99@53 325 Q_OBJECT
joachim99@8 326 public:
joachim99@8 327 DirectoryMergeInfo( QWidget* pParent );
joachim99@8 328 void setInfo(
joachim99@8 329 const FileAccess& APath,
joachim99@8 330 const FileAccess& BPath,
joachim99@8 331 const FileAccess& CPath,
joachim99@8 332 const FileAccess& DestPath,
joachim99@8 333 MergeFileInfos& mfi );
joachim99@8 334 QListView* getInfoList() {return m_pInfoList;}
joachim99@66 335 virtual bool eventFilter( QObject* o, QEvent* e );
joachim99@66 336 signals:
joachim99@66 337 void gotFocus();
joachim99@8 338 private:
joachim99@8 339 QLabel* m_pInfoA;
joachim99@8 340 QLabel* m_pInfoB;
joachim99@8 341 QLabel* m_pInfoC;
joachim99@8 342 QLabel* m_pInfoDest;
joachim99@8 343
joachim99@8 344 QLabel* m_pA;
joachim99@8 345 QLabel* m_pB;
joachim99@8 346 QLabel* m_pC;
joachim99@8 347 QLabel* m_pDest;
joachim99@8 348
joachim99@8 349 QListView* m_pInfoList;
joachim99@8 350 };
joachim99@8 351
joachim99@8 352
joachim99@8 353 #endif