This commit is contained in:
Klaus Basan
2019-05-31 01:32:44 +02:00
committed by Mat Sutcliffe
parent 122aa17431
commit fa60cc6025
3 changed files with 13 additions and 14 deletions

View File

@@ -20,11 +20,11 @@ namespace BlackGui
ui(new Ui::CMarginsInput)
{
ui->setupUi(this);
connect(ui->pb_Ok, &QPushButton::clicked, this, &CMarginsInput::ps_Confirmed);
connect(ui->le_Bottom, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed);
connect(ui->le_Left, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed);
connect(ui->le_Right, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed);
connect(ui->le_Top, &QLineEdit::returnPressed, this, &CMarginsInput::ps_Confirmed);
connect(ui->pb_Ok, &QPushButton::clicked, this, &CMarginsInput::confirmed);
connect(ui->le_Bottom, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed);
connect(ui->le_Left, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed);
connect(ui->le_Right, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed);
connect(ui->le_Top, &QLineEdit::returnPressed, this, &CMarginsInput::confirmed);
QIntValidator *v = new QIntValidator(0, 100, this);
ui->le_Bottom->setValidator(v);
@@ -65,7 +65,7 @@ namespace BlackGui
return m;
}
void CMarginsInput::ps_Confirmed()
void CMarginsInput::confirmed()
{
const QMargins m(this->getMargins());
emit this->changedMargins(m);

View File

@@ -33,7 +33,7 @@ namespace BlackGui
explicit CMarginsInput(QWidget *parent = nullptr);
//! Destructor
~CMarginsInput();
virtual ~CMarginsInput() override;
//! Set margins
void setMargins(const QMargins &margins);
@@ -45,11 +45,10 @@ namespace BlackGui
//! Margins changed
void changedMargins(const QMargins &margins);
private slots:
//! Ok
void ps_Confirmed();
private:
//! Ok
void confirmed();
QScopedPointer<Ui::CMarginsInput> ui;
};
} // ns

View File

@@ -207,7 +207,7 @@ namespace BlackMisc
//! Standard livery marker string
static const QString &standardLiveryMarker();
//! Standard code for
//! Standard code for airline
static QString getStandardCode(const Aviation::CAirlineIcaoCode &airline);
//! Color livery marker
@@ -218,8 +218,8 @@ namespace BlackMisc
private:
CAirlineIcaoCode m_airline; //!< corresponding airline, if any
QString m_combinedCode; //!< livery code and pseudo airline ICAO code
QString m_description; //!< describes the livery
QString m_combinedCode; //!< livery code and pseudo airline ICAO code
QString m_description; //!< describes the livery
CRgbColor m_colorFuselage; //!< color of fuselage
CRgbColor m_colorTail; //!< color of tail
bool m_military = false; //!< military livery?