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

List:       kde-commits
Subject:    koffice/libs/flake/tools
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2009-02-28 22:57:15
Message-ID: 1235861835.871832.557.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 933447 by jaham:

do not add action to the action collection as suggested by Thomas



 M  +1 -2      KoPathTool.cpp  
 M  +3 -1      PathToolOptionWidget.cpp  


--- trunk/koffice/libs/flake/tools/KoPathTool.cpp #933446:933447
@@ -130,8 +130,7 @@
 
     // TODO: implement me
     m_actionMergePoints = new KAction(KIcon("pathpoint-merge"), i18n("Merge points"), this);
-    m_actionMergePoints->setEnabled(false); // not implemented yet.
-    addAction("pathpoint-merge", m_actionMergePoints);
+    //addAction("pathpoint-merge", m_actionMergePoints);
 
     m_actionConvertToPath = new KAction(KIcon("convert-to-path"), i18n("To Path"), this);
     m_actionConvertToPath->setShortcut(Qt::Key_P);
--- trunk/koffice/libs/flake/tools/PathToolOptionWidget.cpp #933446:933447
@@ -37,7 +37,9 @@
     widget.breakPoint->setDefaultAction(tool->action("path-break-point"));
     widget.breakSegment->setDefaultAction(tool->action("path-break-segment"));
     widget.joinSegment->setDefaultAction(tool->action("pathpoint-join"));
-    widget.mergePoints->setDefaultAction(tool->action("pathpoint-merge"));
+    // TODO: reenable again when action is implemented
+    //widget.mergePoints->setDefaultAction(tool->action("pathpoint-merge"));
+    widget.mergePoints->setVisible(false);
 
     connect(widget.convertToPath, SIGNAL(released()), tool->action("convert-to-path"), SLOT(trigger()));
 }
[prev in list] [next in list] [prev in thread] [next in thread]