diff options
Diffstat (limited to 'src/directorymergewindow.cpp')
| -rw-r--r-- | src/directorymergewindow.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index 645422b..b533c59 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -267,13 +267,13 @@ static int s_WhiteCol = 9; // Nr of white deltas (for 2 input files) DirectoryMergeWindow::DirectoryMergeWindow( TQWidget* pParent, OptionDialog* pOptions, TDEIconLoader* pIconLoader ) : TQListView( pParent ) { - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*))); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(onDoubleClick(TQListViewItem*))); - connect( this, TQT_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), - this, TQT_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); - connect( this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(onSelectionChanged(TQListViewItem*))); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*))); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), this, TQ_SLOT(onDoubleClick(TQListViewItem*))); + connect( this, TQ_SIGNAL( mouseButtonPressed(int,TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT( onClick(int,TQListViewItem*,const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint &,int)), + this, TQ_SLOT( slotShowContextMenu(TQListViewItem*,const TQPoint &,int))); + connect( this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(onSelectionChanged(TQListViewItem*))); m_pOptions = pOptions; m_pIconLoader = pIconLoader; m_pDirectoryMergeInfo = 0; @@ -2917,51 +2917,51 @@ void DirectoryMergeWindow::initDirectoryMergeActions( TQObject* pKDiff3App, TDEA #include "xpm/showfilesonlyinc.xpm" DirectoryMergeWindow* p = this; - m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQT_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); - m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQT_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); - m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQT_SLOT(compareCurrentFile()), ac, "dir_compare_current"); - m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQT_SLOT(slotMergeCurrentFile()), ac, "merge_current"); - m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQT_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); - m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQT_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); - m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQT_SLOT(reload()), ac, "dir_rescan"); - m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQT_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); - m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQT_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); - m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQT_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); - m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQT_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); - m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQT_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); - m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQT_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); - m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQT_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); - -// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQT_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); -// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQT_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); - - m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQT_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); - m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQT_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); - m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQT_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); - m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQT_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); - m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQT_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); + m_pDirStartOperation = new TDEAction(i18n("Start/Continue Directory Merge"), TQt::Key_F7, p, TQ_SLOT(slotRunOperationForAllItems()), ac, "dir_start_operation"); + m_pDirRunOperationForCurrentItem = new TDEAction(i18n("Run Operation for Current Item"), TQt::Key_F6, p, TQ_SLOT(slotRunOperationForCurrentItem()), ac, "dir_run_operation_for_current_item"); + m_pDirCompareCurrent = new TDEAction(i18n("Compare Selected File"), 0, p, TQ_SLOT(compareCurrentFile()), ac, "dir_compare_current"); + m_pDirMergeCurrent = new TDEAction(i18n("Merge Current File"), TQIconSet(TQPixmap(startmerge)), 0, pKDiff3App, TQ_SLOT(slotMergeCurrentFile()), ac, "merge_current"); + m_pDirFoldAll = new TDEAction(i18n("Fold All Subdirs"), 0, p, TQ_SLOT(slotFoldAllSubdirs()), ac, "dir_fold_all"); + m_pDirUnfoldAll = new TDEAction(i18n("Unfold All Subdirs"), 0, p, TQ_SLOT(slotUnfoldAllSubdirs()), ac, "dir_unfold_all"); + m_pDirRescan = new TDEAction(i18n("Rescan"), TQt::SHIFT+TQt::Key_F5, p, TQ_SLOT(reload()), ac, "dir_rescan"); + m_pDirSaveMergeState = 0; //new TDEAction(i18n("Save Directory Merge State ..."), 0, p, TQ_SLOT(slotSaveMergeState()), ac, "dir_save_merge_state"); + m_pDirLoadMergeState = 0; //new TDEAction(i18n("Load Directory Merge State ..."), 0, p, TQ_SLOT(slotLoadMergeState()), ac, "dir_load_merge_state"); + m_pDirChooseAEverywhere = new TDEAction(i18n("Choose A for All Items"), 0, p, TQ_SLOT(slotChooseAEverywhere()), ac, "dir_choose_a_everywhere"); + m_pDirChooseBEverywhere = new TDEAction(i18n("Choose B for All Items"), 0, p, TQ_SLOT(slotChooseBEverywhere()), ac, "dir_choose_b_everywhere"); + m_pDirChooseCEverywhere = new TDEAction(i18n("Choose C for All Items"), 0, p, TQ_SLOT(slotChooseCEverywhere()), ac, "dir_choose_c_everywhere"); + m_pDirAutoChoiceEverywhere = new TDEAction(i18n("Auto-Choose Operation for All Items"), 0, p, TQ_SLOT(slotAutoChooseEverywhere()), ac, "dir_autochoose_everywhere"); + m_pDirDoNothingEverywhere = new TDEAction(i18n("No Operation for All Items"), 0, p, TQ_SLOT(slotNoOpEverywhere()), ac, "dir_nothing_everywhere"); + +// m_pDirSynchronizeDirectories = new TDEToggleAction(i18n("Synchronize Directories"), 0, this, TQ_SLOT(slotSynchronizeDirectories()), ac, "dir_synchronize_directories"); +// m_pDirChooseNewerFiles = new TDEToggleAction(i18n("Copy Newer Files Instead of Merging"), 0, this, TQ_SLOT(slotChooseNewerFiles()), ac, "dir_choose_newer_files"); + + m_pDirShowIdenticalFiles = new TDEToggleAction(i18n("Show Identical Files"), TQIconSet(TQPixmap(showequalfiles)), 0, this, TQ_SLOT(slotShowIdenticalFiles()), ac, "dir_show_identical_files"); + m_pDirShowDifferentFiles = new TDEToggleAction(i18n("Show Different Files"), 0, this, TQ_SLOT(slotShowDifferentFiles()), ac, "dir_show_different_files"); + m_pDirShowFilesOnlyInA = new TDEToggleAction(i18n("Show Files only in A"), TQIconSet(TQPixmap(showfilesonlyina)), 0, this, TQ_SLOT(slotShowFilesOnlyInA()), ac, "dir_show_files_only_in_a"); + m_pDirShowFilesOnlyInB = new TDEToggleAction(i18n("Show Files only in B"), TQIconSet(TQPixmap(showfilesonlyinb)), 0, this, TQ_SLOT(slotShowFilesOnlyInB()), ac, "dir_show_files_only_in_b"); + m_pDirShowFilesOnlyInC = new TDEToggleAction(i18n("Show Files only in C"), TQIconSet(TQPixmap(showfilesonlyinc)), 0, this, TQ_SLOT(slotShowFilesOnlyInC()), ac, "dir_show_files_only_in_c"); m_pDirShowIdenticalFiles->setChecked( m_pOptions->m_bDmShowIdenticalFiles ); - m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQT_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); - m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQT_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); - - m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); - m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQT_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); - m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQT_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); - m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQT_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); - m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQT_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); - m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQT_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); - - m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQT_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); - m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQT_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); - m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQT_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); - m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQT_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); - m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQT_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); - m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQT_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); - m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQT_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); - m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQT_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); - m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQT_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); + m_pDirCompareExplicit = new TDEAction(i18n("Compare Explicitly Selected Files"), 0, p, TQ_SLOT(slotCompareExplicitlySelectedFiles()), ac, "dir_compare_explicitly_selected_files"); + m_pDirMergeExplicit = new TDEAction(i18n("Merge Explicitly Selected Files"), 0, p, TQ_SLOT(slotMergeExplicitlySelectedFiles()), ac, "dir_merge_explicitly_selected_files"); + + m_pDirCurrentDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_do_nothing"); + m_pDirCurrentChooseA = new TDEAction(i18n("A"), 0, p, TQ_SLOT(slotCurrentChooseA()), ac, "dir_current_choose_a"); + m_pDirCurrentChooseB = new TDEAction(i18n("B"), 0, p, TQ_SLOT(slotCurrentChooseB()), ac, "dir_current_choose_b"); + m_pDirCurrentChooseC = new TDEAction(i18n("C"), 0, p, TQ_SLOT(slotCurrentChooseC()), ac, "dir_current_choose_c"); + m_pDirCurrentMerge = new TDEAction(i18n("Merge"), 0, p, TQ_SLOT(slotCurrentMerge()), ac, "dir_current_merge"); + m_pDirCurrentDelete = new TDEAction(i18n("Delete (if exists)"), 0, p, TQ_SLOT(slotCurrentDelete()), ac, "dir_current_delete"); + + m_pDirCurrentSyncDoNothing = new TDEAction(i18n("Do Nothing"), 0, p, TQ_SLOT(slotCurrentDoNothing()), ac, "dir_current_sync_do_nothing"); + m_pDirCurrentSyncCopyAToB = new TDEAction(i18n("Copy A to B"), 0, p, TQ_SLOT(slotCurrentCopyAToB()), ac, "dir_current_sync_copy_a_to_b" ); + m_pDirCurrentSyncCopyBToA = new TDEAction(i18n("Copy B to A"), 0, p, TQ_SLOT(slotCurrentCopyBToA()), ac, "dir_current_sync_copy_b_to_a" ); + m_pDirCurrentSyncDeleteA = new TDEAction(i18n("Delete A"), 0, p, TQ_SLOT(slotCurrentDeleteA()), ac,"dir_current_sync_delete_a"); + m_pDirCurrentSyncDeleteB = new TDEAction(i18n("Delete B"), 0, p, TQ_SLOT(slotCurrentDeleteB()), ac,"dir_current_sync_delete_b"); + m_pDirCurrentSyncDeleteAAndB = new TDEAction(i18n("Delete A && B"), 0, p, TQ_SLOT(slotCurrentDeleteAAndB()), ac,"dir_current_sync_delete_a_and_b"); + m_pDirCurrentSyncMergeToA = new TDEAction(i18n("Merge to A"), 0, p, TQ_SLOT(slotCurrentMergeToA()), ac,"dir_current_sync_merge_to_a"); + m_pDirCurrentSyncMergeToB = new TDEAction(i18n("Merge to B"), 0, p, TQ_SLOT(slotCurrentMergeToB()), ac,"dir_current_sync_merge_to_b"); + m_pDirCurrentSyncMergeToAAndB = new TDEAction(i18n("Merge to A && B"), 0, p, TQ_SLOT(slotCurrentMergeToAAndB()), ac,"dir_current_sync_merge_to_a_and_b"); } |