give all preferences dialogs a clear name

The numbering was somewhat artificial.
2020-04-14 00:31:18 +02:00
parent 79f7986eb9
commit ac82f6ca4a
11 changed files with 73 additions and 76 deletions
--- a/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
+++ b/src/Mod/TechDraw/Gui/AppTechDrawGui.cpp
@@ -40,12 +40,12 @@
 #include "MDIViewPage.h"

 #include "DlgPrefsTechDrawGeneralImp.h"
-#include "DlgPrefsTechDraw2Imp.h"
+#include "DlgPrefsTechDrawscaleImp.h"
 #include "DlgPrefsTechDrawAnnotationImp.h"
 #include "DlgPrefsTechDrawDimensionsImp.h"
 #include "DlgPrefsTechDrawColorsImp.h"
-#include "DlgPrefsTechDraw4Imp.h"
-#include "DlgPrefsTechDraw5Imp.h"
+#include "DlgPrefsTechDrawAdvancedImp.h"
+#include "DlgPrefsTechDrawHLRImp.h"
 #include "ViewProviderPage.h"
 #include "ViewProviderDrawingView.h"
 #include "ViewProviderDimension.h"
@@ -151,13 +151,13 @@ PyMOD_INIT_FUNC(TechDrawGui)
    TechDrawGui::ViewProviderCosmeticExtension::init();

    // register preferences pages
-    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawGeneralImp> ("TechDraw");  //General
-    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw2Imp> ("TechDraw");  //Scale
+    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawGeneralImp> ("TechDraw");    //General
+    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawScaleImp> ("TechDraw");      //Scale
    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawDimensionsImp>("TechDraw");  //Dimensions
    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawAnnotationImp> ("TechDraw"); //Annotation
-    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawColorsImp>("TechDraw");  //Colors
-    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw5Imp> ("TechDraw");  //HLR
-    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDraw4Imp> ("TechDraw");  //Advanced
+    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawColorsImp>("TechDraw");      //Colors
+    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawHLRImp> ("TechDraw");        //HLR
+    new Gui::PrefPageProducer<TechDrawGui::DlgPrefsTechDrawAdvancedImp> ("TechDraw");   //Advanced

    // add resources and reloads the translators
    loadTechDrawResource();
