[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/kpdf/ui
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-06-03 17:38:26
Message-ID: 1117820306.150809.19775.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 421672 by aacid:

revert fix for 106546 was causing other problems


 M  +16 -8     pageview.cpp  


--- trunk/KDE/kdegraphics/kpdf/ui/pageview.cpp #421671:421672
@@ -588,14 +588,18 @@
         {
             // part doesn't get this key event because of the keyboard grab
             d->findTimeoutTimer->stop(); // restore normal operation during possible \
                messagebox is displayed
-            //commenting as seems to cause bug 106546 and does not seem to give \
                anything
-            //releaseKeyboard();
+            // it is needed to grab the keyboard becase people may have Space \
assigned to a  +            // accel and without grabbing the keyboard you can not \
vim-search for space +            // because it activates the accel
+            releaseKeyboard();
             if ( d->document->continueSearch( PAGEVIEW_SEARCH_ID ) )
                 d->messageWindow->display( i18n("Text found: \
\"%1\".").arg(d->typeAheadString.lower()),  PageViewMessage::Find, 3000 );
             d->findTimeoutTimer->start( 3000, true );
-            //commenting as seems to cause bug 106546 and does not seem to give \
                anything
-            // grabKeyboard();
+            // it is needed to grab the keyboard becase people may have Space \
assigned to a  +            // accel and without grabbing the keyboard you can not \
vim-search for space +            // because it activates the accel
+            grabKeyboard();
         }
         // esc and return: end search
         else if( e->key() == Key_Escape || e->key() == Key_Return )
@@ -634,8 +638,10 @@
             connect( d->findTimeoutTimer, SIGNAL( timeout() ), this, SLOT( \
findAheadStop() ) );  }
         d->findTimeoutTimer->start( 3000, true );
-        //commenting as seems to cause bug 106546 and does not seem to give anything
-        // grabKeyboard();
+        // it is needed to grab the keyboard becase people may have Space assigned \
to a  +        // accel and without grabbing the keyboard you can not vim-search for \
space +        // because it activates the accel
+        grabKeyboard();
         return;
     }
 
@@ -1848,8 +1854,10 @@
     d->typeAheadActive = false;
     d->typeAheadString = "";
     d->messageWindow->display( i18n("Find stopped."), PageViewMessage::Find, 1000 );
-    //commenting as seems to cause bug 106546 and does not seem to give anything
-    //releaseKeyboard();
+    // it is needed to grab the keyboard becase people may have Space assigned to a 
+    // accel and without grabbing the keyboard you can not vim-search for space
+    // because it activates the accel
+    releaseKeyboard();
 }
 
 void PageView::slotZoom()


[prev in list] [next in list] [prev in thread] [next in thread]