flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-16 10:25:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T265, Ref T430, Ref T473 renamed to CDbModelMappingModifyDialog (as it is a dialog)

Browse Source
This commit is contained in:
Klaus Basan
2018-12-21 10:44:50 +01:00
committed by Mat Sutcliffe
parent 4aec50ccfc
commit ddb26a0ea5
5 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/dbmappingcomponent.cpp
View File

@@ -11,7 +11,7 @@
#include "blackgui/components/dbautostashingcomponent.h" #include "blackgui/components/dbautostashingcomponent.h"
#include "blackgui/components/dbautosimulatorstashingcomponent.h" #include "blackgui/components/dbautosimulatorstashingcomponent.h"
#include "blackgui/components/dbmappingcomponent.h" #include "blackgui/components/dbmappingcomponent.h"
#include "blackgui/components/dbmodelmappingmodifycomponent.h" #include "blackgui/components/dbmodelmappingmodifydialog.h"
#include "blackgui/components/dbownmodelscomponent.h" #include "blackgui/components/dbownmodelscomponent.h"
#include "blackgui/components/dbownmodelsetcomponent.h" #include "blackgui/components/dbownmodelsetcomponent.h"
#include "blackgui/components/dbstashcomponent.h" #include "blackgui/components/dbstashcomponent.h"
@@ -74,7 +74,7 @@ namespace BlackGui
ui(new Ui::CDbMappingComponent), ui(new Ui::CDbMappingComponent),
m_autoStashDialog(new CDbAutoStashingComponent(this)), m_autoStashDialog(new CDbAutoStashingComponent(this)),
m_autoSimulatorDialog(new CDbAutoSimulatorStashingComponent(this)), m_autoSimulatorDialog(new CDbAutoSimulatorStashingComponent(this)),
m_modelModifyDialog(new CDbModelMappingModifyComponent(this)) m_modelModifyDialog(new CDbModelMappingModifyDialog(this))
{ {
ui->setupUi(this); ui->setupUi(this);
ui->comp_StashAircraft->setMappingComponent(this); ui->comp_StashAircraft->setMappingComponent(this);

4
src/blackgui/components/dbmappingcomponent.h
View File

@@ -57,7 +57,7 @@ namespace BlackGui
{ {
class CDbAutoStashingComponent; class CDbAutoStashingComponent;
class CDbAutoSimulatorStashingComponent; class CDbAutoSimulatorStashingComponent;
class CDbModelMappingModifyComponent; class CDbModelMappingModifyDialog;
/*! /*!
* Mapping component * Mapping component
@@ -323,7 +323,7 @@ namespace BlackGui
QScopedPointer<Ui::CDbMappingComponent> ui; QScopedPointer<Ui::CDbMappingComponent> ui;
QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog; //!< dialog auto stashing QScopedPointer<CDbAutoStashingComponent> m_autoStashDialog; //!< dialog auto stashing
QScopedPointer<CDbAutoSimulatorStashingComponent> m_autoSimulatorDialog; //!< dialog auto simulator update QScopedPointer<CDbAutoSimulatorStashingComponent> m_autoSimulatorDialog; //!< dialog auto simulator update
QScopedPointer<CDbModelMappingModifyComponent> m_modelModifyDialog; //!< dialog when modifying models QScopedPointer<CDbModelMappingModifyDialog> m_modelModifyDialog; //!< dialog when modifying models
BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules BlackMisc::Simulation::FsCommon::CVPilotRulesReader m_vPilotReader; //!< read vPilot rules
BlackMisc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::onStashedModelsChangedDigest, 750, 25 }; BlackMisc::CDigestSignal m_dsStashedModelsChanged { this, &CDbMappingComponent::onStashedModelsChangedDigest, 750, 25 };
BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this, &CDbMappingComponent::onUserChanged }; BlackMisc::CDataReadOnly<BlackCore::Data::TAuthenticatedDbUser> m_swiftDbUser { this, &CDbMappingComponent::onUserChanged };

15
src/blackgui/components/dbmodelmappingmodifycomponent.cpp → src/blackgui/components/dbmodelmappingmodifydialog.cpp
View File

@@ -7,9 +7,9 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
#include "blackgui/components/dbmodelmappingmodifycomponent.h" #include "blackgui/components/dbmodelmappingmodifydialog.h"
#include "blackgui/editors/modelmappingmodifyform.h" #include "blackgui/editors/modelmappingmodifyform.h"
#include "ui_dbmodelmappingmodifycomponent.h" #include "ui_dbmodelmappingmodifydialog.h"
#include <QWidget> #include <QWidget>
@@ -20,25 +20,26 @@ namespace BlackGui
{ {
namespace Components namespace Components
{ {
CDbModelMappingModifyComponent::CDbModelMappingModifyComponent(QWidget *parent) : CDbModelMappingModifyDialog::CDbModelMappingModifyDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
CDbMappingComponentAware(parent), CDbMappingComponentAware(parent),
ui(new Ui::CDbModelMappingModifyComponent) ui(new Ui::CDbModelMappingModifyDialog)
{ {
ui->setupUi(this); ui->setupUi(this);
this->setWindowFlags(this->windowFlags() & ~Qt::WindowContextHelpButtonHint);
} }
CDbModelMappingModifyComponent::~CDbModelMappingModifyComponent() CDbModelMappingModifyDialog::~CDbModelMappingModifyDialog()
{ {
// void // void
} }
CPropertyIndexVariantMap CDbModelMappingModifyComponent::getValues() const CPropertyIndexVariantMap CDbModelMappingModifyDialog::getValues() const
{ {
return (ui->editor_ModelMappingModify->getValues()); return (ui->editor_ModelMappingModify->getValues());
} }
void CDbModelMappingModifyComponent::setValue(const CAircraftModel &model) void CDbModelMappingModifyDialog::setValue(const CAircraftModel &model)
{ {
ui->editor_ModelMappingModify->setValue(model); ui->editor_ModelMappingModify->setValue(model);
} }

17
src/blackgui/components/dbmodelmappingmodifycomponent.h → src/blackgui/components/dbmodelmappingmodifydialog.h
View File

@@ -9,8 +9,8 @@
//! \file //! \file
#ifndef BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYCOMPONENT_H #ifndef BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
#define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYCOMPONENT_H #define BLACKGUI_COMPONENTS_DBMODELMAPPINGMODIFYDIALOG_H
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/components/dbmappingcomponentaware.h" #include "blackgui/components/dbmappingcomponentaware.h"
@@ -20,11 +20,8 @@
#include <QObject> #include <QObject>
#include <QScopedPointer> #include <QScopedPointer>
class QWidget;
namespace BlackMisc { namespace Simulation { class CAircraftModel; } } namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
namespace Ui { class CDbModelMappingModifyComponent; } namespace Ui { class CDbModelMappingModifyDialog; }
namespace BlackGui namespace BlackGui
{ {
namespace Components namespace Components
@@ -32,7 +29,7 @@ namespace BlackGui
/*! /*!
* Modify model fields as dialog * Modify model fields as dialog
*/ */
class BLACKGUI_EXPORT CDbModelMappingModifyComponent : class BLACKGUI_EXPORT CDbModelMappingModifyDialog :
public QDialog, public QDialog,
public CDbMappingComponentAware public CDbMappingComponentAware
{ {
@@ -40,10 +37,10 @@ namespace BlackGui
public: public:
//! Constructor //! Constructor
explicit CDbModelMappingModifyComponent(QWidget *parent = nullptr); explicit CDbModelMappingModifyDialog(QWidget *parent = nullptr);
//! Destructor //! Destructor
~CDbModelMappingModifyComponent(); virtual ~CDbModelMappingModifyDialog();
//! Get the values //! Get the values
BlackMisc::CPropertyIndexVariantMap getValues() const; BlackMisc::CPropertyIndexVariantMap getValues() const;
@@ -52,7 +49,7 @@ namespace BlackGui
void setValue(const BlackMisc::Simulation::CAircraftModel &model); void setValue(const BlackMisc::Simulation::CAircraftModel &model);
private: private:
QScopedPointer<Ui::CDbModelMappingModifyComponent> ui; QScopedPointer<Ui::CDbModelMappingModifyDialog> ui;
}; };
} // ns } // ns
} // ns } // ns

23
src/blackgui/components/dbmodelmappingmodifycomponent.ui → src/blackgui/components/dbmodelmappingmodifydialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>CDbModelMappingModifyComponent</class> <class>CDbModelMappingModifyDialog</class>
<widget class="QDialog" name="CDbModelMappingModifyComponent"> <widget class="QDialog" name="CDbModelMappingModifyDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
@@ -20,7 +20,7 @@
<string>Model modify form</string> <string>Model modify form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item alignment="Qt::AlignTop">
<widget class="BlackGui::Editors::CModelMappingModifyForm" name="editor_ModelMappingModify"> <widget class="BlackGui::Editors::CModelMappingModifyForm" name="editor_ModelMappingModify">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@@ -36,19 +36,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="vs_ModelMappingModify">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QDialogButtonBox" name="bb_ModelMappingModiyForm"> <widget class="QDialogButtonBox" name="bb_ModelMappingModiyForm">
<property name="orientation"> <property name="orientation">
@@ -74,7 +61,7 @@
<connection> <connection>
<sender>bb_ModelMappingModiyForm</sender> <sender>bb_ModelMappingModiyForm</sender>
<signal>accepted()</signal> <signal>accepted()</signal>
<receiver>CDbModelMappingModifyComponent</receiver> <receiver>CDbModelMappingModifyDialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
@@ -90,7 +77,7 @@
<connection> <connection>
<sender>bb_ModelMappingModiyForm</sender> <sender>bb_ModelMappingModiyForm</sender>
<signal>rejected()</signal> <signal>rejected()</signal>
<receiver>CDbModelMappingModifyComponent</receiver> <receiver>CDbModelMappingModifyDialog</receiver>
<slot>reject()</slot> <slot>reject()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">