aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing regression in method DialogTool::GetNodeName.

Browse Source 
--HG--
branch : release
This commit is contained in:
Roman Telezhynskyi 2019-05-27 19:14:07 +03:00
parent 43c986c597
commit b352c12afa
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.txt
View File

@ -25,6 +25,7 @@
- [#967] Variable must not include new line character. - [#967] Variable must not include new line character.
- German translation for Inno setup script. - German translation for Inno setup script.
- [#971] Group operation do not work with VCubicBezierPath. - [#971] Group operation do not work with VCubicBezierPath.
- Regression in method DialogTool::GetNodeName.
# Version 0.6.1 October 23, 2018 # Version 0.6.1 October 23, 2018
- [#885] Regression. Broken support for multi size measurements. - [#885] Regression. Broken support for multi size measurements.

12
src/libs/vtools/dialogs/tools/dialogtool.cpp
View File

@ -624,7 +624,7 @@ QFont DialogTool::NodeFont(QFont font, bool nodeExcluded)
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const QString DialogTool::GetNodeName(const VPieceNode &node, bool showPassmarkDetails) const
{ {
const QSharedPointer<VGObject> obj = data->GetGObject(node.GetId()); const QSharedPointer<VGObject> obj = data->GetGObject(node.GetId());
QString name = obj->name(); QString name = obj->name();
@ -634,14 +634,14 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
int bias = 0; int bias = 0;
qApp->TrVars()->VariablesToUser(name, 0, obj->name(), bias); qApp->TrVars()->VariablesToUser(name, 0, obj->name(), bias);
if (showDetails && node.GetReverse()) if (node.GetReverse())
{ {
name = QLatin1String("- ") + name; name = QStringLiteral("- ") + name;
} }
} }
else else
{ {
if (showDetails && node.IsPassmark()) if (showPassmarkDetails && node.IsPassmark())
{ {
switch(node.GetPassmarkLineType()) switch(node.GetPassmarkLineType())
{ {
@ -655,7 +655,7 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
name += QLatin1Literal("|||"); name += QLatin1Literal("|||");
break; break;
case PassmarkLineType::TMark: case PassmarkLineType::TMark:
name += QString("┴"); name += QStringLiteral("┴");
break; break;
case PassmarkLineType::VMark: case PassmarkLineType::VMark:
name += QLatin1Char('^'); name += QLatin1Char('^');
@ -665,7 +665,7 @@ QString DialogTool::GetNodeName(const VPieceNode &node, bool showDetails) const
} }
} }
if (showDetails && not node.IsCheckUniqueness()) if (not node.IsCheckUniqueness())
{ {
name = QLatin1Char('[') + name + QLatin1Char(']'); name = QLatin1Char('[') + name + QLatin1Char(']');
} }

2
src/libs/vtools/dialogs/tools/dialogtool.h
View File

@ -284,7 +284,7 @@ protected:
static QString DialogWarningIcon(); static QString DialogWarningIcon();
static QFont NodeFont(QFont font, bool nodeExcluded = false); static QFont NodeFont(QFont font, bool nodeExcluded = false);
QString GetNodeName(const VPieceNode &node, bool showDetails = false) const; QString GetNodeName(const VPieceNode &node, bool showPassmarkDetails = false) const;
void NewNodeItem(QListWidget *listWidget, const VPieceNode &node, bool showPassmark = true); void NewNodeItem(QListWidget *listWidget, const VPieceNode &node, bool showPassmark = true);
void InitNodeAngles(QComboBox *box); void InitNodeAngles(QComboBox *box);