--- a/src/Mod/TechDraw/Gui/CMakeLists.txt
+++ b/src/Mod/TechDraw/Gui/CMakeLists.txt
@@ -45,12 +45,12 @@ set(TechDrawGui_MOC_HDRS
    QGIViewBalloon.h
    TaskProjGroup.h
    DlgPrefsTechDrawGeneralImp.h
-    DlgPrefsTechDraw2Imp.h
+    DlgPrefsTechDrawscaleImp.h
    DlgPrefsTechDrawAnnotationImp.h
    DlgPrefsTechDrawDimensionsImp.h
    DlgPrefsTechDrawColorsImp.h
-    DlgPrefsTechDraw4Imp.h
-    DlgPrefsTechDraw5Imp.h
+    DlgPrefsTechDrawAdvancedImp.h
+    DlgPrefsTechDrawHLRImp.h
    TaskLinkDim.h
    DlgTemplateField.h
    TaskSectionView.h
@@ -87,12 +87,12 @@ endif()

 set(TechDrawGui_UIC_SRCS
    DlgPrefsTechDrawGeneral.ui
-    DlgPrefsTechDraw2.ui
+    DlgPrefsTechDrawscale.ui
    DlgPrefsTechDrawAnnotation.ui
    DlgPrefsTechDrawDimensions.ui
    DlgPrefsTechDrawColors.ui
-    DlgPrefsTechDraw4.ui
-    DlgPrefsTechDraw5.ui
+    DlgPrefsTechDrawAdvanced.ui
+    DlgPrefsTechDrawHLR.ui
    TaskProjGroup.ui
    TaskLinkDim.ui
    DlgTemplateField.ui
@@ -152,9 +152,9 @@ SET(TechDrawGui_SRCS
    DlgPrefsTechDrawGeneral.ui
    DlgPrefsTechDrawGeneralImp.cpp
    DlgPrefsTechDrawGeneralImp.h
-    DlgPrefsTechDraw2.ui
-    DlgPrefsTechDraw2Imp.cpp
-    DlgPrefsTechDraw2Imp.h
+    DlgPrefsTechDrawscale.ui
+    DlgPrefsTechDrawscaleImp.cpp
+    DlgPrefsTechDrawscaleImp.h
    DlgPrefsTechDrawAnnotation.ui
    DlgPrefsTechDrawAnnotationImp.cpp
    DlgPrefsTechDrawAnnotationImp.h
@@ -164,12 +164,12 @@ SET(TechDrawGui_SRCS
    DlgPrefsTechDrawColors.ui
    DlgPrefsTechDrawColorsImp.cpp
    DlgPrefsTechDrawColorsImp.h
-    DlgPrefsTechDraw4.ui
-    DlgPrefsTechDraw4Imp.cpp
-    DlgPrefsTechDraw4Imp.h
-    DlgPrefsTechDraw5.ui
-    DlgPrefsTechDraw5Imp.cpp
-    DlgPrefsTechDraw5Imp.h
+    DlgPrefsTechDrawAdvanced.ui
+    DlgPrefsTechDrawAdvancedImp.cpp
+    DlgPrefsTechDrawAdvancedImp.h
+    DlgPrefsTechDrawHLR.ui
+    DlgPrefsTechDrawHLRImp.cpp
+    DlgPrefsTechDrawHLRImp.h
    TaskLinkDim.ui
    TaskLinkDim.cpp
    TaskLinkDim.h
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TechDrawGui::DlgPrefsTechDraw4Imp</class>
- <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDraw4Imp">
+ <class>TechDrawGui::DlgPrefsTechDrawAdvancedImp</class>
+ <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDrawAdvancedImp">
  <property name="geometry">
   <rect>
    <x>0</x>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp
@@ -25,23 +25,23 @@

 #include "PreCompiled.h"

-#include "DlgPrefsTechDraw4Imp.h"
+#include "DlgPrefsTechDrawAdvancedImp.h"
 #include <Gui/PrefWidgets.h>

 using namespace TechDrawGui;

-DlgPrefsTechDraw4Imp::DlgPrefsTechDraw4Imp( QWidget* parent )
+DlgPrefsTechDrawAdvancedImp::DlgPrefsTechDrawAdvancedImp( QWidget* parent )
  : PreferencePage( parent )
 {
    this->setupUi(this);
 }

-DlgPrefsTechDraw4Imp::~DlgPrefsTechDraw4Imp()
+DlgPrefsTechDrawAdvancedImp::~DlgPrefsTechDrawAdvancedImp()
 {
    // no need to delete child widgets, Qt does it all for us
 }

-void DlgPrefsTechDraw4Imp::saveSettings()
+void DlgPrefsTechDrawAdvancedImp::saveSettings()
 {
    cbEndCap->onSave();
    cbCrazyEdges->onSave();
@@ -56,7 +56,7 @@ void DlgPrefsTechDraw4Imp::saveSettings()
    leFormatSpec->onSave();
 }

-void DlgPrefsTechDraw4Imp::loadSettings()
+void DlgPrefsTechDrawAdvancedImp::loadSettings()
 {
    cbEndCap->onRestore();
    cbCrazyEdges->onRestore();
@@ -74,7 +74,7 @@ void DlgPrefsTechDraw4Imp::loadSettings()
 /**
 * Sets the strings of the subwidgets using the current language.
 */
-void DlgPrefsTechDraw4Imp::changeEvent(QEvent *e)
+void DlgPrefsTechDrawAdvancedImp::changeEvent(QEvent *e)
 {
    if (e->type() == QEvent::LanguageChange) {
        saveSettings();
@@ -86,4 +86,4 @@ void DlgPrefsTechDraw4Imp::changeEvent(QEvent *e)
    }
 }

-#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDraw4Imp.cpp>
+#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDrawAdvancedImp.cpp>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.h
@@ -1,7 +1,6 @@
 /**************************************************************************
 *   Copyright (c) 2015 FreeCAD Developers                                 *
 *   Author: WandererFan <wandererfan@gmail.com>                           *
- *   Based on src/Mod/FEM/Gui/DlgPrefsTechDraw5Imp.cpp                     *
 *                                                                         *
 *   This file is part of the FreeCAD CAx development system.              *
 *                                                                         *
@@ -23,21 +22,21 @@
 ***************************************************************************/


-#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP5_H
-#define DRAWINGGUI_DLGPREFSTECHDRAWIMP5_H
+#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H
+#define DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H

-#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDraw5.h>
+#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDrawAdvanced.h>
 #include <Gui/PropertyPage.h>

 namespace TechDrawGui {

-class DlgPrefsTechDraw5Imp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDraw5Imp
+class DlgPrefsTechDrawAdvancedImp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDrawAdvancedImp
 {
    Q_OBJECT

 public:
-    DlgPrefsTechDraw5Imp( QWidget* parent = 0 );
-    ~DlgPrefsTechDraw5Imp();
+    DlgPrefsTechDrawAdvancedImp( QWidget* parent = 0 );
+    ~DlgPrefsTechDrawAdvancedImp();

 protected:
    void saveSettings();
@@ -47,4 +46,4 @@ protected:

 } // namespace TechDrawGui

-#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMP5_H
+#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPADVANCED_H
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TechDrawGui::DlgPrefsTechDraw5Imp</class>
- <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDraw5Imp">
+ <class>TechDrawGui::DlgPrefsTechDrawHLRImp</class>
+ <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDrawHLRImp">
  <property name="geometry">
   <rect>
    <x>0</x>
@@ -23,7 +23,7 @@
   </size>
  </property>
  <property name="windowTitle">
-   <string>HLR Parameters</string>
+   <string>HLR</string>
  </property>
  <property name="toolTip">
   <string/>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.cpp
@@ -25,23 +25,23 @@

 #include "PreCompiled.h"

-#include "DlgPrefsTechDraw5Imp.h"
+#include "DlgPrefsTechDrawHLRImp.h"
 #include <Gui/PrefWidgets.h>

 using namespace TechDrawGui;

-DlgPrefsTechDraw5Imp::DlgPrefsTechDraw5Imp( QWidget* parent )
+DlgPrefsTechDrawHLRImp::DlgPrefsTechDrawHLRImp( QWidget* parent )
  : PreferencePage( parent )
 {
    this->setupUi(this);
 }

-DlgPrefsTechDraw5Imp::~DlgPrefsTechDraw5Imp()
+DlgPrefsTechDrawHLRImp::~DlgPrefsTechDrawHLRImp()
 {
    // no need to delete child widgets, Qt does it all for us
 }

-void DlgPrefsTechDraw5Imp::saveSettings()
+void DlgPrefsTechDrawHLRImp::saveSettings()
 {
    pcbSeamViz->onSave();
    pcbSmoothViz->onSave();
@@ -55,7 +55,7 @@ void DlgPrefsTechDraw5Imp::saveSettings()
    pcbHardHid->onSave();
 }

-void DlgPrefsTechDraw5Imp::loadSettings()
+void DlgPrefsTechDrawHLRImp::loadSettings()
 {
    pcbSeamViz->onRestore();
    pcbSmoothViz->onRestore();
@@ -72,7 +72,7 @@ void DlgPrefsTechDraw5Imp::loadSettings()
 /**
 * Sets the strings of the subwidgets using the current language.
 */
-void DlgPrefsTechDraw5Imp::changeEvent(QEvent *e)
+void DlgPrefsTechDrawHLRImp::changeEvent(QEvent *e)
 {
    if (e->type() == QEvent::LanguageChange) {
        saveSettings();
@@ -84,4 +84,4 @@ void DlgPrefsTechDraw5Imp::changeEvent(QEvent *e)
    }
 }

-#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDraw5Imp.cpp>
+#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDrawHLRImp.cpp>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLRImp.h
@@ -1,7 +1,6 @@
 /**************************************************************************
 *   Copyright (c) 2015 FreeCAD Developers                                 *
 *   Author: WandererFan <wandererfan@gmail.com>                           *
- *   Based on src/Mod/FEM/Gui/DlgPrefsTechDraw4Imp.cpp                     *
 *                                                                         *
 *   This file is part of the FreeCAD CAx development system.              *
 *                                                                         *
@@ -23,21 +22,21 @@
 ***************************************************************************/


-#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP4_H
-#define DRAWINGGUI_DLGPREFSTECHDRAWIMP4_H
+#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H
+#define DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H

-#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDraw4.h>
+#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDrawHLR.h>
 #include <Gui/PropertyPage.h>

 namespace TechDrawGui {

-class DlgPrefsTechDraw4Imp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDraw4Imp
+class DlgPrefsTechDrawHLRImp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDrawHLRImp
 {
    Q_OBJECT

 public:
-    DlgPrefsTechDraw4Imp( QWidget* parent = 0 );
-    ~DlgPrefsTechDraw4Imp();
+    DlgPrefsTechDrawHLRImp( QWidget* parent = 0 );
+    ~DlgPrefsTechDrawHLRImp();

 protected:
    void saveSettings();
@@ -47,4 +46,4 @@ protected:

 } // namespace TechDrawGui

-#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMP4_H
+#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPHLR_H
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>TechDrawGui::DlgPrefsTechDraw2Imp</class>
- <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDraw2Imp">
+ <class>TechDrawGui::DlgPrefsTechDrawScaleImp</class>
+ <widget class="QWidget" name="TechDrawGui::DlgPrefsTechDrawScaleImp">
  <property name="geometry">
   <rect>
    <x>0</x>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp
@@ -25,12 +25,12 @@

 #include "PreCompiled.h"

-#include "DlgPrefsTechDraw2Imp.h"
+#include "DlgPrefsTechDrawScaleImp.h"
 #include <Gui/PrefWidgets.h>

 using namespace TechDrawGui;

-DlgPrefsTechDraw2Imp::DlgPrefsTechDraw2Imp( QWidget* parent )
+DlgPrefsTechDrawScaleImp::DlgPrefsTechDrawScaleImp( QWidget* parent )
  : PreferencePage( parent )
 {
    this->setupUi(this);
@@ -42,12 +42,12 @@ DlgPrefsTechDraw2Imp::DlgPrefsTechDraw2Imp( QWidget* parent )
        this, SLOT(onScaleTypeChanged(int)));
 }

-DlgPrefsTechDraw2Imp::~DlgPrefsTechDraw2Imp()
+DlgPrefsTechDrawScaleImp::~DlgPrefsTechDrawScaleImp()
 {
    // no need to delete child widgets, Qt does it all for us
 }

-void DlgPrefsTechDraw2Imp::onScaleTypeChanged(int index)
+void DlgPrefsTechDrawScaleImp::onScaleTypeChanged(int index)
 {
    // disable custom scale if the scale type is not custom

@@ -57,7 +57,7 @@ void DlgPrefsTechDraw2Imp::onScaleTypeChanged(int index)
        this->pdsbViewScale->setEnabled(false);
 }

-void DlgPrefsTechDraw2Imp::saveSettings()
+void DlgPrefsTechDrawScaleImp::saveSettings()
 {
    pdsbToleranceScale->onSave();
    pdsbTemplateMark->onSave();
@@ -72,7 +72,7 @@ void DlgPrefsTechDraw2Imp::saveSettings()
    pdsbSymbolScale->onSave();
 }

-void DlgPrefsTechDraw2Imp::loadSettings()
+void DlgPrefsTechDrawScaleImp::loadSettings()
 {
    double markDefault = 3.0;
    pdsbTemplateMark->setValue(markDefault);
@@ -92,7 +92,7 @@ void DlgPrefsTechDraw2Imp::loadSettings()
 /**
 * Sets the strings of the subwidgets using the current language.
 */
-void DlgPrefsTechDraw2Imp::changeEvent(QEvent *e)
+void DlgPrefsTechDrawScaleImp::changeEvent(QEvent *e)
 {
    if (e->type() == QEvent::LanguageChange) {
        saveSettings();
@@ -104,4 +104,4 @@ void DlgPrefsTechDraw2Imp::changeEvent(QEvent *e)
    }
 }

-#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDraw2Imp.cpp>
+#include <Mod/TechDraw/Gui/moc_DlgPrefsTechDrawScaleImp.cpp>
--- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h
+++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.h
@@ -1,7 +1,6 @@
 /**************************************************************************
 *   Copyright (c) 2015 FreeCAD Developers                                 *
 *   Author: WandererFan <wandererfan@gmail.com>                           *
- *   Based on src/Mod/FEM/Gui/DlgPrefsTechDraw2Imp.cpp                     *
 *                                                                         *
 *   This file is part of the FreeCAD CAx development system.              *
 *                                                                         *
@@ -23,21 +22,21 @@
 ***************************************************************************/


-#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMP2_H
-#define DRAWINGGUI_DLGPREFSTECHDRAWIMP2_H
+#ifndef DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H
+#define DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H

-#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDraw2.h>
+#include <Mod/TechDraw/Gui/ui_DlgPrefsTechDrawScale.h>
 #include <Gui/PropertyPage.h>

 namespace TechDrawGui {

-class DlgPrefsTechDraw2Imp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDraw2Imp
+class DlgPrefsTechDrawScaleImp : public Gui::Dialog::PreferencePage, public Ui_DlgPrefsTechDrawScaleImp
 {
    Q_OBJECT

 public:
-    DlgPrefsTechDraw2Imp( QWidget* parent = 0 );
-    ~DlgPrefsTechDraw2Imp();
+    DlgPrefsTechDrawScaleImp( QWidget* parent = 0 );
+    ~DlgPrefsTechDrawScaleImp();

 protected Q_SLOTS:
    void onScaleTypeChanged(int index);
@@ -50,4 +49,4 @@ protected:

 } // namespace TechDrawGui

-#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMP2_H
+#endif // DRAWINGGUI_DLGPREFSTECHDRAWIMPSCALE_H