From cb25c494de8d00c7ddc29f498bb379224c1b8a78 Mon Sep 17 00:00:00 2001
From: WandererFan <wandererfan@gmail.com>
Date: Sun, 17 Jan 2016 12:15:52 -0500
Subject: [PATCH] misc /Mod/Drawing, QGI, obs functions

---
 src/Mod/TechDraw/Gui/TaskProjGroup.cpp     | 8 ++++----
 src/Mod/TechDraw/Gui/TemplateTextField.cpp | 2 +-
 src/Mod/TechDraw/Gui/TemplateTextField.h   | 2 +-
 src/Mod/TechDraw/Gui/Workbench.cpp         | 9 +++------
 src/Mod/TechDraw/InitGui.py                | 9 +++------
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
index 7e6c0125b..d905da2b3 100644
--- a/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
+++ b/src/Mod/TechDraw/Gui/TaskProjGroup.cpp
@@ -35,11 +35,11 @@
 
 #include <Mod/Part/App/PartFeature.h>
 
-#include <Mod/Drawing/App/DrawPage.h>
-#include <Mod/Drawing/App/DrawViewPart.h>
+#include <Mod/TechDraw/App/DrawPage.h>
+#include <Mod/TechDraw/App/DrawViewPart.h>
 
-#include <Mod/Drawing/App/DrawProjGroupItem.h>
-#include <Mod/Drawing/App/DrawProjGroup.h>
+#include <Mod/TechDraw/App/DrawProjGroupItem.h>
+#include <Mod/TechDraw/App/DrawProjGroup.h>
 
 #include "TaskProjGroup.h"
 #include "ui_TaskProjGroup.h"
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.cpp b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
index 6351783fd..3deded85f 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.cpp
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.cpp
@@ -33,7 +33,7 @@
 
 using namespace TechDrawGui;
 
-TemplateTextField::TemplateTextField(QGI *parent,
+TemplateTextField::TemplateTextField(QGraphicsItem*parent,
                                      TechDraw::DrawTemplate *myTmplte,
                                      const std::string &myFieldName)
     : QGraphicsRectItem(parent), tmplte(myTmplte), fieldNameStr(myFieldName)
diff --git a/src/Mod/TechDraw/Gui/TemplateTextField.h b/src/Mod/TechDraw/Gui/TemplateTextField.h
index 977c09914..c893d16c2 100644
--- a/src/Mod/TechDraw/Gui/TemplateTextField.h
+++ b/src/Mod/TechDraw/Gui/TemplateTextField.h
@@ -45,7 +45,7 @@ namespace TechDrawGui
     class TechDrawGuiExport TemplateTextField : public QGraphicsRectItem
     {
         public:
-            TemplateTextField(QGI *parent,
+            TemplateTextField(QGraphicsItem*parent,
                               TechDraw::DrawTemplate *myTmplte,
                               const std::string &myFieldName);
 
diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp
index d9aa5f829..fd03ab41b 100644
--- a/src/Mod/TechDraw/Gui/Workbench.cpp
+++ b/src/Mod/TechDraw/Gui/Workbench.cpp
@@ -76,8 +76,8 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     *draw << "Drawing_NewDimension";
     //*part << "Drawing_DraftView";
     *draw << "Drawing_ExportPage";
-    *draw << "Separator";
-    *draw << "Drawing_ProjectShape";
+    //*draw << "Separator";
+    //*draw << "Drawing_ProjectShape";
 
     return root;
 }
@@ -117,7 +117,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
     file->setCommand("Drawing File Access");
     *file << "Drawing_ExportPage";
     *file << "Drawing_Symbol";
-
+
     Gui::ToolBarItem *decor = new Gui::ToolBarItem(root);
     decor->setCommand("Drawing Decoration");
     *decor << "Drawing_NewHatch";
@@ -163,9 +163,6 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
     Gui::ToolBarItem *decor = new Gui::ToolBarItem(root);
     decor->setCommand("Drawing Decoration");
     *decor << "Drawing_NewHatch";
-
-//     *img << "Drawing_OpenBrowserView";
-//     *img << "Drawing_DraftView";
 
     return root;
 }
diff --git a/src/Mod/TechDraw/InitGui.py b/src/Mod/TechDraw/InitGui.py
index 9f18c0463..b6eaa85f3 100644
--- a/src/Mod/TechDraw/InitGui.py
+++ b/src/Mod/TechDraw/InitGui.py
@@ -33,9 +33,9 @@
 class DrawingWorkbench (Workbench):
     "Drawing workbench object"
     def __init__(self):
-        self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/Drawing/Resources/icons/preferences-drawing.svg"
-        self.__class__.MenuText = "Drawing"
-        self.__class__.ToolTip = "Drawing workbench"
+        self.__class__.Icon = FreeCAD.getResourceDir() + "Mod/TechDraw/Resources/icons/preferences-drawing.svg"
+        self.__class__.MenuText = "TechDraw"
+        self.__class__.ToolTip = "Technical Drawing workbench"
 
 
     def Initialize(self):
@@ -46,6 +46,3 @@ class DrawingWorkbench (Workbench):
 
 Gui.addWorkbench(DrawingWorkbench())
 
-# Append the open handler
-FreeCAD.addImportType("Drawing (*.svg *.svgz)","TechDrawGui")
-FreeCAD.addExportType("Drawing (*.svg *.svgz *.dxf)","TechDrawGui")