From 2bfccf8146c70e1b59c5fd3218098ebd9c5f3360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Fri, 1 Jan 2021 11:16:35 +0100 Subject: [PATCH 1/4] Fix Qt deprecation warnings. QPrinter::paperRect() and QPrinter::pageRect() are obsolete. --- src/Gui/GraphvizView.cpp | 4 ++++ src/Gui/View3DInventor.cpp | 4 ++++ src/Mod/Drawing/Gui/DrawingView.cpp | 10 +++++++++- src/Mod/TechDraw/Gui/MDIViewPage.cpp | 10 +++++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/Gui/GraphvizView.cpp b/src/Gui/GraphvizView.cpp index 58632d31cc..707d3d2a48 100644 --- a/src/Gui/GraphvizView.cpp +++ b/src/Gui/GraphvizView.cpp @@ -445,7 +445,11 @@ bool GraphvizView::onHasMsg(const char* pMsg) const void GraphvizView::print(QPrinter* printer) { QPainter p(printer); +#if QT_VERSION >= 0x050300 + QRect rect = printer->pageLayout().paintRectPixels(printer->resolution()); +#else QRect rect = printer->pageRect(); +#endif view->scene()->render(&p, rect); //QByteArray buffer = exportGraph(QString::fromLatin1("svg")); //QSvgRenderer svg(buffer); diff --git a/src/Gui/View3DInventor.cpp b/src/Gui/View3DInventor.cpp index 64d0e0805f..819834d536 100644 --- a/src/Gui/View3DInventor.cpp +++ b/src/Gui/View3DInventor.cpp @@ -536,7 +536,11 @@ void View3DInventor::print(QPrinter* printer) return; } +#if QT_VERSION >= 0x050300 + QRect rect = printer->pageLayout().paintRectPixels(printer->resolution()); +#else QRect rect = printer->pageRect(); +#endif QImage img; _viewer->imageFromFramebuffer(rect.width(), rect.height(), 8, QColor(255,255,255), img); p.drawImage(0,0,img); diff --git a/src/Mod/Drawing/Gui/DrawingView.cpp b/src/Mod/Drawing/Gui/DrawingView.cpp index bb72a81107..db0305b5bc 100644 --- a/src/Mod/Drawing/Gui/DrawingView.cpp +++ b/src/Mod/Drawing/Gui/DrawingView.cpp @@ -612,12 +612,20 @@ void DrawingView::print(QPrinter* printer) qApp->restoreOverrideCursor(); return; } +#if QT_VERSION >= 0x050300 + QRect rect = printer->pageLayout().fullRectPixels(printer->resolution()); +#else QRect rect = printer->paperRect(); +#endif #ifdef Q_OS_WIN32 // On Windows the preview looks broken when using paperRect as render area. // Although the picture is scaled when using pageRect, it looks just fine. if (paintType == QPaintEngine::Picture) - rect = printer->pageRect(); +#if QT_VERSION >= 0x050300 + QRect rect = printer->pageLayout().paintRectPixels(printer->resolution()); +#else + QRect rect = printer->pageRect(); +#endif #endif this->m_view->scene()->render(&p, rect); p.end(); diff --git a/src/Mod/TechDraw/Gui/MDIViewPage.cpp b/src/Mod/TechDraw/Gui/MDIViewPage.cpp index 1cfe08c1a6..432313175e 100644 --- a/src/Mod/TechDraw/Gui/MDIViewPage.cpp +++ b/src/Mod/TechDraw/Gui/MDIViewPage.cpp @@ -757,12 +757,20 @@ void MDIViewPage::print(QPrinter* printer) return; } +#if QT_VERSION >= 0x050300 + QRect targetRect = printer->pageLayout().fullRectPixels(printer->resolution()); +#else QRect targetRect = printer->paperRect(); +#endif #ifdef Q_OS_WIN32 // On Windows the preview looks broken when using paperRect as render area. // Although the picture is scaled when using pageRect, it looks just fine. if (paintType == QPaintEngine::Picture) - targetRect = printer->pageRect(); +#if QT_VERSION >= 0x050300 + QRect targetRect = printer->pageLayout().paintRectPixels(printer->resolution()); +#else + QRect targetRect = printer->pageRect(); +#endif #endif //bool block = From 78492b5bb766d19eb068ede6750e56c1c5d53c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Skowro=C5=84ski?= Date: Fri, 1 Jan 2021 10:52:17 +0100 Subject: [PATCH 2/4] Fix build warnings from deprecated Boost headers (1.74) --- src/Mod/Path/App/Area.cpp | 2 +- src/boost_geometry.hpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 src/boost_geometry.hpp diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index b3f2440dcc..11f11fc63f 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -35,7 +35,7 @@ # include "boost_fix/intrusive/detail/memory_util.hpp" # include "boost_fix/container/detail/memory_util.hpp" # endif -# include +# include # include # include # include diff --git a/src/boost_geometry.hpp b/src/boost_geometry.hpp new file mode 100644 index 0000000000..e3d066ebdc --- /dev/null +++ b/src/boost_geometry.hpp @@ -0,0 +1,9 @@ +#ifndef FREECAD_GEOMETRY_HPP_WORKAROUND +#define FREECAD_GEOMETRY_HPP_WORKAROUND + +// Workaround for boost >= 1.74 +#define BOOST_ALLOW_DEPRECATED_HEADERS +#include +#undef BOOST_ALLOW_DEPRECATED_HEADERS + +#endif // #ifndef FREECAD_GEOMETRY_HPP_WORKAROUND From 12c9aa00cf86d75ac9194221887b3e35419ca71c Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 27 Dec 2020 05:35:49 +0100 Subject: [PATCH 3/4] [TD] update balloon dialog 2 weeks ago the properties EndTypeScale and LineVisible were added but not to the dialog. This PR adds them t the balloon dialog- It also took the opportunity to cleanup the code: - add missing tooltips - uniform tooltips in App and Gui - uniform the UI element names --- src/Mod/TechDraw/App/DrawViewBalloon.cpp | 20 +- src/Mod/TechDraw/Gui/TaskBalloon.cpp | 73 +++-- src/Mod/TechDraw/Gui/TaskBalloon.h | 8 +- src/Mod/TechDraw/Gui/TaskBalloon.ui | 297 +++++++++++-------- src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp | 15 +- 5 files changed, 245 insertions(+), 168 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp index 2a19855a21..684cbc934b 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp +++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp @@ -91,26 +91,26 @@ const char* DrawViewBalloon::balloonTypeEnums[]= {"Circular", DrawViewBalloon::DrawViewBalloon(void) { - ADD_PROPERTY_TYPE(Text , (""),"",App::Prop_None,"The text to be displayed"); - ADD_PROPERTY_TYPE(SourceView,(0),"",(App::PropertyType)(App::Prop_None),"Source view for balloon"); - ADD_PROPERTY_TYPE(OriginX,(0),"",(App::PropertyType)(App::Prop_None),"Balloon origin x"); - ADD_PROPERTY_TYPE(OriginY,(0),"",(App::PropertyType)(App::Prop_None),"Balloon origin y"); + ADD_PROPERTY_TYPE(Text, (""), "", App::Prop_None, "The text to be displayed"); + ADD_PROPERTY_TYPE(SourceView, (0), "", (App::PropertyType)(App::Prop_None), "Source view for balloon"); + ADD_PROPERTY_TYPE(OriginX, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin x"); + ADD_PROPERTY_TYPE(OriginY, (0), "", (App::PropertyType)(App::Prop_None), "Balloon origin y"); EndType.setEnums(ArrowPropEnum::ArrowTypeEnums); - ADD_PROPERTY(EndType,(prefEnd())); + ADD_PROPERTY_TYPE(EndType, (prefEnd()), "", (App::PropertyType)(App::Prop_None), "End symbol for the balloon line"); - ADD_PROPERTY_TYPE(EndTypeScale,(1.0),"",(App::PropertyType)(App::Prop_None),"EndType shape scale"); + ADD_PROPERTY_TYPE(EndTypeScale, (1.0), "", (App::PropertyType)(App::Prop_None),"End symbol scale factor"); EndTypeScale.setConstraints(&SymbolScaleRange); BubbleShape.setEnums(balloonTypeEnums); - ADD_PROPERTY(BubbleShape,(prefShape())); + ADD_PROPERTY_TYPE(BubbleShape, (prefShape()), "", (App::PropertyType)(App::Prop_None), "Shape of the balloon bubble"); - ADD_PROPERTY_TYPE(ShapeScale,(1.0),"",(App::PropertyType)(App::Prop_None),"Balloon shape scale"); + ADD_PROPERTY_TYPE(ShapeScale, (1.0), "", (App::PropertyType)(App::Prop_None), "Balloon shape scale"); ShapeScale.setConstraints(&SymbolScaleRange); - ADD_PROPERTY_TYPE(TextWrapLen,(-1),"",(App::PropertyType)(App::Prop_None),"Text wrap length; -1 means no wrap"); + ADD_PROPERTY_TYPE(TextWrapLen, (-1), "", (App::PropertyType)(App::Prop_None), "Text wrap length; -1 means no wrap"); - ADD_PROPERTY_TYPE(KinkLength,(prefKinkLength()),"",(App::PropertyType)(App::Prop_None), + ADD_PROPERTY_TYPE(KinkLength, (prefKinkLength()), "", (App::PropertyType)(App::Prop_None), "Distance from symbol to leader kink"); SourceView.setScope(App::LinkScope::Global); diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.cpp b/src/Mod/TechDraw/Gui/TaskBalloon.cpp index 8816f46a48..f5938235ee 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.cpp +++ b/src/Mod/TechDraw/Gui/TaskBalloon.cpp @@ -68,44 +68,49 @@ TaskBalloon::TaskBalloon(QGIViewBalloon *parent, ViewProviderBalloon *balloonVP) ui->setupUi(this); - ui->inputScale->setValue(parent->dvBalloon->ShapeScale.getValue()); - connect(ui->inputScale, SIGNAL(valueChanged(double)), this, SLOT(onShapeScaleChanged())); + ui->qsbShapeScale->setValue(parent->dvBalloon->ShapeScale.getValue()); + connect(ui->qsbShapeScale, SIGNAL(valueChanged(double)), this, SLOT(onShapeScaleChanged())); + + ui->qsbSymbolScale->setValue(parent->dvBalloon->EndTypeScale.getValue()); + connect(ui->qsbSymbolScale, SIGNAL(valueChanged(double)), this, SLOT(onEndSymbolScaleChanged())); std::string value = parent->dvBalloon->Text.getValue(); QString qs = QString::fromUtf8(value.data(), value.size()); - ui->inputValue->setText(qs); - ui->inputValue->selectAll(); - connect(ui->inputValue, SIGNAL(textChanged(QString)), this, SLOT(onTextChanged())); - QTimer::singleShot(0, ui->inputValue, SLOT(setFocus())); + ui->leText->setText(qs); + ui->leText->selectAll(); + connect(ui->leText, SIGNAL(textChanged(QString)), this, SLOT(onTextChanged())); + QTimer::singleShot(0, ui->leText, SLOT(setFocus())); - DrawGuiUtil::loadArrowBox(ui->comboEndType); + DrawGuiUtil::loadArrowBox(ui->comboEndSymbol); i = parent->dvBalloon->EndType.getValue(); - ui->comboEndType->setCurrentIndex(i); - connect(ui->comboEndType, SIGNAL(currentIndexChanged(int)), this, SLOT(onEndTypeChanged())); + ui->comboEndSymbol->setCurrentIndex(i); + connect(ui->comboEndSymbol, SIGNAL(currentIndexChanged(int)), this, SLOT(onEndSymbolChanged())); i = parent->dvBalloon->BubbleShape.getValue(); - ui->comboSymbol->setCurrentIndex(i); - connect(ui->comboSymbol, SIGNAL(currentIndexChanged(int)), this, SLOT(onShapeChanged())); + ui->comboBubbleShape->setCurrentIndex(i); + connect(ui->comboBubbleShape, SIGNAL(currentIndexChanged(int)), this, SLOT(onBubbleShapeChanged())); ui->qsbFontSize->setUnit(Base::Unit::Length); ui->qsbFontSize->setMinimum(0); connect(ui->qsbFontSize, SIGNAL(valueChanged(double)), this, SLOT(onFontsizeChanged())); + connect(ui->comboLineVisible, SIGNAL(currentIndexChanged(int)), this, SLOT(onLineVisibleChanged())); ui->qsbLineWidth->setUnit(Base::Unit::Length); ui->qsbLineWidth->setSingleStep(0.100); ui->qsbLineWidth->setMinimum(0); connect(ui->qsbLineWidth, SIGNAL(valueChanged(double)), this, SLOT(onLineWidthChanged())); - ui->qsbBalloonKink->setUnit(Base::Unit::Length); + ui->qsbKinkLength->setUnit(Base::Unit::Length); // negative kink length is allowed, thus no minimum - connect(ui->qsbBalloonKink, SIGNAL(valueChanged(double)), this, SLOT(onBalloonKinkChanged())); + connect(ui->qsbKinkLength, SIGNAL(valueChanged(double)), this, SLOT(onKinkLengthChanged())); if (balloonVP != nullptr) { ui->textColor->setColor(balloonVP->Color.getValue().asValue()); connect(ui->textColor, SIGNAL(changed()), this, SLOT(onColorChanged())); ui->qsbFontSize->setValue(balloonVP->Fontsize.getValue()); + ui->comboLineVisible->setCurrentIndex(balloonVP->LineVisible.getValue()); ui->qsbLineWidth->setValue(balloonVP->LineWidth.getValue()); } // new balloons have already the preferences BalloonKink length - ui->qsbBalloonKink->setValue(parent->dvBalloon->KinkLength.getValue()); + ui->qsbKinkLength->setValue(parent->dvBalloon->KinkLength.getValue()); } TaskBalloon::~TaskBalloon() @@ -115,16 +120,18 @@ TaskBalloon::~TaskBalloon() bool TaskBalloon::accept() { - m_parent->dvBalloon->Text.setValue(ui->inputValue->text().toUtf8().constData()); + m_parent->dvBalloon->Text.setValue(ui->leText->text().toUtf8().constData()); App::Color ac; ac.setValue(ui->textColor->color()); m_balloonVP->Color.setValue(ac); m_balloonVP->Fontsize.setValue(ui->qsbFontSize->value().getValue()); - m_parent->dvBalloon->ShapeScale.setValue(ui->inputScale->value().getValue()); - m_parent->dvBalloon->EndType.setValue(ui->comboEndType->currentIndex()); - m_parent->dvBalloon->BubbleShape.setValue(ui->comboSymbol->currentIndex()); + m_parent->dvBalloon->ShapeScale.setValue(ui->qsbShapeScale->value().getValue()); + m_parent->dvBalloon->EndType.setValue(ui->comboEndSymbol->currentIndex()); + m_parent->dvBalloon->EndTypeScale.setValue(ui->qsbSymbolScale->value().getValue()); + m_parent->dvBalloon->BubbleShape.setValue(ui->comboBubbleShape->currentIndex()); + m_balloonVP->LineVisible.setValue(ui->comboLineVisible->currentIndex()); m_balloonVP->LineWidth.setValue(ui->qsbLineWidth->value().getValue()); - m_parent->dvBalloon->KinkLength.setValue(ui->qsbBalloonKink->value().getValue()); + m_parent->dvBalloon->KinkLength.setValue(ui->qsbKinkLength->value().getValue()); m_parent->updateView(true); return true; @@ -144,7 +151,7 @@ void TaskBalloon::recomputeFeature() void TaskBalloon::onTextChanged() { - m_parent->dvBalloon->Text.setValue(ui->inputValue->text().toUtf8().constData()); + m_parent->dvBalloon->Text.setValue(ui->leText->text().toUtf8().constData()); recomputeFeature(); } @@ -162,21 +169,33 @@ void TaskBalloon::onFontsizeChanged() recomputeFeature(); } -void TaskBalloon::onShapeChanged() +void TaskBalloon::onBubbleShapeChanged() { - m_parent->dvBalloon->BubbleShape.setValue(ui->comboSymbol->currentIndex()); + m_parent->dvBalloon->BubbleShape.setValue(ui->comboBubbleShape->currentIndex()); recomputeFeature(); } void TaskBalloon::onShapeScaleChanged() { - m_parent->dvBalloon->ShapeScale.setValue(ui->inputScale->value().getValue()); + m_parent->dvBalloon->ShapeScale.setValue(ui->qsbShapeScale->value().getValue()); recomputeFeature(); } -void TaskBalloon::onEndTypeChanged() +void TaskBalloon::onEndSymbolChanged() { - m_parent->dvBalloon->EndType.setValue(ui->comboEndType->currentIndex()); + m_parent->dvBalloon->EndType.setValue(ui->comboEndSymbol->currentIndex()); + recomputeFeature(); +} + +void TaskBalloon::onEndSymbolScaleChanged() +{ + m_parent->dvBalloon->EndTypeScale.setValue(ui->qsbSymbolScale->value().getValue()); + recomputeFeature(); +} + +void TaskBalloon::onLineVisibleChanged() +{ + m_balloonVP->LineVisible.setValue(ui->comboLineVisible->currentIndex()); recomputeFeature(); } @@ -186,9 +205,9 @@ void TaskBalloon::onLineWidthChanged() recomputeFeature(); } -void TaskBalloon::onBalloonKinkChanged() +void TaskBalloon::onKinkLengthChanged() { - m_parent->dvBalloon->KinkLength.setValue(ui->qsbBalloonKink->value().getValue()); + m_parent->dvBalloon->KinkLength.setValue(ui->qsbKinkLength->value().getValue()); recomputeFeature(); } diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.h b/src/Mod/TechDraw/Gui/TaskBalloon.h index 0e3689c158..b292557c06 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.h +++ b/src/Mod/TechDraw/Gui/TaskBalloon.h @@ -56,11 +56,13 @@ private Q_SLOTS: void onTextChanged(); void onColorChanged(); void onFontsizeChanged(); - void onShapeChanged(); + void onBubbleShapeChanged(); void onShapeScaleChanged(); - void onEndTypeChanged(); + void onEndSymbolChanged(); + void onEndSymbolScaleChanged(); + void onLineVisibleChanged(); void onLineWidthChanged(); - void onBalloonKinkChanged(); + void onKinkLengthChanged(); private: Ui_TaskBalloon *ui; diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui index 9433fc0882..8d064d6d10 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.ui +++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui @@ -7,7 +7,7 @@ 0 0 307 - 229 + 279 @@ -16,27 +16,6 @@ - - - - Text: - - - - - - - Text to be displayed - - - - - - - Text Color: - - - @@ -51,10 +30,10 @@ - - + + - Fontsize: + Line Visible: @@ -89,15 +68,171 @@ + + + + End symbol for the balloon line + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Leader line width + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.350000000000000 + + + BalloonKink + + + Mod/TechDraw/Dimensions + + + + + + + Shape Scale: + + + + + + + Line Width: + + + + + + + Leader Kink Length: + + + + + + + Text: + + + + + + + End Symbol: + + + + + + + + 0 + 20 + + + + Bubble shape scale factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + - Shape: + Bubble Shape: + + + + + + + Font Size: + + + + + + + Whether the leader line is visible or not + + + 0 + + + + False + + + + + True + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Length of balloon leader line kink + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + BalloonKink + + + Mod/TechDraw/Dimensions - + Shape of the balloon bubble @@ -166,15 +301,22 @@ - - - - Shape Scale: + + + + Text to be displayed - - + + + + Text Color: + + + + + 0 @@ -182,7 +324,7 @@ - Scale factor for the 'Shape' + End symbol scale factor Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -198,93 +340,10 @@ - - - - End Symbol: - - - - - - - End symbol for the balloon line - - - - + - Line Width: - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Leader line width - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.350000000000000 - - - BalloonKink - - - Mod/TechDraw/Dimensions - - - - - - - Leader Kink Length: - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Length of balloon leader line kink - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - BalloonKink - - - Mod/TechDraw/Dimensions + End Symbol Scale: diff --git a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp index f79910b5e5..ae7c0a5186 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderBalloon.cpp @@ -47,7 +47,6 @@ #include #include -//#include #include "PreferencesGui.h" #include "TaskBalloon.h" @@ -67,18 +66,16 @@ ViewProviderBalloon::ViewProviderBalloon() static const char *group = "Balloon Format"; - ADD_PROPERTY_TYPE(Font,(Preferences::labelFont().c_str()),group,App::Prop_None, "The name of the font to use"); - ADD_PROPERTY_TYPE(Fontsize,(Preferences::dimFontSizeMM()), - group,(App::PropertyType)(App::Prop_None),"Balloon text size in units"); + ADD_PROPERTY_TYPE(Font, (Preferences::labelFont().c_str()), group, App::Prop_None, "The name of the font to use"); + ADD_PROPERTY_TYPE(Fontsize, (Preferences::dimFontSizeMM()), + group, (App::PropertyType)(App::Prop_None), "Balloon text size in units"); int lgNumber = Preferences::lineGroup(); auto lg = TechDraw::LineGroup::lineGroupFactory(lgNumber); double weight = lg->getWeight("Thin"); delete lg; //Coverity CID 174670 - ADD_PROPERTY_TYPE(LineWidth,(weight),group,(App::PropertyType)(App::Prop_None),"Leader line width"); - ADD_PROPERTY_TYPE(LineVisible,(true),group,(App::PropertyType)(App::Prop_None),"Balloon line visible or hidden"); - - ADD_PROPERTY_TYPE(Color,(PreferencesGui::dimColor()), - group,App::Prop_None,"Color of the balloon"); + ADD_PROPERTY_TYPE(LineWidth, (weight), group, (App::PropertyType)(App::Prop_None), "Leader line width"); + ADD_PROPERTY_TYPE(LineVisible, (true), group, (App::PropertyType)(App::Prop_None), "Balloon line visible or hidden"); + ADD_PROPERTY_TYPE(Color, (PreferencesGui::dimColor()), group, App::Prop_None, "Color of the balloon"); } ViewProviderBalloon::~ViewProviderBalloon() From a9945500d8fd69ca30e353bd4ad8b3914621f841 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 2 Jan 2021 12:00:01 +0100 Subject: [PATCH 4/4] TechDraw: [skip ci] restore TAB order of TaskBalloon dialog --- src/Mod/TechDraw/Gui/TaskBalloon.ui | 338 ++++++++++++++-------------- 1 file changed, 169 insertions(+), 169 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskBalloon.ui b/src/Mod/TechDraw/Gui/TaskBalloon.ui index 8d064d6d10..b4c1911af1 100644 --- a/src/Mod/TechDraw/Gui/TaskBalloon.ui +++ b/src/Mod/TechDraw/Gui/TaskBalloon.ui @@ -16,6 +16,27 @@ + + + + Text: + + + + + + + Text to be displayed + + + + + + + Text Color: + + + @@ -30,10 +51,10 @@ - - + + - Line Visible: + Font Size: @@ -68,104 +89,6 @@ - - - - End symbol for the balloon line - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Leader line width - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.350000000000000 - - - BalloonKink - - - Mod/TechDraw/Dimensions - - - - - - - Shape Scale: - - - - - - - Line Width: - - - - - - - Leader Kink Length: - - - - - - - Text: - - - - - - - End Symbol: - - - - - - - - 0 - 20 - - - - Bubble shape scale factor - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 0.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - @@ -173,64 +96,6 @@ - - - - Font Size: - - - - - - - Whether the leader line is visible or not - - - 0 - - - - False - - - - - True - - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Length of balloon leader line kink - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - BalloonKink - - - Mod/TechDraw/Dimensions - - - @@ -301,17 +166,56 @@ - - - - Text to be displayed + + + + Shape Scale: - - + + + + + 0 + 20 + + + + Bubble shape scale factor + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + - Text Color: + End Symbol: + + + + + + + End symbol for the balloon line + + + + + + + End Symbol Scale: @@ -340,10 +244,106 @@ - - + + - End Symbol Scale: + Line Visible: + + + + + + + Whether the leader line is visible or not + + + 0 + + + + False + + + + + True + + + + + + + + Line Width: + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Leader line width + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.350000000000000 + + + BalloonKink + + + Mod/TechDraw/Dimensions + + + + + + + Leader Kink Length: + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Length of balloon leader line kink + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + BalloonKink + + + Mod/TechDraw/Dimensions