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

List:       kde-commits
Subject:    koffice/kivio
From:       Peter Simonsson <psn () linux ! se>
Date:       2006-01-18 16:31:29
Message-ID: 1137601889.438182.30667.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 499755 by psn:

It should only be possible to move guidelines when using the select tool


 M  +1 -1      kiviopart/addstenciltool.cpp  
 M  +14 -7     kiviopart/kivio_canvas.cpp  
 M  +1 -1      kiviopart/ui/kivio_birdeye_panel.cpp  
 M  +3 -3      plugins/kivioselecttool/tool_select.cpp  


--- trunk/koffice/kivio/kiviopart/addstenciltool.cpp #499754:499755
@@ -98,7 +98,7 @@
     view()->canvasWidget()->setCursor(Qt::CrossCursor);
     emit activated(this);
   } else {
-    view()->canvasWidget()->setCursor(Qt::ArrowCursor);
+    view()->canvasWidget()->unsetCursor();
     m_spawner = 0;
     delete m_stencil;
     m_stencil = 0;
--- trunk/koffice/kivio/kiviopart/kivio_canvas.cpp #499754:499755
@@ -424,7 +424,9 @@
       return;
     }
 
-    if(m_pView->isShowGuides()) {
+    Kivio::PluginManager* pluginManager = view()->pluginManager();
+
+    if(m_pView->isShowGuides() && (!pluginManager || (pluginManager->defaultTool() == \
pluginManager->activeTool()))) {  if(m_guides.mousePressEvent(e)) {
         delegateThisEvent = false;
         return;
@@ -437,9 +439,13 @@
   if(!m_pDoc->isReadWrite())
     return;
 
-  if(view()->isShowGuides() && m_guides.mouseReleaseEvent(e)) {
-    delegateThisEvent = false;
-    return;
+  Kivio::PluginManager* pluginManager = view()->pluginManager();
+
+  if(view()->isShowGuides() && (!pluginManager || (pluginManager->defaultTool() == \
pluginManager->activeTool()))) { +    if(m_guides.mouseReleaseEvent(e)) {
+      delegateThisEvent = false;
+      return;
+    }
   }
 }
 
@@ -451,9 +457,10 @@
   if(m_pasteMoving) {
     continuePasteMoving(e->pos());
   } else {
-    if(m_pView->isShowGuides())
-    {
-      m_guides.mouseMoveEvent(e);
+    Kivio::PluginManager* pluginManager = view()->pluginManager();
+
+    if(m_pView->isShowGuides() && (!pluginManager || (pluginManager->defaultTool() == \
pluginManager->activeTool()))) { +      delegateThisEvent = !m_guides.mouseMoveEvent(e);
     }
   }
 
--- trunk/koffice/kivio/kiviopart/ui/kivio_birdeye_panel.cpp #499754:499755
@@ -231,7 +231,7 @@
     return;
   }
 
-  canvas->setCursor(arrowCursor);
+  canvas->unsetCursor();
   handlePress = false;
 }
 
--- trunk/koffice/kivio/plugins/kivioselecttool/tool_select.cpp #499754:499755
@@ -150,7 +150,7 @@
 {
   if(a) {
     m_selectAction->setChecked(true);
-    view()->canvasWidget()->setCursor(arrowCursor);
+    view()->canvasWidget()->unsetCursor();
     m_mode = stmNone;
     emit activated(this);
   } else if(m_selectAction->isChecked()) {
@@ -605,7 +605,7 @@
   }
 
   if(!hit) {
-    pagePoint = canvas->snapToGrid( pagePoint );
+    pagePoint = canvas->snapToGridAndGuides( pagePoint );
   }
 
   KivioCustomDragData data;
@@ -865,7 +865,7 @@
     pStencil = canvas->activePage()->selectedStencils()->next();
   }
 
-  canvas->setCursor( arrowCursor );
+  canvas->unsetCursor();
 }
 
 


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