Parcourir la source

Make Ctrl+Return work for "Open file at cursor".

git-svn-id: file:///var/svn/tigccpp/branches/ktigcc-1-branch@1176 9552661e-59e3-4036-b4f2-dbe53926924f
kevinkofler il y a 17 ans
Parent
commit
9c448e1cf1
3 fichiers modifiés avec 21 ajouts et 0 suppressions
  1. 5 0
      ktigcc/NEWS
  2. 10 0
      ktigcc/mainform.ui.h
  3. 6 0
      ktigcc/srcfilewin.ui.h

+ 5 - 0
ktigcc/NEWS

@@ -1,5 +1,10 @@
 This is a summary of the changes in KTIGCC since the first alpha release:
 
+CVS ktigcc-1-branch (2007-07-02):
+
+* Ctrl+Return now works for "Open file at cursor" (not just Ctrl+Numpad Enter)
+
+
 KTIGCC 1.07 (2007-04-03):
 
 * Added a full changelog (generated from CVS logs).

+ 10 - 0
ktigcc/mainform.ui.h

@@ -1098,6 +1098,8 @@ void MainForm::init()
   accel->setItemEnabled(15,TRUE);
   accel->insertItem(CTRL+Key_F9,16);
   accel->setItemEnabled(16,TRUE);
+  accel->insertItem(CTRL+Key_Return,17);
+  accel->setItemEnabled(17,FALSE);
   connect(accel,SIGNAL(activated(int)),this,SLOT(accel_activated(int)));
   fileTreeAccel=new QAccel(this);
   fileTreeAccel->insertItem(Key_Delete,0);
@@ -1279,6 +1281,10 @@ void MainForm::te_popup_activated(int index)
 
 void MainForm::accel_activated(int index)
 {
+  if (index == 17) {
+    findOpenFileAtCursor();
+    return;    
+  }
   if (CURRENT_VIEW && CURRENT_VIEW->hasFocus()) {
     switch (index) {
       case 0: editUndo(); break;
@@ -5280,6 +5286,7 @@ void MainForm::fileTreeClicked(QListViewItem *item)
     accel->setItemEnabled(8,FALSE);
     accel->setItemEnabled(9,FALSE);
     accel->setItemEnabled(10,FALSE);
+    accel->setItemEnabled(17,FALSE);
   } else if (IS_FILE(item)) {
     fileNewFolderAction->setEnabled(TRUE);
     CATEGORY_OF(category,item->parent());
@@ -5319,6 +5326,7 @@ void MainForm::fileTreeClicked(QListViewItem *item)
       accel->setItemEnabled(8,TRUE);
       accel->setItemEnabled(9,TRUE);
       accel->setItemEnabled(10,TRUE);
+      accel->setItemEnabled(17,TRUE);
     } else {
       filePrintAction->setEnabled(FALSE);
       filePrintQuicklyAction->setEnabled(FALSE);
@@ -5345,6 +5353,7 @@ void MainForm::fileTreeClicked(QListViewItem *item)
       accel->setItemEnabled(8,FALSE);
       accel->setItemEnabled(9,FALSE);
       accel->setItemEnabled(10,FALSE);
+      accel->setItemEnabled(17,FALSE);
     }
   } else {
     fileNewFolderAction->setEnabled(FALSE);
@@ -5373,6 +5382,7 @@ void MainForm::fileTreeClicked(QListViewItem *item)
     accel->setItemEnabled(8,FALSE);
     accel->setItemEnabled(9,FALSE);
     accel->setItemEnabled(10,FALSE);
+    accel->setItemEnabled(17,FALSE);
   }
   currentListItem=item;
   updateLeftStatusLabel();

+ 6 - 0
ktigcc/srcfilewin.ui.h

@@ -226,6 +226,7 @@ void SourceFileWindow::initBase()
   THIS->accel->insertItem(CTRL+Key_J,8);
   THIS->accel->insertItem(CTRL+Key_Space,9);
   THIS->accel->insertItem(CTRL+Key_M,10);
+  THIS->accel->insertItem(CTRL+Key_Return,11);
   THIS->accel->setItemEnabled(0,!!(CURRENT_VIEW->getDoc()->undoCount()));
   THIS->accel->setItemEnabled(1,!!(CURRENT_VIEW->getDoc()->redoCount()));
   THIS->accel->setItemEnabled(2,CURRENT_VIEW->getDoc()->hasSelection());
@@ -237,6 +238,7 @@ void SourceFileWindow::initBase()
   THIS->accel->setItemEnabled(8,TRUE);
   THIS->accel->setItemEnabled(9,TRUE);
   THIS->accel->setItemEnabled(10,TRUE);
+  THIS->accel->setItemEnabled(11,TRUE);
   connect(THIS->accel,SIGNAL(activated(int)),this,SLOT(accel_activated(int)));
   if (preferences.useSystemIcons) {
     setUsesBigPixmaps(TRUE);
@@ -334,6 +336,10 @@ void SourceFileWindow::te_popup_activated(int index)
 
 void SourceFileWindow::accel_activated(int index)
 {
+  if (index == 11) {
+    findOpenFileAtCursor();
+    return;    
+  }
   if (CURRENT_VIEW && CURRENT_VIEW->hasFocus()) {
     switch (index) {
       case 0: editUndo(); break;