flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T219, adjusted existing forms

Browse Source
This commit is contained in:
Klaus Basan
2018-01-07 03:06:59 +01:00
parent 9fc231b657
commit e7073202bd
8 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackgui/editors/aircrafticaoform.cpp
View File

@@ -52,11 +52,11 @@ namespace BlackGui
connect(ui->aircraft_Selector, &CDbAircraftIcaoSelectorComponent::changedAircraftIcao, this, &CAircraftIcaoForm::setValue);
// Id
connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAircraftIcaoForm::ps_idEntered);
connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAircraftIcaoForm::idEntered);
// drag and drop, pasted
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAircraftIcaoForm::ps_droppedCode);
connect(ui->tb_Paste, &QToolButton::clicked, this, &CAircraftIcaoForm::ps_pasted);
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAircraftIcaoForm::droppedCode);
connect(ui->tb_Paste, &QToolButton::clicked, this, &CAircraftIcaoForm::pasted);
ui->drop_DropData->setInfoText("<drop aircraft ICAO code>");
ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId<CAircraftIcaoCode>(), qMetaTypeId<CAircraftIcaoCodeList>()});
}
@@ -66,8 +66,8 @@ namespace BlackGui
bool CAircraftIcaoForm::setValue(const BlackMisc::Aviation::CAircraftIcaoCode &icao)
{
if (icao == this->m_originalCode) { return false; }
this->m_originalCode = icao;
if (icao == m_originalCode) { return false; }
m_originalCode = icao;
ui->le_Id->setText(icao.getDbKeyAsString());
ui->aircraft_Selector->setAircraftIcao(icao);
@@ -173,7 +173,7 @@ namespace BlackGui
void CAircraftIcaoForm::setReadOnly(bool readOnly)
{
this->m_readOnly = readOnly;
m_readOnly = readOnly;
ui->aircraft_Selector->setReadOnly(readOnly);
ui->le_Manufacturer->setReadOnly(readOnly);
ui->le_ModelDescription->setReadOnly(readOnly);
@@ -203,7 +203,7 @@ namespace BlackGui
void CAircraftIcaoForm::clear()
{
setValue(CAircraftIcaoCode());
this->setValue(CAircraftIcaoCode());
}
void CAircraftIcaoForm::resetValue()
@@ -211,7 +211,7 @@ namespace BlackGui
this->setValue(m_originalCode);
}
void CAircraftIcaoForm::ps_droppedCode(const BlackMisc::CVariant &variantDropped)
void CAircraftIcaoForm::droppedCode(const BlackMisc::CVariant &variantDropped)
{
CAircraftIcaoCode icao;
if (variantDropped.canConvert<CAircraftIcaoCode>())
@@ -220,9 +220,9 @@ namespace BlackGui
}
else if (variantDropped.canConvert<CAircraftIcaoCodeList>())
{
CAircraftIcaoCodeList icaoList(variantDropped.value<CAircraftIcaoCodeList>());
const CAircraftIcaoCodeList icaoList(variantDropped.value<CAircraftIcaoCodeList>());
if (icaoList.isEmpty()) { return; }
icao = icaoList.front();
icao = icaoList.front();
}
else
{
@@ -231,7 +231,7 @@ namespace BlackGui
this->setValue(icao);
}
void CAircraftIcaoForm::ps_idEntered()
void CAircraftIcaoForm::idEntered()
{
if (!sGui || !sGui->hasWebDataServices())
{

16
src/blackgui/editors/aircrafticaoform.h
View File

@@ -31,8 +31,7 @@ namespace BlackGui
/*!
* Aircraft ICAO form
*/
class BLACKGUI_EXPORT CAircraftIcaoForm :
public CForm
class BLACKGUI_EXPORT CAircraftIcaoForm : public CForm
{
Q_OBJECT
@@ -73,17 +72,16 @@ namespace BlackGui
//! \copydoc CForm::jsonPasted
virtual void jsonPasted(const QString &json) override;
private slots:
//! Variant has been dropped
void ps_droppedCode(const BlackMisc::CVariant &variantDropped);
//! Id has been entered
void ps_idEntered();
private:
QScopedPointer<Ui::CAircraftIcaoForm> ui;
BlackMisc::Aviation::CAircraftIcaoCode m_originalCode;
//! Variant has been dropped
void droppedCode(const BlackMisc::CVariant &variantDropped);
//! Id has been entered
void idEntered();
//! Key from GUI
int getDbKeyFromGui() const;
};

2
src/blackgui/editors/airlineicaoform.cpp
View File

@@ -52,7 +52,7 @@ namespace BlackGui
connect(ui->le_Id, &QLineEdit::returnPressed, this, &CAirlineIcaoForm::ps_idEntered);
// drag and drop, paste
connect(ui->tb_Paste, &QToolButton::clicked, this, &CAirlineIcaoForm::ps_pasted);
connect(ui->tb_Paste, &QToolButton::clicked, this, &CAirlineIcaoForm::pasted);
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CAirlineIcaoForm::ps_droppedCode);
ui->drop_DropData->setInfoText("<drop airline ICAO code>");
ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId<CAirlineIcaoCode>(), qMetaTypeId<CAirlineIcaoCodeList>()});

