Mercurial > hg > easyhg-kdiff3

comparison kdiff3/src/kdiff3.cpp @ 26:07416314eb5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Allow CTRL-Tab for Windows
author joachim99
date Sat, 11 Oct 2003 12:45:25 +0000
parents 86d21651c8db
children c59d5a3a8ff3
comparison
equal deleted inserted replaced
25:d101155f5c52 26:07416314eb5e
15 * * 15 * *
16 ***************************************************************************/ 16 ***************************************************************************/
17 17
18 /*************************************************************************** 18 /***************************************************************************
19 * $Log$ 19 * $Log$
20 * Revision 1.2 2003/10/11 12:45:25 joachim99
21 * Allow CTRL-Tab for Windows
22 *
20 * Revision 1.1 2003/10/06 18:38:48 joachim99 23 * Revision 1.1 2003/10/06 18:38:48 joachim99
21 * KDiff3 version 0.9.70 24 * KDiff3 version 0.9.70
22 * *
23 ***************************************************************************/ 25 ***************************************************************************/
24 26
25 #include "diff.h" 27 #include "diff.h"
26 28
27 #include <iostream> 29 #include <iostream>
378 fileReload = new KAction(i18n("Reload"), /*QIconSet(QPixmap(reloadIcon)),*/ 0, this, SLOT(slotReload()), ac, "file_reload"); 380 fileReload = new KAction(i18n("Reload"), /*QIconSet(QPixmap(reloadIcon)),*/ 0, this, SLOT(slotReload()), ac, "file_reload");
379 showWindowA = new KToggleAction(i18n("Show Window A"), 0, this, SLOT(slotShowWindowAToggled()), ac, "win_show_a"); 381 showWindowA = new KToggleAction(i18n("Show Window A"), 0, this, SLOT(slotShowWindowAToggled()), ac, "win_show_a");
380 showWindowB = new KToggleAction(i18n("Show Window B"), 0, this, SLOT(slotShowWindowBToggled()), ac, "win_show_b"); 382 showWindowB = new KToggleAction(i18n("Show Window B"), 0, this, SLOT(slotShowWindowBToggled()), ac, "win_show_b");
381 showWindowC = new KToggleAction(i18n("Show Window C"), 0, this, SLOT(slotShowWindowCToggled()), ac, "win_show_c"); 383 showWindowC = new KToggleAction(i18n("Show Window C"), 0, this, SLOT(slotShowWindowCToggled()), ac, "win_show_c");
382 winFocusNext = new KAction(i18n("Focus Next Window"), ALT+Key_Right, this, SLOT(slotWinFocusNext()), ac, "win_focus_next"); 384 winFocusNext = new KAction(i18n("Focus Next Window"), ALT+Key_Right, this, SLOT(slotWinFocusNext()), ac, "win_focus_next");
385 #ifdef _WIN32
386 new KAction(i18n("Focus Next Window"), CTRL+Key_Tab, this, SLOT(slotWinFocusNext()), ac, "win_focus_next", false, false);
387 #endif
383 winFocusPrev = new KAction(i18n("Focus Prev Window"), ALT+Key_Left, this, SLOT(slotWinFocusPrev()), ac, "win_focus_prev"); 388 winFocusPrev = new KAction(i18n("Focus Prev Window"), ALT+Key_Left, this, SLOT(slotWinFocusPrev()), ac, "win_focus_prev");
384 winToggleSplitOrientation = new KAction(i18n("Toggle Split Orientation"), 0, this, SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation"); 389 winToggleSplitOrientation = new KAction(i18n("Toggle Split Orientation"), 0, this, SLOT(slotWinToggleSplitterOrientation()), ac, "win_toggle_split_orientation");
385 } 390 }
386 391
387 void KDiff3App::initDirectoryMergeActions() 392 void KDiff3App::initDirectoryMergeActions()