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

List:       kde-commits
Subject:    branches/KDE/3.5/kdegraphics/kolourpaint
From:       Clarence Dang <dang () kde ! org>
Date:       2007-10-07 6:01:36
Message-ID: 1191736896.158735.854.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 722290 by dang:

End the current shape in more kpMainWindow slots.

[BACKPORT from trunk/]


 M  +3 -0      kpmainwindow_file.cpp  
 M  +5 -0      kpmainwindow_help.cpp  
 M  +9 -0      kpmainwindow_settings.cpp  


--- branches/KDE/3.5/kdegraphics/kolourpaint/kpmainwindow_file.cpp #722289:722290
@@ -1234,6 +1234,9 @@
 // private slot
 void kpMainWindow::slotMail ()
 {
+    if (toolHasBegunShape ())
+        tool ()->endShapeInternal ();
+
     if (m_document->url ().isEmpty ()/*no name*/ ||
         !m_document->isFromURL () ||
         m_document->isModified ()/*needs to be saved*/)
--- branches/KDE/3.5/kdegraphics/kolourpaint/kpmainwindow_help.cpp #722289:722290
@@ -39,7 +39,9 @@
 #include <klocale.h>
 #include <kshortcut.h>
 
+#include <kptool.h>
 
+
 // private
 void kpMainWindow::setupHelpMenuActions ()
 {
@@ -102,7 +104,10 @@
     kdDebug () << "kpMainWindow::slotHelpTakingScreenshots()" << endl;
 #endif
 
+    if (toolHasBegunShape ())
+        tool ()->endShapeInternal ();
 
+
     // TODO: Totally bogus logic if kwin not running under same user as KolourPaint.
     // SYNC: KWin contains PrintScreen key logic
     QCStringList dcopApps = KApplication::dcopClient ()->registeredApplications ();
--- branches/KDE/3.5/kdegraphics/kolourpaint/kpmainwindow_settings.cpp #722289:722290
@@ -40,6 +40,7 @@
 
 #include <kpdefs.h>
 #include <kpdocument.h>
+#include <kptool.h>
 #include <kptooltoolbar.h>
 
 
@@ -130,6 +131,10 @@
     kdDebug () << "kpMainWindow::slotKeyBindings()" << endl;
 #endif
 
+    if (toolHasBegunShape ())
+        tool ()->endShapeInternal ();
+
+
     bool singleKeyTriggersDisabled = !actionsSingleKeyTriggersEnabled ();
 
     if (singleKeyTriggersDisabled)
@@ -156,6 +161,10 @@
     kdDebug () << "kpMainWindow::slotConfigureToolBars()" << endl;
 #endif
 
+    if (toolHasBegunShape ())
+        tool ()->endShapeInternal ();
+
+
     //saveMainWindowSettings (kapp->config (), autoSaveGroup ());
 
     KEditToolbar dialog (actionCollection (),
[prev in list] [next in list] [prev in thread] [next in thread]