Replace DlgReportView by DlgSettingsReportView in the files.
This commit is contained in:
@@ -312,7 +312,7 @@ SET(Gui_UIC_SRCS
|
||||
DlgProjectInformation.ui
|
||||
DlgProjectUtility.ui
|
||||
DlgPropertyLink.ui
|
||||
DlgReportView.ui
|
||||
DlgSettingsReportView.ui
|
||||
DlgRevertToBackupConfig.ui
|
||||
DlgSettingsGeneral.ui
|
||||
DlgSettings3DView.ui
|
||||
@@ -559,7 +559,7 @@ SET(Dialog_Settings_CPP_SRCS
|
||||
DlgEditorImp.cpp
|
||||
DlgOnlineHelpImp.cpp
|
||||
DlgPreferencesImp.cpp
|
||||
DlgReportViewImp.cpp
|
||||
DlgSettingsReportView.cpp
|
||||
DlgSettingsGeneral.cpp
|
||||
DlgSettings3DViewImp.cpp
|
||||
DlgSettingsCacheDirectory.cpp
|
||||
@@ -580,7 +580,7 @@ SET(Dialog_Settings_HPP_SRCS
|
||||
DlgSettingsGeneral.h
|
||||
DlgOnlineHelpImp.h
|
||||
DlgPreferencesImp.h
|
||||
DlgReportViewImp.h
|
||||
DlgSettingsReportView.h
|
||||
DlgSettings3DViewImp.h
|
||||
DlgSettingsCacheDirectory.h
|
||||
DlgSettingsNavigation.h
|
||||
@@ -601,7 +601,7 @@ SET(Dialog_Settings_SRCS
|
||||
DlgEditor.ui
|
||||
DlgOnlineHelp.ui
|
||||
DlgPreferences.ui
|
||||
DlgReportView.ui
|
||||
DlgSettingsReportView.ui
|
||||
DlgSettingsGeneral.ui
|
||||
DlgSettings3DView.ui
|
||||
DlgSettingsCacheDirectory.ui
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>Gui::Dialog::DlgReportView</class>
|
||||
<widget class="QWidget" name="Gui::Dialog::DlgReportView">
|
||||
<class>Gui::Dialog::DlgSettingsReportView</class>
|
||||
<widget class="QWidget" name="Gui::Dialog::DlgSettingsReportView">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
|
||||
@@ -22,24 +22,24 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
|
||||
#include "DlgReportViewImp.h"
|
||||
#include "ui_DlgReportView.h"
|
||||
#include "DlgSettingsReportView.h"
|
||||
#include "ui_DlgSettingsReportView.h"
|
||||
|
||||
|
||||
using namespace Gui::Dialog;
|
||||
|
||||
/* TRANSLATOR Gui::Dialog::DlgReportViewImp */
|
||||
/* TRANSLATOR Gui::Dialog::DlgSettingsReportView */
|
||||
|
||||
/**
|
||||
* Constructs a DlgReportViewImp which is a child of 'parent', with the
|
||||
* Constructs a DlgSettingsReportView which is a child of 'parent', with the
|
||||
* name 'name' and widget flags set to 'f'
|
||||
*
|
||||
* The dialog will by default be modeless, unless you set 'modal' to
|
||||
* true to construct a modal dialog.
|
||||
*/
|
||||
DlgReportViewImp::DlgReportViewImp( QWidget* parent )
|
||||
DlgSettingsReportView::DlgSettingsReportView( QWidget* parent )
|
||||
: PreferencePage(parent)
|
||||
, ui(new Ui_DlgReportView)
|
||||
, ui(new Ui_DlgSettingsReportView)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->colorText->setColor(qApp->palette().windowText().color());
|
||||
@@ -48,11 +48,11 @@ DlgReportViewImp::DlgReportViewImp( QWidget* parent )
|
||||
/**
|
||||
* Destroys the object and frees any allocated resources
|
||||
*/
|
||||
DlgReportViewImp::~DlgReportViewImp()
|
||||
DlgSettingsReportView::~DlgSettingsReportView()
|
||||
{
|
||||
}
|
||||
|
||||
void DlgReportViewImp::saveSettings()
|
||||
void DlgSettingsReportView::saveSettings()
|
||||
{
|
||||
ui->checkMessage->onSave();
|
||||
ui->checkLogging->onSave();
|
||||
@@ -71,7 +71,7 @@ void DlgReportViewImp::saveSettings()
|
||||
ui->pythonError->onSave();
|
||||
}
|
||||
|
||||
void DlgReportViewImp::loadSettings()
|
||||
void DlgSettingsReportView::loadSettings()
|
||||
{
|
||||
ui->checkMessage->onRestore();
|
||||
ui->checkLogging->onRestore();
|
||||
@@ -97,7 +97,7 @@ void DlgReportViewImp::loadSettings()
|
||||
/**
|
||||
* Sets the strings of the subwidgets using the current language.
|
||||
*/
|
||||
void DlgReportViewImp::changeEvent(QEvent *e)
|
||||
void DlgSettingsReportView::changeEvent(QEvent *e)
|
||||
{
|
||||
if (e->type() == QEvent::LanguageChange) {
|
||||
ui->retranslateUi(this);
|
||||
@@ -107,4 +107,4 @@ void DlgReportViewImp::changeEvent(QEvent *e)
|
||||
}
|
||||
}
|
||||
|
||||
#include "moc_DlgReportViewImp.cpp"
|
||||
#include "moc_DlgSettingsReportView.cpp"
|
||||
|
||||
@@ -21,27 +21,27 @@
|
||||
***************************************************************************/
|
||||
|
||||
|
||||
#ifndef GUI_DIALOG_DLG_REPORT_VIEW_IMP
|
||||
#define GUI_DIALOG_DLG_REPORT_VIEW_IMP
|
||||
#ifndef GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW
|
||||
#define GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW
|
||||
|
||||
#include "PropertyPage.h"
|
||||
#include <memory>
|
||||
|
||||
namespace Gui {
|
||||
namespace Dialog {
|
||||
class Ui_DlgReportView;
|
||||
class Ui_DlgSettingsReportView;
|
||||
|
||||
/** The DlgReportViewImp class implements the available settings for the
|
||||
/** The DlgSettingsReportView class implements the available settings for the
|
||||
* Report View to change.
|
||||
* \author Werner Mayer
|
||||
*/
|
||||
class DlgReportViewImp : public PreferencePage
|
||||
class DlgSettingsReportView : public PreferencePage
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit DlgReportViewImp( QWidget* parent = nullptr );
|
||||
~DlgReportViewImp() override;
|
||||
explicit DlgSettingsReportView( QWidget* parent = nullptr );
|
||||
~DlgSettingsReportView() override;
|
||||
|
||||
void saveSettings() override;
|
||||
void loadSettings() override;
|
||||
@@ -50,10 +50,10 @@ protected:
|
||||
void changeEvent(QEvent *e) override;
|
||||
|
||||
private:
|
||||
std::unique_ptr<Ui_DlgReportView> ui;
|
||||
std::unique_ptr<Ui_DlgSettingsReportView> ui;
|
||||
};
|
||||
|
||||
} // namespace Dialog
|
||||
} // namespace Gui
|
||||
|
||||
#endif //GUI_DIALOG_DLG_REPORT_VIEW_IMP
|
||||
#endif //GUI_DIALOG_DLG_SETTINGS_REPORT_VIEW
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "DlgSettingsPythonConsole.h"
|
||||
#include "DlgSettingsMacroImp.h"
|
||||
#include "DlgSettingsDocumentImp.h"
|
||||
#include "DlgReportViewImp.h"
|
||||
#include "DlgSettingsReportView.h"
|
||||
#include "DlgSettingsWorkbenchesImp.h"
|
||||
|
||||
#include "DlgToolbarsImp.h"
|
||||
@@ -65,12 +65,12 @@ WidgetFactorySupplier::WidgetFactorySupplier()
|
||||
// ADD YOUR PREFERENCE PAGES HERE
|
||||
//
|
||||
//
|
||||
new PrefPageProducer<DlgSettingsGeneral> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsGeneral> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsDocumentImp> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsSelection> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsCacheDirectory> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsNotificationArea> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgReportViewImp> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettingsReportView> ( QT_TRANSLATE_NOOP("QObject","General") );
|
||||
new PrefPageProducer<DlgSettings3DViewImp> ( QT_TRANSLATE_NOOP("QObject","Display") );
|
||||
new PrefPageProducer<DlgSettingsNavigation> ( QT_TRANSLATE_NOOP("QObject","Display") );
|
||||
new PrefPageProducer<DlgSettingsViewColor> ( QT_TRANSLATE_NOOP("QObject","Display") );
|
||||
|
||||
Reference in New Issue
Block a user