From 694c409cafcfb4e7ed57b6c17e690a85a88f5a9f Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 13 Sep 2015 23:24:12 +0200 Subject: [PATCH] + minor changes --- src/Mod/Sketcher/Gui/CommandConstraints.cpp | 9 ++++++--- src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp | 1 + src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp index 789f1e0d4..84901095b 100644 --- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp +++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp @@ -65,13 +65,16 @@ ConstraintCreationMode constraintCreationMode=Driving; bool isCreateConstraintActive(Gui::Document *doc) { - if (doc) + if (doc) { // checks if a Sketch Viewprovider is in Edit and is in no special mode - if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom(SketcherGui::ViewProviderSketch::getClassTypeId())) + if (doc->getInEdit() && doc->getInEdit()->isDerivedFrom(SketcherGui::ViewProviderSketch::getClassTypeId())) { if (dynamic_cast(doc->getInEdit()) - ->getSketchMode() == ViewProviderSketch::STATUS_NONE) + ->getSketchMode() == ViewProviderSketch::STATUS_NONE) { if (Gui::Selection().countObjectsOfType(Sketcher::SketchObject::getClassTypeId()) > 0) return true; + } + } + } return false; } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp index de1a9a7d6..0d302fb70 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherConstrains.cpp @@ -192,6 +192,7 @@ void ConstraintView::modifyCurrentItem() void ConstraintView::renameCurrentItem() { + // See also TaskSketcherConstrains::on_listWidgetConstraints_itemChanged QListWidgetItem* item = currentItem(); if (item) editItem(item); diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index bb528f630..25348399c 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -853,7 +853,8 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe << "Sketcher_External" << "Sketcher_ToggleConstruction" /*<< "Sketcher_CreateText"*/ - /*<< "Sketcher_CreateDraftLine"*/; + /*<< "Sketcher_CreateDraftLine"*/ + << "Separator"; Gui::Application::Instance->setupContextMenu("View", geom); //Create the Context Menu using the Main View Qt Widget