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

Crowdin: Several more various fixes

Browse Source
This commit is contained in:
luz.paz
2019-01-19 07:50:34 -05:00
committed by Yorik van Havre
parent e1446a0b99
commit d5ea453f9d
6 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Gui/CommandDoc.cpp
View File

@@ -1143,7 +1143,7 @@ void StdCmdDelete::activated(int iMsg)
//message for linked items
if (!affectedLabels.empty()) {
bodyMessageStream << qApp->translate("Std_Delete",
"These items are linked to items selected for deletion and might break.\n\n");
"These items are linked to items selected for deletion and might break.") << "\n\n";
for (const auto &currentLabel : affectedLabels)
bodyMessageStream << currentLabel << '\n';
}
@@ -1154,13 +1154,13 @@ void StdCmdDelete::activated(int iMsg)
bodyMessageStream << "\n";
}
std::string thisDoc = pGuiDoc->getDocument()->getName();
bodyMessageStream << qApp->translate("Std_Delete",
"These items are selected for deletion, but are not in the active document. \n\n");
bodyMessageStream << qApp->translate("Std_Delete",
"These items are selected for deletion, but are not in the active document.") << "\n\n";
for (const auto &currentLabel : inactiveLabels)
bodyMessageStream << currentLabel << " / " << Base::Tools::fromStdString(thisDoc) << '\n';
}
bodyMessageStream << qApp->translate("Std_Delete",
"\n\nAre you sure you want to continue?");
bodyMessageStream << "\n\n" << qApp->translate("Std_Delete",
"Are you sure you want to continue?");
int ret = QMessageBox::question(Gui::getMainWindow(),
qApp->translate("Std_Delete", "Delete Selection Issues"), bodyMessage,
@@ -1477,4 +1477,3 @@ void CreateDocCommands(void)
}
} // namespace Gui

4
src/Gui/Selection.cpp
View File

