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

Fix for a previous commits

Browse Source 
Crowdin:  Sketcher/App/SketcherAnalysis remove newlines
Crowdin:  Part/AttachmentEditor/TaskAttachmentEditor.py fix previous commiit
Crowdin:  Gui/NetworkRetriever.cpp correct previous commit
This commit is contained in:
luz.paz
2019-01-26 06:29:51 -05:00
committed by Yorik van Havre
parent 1770117406
commit 3253de75e9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui/NetworkRetriever.cpp
View File

@@ -118,7 +118,8 @@ void NetworkRetriever::testFailure()
if ( wget->state() == QProcess::Running )
{
d->fail = false;
Base::Console().Message( tr("Download started...").toLatin1() + QString::fromUtf8("\n"));
QString msg = tr("Download started...") + QString::fromUtf8("\n"); // all QString
Base::Console().Message(msg.toUtf8().constData()); // all cStyleString
}
}

7
src/Mod/Part/AttachmentEditor/TaskAttachmentEditor.py
View File

@@ -1,6 +1,5 @@
#/***************************************************************************
# * Copyright (c) Victor Titov (DeepSOIC) *
# * (vv.titov@gmail.com) 2016 *
# * Copyright (c) 2016 Victor Titov (DeepSOIC) <vv.titov@gmail.com> *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
@@ -526,8 +525,8 @@ class AttachmentEditorTaskPanel(FrozenClass):
tip = mi['BriefDocu']
if (m != 'Deactivated'):
tip += QString::fromLatin1("\n\n")
tip += _translate('AttachmentEditor', "Reference combinations:", None) + u"\n\n".join(cmb)
tip += u"\n\n"
tip += _translate('AttachmentEditor', "Reference combinations:", None) + u" \n\n".join(cmb)
item.setToolTip(tip)

14
src/Mod/Sketcher/App/SketchAnalysis.cpp
View File

@@ -373,7 +373,7 @@ void SketchAnalysis::makeMissingPointOnPointCoincident(bool onebyone)
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying coincident constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying coincident constraints."));
}
}
else {
@@ -452,7 +452,7 @@ void SketchAnalysis::makeMissingVerticalHorizontal(bool onebyone)
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying vertical/horizontal constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying vertical/horizontal constraints."));
}
}
else {
@@ -647,7 +647,7 @@ void SketchAnalysis::makeMissingEquality(bool onebyone)
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying equality constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch while applying equality constraints."));
}
}
else {
@@ -701,7 +701,7 @@ int SketchAnalysis::autoconstraint(double precision, double angleprecision, bool
solvesketch(status,dofs,true);
if(status) {// it should not be possible at this moment as we start from a clean situation
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch without constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch without constraints."));
}
// STAGE 1: Vertical/Horizontal Line Segments
@@ -738,7 +738,7 @@ int SketchAnalysis::autoconstraint(double precision, double angleprecision, bool
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying horizontal and vertical constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying horizontal and vertical constraints."));
}
}
@@ -760,7 +760,7 @@ int SketchAnalysis::autoconstraint(double precision, double angleprecision, bool
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying point-on-point constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying point-on-point constraints."));
}
}
@@ -788,7 +788,7 @@ int SketchAnalysis::autoconstraint(double precision, double angleprecision, bool
}
if(status) {
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying equality constraints.")+"\n")
THROWMT(Base::RuntimeError, QT_TRANSLATE_NOOP("Exceptions", "Autoconstrain error: Unsolvable sketch after applying equality constraints."));
}
}