palo/valentina
1
0
Fork 0
mirror of https://gitlab.com/smart-pattern/valentina.git synced 2024-09-21 00:04:03 +02:00
Code Issues Projects Releases Wiki Activity

Fix error: tr() cannot be called without context.

Browse source
This commit is contained in:
Roman Telezhynskyi 2023-10-13 18:33:16 +03:00
parent a312e154b7
commit 9d734a667b
2 changed files with 62 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp
View file

@ -2285,7 +2285,7 @@ auto DialogPiecePath::InitContextMenu(QMenu *menu, const VPieceNode &rowNode) ->
if (rowNode.GetTypeTool() != Tool::NodePoint) if (rowNode.GetTypeTool() != Tool::NodePoint)
{ {
QAction *actionReverse = menu->addAction(tr("Reverse")); QAction *actionReverse = menu->addAction(QApplication::translate("DialogSeamAllowance", "Reverse"));
actionReverse->setCheckable(true); actionReverse->setCheckable(true);
actionReverse->setChecked(rowNode.GetReverse()); actionReverse->setChecked(rowNode.GetReverse());
contextMenu.insert(static_cast<int>(ContextMenuOption::Reverse), actionReverse); contextMenu.insert(static_cast<int>(ContextMenuOption::Reverse), actionReverse);
@ -2295,9 +2295,10 @@ auto DialogPiecePath::InitContextMenu(QMenu *menu, const VPieceNode &rowNode) ->
if (m_showMode && GetType() == PiecePathType::CustomSeamAllowance && if (m_showMode && GetType() == PiecePathType::CustomSeamAllowance &&
ui->tabWidget->indexOf(ui->tabPassmarks) != -1) ui->tabWidget->indexOf(ui->tabPassmarks) != -1)
{ {
QMenu *passmarkSubmenu = menu->addMenu(tr("Passmark")); QMenu *passmarkSubmenu = menu->addMenu(QApplication::translate("DialogSeamAllowance", "Passmark"));
QAction *actionNonePassmark = passmarkSubmenu->addAction(tr("None")); QAction *actionNonePassmark =
passmarkSubmenu->addAction(QApplication::translate("DialogSeamAllowance", "None"));
actionNonePassmark->setCheckable(true); actionNonePassmark->setCheckable(true);
actionNonePassmark->setChecked(!rowNode.IsPassmark()); actionNonePassmark->setChecked(!rowNode.IsPassmark());
contextMenu.insert(static_cast<int>(ContextMenuOption::NonePassmark), actionNonePassmark); contextMenu.insert(static_cast<int>(ContextMenuOption::NonePassmark), actionNonePassmark);
@ -2314,42 +2315,54 @@ auto DialogPiecePath::InitContextMenu(QMenu *menu, const VPieceNode &rowNode) ->
}; };
contextMenu.insert(static_cast<int>(ContextMenuOption::OneLine), contextMenu.insert(static_cast<int>(ContextMenuOption::OneLine),
InitPassmarkLineTypeAction(tr("One line"), PassmarkLineType::OneLine)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "One line"),
PassmarkLineType::OneLine));
contextMenu.insert(static_cast<int>(ContextMenuOption::TwoLines), contextMenu.insert(static_cast<int>(ContextMenuOption::TwoLines),
InitPassmarkLineTypeAction(tr("Two lines"), PassmarkLineType::TwoLines)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Two lines"),
PassmarkLineType::TwoLines));
contextMenu.insert(static_cast<int>(ContextMenuOption::ThreeLines), contextMenu.insert(static_cast<int>(ContextMenuOption::ThreeLines),
InitPassmarkLineTypeAction(tr("Three lines"), PassmarkLineType::ThreeLines)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Three lines"),
PassmarkLineType::ThreeLines));
contextMenu.insert(static_cast<int>(ContextMenuOption::TMark), contextMenu.insert(static_cast<int>(ContextMenuOption::TMark),
InitPassmarkLineTypeAction(tr("T mark"), PassmarkLineType::TMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "T mark"),
contextMenu.insert(static_cast<int>(ContextMenuOption::ExternalVMark), PassmarkLineType::TMark));
InitPassmarkLineTypeAction(tr("External V mark"), PassmarkLineType::ExternalVMark)); contextMenu.insert(
contextMenu.insert(static_cast<int>(ContextMenuOption::InternalVMark), static_cast<int>(ContextMenuOption::ExternalVMark),
InitPassmarkLineTypeAction(tr("Internal V mark"), PassmarkLineType::InternalVMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "External V mark"),
PassmarkLineType::ExternalVMark));
contextMenu.insert(
static_cast<int>(ContextMenuOption::InternalVMark),
InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Internal V mark"),
PassmarkLineType::InternalVMark));
contextMenu.insert(static_cast<int>(ContextMenuOption::UMark), contextMenu.insert(static_cast<int>(ContextMenuOption::UMark),
InitPassmarkLineTypeAction(tr("U mark"), PassmarkLineType::UMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "U mark"),
PassmarkLineType::UMark));
contextMenu.insert(static_cast<int>(ContextMenuOption::BoxMark), contextMenu.insert(static_cast<int>(ContextMenuOption::BoxMark),
InitPassmarkLineTypeAction(tr("Box mark"), PassmarkLineType::BoxMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Box mark"),
PassmarkLineType::BoxMark));
contextMenu.insert(static_cast<int>(ContextMenuOption::CheckMark), contextMenu.insert(static_cast<int>(ContextMenuOption::CheckMark),
InitPassmarkLineTypeAction(tr("Check mark"), PassmarkLineType::CheckMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Check mark"),
PassmarkLineType::CheckMark));
} }
QAction *actionUniqueness = menu->addAction(tr("Check uniqueness")); QAction *actionUniqueness = menu->addAction(QApplication::translate("DialogSeamAllowance", "Check uniqueness"));
actionUniqueness->setCheckable(true); actionUniqueness->setCheckable(true);
actionUniqueness->setChecked(rowNode.IsCheckUniqueness()); actionUniqueness->setChecked(rowNode.IsCheckUniqueness());
contextMenu.insert(static_cast<int>(ContextMenuOption::Uniqueness), actionUniqueness); contextMenu.insert(static_cast<int>(ContextMenuOption::Uniqueness), actionUniqueness);
QAction *actionTurnPoint = menu->addAction(tr("Turn point")); QAction *actionTurnPoint = menu->addAction(QApplication::translate("DialogSeamAllowance", "Turn point"));
actionTurnPoint->setCheckable(true); actionTurnPoint->setCheckable(true);
actionTurnPoint->setChecked(rowNode.IsTurnPoint()); actionTurnPoint->setChecked(rowNode.IsTurnPoint());
contextMenu.insert(static_cast<int>(ContextMenuOption::TurnPoint), actionTurnPoint); contextMenu.insert(static_cast<int>(ContextMenuOption::TurnPoint), actionTurnPoint);
} }
QAction *actionExcluded = menu->addAction(tr("Excluded")); QAction *actionExcluded = menu->addAction(QApplication::translate("DialogSeamAllowance", "Excluded"));
actionExcluded->setCheckable(true); actionExcluded->setCheckable(true);
actionExcluded->setChecked(rowNode.IsExcluded()); actionExcluded->setChecked(rowNode.IsExcluded());
contextMenu.insert(static_cast<int>(ContextMenuOption::Excluded), actionExcluded); contextMenu.insert(static_cast<int>(ContextMenuOption::Excluded), actionExcluded);
QAction *actionDelete = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), tr("Delete")); QAction *actionDelete = menu->addAction(QIcon::fromTheme(QStringLiteral("edit-delete")),
QApplication::translate("DialogSeamAllowance", "Delete"));
contextMenu.insert(static_cast<int>(ContextMenuOption::Delete), actionDelete); contextMenu.insert(static_cast<int>(ContextMenuOption::Delete), actionDelete);
return contextMenu; return contextMenu;

