From ccdb56c06e413b2e2bbab89277c45202752ac30b Mon Sep 17 00:00:00 2001 From: WandererFan Date: Thu, 21 Jan 2016 13:46:48 -0500 Subject: [PATCH] use Mod/TechDraw for preferences --- src/Mod/TechDraw/App/DrawViewAnnotation.cpp | 2 +- src/Mod/TechDraw/App/DrawViewDimension.cpp | 2 +- src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp | 1 - src/Mod/TechDraw/Gui/Command.cpp | 4 ++-- src/Mod/TechDraw/Gui/QGIEdge.cpp | 2 +- src/Mod/TechDraw/Gui/QGIFace.cpp | 2 +- src/Mod/TechDraw/Gui/QGIHatch.cpp | 2 +- src/Mod/TechDraw/Gui/QGIVertex.cpp | 2 +- src/Mod/TechDraw/Gui/QGIView.cpp | 4 ++-- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 4 ++-- 10 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp index b05030385..ffe63105e 100644 --- a/src/Mod/TechDraw/App/DrawViewAnnotation.cpp +++ b/src/Mod/TechDraw/App/DrawViewAnnotation.cpp @@ -54,7 +54,7 @@ DrawViewAnnotation::DrawViewAnnotation(void) static const char *vgroup = "Annotation"; Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); std::string fontName = hGrp->GetASCII("LabelFont", "osifont"); ADD_PROPERTY_TYPE(Text ,("Default Text"),vgroup,App::Prop_None,"The text to be displayed"); diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index 39a90c212..6f2b9a0c4 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -79,7 +79,7 @@ enum RefType{ DrawViewDimension::DrawViewDimension(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); std::string fontName = hGrp->GetASCII("LabelFont", "osifont"); ADD_PROPERTY_TYPE(References,(0,0),"Dimension",(App::PropertyType)(App::Prop_None),"Dimension Supporting References"); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp index 7e943489c..0973a0213 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGuiPy.cpp @@ -31,7 +31,6 @@ #include "MDIViewPage.h" #include #include -//#include #include #include diff --git a/src/Mod/TechDraw/Gui/Command.cpp b/src/Mod/TechDraw/Gui/Command.cpp index 346bd4f87..fbfaf51a9 100644 --- a/src/Mod/TechDraw/Gui/Command.cpp +++ b/src/Mod/TechDraw/Gui/Command.cpp @@ -97,7 +97,7 @@ CmdTechDrawNewPageDef::CmdTechDrawNewPageDef() void CmdTechDrawNewPageDef::activated(int iMsg) { Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/Templates"; QString templateDir = QString::fromStdString(hGrp->GetASCII("TemplateDir", defaultDir.c_str())); @@ -166,7 +166,7 @@ CmdTechDrawNewPage::CmdTechDrawNewPage() void CmdTechDrawNewPage::activated(int iMsg) { Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); std::string defaultDir = App::Application::getResourceDir() + "Mod/Drawing/Templates"; QString templateDir = QString::fromStdString(hGrp->GetASCII("TemplateDir", defaultDir.c_str())); diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp index 791cc4e3a..9f53042c6 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.cpp +++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp @@ -59,7 +59,7 @@ QGIEdge::QGIEdge(int index) : isSmoothEdge = false; Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); diff --git a/src/Mod/TechDraw/Gui/QGIFace.cpp b/src/Mod/TechDraw/Gui/QGIFace.cpp index 97aaf4506..3ea966522 100644 --- a/src/Mod/TechDraw/Gui/QGIFace.cpp +++ b/src/Mod/TechDraw/Gui/QGIFace.cpp @@ -54,7 +54,7 @@ QGIFace::QGIFace(int ref) : setAcceptHoverEvents(true); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); diff --git a/src/Mod/TechDraw/Gui/QGIHatch.cpp b/src/Mod/TechDraw/Gui/QGIHatch.cpp index b6e9cb4ce..c26f910aa 100644 --- a/src/Mod/TechDraw/Gui/QGIHatch.cpp +++ b/src/Mod/TechDraw/Gui/QGIHatch.cpp @@ -65,7 +65,7 @@ QGIHatch::QGIHatch(std::string parentHatch) : setCacheMode(QGraphicsItem::NoCache); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); diff --git a/src/Mod/TechDraw/Gui/QGIVertex.cpp b/src/Mod/TechDraw/Gui/QGIVertex.cpp index bcb1efcfb..4c78d71f6 100644 --- a/src/Mod/TechDraw/Gui/QGIVertex.cpp +++ b/src/Mod/TechDraw/Gui/QGIVertex.cpp @@ -52,7 +52,7 @@ QGIVertex::QGIVertex(int index) : setAcceptHoverEvents(true); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index ca8a3ec6d..1d934eb8d 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -70,7 +70,7 @@ QGIView::QGIView(const QPoint &pos, QGraphicsScene *scene) setPos(pos); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); @@ -81,7 +81,7 @@ QGIView::QGIView(const QPoint &pos, QGraphicsScene *scene) m_colCurrent = m_colNormal; m_pen.setColor(m_colCurrent); - hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing"); + hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw"); std::string fontName = hGrp->GetASCII("LabelFont", "osifont"); m_font.setFamily(QString::fromStdString(fontName)); m_font.setPointSize(5.0); //scene units (mm), not points diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index ffddb0fb3..533b69116 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -89,7 +89,7 @@ QGIDatumLabel::QGIDatumLabel(int ref, QGraphicsScene *scene ) : reference(ref) setAcceptHoverEvents(true); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00)); @@ -194,7 +194,7 @@ QGIViewDimension::QGIViewDimension(const QPoint &pos, QGraphicsScene *scene) : pen.setWidthF(1.); Base::Reference hGrp = App::GetApplication().GetUserParameter() - .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Drawing/Colors"); + .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Colors"); App::Color fcColor = App::Color((uint32_t) hGrp->GetUnsigned("NormalColor", 0x00000000)); m_colNormal = fcColor.asQColor(); fcColor.setPackedValue(hGrp->GetUnsigned("SelectColor", 0x0000FF00));