2
src/blackgui/editors/liveryform.cpp
View File

@@ -53,7 +53,7 @@ namespace BlackGui
connect(ui->comp_LiverySelector, &CDbLiverySelectorComponent::changedLivery, this, &CLiveryForm::setValue);
// drag and drop, paste
connect(ui->tb_Paste, &QToolButton::clicked, this, &CLiveryForm::ps_pasted);
connect(ui->tb_Paste, &QToolButton::clicked, this, &CLiveryForm::pasted);
connect(ui->drop_DropData, &CDropSite::droppedValueObject, this, &CLiveryForm::ps_droppedLivery);
ui->drop_DropData->setInfoText("<drop livery>");
ui->drop_DropData->setAcceptedMetaTypeIds({ qMetaTypeId<CLivery>(), qMetaTypeId<CLiveryList>()});

10
src/blackgui/editors/modelmappingform.cpp
View File

@@ -28,7 +28,7 @@ namespace BlackGui
namespace Editors
{
CModelMappingForm::CModelMappingForm(QWidget *parent) :
CForm(parent),
CFormDbUser(parent),
ui(new Ui::CModelMappingForm)
{
ui->setupUi(this);
@@ -38,7 +38,7 @@ namespace BlackGui
connect(ui->pb_Stash, &QPushButton::clicked, this, &CModelMappingForm::requestStash);
// for setting mode (include/exclude)
this->ps_userChanged();
this->userChanged();
}
CModelMappingForm::~CModelMappingForm()
@@ -58,7 +58,7 @@ namespace BlackGui
CStatusMessageList CModelMappingForm::validate(bool withNestedObjects) const
{
const CAircraftModel model(getValue());
CStatusMessageList msgs(model.validate(withNestedObjects));
const CStatusMessageList msgs(model.validate(withNestedObjects));
ui->val_Indicator->setState(msgs);
return msgs;
}
@@ -88,7 +88,7 @@ namespace BlackGui
m_originalModel = model;
}
void CModelMappingForm::ps_userChanged()
void CModelMappingForm::userChanged()
{
const CAuthenticatedUser user(this->getSwiftDbUser());
if (user.hasAdminRole())
@@ -101,7 +101,7 @@ namespace BlackGui
ui->selector_ModelMode->setReadOnly(true);
}
CForm::ps_userChanged();
CFormDbUser::userChanged();
}
} // ns
} // ns

8
src/blackgui/editors/modelmappingform.h
View File

