[Uml-devel] kdesdk/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

handleCursorKeyReleaseEvent(): Require "Alt" + cursorkeys for widget move.
BUG:93122


  M +2 -2      ChangeLog   1.44
  M +29 -29    umbrello/uml.cpp   1.123


--- kdesdk/umbrello/ChangeLog  #1.43:1.44
@@ -7,5 +7,5 @@
 * Ability to directly type into Note
 
-* Move canvas items using the keyboard  
+* Move canvas items using the keyboard (Alt + arrow keys)
         
 * PHP 5 code generator
@@ -19,5 +19,5 @@
 89563 89579 89582 89699 89860 89903       90102 90106 90206
 90755       91298 91433 91494 91869 91922       92116 92123
-92222 92300 92301 92781 92995 93501 93595 93696 94173
+92222 92300 92301 92781 92995 93122 93501 93595 93696 94173
 
 

--- kdesdk/umbrello/umbrello/uml.cpp  #1.122:1.123
@@ -1480,5 +1480,8 @@ void UMLApp::handleCursorKeyReleaseEvent
         // in case we have selected something in the diagram, move it by one pixel
         // to the direction pointed by the cursor key
-        if (m_view && m_view->getSelectCount()) {
+        if (m_view == NULL || !m_view->getSelectCount() || e->state() != Qt::AltButton) {
+                e->ignore();
+                return;
+        }
                 int dx = 0;
                 int dy = 0;
@@ -1508,7 +1511,4 @@ void UMLApp::handleCursorKeyReleaseEvent
                 }
                 e->accept();
-        } else {
-                e->ignore();
-        }
 }