[Uml-devel] KDE_3_2_BRANCH: kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

Backport a commit from a moment ago
--
CVS commit by jriddell:

Patch from BARTKO, Zoltan <bartko.zoltan-AT-pobox.sk>
Prevent switching to previously used tool when typeing a backspace in document window.


  M +7 -0      docwindow.cpp   1.2.2.1
  M +4 -0      docwindow.h   1.3.2.1
  M +2 -1      uml.cpp   1.85.2.3


--- kdesdk/umbrello/umbrello/docwindow.cpp  #1.2:1.2.2.1
@@ -137,4 +137,11 @@ void DocWindow::newDocumentation( ) {
 }
 
+bool DocWindow::isTyping()
+{
+        if (m_pDocMLE->hasFocus())
+                return true;
+        else
+                return false;
+}
 
 #include "docwindow.moc"

--- kdesdk/umbrello/umbrello/docwindow.h  #1.3:1.3.2.1
@@ -91,4 +91,8 @@ public:
         void newDocumentation( );
 
+        /**
+         * Checks if the user is typing in the documentation edit window
+         */
+        bool isTyping();
 private:
         /**

--- kdesdk/umbrello/umbrello/uml.cpp  #1.85.2.2:1.85.2.3
@@ -1334,4 +1334,5 @@ void UMLApp::keyReleaseEvent(QKeyEvent *
         switch(e->key()) {
                 case Qt::Key_Backspace:
+                        if (!m_pDocWindow->isTyping())
                         toolsbar->setOldTool();
                         e->accept();