kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[skip ci] fix superfluous workarounds

Browse Source
This commit is contained in:
wmayer
2020-01-09 23:36:28 +01:00
parent d700744052
commit 379018cde4
3 changed files with 6 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Gui/QuantitySpinBox.cpp
View File

@@ -290,16 +290,6 @@ void Gui::QuantitySpinBox::setExpression(boost::shared_ptr<Expression> expr)
}
}
void Gui::QuantitySpinBox::setEditorToolTip(const QString &name)
{
lineEdit()->setToolTip(name);
}
void Gui::QuantitySpinBox::setIconToolTip(const QString &name)
{
iconLabel->setToolTip(name);
}
QString QuantitySpinBox::boundToName() const
{
if (isBound()) {

4
src/Gui/QuantitySpinBox.h
View File

@@ -129,10 +129,6 @@ public:
bool event(QEvent *event);
void setExpression(boost::shared_ptr<App::Expression> expr);
/// Sets a tooltip for the LineEdit
void setEditorToolTip(const QString &name);
/// Sets a tooltip for the IconLabel
void setIconToolTip(const QString &name);
void bind(const App::ObjectIdentifier &_path);
bool apply(const std::string &propName);

16
src/Mod/Part/Gui/TaskAttacher.cpp
View File

@@ -215,12 +215,6 @@ TaskAttacher::TaskAttacher(Gui::ViewProviderDocumentObject *ViewProvider,QWidget
Gui::Document* document = Gui::Application::Instance->getDocument(ViewProvider->getObject()->getDocument());
connectDelObject = document->signalDeletedObject.connect(bnd1);
connectDelDocument = document->signalDeleteDocument.connect(bnd2);
// set tooltips because the ones in the .ui file are not taken for QuantitySpinBoxes (see bug https://freecadweb.org/tracker/view.php?id=4059)
// FIXME: remove this once the bug is fixed
ui->attachmentOffsetRoll->setEditorToolTip(QString::fromUtf8("Rotation around the x-axis\nNote: The placement is expressed in local coordinate system\nof object being attached."));
ui->attachmentOffsetPitch->setEditorToolTip(QString::fromUtf8("Rotation around the y-axis\nNote: The placement is expressed in local coordinate system\nof object being attached."));
ui->attachmentOffsetYaw->setEditorToolTip(QString::fromUtf8("Rotation around the z-axis\nNote: The placement is expressed in local coordinate system\nof object being attached."));
}
TaskAttacher::~TaskAttacher()
@@ -745,10 +739,12 @@ void TaskAttacher::updateAttachmentOffsetUI()
ui->attachmentOffsetPitch->setEnabled(!bRotationBound);
ui->attachmentOffsetRoll->setEnabled(!bRotationBound);
QString tooltip = bRotationBound ? tr("Not editable because rotation of AttachmentOffset is bound by expressions.") : QString();
ui->attachmentOffsetYaw->setToolTip(tooltip);
ui->attachmentOffsetPitch->setToolTip(tooltip);
ui->attachmentOffsetRoll->setToolTip(tooltip);
if (bRotationBound) {
QString tooltip = tr("Not editable because rotation of AttachmentOffset is bound by expressions.");
ui->attachmentOffsetYaw->setToolTip(tooltip);
ui->attachmentOffsetPitch->setToolTip(tooltip);
ui->attachmentOffsetRoll->setToolTip(tooltip);
}
bBlock = false;
ui->attachmentOffsetX->blockSignals(bBlock);