@@ -506,12 +506,14 @@ bool SelectionSingleton::setPreselect(const char* pDocName, const char* pObjectN
} else {
msg = QCoreApplication::translate("SelectionFilter","Not allowed:");
}
msg += QString::fromUtf8(" ");
msg.append(
QObject::tr(" %1.%2.%3 ")
QObject::tr("%1.%2.%3")
.arg(QString::fromLatin1(pDocName))
.arg(QString::fromLatin1(pObjectName))
.arg(QString::fromLatin1(pSubName))
);
msg += QString::fromUtf8(" ");
if (getMainWindow()) {
getMainWindow()->showMessage(msg);

34
src/Gui/SoFCCSysDragger.cpp
View File

@@ -61,20 +61,20 @@
* file to include in the project. I would have gone this way but after installing
* inventor-demo(ubuntu), the mock compiler tool was there only in source and make
* didn't do anything. Didn't want to put any time into something I didn't like anyway.
*
*
* static SbList <SoNode*> * defaultdraggerparts = NULL; is a global definition
* in SoInteractionKit that contains the geometry. There doesn't appear to be anyway
* to add to this other than readDefaultParts, that takes a file. So maybe a temp file?
*
*
* naming appears to be central to the core. It looks like as long as an object
* is alive SoNode::getByName() will find it. So maybe just create my own little
* container of objects to keep the default geometry alive....This appears to be
* working and I like this solution.
*
*
* SoInteractionKit warns about these
* names all being the same scope and do NOT have to be unique. Need to make names
* descriptive to avoid collisions.
* this is point of the SoGroup accessed from SoFCDB::getStorage().
*/
@@ -270,10 +270,10 @@ void TDragger::drag()
SbVec3f hitPoint = projector.project(getNormalizedLocaterPosition());
SbVec3f startingPoint = getLocalStartingPoint();
SbVec3f localMovement = hitPoint - startingPoint;
//scale the increment to match local space.
float scaledIncrement = static_cast<float>(translationIncrement.getValue()) / autoScaleResult.getValue();
localMovement = roundTranslation(localMovement, scaledIncrement);
//when the movement vector is null either the appendTranslation or
//the setMotionMatrix doesn't work. either way it stops translating
@@ -287,11 +287,11 @@ void TDragger::drag()
}
else
setMotionMatrix(appendTranslation(getStartMotionMatrix(), localMovement));
Base::Quantity quantity(
static_cast<double>(translationIncrementCount.getValue()) * translationIncrement.getValue(), Base::Unit::Length);
QString message(QObject::tr("Translation: "));
QString message(QObject::tr("Translation:")+QString::fromUtf8(" "));
message += quantity.getUserString();
getMainWindow()->showMessage(message, 3000);
}
@@ -571,12 +571,12 @@ void RDragger::drag()
}
else
setMotionMatrix(appendRotation(getStartMotionMatrix(), localRotation, SbVec3f(0.0, 0.0, 0.0)));
Base::Quantity quantity(
static_cast<double>(rotationIncrementCount.getValue()) * (180.0 / M_PI) *
rotationIncrement.getValue(), Base::Unit::Angle);
QString message(QObject::tr("Rotation: "));
QString message(QObject::tr("Rotation:")+QString::fromUtf8(" "));
message += quantity.getUserString();
getMainWindow()->showMessage(message, 3000);
}
@@ -651,7 +651,7 @@ SoFCCSysDragger::SoFCCSysDragger()
SO_KIT_ADD_CATALOG_ENTRY(xTranslatorSeparator, SoSeparator, TRUE, xTranslatorSwitch, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(yTranslatorSeparator, SoSeparator, TRUE, yTranslatorSwitch, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(zTranslatorSeparator, SoSeparator, TRUE, zTranslatorSwitch, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(xTranslatorColor, SoBaseColor, TRUE, xTranslatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(yTranslatorColor, SoBaseColor, TRUE, yTranslatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(zTranslatorColor, SoBaseColor, TRUE, zTranslatorSeparator, "", TRUE);
@@ -675,7 +675,7 @@ SoFCCSysDragger::SoFCCSysDragger()
SO_KIT_ADD_CATALOG_ENTRY(xRotatorColor, SoBaseColor, TRUE, xRotatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(yRotatorColor, SoBaseColor, TRUE, yRotatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(zRotatorColor, SoBaseColor, TRUE, zRotatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(xRotatorRotation, SoRotation, TRUE, xRotatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(yRotatorRotation, SoRotation, TRUE, yRotatorSeparator, "", TRUE);
SO_KIT_ADD_CATALOG_ENTRY(zRotatorRotation, SoRotation, TRUE, zRotatorSeparator, "", TRUE);
@@ -700,7 +700,7 @@ SoFCCSysDragger::SoFCCSysDragger()
SO_KIT_ADD_FIELD(autoScaleResult, (1.0));
SO_KIT_INIT_INSTANCE();
SoBaseColor *color;
color = SO_GET_ANY_PART(this, "xTranslatorColor", SoBaseColor);
color->rgb.setValue(1.0, 0.0, 0.0);
@@ -720,12 +720,12 @@ SoFCCSysDragger::SoFCCSysDragger()
tDragger->translationIncrement.connectFrom(&this->translationIncrement);
tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);
translationIncrementCountX.connectFrom(&tDragger->translationIncrementCount);
tDragger = SO_GET_ANY_PART(this, "yTranslatorDragger", TDragger);
tDragger->translationIncrement.connectFrom(&this->translationIncrement);
tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);
translationIncrementCountY.connectFrom(&tDragger->translationIncrementCount);
tDragger = SO_GET_ANY_PART(this, "zTranslatorDragger", TDragger);
tDragger->translationIncrement.connectFrom(&this->translationIncrement);
tDragger->autoScaleResult.connectFrom(&this->autoScaleResult);

2
src/Mod/Mesh/Gui/DlgSettingsImportExport.ui
View File

File diff suppressed because one or more lines are too long

2
src/Mod/Part/Gui/DlgSettings3DViewPart.ui
View File

File diff suppressed because one or more lines are too long

6
src/Mod/TechDraw/Gui/MDIViewPage.cpp
View File

@@ -1218,12 +1218,14 @@ bool MDIViewPage::compareSelections(std::vector<Gui::SelectionObject> treeSel, Q
void MDIViewPage::showStatusMsg(const char* s1, const char* s2, const char* s3) const
{
QString msg = QString::fromUtf8("Selected: ");
msg.append(QObject::tr(" %1.%2.%3 ")
QString msg = tr("Selected:");
msg += QString::fromUtf8(" ");
msg.append(QObject::tr("%1.%2.%3")
.arg(QString::fromUtf8(s1))
.arg(QString::fromUtf8(s2))
.arg(QString::fromUtf8(s3))
);
msg += QString::fromUtf8(" ");
if (Gui::getMainWindow()) {
Gui::getMainWindow()->showMessage(msg,3000);
}