49
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp
View file

@ -4532,7 +4532,7 @@ auto DialogSeamAllowance::InitMainPathContextMenu(QMenu *menu, const VPieceNode
if (rowNode.GetTypeTool() != Tool::NodePoint) if (rowNode.GetTypeTool() != Tool::NodePoint)
{ {
QAction *actionReverse = menu->addAction(tr("Reverse")); QAction *actionReverse = menu->addAction(QApplication::translate("DialogSeamAllowance", "Reverse"));
actionReverse->setCheckable(true); actionReverse->setCheckable(true);
actionReverse->setChecked(rowNode.GetReverse()); actionReverse->setChecked(rowNode.GetReverse());
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Reverse), actionReverse); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Reverse), actionReverse);
@ -4541,9 +4541,10 @@ auto DialogSeamAllowance::InitMainPathContextMenu(QMenu *menu, const VPieceNode
{ {
if (applyAllowed) if (applyAllowed)
{ {
QMenu *passmarkSubmenu = menu->addMenu(tr("Passmark")); QMenu *passmarkSubmenu = menu->addMenu(QApplication::translate("DialogSeamAllowance", "Passmark"));
QAction *actionNonePassmark = passmarkSubmenu->addAction(tr("None")); QAction *actionNonePassmark =
passmarkSubmenu->addAction(QApplication::translate("DialogSeamAllowance", "None"));
actionNonePassmark->setCheckable(true); actionNonePassmark->setCheckable(true);
actionNonePassmark->setChecked(!rowNode.IsPassmark()); actionNonePassmark->setChecked(!rowNode.IsPassmark());
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::NonePassmark), actionNonePassmark); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::NonePassmark), actionNonePassmark);
@ -4560,42 +4561,54 @@ auto DialogSeamAllowance::InitMainPathContextMenu(QMenu *menu, const VPieceNode
}; };
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::OneLine), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::OneLine),
InitPassmarkLineTypeAction(tr("One line"), PassmarkLineType::OneLine)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "One line"),
PassmarkLineType::OneLine));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TwoLines), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TwoLines),
InitPassmarkLineTypeAction(tr("Two lines"), PassmarkLineType::TwoLines)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Two lines"),
PassmarkLineType::TwoLines));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::ThreeLines), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::ThreeLines),
InitPassmarkLineTypeAction(tr("Three lines"), PassmarkLineType::ThreeLines)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Three lines"),
PassmarkLineType::ThreeLines));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TMark), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TMark),
InitPassmarkLineTypeAction(tr("T mark"), PassmarkLineType::TMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "T mark"),
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::ExternalVMark), PassmarkLineType::TMark));
InitPassmarkLineTypeAction(tr("External V mark"), PassmarkLineType::ExternalVMark)); contextMenu.insert(
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::InternalVMark), static_cast<int>(MainPathContextMenuOption::ExternalVMark),
InitPassmarkLineTypeAction(tr("Internal V mark"), PassmarkLineType::InternalVMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "External V mark"),
PassmarkLineType::ExternalVMark));
contextMenu.insert(
static_cast<int>(MainPathContextMenuOption::InternalVMark),
InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Internal V mark"),
PassmarkLineType::InternalVMark));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::UMark), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::UMark),
InitPassmarkLineTypeAction(tr("U mark"), PassmarkLineType::UMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "U mark"),
PassmarkLineType::UMark));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::BoxMark), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::BoxMark),
InitPassmarkLineTypeAction(tr("Box mark"), PassmarkLineType::BoxMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Box mark"),
PassmarkLineType::BoxMark));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::CheckMark), contextMenu.insert(static_cast<int>(MainPathContextMenuOption::CheckMark),
InitPassmarkLineTypeAction(tr("Check mark"), PassmarkLineType::CheckMark)); InitPassmarkLineTypeAction(QApplication::translate("DialogSeamAllowance", "Check mark"),
PassmarkLineType::CheckMark));
} }
QAction *actionUniqueness = menu->addAction(tr("Check uniqueness")); QAction *actionUniqueness = menu->addAction(QApplication::translate("DialogSeamAllowance", "Check uniqueness"));
actionUniqueness->setCheckable(true); actionUniqueness->setCheckable(true);
actionUniqueness->setChecked(rowNode.IsCheckUniqueness()); actionUniqueness->setChecked(rowNode.IsCheckUniqueness());
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Uniqueness), actionUniqueness); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Uniqueness), actionUniqueness);
QAction *actionTurnPoint = menu->addAction(tr("Turn point")); QAction *actionTurnPoint = menu->addAction(QApplication::translate("DialogSeamAllowance", "Turn point"));
actionTurnPoint->setCheckable(true); actionTurnPoint->setCheckable(true);
actionTurnPoint->setChecked(rowNode.IsTurnPoint()); actionTurnPoint->setChecked(rowNode.IsTurnPoint());
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TurnPoint), actionTurnPoint); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::TurnPoint), actionTurnPoint);
} }
QAction *actionExcluded = menu->addAction(tr("Excluded")); QAction *actionExcluded = menu->addAction(QApplication::translate("DialogSeamAllowance", "Excluded"));
actionExcluded->setCheckable(true); actionExcluded->setCheckable(true);
actionExcluded->setChecked(rowNode.IsExcluded()); actionExcluded->setChecked(rowNode.IsExcluded());
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Excluded), actionExcluded); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Excluded), actionExcluded);
QAction *actionDelete = menu->addAction(QIcon::fromTheme(editDeleteIcon), tr("Delete")); QAction *actionDelete =
menu->addAction(QIcon::fromTheme(editDeleteIcon), QApplication::translate("DialogSeamAllowance", "Delete"));
contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Delete), actionDelete); contextMenu.insert(static_cast<int>(MainPathContextMenuOption::Delete), actionDelete);
return contextMenu; return contextMenu;