@@ -30,7 +30,7 @@ namespace BlackGui
/*!
* Model mapping form
*/
class BLACKGUI_EXPORT CModelMappingForm : public CForm
class BLACKGUI_EXPORT CModelMappingForm : public CFormDbUser
{
Q_OBJECT
@@ -61,9 +61,9 @@ namespace BlackGui
//! Request stashing for model
void requestStash();
protected slots:
//! \copydoc CForm::ps_userChanged
virtual void ps_userChanged() override;
protected:
//! \copydoc CFormDbUser::userChanged
virtual void userChanged() override;
private:
QScopedPointer<Ui::CModelMappingForm> ui;

20
src/blackgui/editors/modelmappingmodifyform.cpp
View File

@@ -29,16 +29,16 @@ namespace BlackGui
namespace Editors
{
CModelMappingModifyForm::CModelMappingModifyForm(QWidget *parent) :
CForm(parent),
CFormDbUser(parent),
ui(new Ui::CModelMappingModifyForm)
{
ui->setupUi(this);
connect(ui->le_Description, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::ps_returnPressed);
connect(ui->le_Name, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::ps_returnPressed);
connect(ui->selector_ModeSelector, &CModelModeSelector::changed, this, &CModelMappingModifyForm::ps_changed);
connect(ui->selector_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMappingModifyForm::ps_changed);
connect(ui->le_Description, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::returnPressed);
connect(ui->le_Name, &QLineEdit::returnPressed, this, &CModelMappingModifyForm::returnPressed);
connect(ui->selector_ModeSelector, &CModelModeSelector::changed, this, &CModelMappingModifyForm::changed);
connect(ui->selector_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMappingModifyForm::changed);
this->ps_userChanged();
this->userChanged();
}
CModelMappingModifyForm::~CModelMappingModifyForm()
@@ -90,7 +90,7 @@ namespace BlackGui
Q_UNUSED(readOnly);
}
void CModelMappingModifyForm::ps_userChanged()
void CModelMappingModifyForm::userChanged()
{
const CAuthenticatedUser user(this->getSwiftDbUser());
if (user.hasAdminRole())
@@ -103,17 +103,17 @@ namespace BlackGui
ui->selector_ModeSelector->setReadOnly(true);
}
CForm::ps_userChanged();
CFormDbUser::userChanged();
}
void CModelMappingModifyForm::ps_returnPressed()
void CModelMappingModifyForm::returnPressed()
{
QCheckBox *cb = widgetToCheckbox(sender());
if (!cb) { return; }
cb->setChecked(true);
}
void CModelMappingModifyForm::ps_changed()
void CModelMappingModifyForm::changed()
{
QCheckBox *cb = widgetToCheckbox(sender());
if (!cb) { return; }

27
src/blackgui/editors/modelmappingmodifyform.h
View File

@@ -15,7 +15,6 @@
#include "form.h"
#include "blackgui/blackguiexport.h"
#include "blackmisc/propertyindexvariantmap.h"
#include <QFrame>
#include <QObject>
#include <QScopedPointer>
@@ -23,9 +22,8 @@
class QCheckBox;
class QWidget;
namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
namespace Ui { class CModelMappingModifyForm; }
namespace BlackMisc { namespace Simulation { class CAircraftModel; } }
namespace BlackGui
{
namespace Editors
@@ -33,7 +31,7 @@ namespace BlackGui
/*!
* Allows to modify individual fields of the model form
*/
class BLACKGUI_EXPORT CModelMappingModifyForm : public CForm
class BLACKGUI_EXPORT CModelMappingModifyForm : public CFormDbUser
{
Q_OBJECT
@@ -42,7 +40,7 @@ namespace BlackGui
explicit CModelMappingModifyForm(QWidget *parent = nullptr);
//! Destructor
~CModelMappingModifyForm();
virtual ~CModelMappingModifyForm();
//! Get the values
BlackMisc::CPropertyIndexVariantMap getValues() const;
@@ -53,18 +51,17 @@ namespace BlackGui
//! \copydoc CForm::setReadOnly
virtual void setReadOnly(bool readOnly) override;
protected slots:
//! \copydoc CForm::ps_userChanged
virtual void ps_userChanged() override;
private slots:
//! Return pressed
void ps_returnPressed();
//! Data changed
void ps_changed();
protected:
//! \copydoc CFormDbUser::userChanged
virtual void userChanged() override;
private:
//! Return pressed
void returnPressed();
//! Data changed
void changed();
//! Checkbox from its corresponding widgte
QCheckBox *widgetToCheckbox(QObject *widget) const;