PD: move to new style connect()
This commit is contained in:
@@ -66,8 +66,10 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform
|
||||
QMetaObject::connectSlotsByName(this);
|
||||
this->groupLayout()->addWidget(proxy);
|
||||
|
||||
connect(ui->buttonAddFeature, SIGNAL(toggled(bool)), this, SLOT(onButtonAddFeature(bool)));
|
||||
connect(ui->buttonRemoveFeature, SIGNAL(toggled(bool)), this, SLOT(onButtonRemoveFeature(bool)));
|
||||
connect(ui->buttonAddFeature, &QToolButton::toggled,
|
||||
this, &TaskMultiTransformParameters::onButtonAddFeature);
|
||||
connect(ui->buttonRemoveFeature, &QToolButton::toggled,
|
||||
this, &TaskMultiTransformParameters::onButtonRemoveFeature);
|
||||
|
||||
// Create context menu
|
||||
QAction* action = new QAction(tr("Remove"), this);
|
||||
@@ -77,50 +79,51 @@ TaskMultiTransformParameters::TaskMultiTransformParameters(ViewProviderTransform
|
||||
action->setShortcutVisibleInContextMenu(true);
|
||||
#endif
|
||||
ui->listWidgetFeatures->addAction(action);
|
||||
connect(action, SIGNAL(triggered()), this, SLOT(onFeatureDeleted()));
|
||||
connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onFeatureDeleted);
|
||||
ui->listWidgetFeatures->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
connect(ui->listWidgetFeatures->model(),
|
||||
SIGNAL(rowsMoved(QModelIndex, int, int, QModelIndex, int)), this, SLOT(indexesMoved()));
|
||||
connect(ui->listWidgetFeatures->model(), &QAbstractListModel::rowsMoved,
|
||||
this, &TaskMultiTransformParameters::indexesMoved);
|
||||
|
||||
// Create a context menu for the listview of transformation features
|
||||
action = new QAction(tr("Edit"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformEdit()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformEdit);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Delete"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformDelete()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformDelete);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Add mirrored transformation"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformAddMirrored()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformAddMirrored);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Add linear pattern"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformAddLinearPattern()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformAddLinearPattern);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Add polar pattern"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformAddPolarPattern()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformAddPolarPattern);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Add scaled transformation"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onTransformAddScaled()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onTransformAddScaled);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Move up"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onMoveUp()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onMoveUp);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
action = new QAction(tr("Move down"), ui->listTransformFeatures);
|
||||
action->connect(action, SIGNAL(triggered()),
|
||||
this, SLOT(onMoveDown()));
|
||||
action->connect(action, &QAction::triggered,
|
||||
this, &TaskMultiTransformParameters::onMoveDown);
|
||||
ui->listTransformFeatures->addAction(action);
|
||||
ui->listTransformFeatures->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
connect(ui->checkBoxUpdateView, SIGNAL(toggled(bool)),
|
||||
this, SLOT(onUpdateView(bool)));
|
||||
connect(ui->checkBoxUpdateView, &QCheckBox::toggled,
|
||||
this, &TaskMultiTransformParameters::onUpdateView);
|
||||
|
||||
connect(ui->listTransformFeatures, SIGNAL(activated(QModelIndex)),
|
||||
this, SLOT(onTransformActivated(QModelIndex)));
|
||||
connect(ui->listTransformFeatures, &QListWidget::activated,
|
||||
this, &TaskMultiTransformParameters::onTransformActivated);
|
||||
|
||||
// Get the transformFeatures data
|
||||
PartDesign::MultiTransform* pcMultiTransform = static_cast<PartDesign::MultiTransform*>(TransformedView->getObject());
|
||||
@@ -270,8 +273,8 @@ void TaskMultiTransformParameters::onTransformEdit()
|
||||
return; // TODO: Show an error?
|
||||
|
||||
subTask->setEnabledTransaction(isEnabledTransaction());
|
||||
connect(ui->checkBoxUpdateView, SIGNAL(toggled(bool)),
|
||||
subTask, SLOT(onUpdateView(bool)));
|
||||
connect(ui->checkBoxUpdateView, &QCheckBox::toggled,
|
||||
subTask, &TaskTransformedParameters::onUpdateView);
|
||||
}
|
||||
|
||||
void TaskMultiTransformParameters::onTransformActivated(const QModelIndex& index)
|
||||
@@ -492,7 +495,8 @@ void TaskMultiTransformParameters::onMoveDown()
|
||||
moveTransformFeature(+1);
|
||||
}
|
||||
|
||||
void TaskMultiTransformParameters::onSubTaskButtonOK() {
|
||||
void TaskMultiTransformParameters::onSubTaskButtonOK()
|
||||
{
|
||||
closeSubTask();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user