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

List:       kde-commits
Subject:    KDE/kdelibs/kde3support/kdeui
From:       David Faure <faure () kde ! org>
Date:       2007-11-29 19:30:43
Message-ID: 1196364643.115385.19232.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 743057 by dfaure:

Remove contextMenuKey usage; Qt tells us when the menu key was pressed.


 M  +1 -14     k3listview.cpp  


--- trunk/KDE/kdelibs/kde3support/kdeui/k3listview.cpp #743056:743057
@@ -100,7 +100,6 @@
       selectionDirection(0),
       tooltipColumn (0),
       selectionMode (Single),
-      contextMenuKey (KGlobalSettings::contextMenuKey()),
       showContextMenusOnPress (KGlobalSettings::showContextMenusOnPress()),
       mDropVisualizerWidth (4),
       paintAbove (0),
@@ -159,7 +158,6 @@
   int tooltipColumn;
 
   SelectionModeExt selectionMode;
-  int contextMenuKey;
   bool showContextMenusOnPress;
 
   QRect mOldDropVisualizer;
@@ -552,7 +550,6 @@
     break;
 
   case KGlobalSettings::SETTINGS_POPUPMENU:
-    d->contextMenuKey = KGlobalSettings::contextMenuKey ();
     d->showContextMenusOnPress = KGlobalSettings::showContextMenusOnPress ();
 
     if (d->showContextMenusOnPress)
@@ -1286,10 +1283,7 @@
 {
     Q3ListView::contentsContextMenuEvent(event);
 
-    // if KGlobalSettings::contextMenuKey() == Qt::Key_Menu it will never reach
-    // keyPressEvent() as it's handled by QKeyMapper::sendKeyEvent()
-    if (event->reason() == QContextMenuEvent::Keyboard
-        && d->contextMenuKey == Qt::Key_Menu) {
+    if (event->reason() == QContextMenuEvent::Keyboard) {
         emit menuShortCutPressed (this, currentItem());
     }
 }
@@ -1464,13 +1458,6 @@
 
 void K3ListView::keyPressEvent (QKeyEvent* e)
 {
-  //don't we need a contextMenuModifier too ? (aleXXX)
-  if (e->key() == d->contextMenuKey)
-        {
-          emit menuShortCutPressed (this, currentItem());
-          return;
-        }
-
   if (d->selectionMode != FileManager)
         Q3ListView::keyPressEvent (e);
   else
[prev in list] [next in list] [prev in thread] [next in thread]