From 41d0007fc477868ccd17f321c4a615d1693cf6b6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 18 Sep 2012 16:24:50 +0200 Subject: [PATCH] Avoid to activate wrong MDI view, show fillet/chamfer tools for selected edges --- src/Gui/TaskView/TaskView.cpp | 3 +++ src/Mod/PartDesign/Gui/Workbench.cpp | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp index b311de8d2..e9551fb5f 100644 --- a/src/Gui/TaskView/TaskView.cpp +++ b/src/Gui/TaskView/TaskView.cpp @@ -132,6 +132,9 @@ public: const QString &title, QWidget *parent = 0) : iisIconLabel(icon, title, parent) { + // do not allow to get the focus because when hiding the task box + // it could cause to activate another MDI view. + setFocusPolicy(Qt::NoFocus); } void setTitle(const QString &text) { myText = text; diff --git a/src/Mod/PartDesign/Gui/Workbench.cpp b/src/Mod/PartDesign/Gui/Workbench.cpp index b4bbff345..9f9c4f0c3 100644 --- a/src/Mod/PartDesign/Gui/Workbench.cpp +++ b/src/Mod/PartDesign/Gui/Workbench.cpp @@ -69,6 +69,17 @@ void Workbench::activated() //Watcher.push_back(new TaskWatcherRobot); + const char* Edge[] = { + "PartDesign_Fillet", + "PartDesign_Chamfer", + 0}; + Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( + "SELECT Part::Feature SUBELEMENT Edge COUNT 1..", + Edge, + "Edge tools", + "Part_Box" + )); + const char* Face[] = { "Sketcher_NewSketch", "PartDesign_Fillet", @@ -81,6 +92,17 @@ void Workbench::activated() "Part_Box" )); + const char* Faces[] = { + "PartDesign_Fillet", + "PartDesign_Chamfer", + 0}; + Watcher.push_back(new Gui::TaskView::TaskWatcherCommands( + "SELECT Part::Feature SUBELEMENT Face COUNT 2..", + Faces, + "Face tools", + "Part_Box" + )); + const char* Sketch[] = { "Sketcher_NewSketch", "PartDesign_Pad",