From 05c730f38d7dbc06b3f4429db69d647dd61e0432 Mon Sep 17 00:00:00 2001 From: WandererFan Date: Tue, 19 Jan 2016 07:57:33 -0500 Subject: [PATCH] Preferences "Drawing" -> "TechDraw" --- src/Mod/TechDraw/App/DrawHatch.cpp | 2 +- src/Mod/TechDraw/Gui/AppTechDrawGui.cpp | 4 ++-- src/Mod/TechDraw/Gui/CMakeLists.txt | 12 +++++------ ...DlgPrefsDrawing.ui => DlgPrefsTechDraw.ui} | 20 +++++++++---------- ...DrawingImp.cpp => DlgPrefsTechDrawImp.cpp} | 14 ++++++------- ...refsDrawingImp.h => DlgPrefsTechDrawImp.h} | 16 +++++++-------- src/Mod/TechDraw/Gui/Resources/TechDraw.qrc | 2 +- ...s-drawing.svg => preferences-techdraw.svg} | 0 8 files changed, 35 insertions(+), 35 deletions(-) rename src/Mod/TechDraw/Gui/{DlgPrefsDrawing.ui => DlgPrefsTechDraw.ui} (94%) rename src/Mod/TechDraw/Gui/{DlgPrefsDrawingImp.cpp => DlgPrefsTechDrawImp.cpp} (89%) rename src/Mod/TechDraw/Gui/{DlgPrefsDrawingImp.h => DlgPrefsTechDrawImp.h} (82%) rename src/Mod/TechDraw/Gui/Resources/icons/{preferences-drawing.svg => preferences-techdraw.svg} (100%) diff --git a/src/Mod/TechDraw/App/DrawHatch.cpp b/src/Mod/TechDraw/App/DrawHatch.cpp index 7f3cb59e2..7a62b18a2 100644 --- a/src/Mod/TechDraw/App/DrawHatch.cpp +++ b/src/Mod/TechDraw/App/DrawHatch.cpp @@ -54,7 +54,7 @@ DrawHatch::DrawHatch(void) ADD_PROPERTY_TYPE(HatchColor,(0.0f,0.0f,0.0f),vgroup,App::Prop_None,"The color of the hatch area"); 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/patterns"; QString patternDir = QString::fromStdString(hGrp->GetASCII("PatternDir", defaultDir.c_str())); diff --git a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp index faf63b6e7..b1418c2b7 100644 --- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp +++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp @@ -34,7 +34,7 @@ #include "Workbench.h" -#include "DlgPrefsDrawingImp.h" +#include "DlgPrefsTechDrawImp.h" #include "ViewProviderPage.h" #include "ViewProviderDrawingView.h" #include "ViewProviderDimension.h" @@ -105,7 +105,7 @@ void TechDrawGuiExport initTechDrawGui() TechDrawGui::ViewProviderHatch::init(); // register preferences pages - new Gui::PrefPageProducer ("Drawing"); + new Gui::PrefPageProducer ("TechDraw"); // add resources and reloads the translators loadTechDrawResource(); diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 21f0e7574..c70243ab4 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -41,7 +41,7 @@ set(TechDrawGui_MOC_HDRS QGIViewSymbol.h QGIViewClip.h TaskProjGroup.h - DlgPrefsDrawingImp.h + DlgPrefsTechDrawImp.h ) fc_wrap_cpp(TechDrawGui_MOC_SRCS ${TechDrawGui_MOC_HDRS}) @@ -50,7 +50,7 @@ SOURCE_GROUP("Moc" FILES ${TechDrawGui_MOC_SRCS}) qt4_add_resources(TechDrawGui_SRCS Resources/TechDraw.qrc) set(TechDrawGui_UIC_SRCS - DlgPrefsDrawing.ui + DlgPrefsTechDrawImp.ui TaskProjGroup.ui ) @@ -71,9 +71,9 @@ SET(TechDrawGui_SRCS TaskProjGroup.ui TaskProjGroup.cpp TaskProjGroup.h - DlgPrefsDrawing.ui - DlgPrefsDrawingImp.cpp - DlgPrefsDrawingImp.h + DlgPrefsTechDraw.ui + DlgPrefsTechDrawImp.cpp + DlgPrefsTechDrawImp.h ) SET(TechDrawGuiView_SRCS @@ -177,7 +177,7 @@ fc_target_copy_resource(TechDrawGui InitGui.py) SET(TechDrawGuiIcon_SVG - Resources/icons/preferences-drawing.svg + Resources/icons/preferences-techdraw.svg ) fc_copy_sources(TechDrawGui "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}/Mod/TechDraw" ${TechDrawGuiIcon_SVG}) diff --git a/src/Mod/TechDraw/Gui/DlgPrefsDrawing.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui similarity index 94% rename from src/Mod/TechDraw/Gui/DlgPrefsDrawing.ui rename to src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui index 1cdc58d39..b543441a6 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsDrawing.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw.ui @@ -1,7 +1,7 @@ - TechDrawGui::DlgPrefsDrawingImp - + TechDrawGui::DlgPrefsTechDrawImp + 0 @@ -11,7 +11,7 @@ - Drawing + TechDraw @@ -51,7 +51,7 @@ SelectColor - Mod/Drawing/Colors + Mod/TechDraw/Colors @@ -61,7 +61,7 @@ HiddenColor - Mod/Drawing/Colors + Mod/TechDraw/Colors @@ -78,7 +78,7 @@ NormalColor - Mod/Drawing/Colors + Mod/TechDraw/Colors @@ -123,7 +123,7 @@ PreSelectColor - Mod/Drawing/Colors + Mod/TechDraw/Colors @@ -178,7 +178,7 @@ LabelFont - Mod/Drawing + Mod/TechDraw @@ -226,7 +226,7 @@ TemplateDir - /Mod/Drawing + /Mod/TechDraw @@ -266,7 +266,7 @@ TemplateFile - Mod/Drawing + Mod/TechDraw diff --git a/src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp similarity index 89% rename from src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.cpp rename to src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp index afb2d8e3a..45aead0d8 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.cpp @@ -25,23 +25,23 @@ #include "PreCompiled.h" -#include "DlgPrefsDrawingImp.h" +#include "DlgPrefsTechDrawImp.h" #include using namespace TechDrawGui; -DlgPrefsDrawingImp::DlgPrefsDrawingImp( QWidget* parent ) +DlgPrefsTechDrawImp::DlgPrefsTechDrawImp( QWidget* parent ) : PreferencePage( parent ) { this->setupUi(this); } -DlgPrefsDrawingImp::~DlgPrefsDrawingImp() +DlgPrefsTechDrawImp::~DlgPrefsTechDrawImp() { // no need to delete child widgets, Qt does it all for us } -void DlgPrefsDrawingImp::saveSettings() +void DlgPrefsTechDrawImp::saveSettings() { pcb_Normal->onSave(); pcb_Select->onSave(); @@ -52,7 +52,7 @@ void DlgPrefsDrawingImp::saveSettings() pfc_DefDir->onSave(); } -void DlgPrefsDrawingImp::loadSettings() +void DlgPrefsTechDrawImp::loadSettings() { pcb_Normal->onRestore(); pcb_Select->onRestore(); @@ -66,7 +66,7 @@ void DlgPrefsDrawingImp::loadSettings() /** * Sets the strings of the subwidgets using the current language. */ -void DlgPrefsDrawingImp::changeEvent(QEvent *e) +void DlgPrefsTechDrawImp::changeEvent(QEvent *e) { if (e->type() == QEvent::LanguageChange) { retranslateUi(this); @@ -76,4 +76,4 @@ void DlgPrefsDrawingImp::changeEvent(QEvent *e) } } -#include "moc_DlgPrefsDrawingImp.cpp" +#include "moc_DlgPrefsTechDrawImp.cpp" diff --git a/src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.h b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h similarity index 82% rename from src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.h rename to src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h index 1ab64c3a4..a5362628e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsDrawingImp.h +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawImp.h @@ -1,7 +1,7 @@ /************************************************************************** * Copyright (c) 2015 FreeCAD Developers * * Author: WandererFan * - * Based on src/Mod/FEM/Gui/DlgPrefsDrawingImp.cpp * + * Based on src/Mod/FEM/Gui/DlgPrefsTechDrawImp.cpp * * * * This file is part of the FreeCAD CAx development system. * * * @@ -23,21 +23,21 @@ ***************************************************************************/ -#ifndef DRAWINGGUI_DLGPREFSDRAWINGIMP_H -#define DRAWINGGUI_DLGPREFSDRAWINGIMP_H +#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP_H +#define DRAWINGGUI_DLGPREFSTECHDRAWIMP_H -#include "ui_DlgPrefsDrawing.h" +#include "ui_DlgPrefsTechDraw.h" #include namespace TechDrawGui { -class DlgPrefsDrawingImp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsDrawingImp +class DlgPrefsTechDrawImp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDrawImp { Q_OBJECT public: - DlgPrefsDrawingImp( QWidget* parent = 0 ); - ~DlgPrefsDrawingImp(); + DlgPrefsTechDrawImp( QWidget* parent = 0 ); + ~DlgPrefsTechDrawImp(); protected: void saveSettings(); @@ -47,4 +47,4 @@ protected: } // namespace TechDrawGui -#endif // DRAWINGGUI_DLGPREFSDRAWINGIMP_H +#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMP_H diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc index 37ba32e6d..91fc38e45 100644 --- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc +++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc @@ -15,7 +15,7 @@ icons/View.svg icons/Section.svg icons/PageTemplate.svg - icons/preferences-drawing.svg + icons/preferences-techdraw.svg icons/actions/document-new.png icons/actions/document-new.svg icons/actions/techdraw-new-default.svg diff --git a/src/Mod/TechDraw/Gui/Resources/icons/preferences-drawing.svg b/src/Mod/TechDraw/Gui/Resources/icons/preferences-techdraw.svg similarity index 100% rename from src/Mod/TechDraw/Gui/Resources/icons/preferences-drawing.svg rename to src/Mod/TechDraw/Gui/Resources/icons/preferences-techdraw.svg