Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

src/Gui/CommandDoc.cpp

@@ -52,6 +52,8 @@
 #include "Placement.h"
 #include "WaitCursor.h"
 #include "ViewProvider.h"
+#include <Gui/View3DInventor.h>
+#include <Gui/View3DInventorViewer.h>
 #include "MergeDocuments.h"
 
 using namespace Gui;
@@ -1022,6 +1024,46 @@ bool StdCmdPlacement::isActive(void)
     return (Gui::Control().activeDialog()==0);
 }
 
+//===========================================================================
+// Std_Edit
+//===========================================================================
+DEF_STD_CMD_A(StdCmdEdit);
+
+StdCmdEdit::StdCmdEdit()
+  :Command("Std_Edit")
+{
+  sGroup        = QT_TR_NOOP("Edit");
+  sMenuText     = QT_TR_NOOP("Toggle &Editmode");
+  sToolTipText  = QT_TR_NOOP("Toggles the selected object's edit mode");
+  sWhatsThis    = "Std_Edit";
+  sStatusTip    = QT_TR_NOOP("Enters or leaves the selected object's edit mode");
+#if QT_VERSION >= 0x040200
+  sPixmap       = "edit-edit";
+#endif
+  eType         = ForEdit;
+}
+
+void StdCmdEdit::activated(int iMsg)
+{
+    Gui::MDIView* view = Gui::getMainWindow()->activeWindow();
+    if (view && view->isDerivedFrom(Gui::View3DInventor::getClassTypeId())) {
+        Gui::View3DInventorViewer* viewer = static_cast<Gui::View3DInventor*>(view)->getViewer();
+        if (viewer->isEditingViewProvider()) {
+            doCommand(Command::Gui,"Gui.activeDocument().resetEdit()");
+        } else {
+            if (Selection().getCompleteSelection().size() > 0) {
+                SelectionSingleton::SelObj obj = Selection().getCompleteSelection()[0];
+                doCommand(Command::Gui,"Gui.activeDocument().setEdit(\"%s\",0)",obj.FeatName);
+            }
+        }
+    }
+}
+
+bool StdCmdEdit::isActive(void)
+{
+    return (Selection().getCompleteSelection().size() > 0) || (Gui::Control().activeDialog() != 0);
+}
+
 
 namespace Gui {
 
@@ -1054,6 +1096,7 @@ void CreateDocCommands(void)
     rcCmdMgr.addCommand(new StdCmdRefresh());
     rcCmdMgr.addCommand(new StdCmdTransform());
     rcCmdMgr.addCommand(new StdCmdPlacement());
+    rcCmdMgr.addCommand(new StdCmdEdit());
 }
 
 } // namespace Gui

src/Gui/Icons/resource.qrc

@@ -45,6 +45,7 @@
         <file>edit-select-all.svg</file>
         <file>edit-redo.svg</file>
         <file>edit-undo.svg</file>
+        <file>edit-edit.svg</file>
         <file>help-browser.svg</file>
         <file>preferences-system.svg</file>
         <file>window-new.svg</file>

src/Gui/Workbench.cpp

@@ -440,7 +440,7 @@ MenuItem* StdWorkbench::setupMenuBar() const
     *edit << "Std_Undo" << "Std_Redo" << "Separator" << "Std_Cut" << "Std_Copy"
           << "Std_Paste" << "Std_DuplicateSelection" << "Separator"
           << "Std_Refresh" << "Std_SelectAll" << "Std_Delete" << "Std_Placement"
-          << "Separator" << "Std_DlgPreferences";
+          << "Std_Edit" << "Separator" << "Std_DlgPreferences";
 
     // Standard views
     MenuItem* stdviews = new MenuItem;

src/Mod/Arch/ArchAxis.py

@@ -340,10 +340,9 @@ class _AxisTaskPanel:
         self.obj.Angles = a
         FreeCAD.ActiveDocument.recompute()
     
-    def finish(self):
+    def accept(self):
         self.resetObject()
-        if self.obj:
-            self.obj.ViewObject.finishEditing()
+        FreeCADGui.ActiveDocument.resetEdit()
                     
     def retranslateUi(self, TaskPanel):
         TaskPanel.setWindowTitle(QtGui.QApplication.translate("Arch", "Axes", None, QtGui.QApplication.UnicodeUTF8))

src/Mod/Arch/ArchComponent.py

@@ -222,8 +222,7 @@ class ComponentTaskPanel:
 
     def accept(self):
         FreeCAD.ActiveDocument.recompute()
-        if self.obj:
-            self.obj.ViewObject.finishEditing()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
 
     def editObject(self,wid,col):
@@ -308,7 +307,7 @@ class ViewProviderComponent:
     
     def unsetEdit(self,vobj,mode):
         FreeCADGui.Control.closeDialog()
-        return
+        return False
 
 class ArchSelectionObserver:
     def __init__(self,origin,watched):

src/Mod/Draft/DraftGui.py

@@ -147,12 +147,10 @@ class DraftTaskPanel:
     def getStandardButtons(self):
         return int(QtGui.QDialogButtonBox.Cancel)
     def accept(self):
-        if FreeCAD.activeDraftCommand:
-            FreeCAD.activeDraftCommand.finish()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
     def reject(self):
-        if FreeCAD.activeDraftCommand:
-            FreeCAD.activeDraftCommand.finish()
+        FreeCADGui.ActiveDocument.resetEdit()
         return True
   
 class DraftToolBar: