[Uml-devel] kdesdk/umbrello/umbrello

[Sebastian Stein]

CVS commit by sstein: 

fix bug #65444
with backspace you change now back to previous used tool
shift and ctrl key are used both for selecting multiple items


  M +1 -1      uml.cpp   1.70
  M +4 -2      umlwidget.cpp   1.56


--- kdesdk/umbrello/umbrello/umlwidget.cpp  #1.55:1.56
@@ -294,5 +294,5 @@ void UMLWidget::mousePressEvent(QMouseEv
                 return;
         }
-        if( me -> state() == ShiftButton )
+        if( me -> state() == ShiftButton || me -> state() == ControlButton )
         {
                 /* we have to save the shift state, because in ReleaseEvent it is lost */
@@ -379,5 +379,7 @@ void UMLWidget::mouseReleaseEvent(QMouse
         }
 
-        if ( me->button() == LeftButton && me->stateAfter() != ShiftButton ) {
+        if ( me->button() == LeftButton && (me->stateAfter() != ShiftButton
+                                                                                                                                || me->stateAfter() != ControlButton) )
+        {
                 m_pView->setAssoc(this);
         }

--- kdesdk/umbrello/umbrello/uml.cpp  #1.69:1.70
@@ -1515,5 +1515,5 @@ void UMLApp::keyPressEvent(QKeyEvent *e)
 void UMLApp::keyReleaseEvent(QKeyEvent *e) {
         switch(e->key()) {
-                case Qt::Key_Shift:
+                case Qt::Key_Backspace:
                         toolsbar->setOldTool();
                         e->accept();