d->m_pDirRunOperationForCurrentItem=KDiff3::createAction<KAction>(i18n("Run Operation for Current Item"),KShortcut(Qt::Key_F6),p,SLOT(slotRunOperationForCurrentItem()),ac,"dir_run_operation_for_current_item");
d->m_pDirMergeCurrent=KDiff3::createAction<KAction>(i18n("Merge Current File"),QIcon(QPixmap(startmerge)),i18n("Merge\nFile"),pKDiff3App,SLOT(slotMergeCurrentFile()),ac,"merge_current");
d->m_pDirFoldAll=KDiff3::createAction<KAction>(i18n("Fold All Subdirs"),p,SLOT(collapseAll()),ac,"dir_fold_all");
d->m_pDirUnfoldAll=KDiff3::createAction<KAction>(i18n("Unfold All Subdirs"),p,SLOT(expandAll()),ac,"dir_unfold_all");
d->m_pDirChooseAEverywhere=KDiff3::createAction<KAction>(i18n("Choose A for All Items"),p,SLOT(slotChooseAEverywhere()),ac,"dir_choose_a_everywhere");
d->m_pDirChooseBEverywhere=KDiff3::createAction<KAction>(i18n("Choose B for All Items"),p,SLOT(slotChooseBEverywhere()),ac,"dir_choose_b_everywhere");
d->m_pDirChooseCEverywhere=KDiff3::createAction<KAction>(i18n("Choose C for All Items"),p,SLOT(slotChooseCEverywhere()),ac,"dir_choose_c_everywhere");
d->m_pDirAutoChoiceEverywhere=KDiff3::createAction<KAction>(i18n("Auto-Choose Operation for All Items"),p,SLOT(slotAutoChooseEverywhere()),ac,"dir_autochoose_everywhere");
d->m_pDirDoNothingEverywhere=KDiff3::createAction<KAction>(i18n("No Operation for All Items"),p,SLOT(slotNoOpEverywhere()),ac,"dir_nothing_everywhere");
d->m_pDirRunOperationForCurrentItem=KDiff3::createAction<QAction>(i18n("Run Operation for Current Item"),KShortcut(Qt::Key_F6),p,SLOT(slotRunOperationForCurrentItem()),ac,"dir_run_operation_for_current_item");
d->m_pDirMergeCurrent=KDiff3::createAction<QAction>(i18n("Merge Current File"),QIcon(QPixmap(startmerge)),i18n("Merge\nFile"),pKDiff3App,SLOT(slotMergeCurrentFile()),ac,"merge_current");
d->m_pDirFoldAll=KDiff3::createAction<QAction>(i18n("Fold All Subdirs"),p,SLOT(collapseAll()),ac,"dir_fold_all");
d->m_pDirUnfoldAll=KDiff3::createAction<QAction>(i18n("Unfold All Subdirs"),p,SLOT(expandAll()),ac,"dir_unfold_all");
d->m_pDirChooseAEverywhere=KDiff3::createAction<QAction>(i18n("Choose A for All Items"),p,SLOT(slotChooseAEverywhere()),ac,"dir_choose_a_everywhere");
d->m_pDirChooseBEverywhere=KDiff3::createAction<QAction>(i18n("Choose B for All Items"),p,SLOT(slotChooseBEverywhere()),ac,"dir_choose_b_everywhere");
d->m_pDirChooseCEverywhere=KDiff3::createAction<QAction>(i18n("Choose C for All Items"),p,SLOT(slotChooseCEverywhere()),ac,"dir_choose_c_everywhere");
d->m_pDirAutoChoiceEverywhere=KDiff3::createAction<QAction>(i18n("Auto-Choose Operation for All Items"),p,SLOT(slotAutoChooseEverywhere()),ac,"dir_autochoose_everywhere");
d->m_pDirDoNothingEverywhere=KDiff3::createAction<QAction>(i18n("No Operation for All Items"),p,SLOT(slotNoOpEverywhere()),ac,"dir_nothing_everywhere");
d->m_pDirCurrentSyncDeleteAAndB=KDiff3::createAction<KAction>(i18n("Delete A && B"),p,SLOT(slotCurrentDeleteAAndB()),ac,"dir_current_sync_delete_a_and_b");
d->m_pDirCurrentSyncMergeToA=KDiff3::createAction<KAction>(i18n("Merge to A"),p,SLOT(slotCurrentMergeToA()),ac,"dir_current_sync_merge_to_a");
d->m_pDirCurrentSyncMergeToB=KDiff3::createAction<KAction>(i18n("Merge to B"),p,SLOT(slotCurrentMergeToB()),ac,"dir_current_sync_merge_to_b");
d->m_pDirCurrentSyncMergeToAAndB=KDiff3::createAction<KAction>(i18n("Merge to A && B"),p,SLOT(slotCurrentMergeToAAndB()),ac,"dir_current_sync_merge_to_a_and_b");
d->m_pDirCurrentSyncDeleteAAndB=KDiff3::createAction<QAction>(i18n("Delete A && B"),p,SLOT(slotCurrentDeleteAAndB()),ac,"dir_current_sync_delete_a_and_b");
d->m_pDirCurrentSyncMergeToA=KDiff3::createAction<QAction>(i18n("Merge to A"),p,SLOT(slotCurrentMergeToA()),ac,"dir_current_sync_merge_to_a");
d->m_pDirCurrentSyncMergeToB=KDiff3::createAction<QAction>(i18n("Merge to B"),p,SLOT(slotCurrentMergeToB()),ac,"dir_current_sync_merge_to_b");
d->m_pDirCurrentSyncMergeToAAndB=KDiff3::createAction<QAction>(i18n("Merge to A && B"),p,SLOT(slotCurrentMergeToAAndB()),ac,"dir_current_sync_merge_to_a_and_b");
@@ -534,25 +534,25 @@ void KDiff3App::initActions( KActionCollection* ac )
#include"xpm/showlinenumbers.xpm"
//#include "reload.xpm"
goCurrent=KDiff3::createAction<KAction>(i18n("Go to Current Delta"),QIcon(QPixmap(currentpos)),i18n("Current\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Space),this,SLOT(slotGoCurrent()),ac,"go_current");
goCurrent=KDiff3::createAction<QAction>(i18n("Go to Current Delta"),QIcon(QPixmap(currentpos)),i18n("Current\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Space),this,SLOT(slotGoCurrent()),ac,"go_current");
goTop=KDiff3::createAction<KAction>(i18n("Go to First Delta"),QIcon(QPixmap(upend)),i18n("First\nDelta"),this,SLOT(slotGoTop()),ac,"go_top");
goTop=KDiff3::createAction<QAction>(i18n("Go to First Delta"),QIcon(QPixmap(upend)),i18n("First\nDelta"),this,SLOT(slotGoTop()),ac,"go_top");
goBottom=KDiff3::createAction<KAction>(i18n("Go to Last Delta"),QIcon(QPixmap(downend)),i18n("Last\nDelta"),this,SLOT(slotGoBottom()),ac,"go_bottom");
goBottom=KDiff3::createAction<QAction>(i18n("Go to Last Delta"),QIcon(QPixmap(downend)),i18n("Last\nDelta"),this,SLOT(slotGoBottom()),ac,"go_bottom");
QStringomitsWhitespace=".\n"+i18n("(Skips white space differences when \"Show White Space\" is disabled.)");
QStringincludeWhitespace=".\n"+i18n("(Does not skip white space differences even when \"Show White Space\" is disabled.)");
goPrevDelta=KDiff3::createAction<KAction>(i18n("Go to Previous Delta"),QIcon(QPixmap(up1arrow)),i18n("Prev\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Up),this,SLOT(slotGoPrevDelta()),ac,"go_prev_delta");
goPrevDelta=KDiff3::createAction<QAction>(i18n("Go to Previous Delta"),QIcon(QPixmap(up1arrow)),i18n("Prev\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Up),this,SLOT(slotGoPrevDelta()),ac,"go_prev_delta");
goNextDelta=KDiff3::createAction<KAction>(i18n("Go to Next Delta"),QIcon(QPixmap(down1arrow)),i18n("Next\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Down),this,SLOT(slotGoNextDelta()),ac,"go_next_delta");
goNextDelta=KDiff3::createAction<QAction>(i18n("Go to Next Delta"),QIcon(QPixmap(down1arrow)),i18n("Next\nDelta"),KShortcut(Qt::CTRL+Qt::Key_Down),this,SLOT(slotGoNextDelta()),ac,"go_next_delta");
goPrevConflict=KDiff3::createAction<KAction>(i18n("Go to Previous Conflict"),QIcon(QPixmap(up2arrow)),i18n("Prev\nConflict"),KShortcut(Qt::CTRL+Qt::Key_PageUp),this,SLOT(slotGoPrevConflict()),ac,"go_prev_conflict");
goPrevConflict=KDiff3::createAction<QAction>(i18n("Go to Previous Conflict"),QIcon(QPixmap(up2arrow)),i18n("Prev\nConflict"),KShortcut(Qt::CTRL+Qt::Key_PageUp),this,SLOT(slotGoPrevConflict()),ac,"go_prev_conflict");
goNextConflict=KDiff3::createAction<KAction>(i18n("Go to Next Conflict"),QIcon(QPixmap(down2arrow)),i18n("Next\nConflict"),KShortcut(Qt::CTRL+Qt::Key_PageDown),this,SLOT(slotGoNextConflict()),ac,"go_next_conflict");
goNextConflict=KDiff3::createAction<QAction>(i18n("Go to Next Conflict"),QIcon(QPixmap(down2arrow)),i18n("Next\nConflict"),KShortcut(Qt::CTRL+Qt::Key_PageDown),this,SLOT(slotGoNextConflict()),ac,"go_next_conflict");
goPrevUnsolvedConflict=KDiff3::createAction<KAction>(i18n("Go to Previous Unsolved Conflict"),QIcon(QPixmap(prevunsolved)),i18n("Prev\nUnsolved"),this,SLOT(slotGoPrevUnsolvedConflict()),ac,"go_prev_unsolved_conflict");
goPrevUnsolvedConflict=KDiff3::createAction<QAction>(i18n("Go to Previous Unsolved Conflict"),QIcon(QPixmap(prevunsolved)),i18n("Prev\nUnsolved"),this,SLOT(slotGoPrevUnsolvedConflict()),ac,"go_prev_unsolved_conflict");
goNextUnsolvedConflict=KDiff3::createAction<KAction>(i18n("Go to Next Unsolved Conflict"),QIcon(QPixmap(nextunsolved)),i18n("Next\nUnsolved"),this,SLOT(slotGoNextUnsolvedConflict()),ac,"go_next_unsolved_conflict");
goNextUnsolvedConflict=KDiff3::createAction<QAction>(i18n("Go to Next Unsolved Conflict"),QIcon(QPixmap(nextunsolved)),i18n("Next\nUnsolved"),this,SLOT(slotGoNextUnsolvedConflict()),ac,"go_next_unsolved_conflict");
chooseA=KDiff3::createAction<KToggleAction>(i18n("Select Line(s) From A"),QIcon(QPixmap(iconA)),i18n("Choose\nA"),KShortcut(Qt::CTRL+Qt::Key_1),this,SLOT(slotChooseA()),ac,"merge_choose_a");
chooseB=KDiff3::createAction<KToggleAction>(i18n("Select Line(s) From B"),QIcon(QPixmap(iconB)),i18n("Choose\nB"),KShortcut(Qt::CTRL+Qt::Key_2),this,SLOT(slotChooseB()),ac,"merge_choose_b");
...
...
@@ -563,44 +563,44 @@ void KDiff3App::initActions( KActionCollection* ac )
showWhiteSpace=KDiff3::createAction<KToggleAction>(i18n("Show White Space"),QIcon(QPixmap(showwhitespace)),i18n("White\nDeltas"),this,SLOT(slotShowWhiteSpaceToggled()),ac,"diff_show_whitespace");
showLineNumbers=KDiff3::createAction<KToggleAction>(i18n("Show Line Numbers"),QIcon(QPixmap(showlinenumbers)),i18n("Line\nNumbers"),this,SLOT(slotShowLineNumbersToggled()),ac,"diff_showlinenumbers");
chooseAEverywhere=KDiff3::createAction<KAction>(i18n("Choose A Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_1),this,SLOT(slotChooseAEverywhere()),ac,"merge_choose_a_everywhere");
chooseBEverywhere=KDiff3::createAction<KAction>(i18n("Choose B Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_2),this,SLOT(slotChooseBEverywhere()),ac,"merge_choose_b_everywhere");
chooseCEverywhere=KDiff3::createAction<KAction>(i18n("Choose C Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_3),this,SLOT(slotChooseCEverywhere()),ac,"merge_choose_c_everywhere");
chooseAForUnsolvedConflicts=KDiff3::createAction<KAction>(i18n("Choose A for All Unsolved Conflicts"),this,SLOT(slotChooseAForUnsolvedConflicts()),ac,"merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts=KDiff3::createAction<KAction>(i18n("Choose B for All Unsolved Conflicts"),this,SLOT(slotChooseBForUnsolvedConflicts()),ac,"merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts=KDiff3::createAction<KAction>(i18n("Choose C for All Unsolved Conflicts"),this,SLOT(slotChooseCForUnsolvedConflicts()),ac,"merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<KAction>(i18n("Choose A for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<KAction>(i18n("Choose B for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<KAction>(i18n("Choose C for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_c_for_unsolved_whitespace_conflicts");
unsolve=KDiff3::createAction<KAction>(i18n("Set Deltas to Conflicts"),this,SLOT(slotUnsolve()),ac,"merge_autounsolve");
mergeRegExp=KDiff3::createAction<KAction>(i18n("Run Regular Expression Auto Merge"),this,SLOT(slotRegExpAutoMerge()),ac,"merge_regexp_automerge");
mergeHistory=KDiff3::createAction<KAction>(i18n("Automatically Solve History Conflicts"),this,SLOT(slotMergeHistory()),ac,"merge_versioncontrol_history");
splitDiff=KDiff3::createAction<KAction>(i18n("Split Diff At Selection"),this,SLOT(slotSplitDiff()),ac,"merge_splitdiff");
chooseAEverywhere=KDiff3::createAction<QAction>(i18n("Choose A Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_1),this,SLOT(slotChooseAEverywhere()),ac,"merge_choose_a_everywhere");
chooseBEverywhere=KDiff3::createAction<QAction>(i18n("Choose B Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_2),this,SLOT(slotChooseBEverywhere()),ac,"merge_choose_b_everywhere");
chooseCEverywhere=KDiff3::createAction<QAction>(i18n("Choose C Everywhere"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_3),this,SLOT(slotChooseCEverywhere()),ac,"merge_choose_c_everywhere");
chooseAForUnsolvedConflicts=KDiff3::createAction<QAction>(i18n("Choose A for All Unsolved Conflicts"),this,SLOT(slotChooseAForUnsolvedConflicts()),ac,"merge_choose_a_for_unsolved_conflicts");
chooseBForUnsolvedConflicts=KDiff3::createAction<QAction>(i18n("Choose B for All Unsolved Conflicts"),this,SLOT(slotChooseBForUnsolvedConflicts()),ac,"merge_choose_b_for_unsolved_conflicts");
chooseCForUnsolvedConflicts=KDiff3::createAction<QAction>(i18n("Choose C for All Unsolved Conflicts"),this,SLOT(slotChooseCForUnsolvedConflicts()),ac,"merge_choose_c_for_unsolved_conflicts");
chooseAForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<QAction>(i18n("Choose A for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseAForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_a_for_unsolved_whitespace_conflicts");
chooseBForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<QAction>(i18n("Choose B for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseBForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_b_for_unsolved_whitespace_conflicts");
chooseCForUnsolvedWhiteSpaceConflicts=KDiff3::createAction<QAction>(i18n("Choose C for All Unsolved Whitespace Conflicts"),this,SLOT(slotChooseCForUnsolvedWhiteSpaceConflicts()),ac,"merge_choose_c_for_unsolved_whitespace_conflicts");
unsolve=KDiff3::createAction<QAction>(i18n("Set Deltas to Conflicts"),this,SLOT(slotUnsolve()),ac,"merge_autounsolve");
mergeRegExp=KDiff3::createAction<QAction>(i18n("Run Regular Expression Auto Merge"),this,SLOT(slotRegExpAutoMerge()),ac,"merge_regexp_automerge");
mergeHistory=KDiff3::createAction<QAction>(i18n("Automatically Solve History Conflicts"),this,SLOT(slotMergeHistory()),ac,"merge_versioncontrol_history");
splitDiff=KDiff3::createAction<QAction>(i18n("Split Diff At Selection"),this,SLOT(slotSplitDiff()),ac,"merge_splitdiff");
winFocusNext=KDiff3::createAction<KAction>(i18n("Focus Next Window"),KShortcut(Qt::ALT+Qt::Key_Right),this,SLOT(slotWinFocusNext()),ac,"win_focus_next");
winFocusNext=KDiff3::createAction<QAction>(i18n("Focus Next Window"),KShortcut(Qt::ALT+Qt::Key_Right),this,SLOT(slotWinFocusNext()),ac,"win_focus_next");
clearManualDiffHelpList=KDiff3::createAction<KAction>(i18n("Clear All Manual Diff Alignments"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_Y),this,SLOT(slotClearManualDiffHelpList()),ac,"diff_clear_manual_diff_help_list");
clearManualDiffHelpList=KDiff3::createAction<QAction>(i18n("Clear All Manual Diff Alignments"),KShortcut(Qt::CTRL+Qt::SHIFT+Qt::Key_Y),this,SLOT(slotClearManualDiffHelpList()),ac,"diff_clear_manual_diff_help_list");
#if defined(_WIN32) || defined(Q_OS_OS2)
KDiff3::createAction<KAction>(i18n("Focus Next Window"),KShortcut(Qt::CTRL+Qt::Key_Tab),this,SLOT(slotWinFocusNext()),ac,"win_focus_next");
KDiff3::createAction<QAction>(i18n("Focus Next Window"),KShortcut(Qt::CTRL+Qt::Key_Tab),this,SLOT(slotWinFocusNext()),ac,"win_focus_next");