Salome HOME
projects
/
modules
/
shaper.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55721f7
)
Automatic translations added.
author
mpv
<mpv@opencascade.com>
Tue, 17 Sep 2019 14:34:09 +0000
(17:34 +0300)
committer
mpv
<mpv@opencascade.com>
Tue, 17 Sep 2019 14:34:09 +0000
(17:34 +0300)
src/FeaturesPlugin/plugin-Features.xml
patch
|
blob
|
history
src/ModuleBase/ModuleBase_ModelWidget.cpp
patch
|
blob
|
history
src/ModuleBase/ModuleBase_WidgetFactory.cpp
patch
|
blob
|
history
src/PartSet/PartSet_WidgetSketchCreator.cpp
patch
|
blob
|
history
src/XGUI/XGUI_MenuMgr.cpp
patch
|
blob
|
history
diff --git
a/src/FeaturesPlugin/plugin-Features.xml
b/src/FeaturesPlugin/plugin-Features.xml
index 215de85d7e5aa773053d10c3b63f0faaa6f2ea09..f7f414e98683f74358dec8ef2baa343558b34edb 100644
(file)
--- a/
src/FeaturesPlugin/plugin-Features.xml
+++ b/
src/FeaturesPlugin/plugin-Features.xml
@@
-11,11
+11,11
@@
icon="icons/Features/extrusion.png" helpfile="extrusionFeature.html">
<source path="extrusion_widget.xml"/>
</feature>
icon="icons/Features/extrusion.png" helpfile="extrusionFeature.html">
<source path="extrusion_widget.xml"/>
</feature>
- <feature id="ExtrusionCut" title="ExtrusionCut" tooltip=""
+ <feature id="ExtrusionCut" title="ExtrusionCut" tooltip="
Cuts an extrusion from a solid
"
icon="icons/Features/extrusion_cut.png" helpfile="extrusionCutFeature.html">
<source path="extrusioncut_widget.xml"/>
</feature>
icon="icons/Features/extrusion_cut.png" helpfile="extrusionCutFeature.html">
<source path="extrusioncut_widget.xml"/>
</feature>
- <feature id="ExtrusionFuse" title="ExtrusionFuse" tooltip=""
+ <feature id="ExtrusionFuse" title="ExtrusionFuse" tooltip="
Fuses an extrusion with a solid
"
icon="icons/Features/extrusion_fuse.png" helpfile="extrusionFuseFeature.html">
<source path="extrusionfuse_widget.xml"/>
</feature>
icon="icons/Features/extrusion_fuse.png" helpfile="extrusionFuseFeature.html">
<source path="extrusionfuse_widget.xml"/>
</feature>
@@
-25,11
+25,11
@@
icon="icons/Features/revol.png" helpfile="revolutionFeature.html">
<source path="revolution_widget.xml"/>
</feature>
icon="icons/Features/revol.png" helpfile="revolutionFeature.html">
<source path="revolution_widget.xml"/>
</feature>
- <feature id="RevolutionCut" title="RevolutionCut" tooltip=""
+ <feature id="RevolutionCut" title="RevolutionCut" tooltip="
Cuts a revolution from a solid
"
icon="icons/Features/revol_cut.png" helpfile="revolutionCutFeature.html">
<source path="revolutioncut_widget.xml"/>
</feature>
icon="icons/Features/revol_cut.png" helpfile="revolutionCutFeature.html">
<source path="revolutioncut_widget.xml"/>
</feature>
- <feature id="RevolutionFuse" title="RevolutionFuse" tooltip=""
+ <feature id="RevolutionFuse" title="RevolutionFuse" tooltip="
Fuses a revolution with a solid
"
icon="icons/Features/revol_fuse.png" helpfile="revolutionFuseFeature.html">
<source path="revolutionfuse_widget.xml"/>
</feature>
icon="icons/Features/revol_fuse.png" helpfile="revolutionFuseFeature.html">
<source path="revolutionfuse_widget.xml"/>
</feature>
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index dd17a65d83edddf770475a99311d68f2f03732a2..89546edfd4bacde2ac2f40b91a4258dbcef1a299 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-155,6
+155,7
@@
void ModuleBase_ModelWidget::processValueState()
Events_InfoMessage ModuleBase_ModelWidget::getValueStateError() const
{
Events_InfoMessage aMessage;
Events_InfoMessage ModuleBase_ModelWidget::getValueStateError() const
{
Events_InfoMessage aMessage;
+ aMessage.setContext(context());
ModuleBase_ModelWidget::ValueState aState = getValueState();
if (aState != ModuleBase_ModelWidget::Stored) {
ModuleBase_ModelWidget::ValueState aState = getValueState();
if (aState != ModuleBase_ModelWidget::Stored) {
diff --git
a/src/ModuleBase/ModuleBase_WidgetFactory.cpp
b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
index 23728c5696ed0be83a2054d8285c930db7659681..0cc45bf0947f676388cd9fb748f86c0286a6169e 100644
(file)
--- a/
src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@
-274,7
+274,8
@@
ModuleBase_PageBase* ModuleBase_WidgetFactory::createPageByType(const std::strin
if (theType == WDG_GROUP) {
QString aGroupName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
ModuleBase_PageGroupBox* aPage = new ModuleBase_PageGroupBox(theParent);
if (theType == WDG_GROUP) {
QString aGroupName = qs(myWidgetApi->getProperty(CONTAINER_PAGE_NAME));
ModuleBase_PageGroupBox* aPage = new ModuleBase_PageGroupBox(theParent);
- aPage->setTitle(aGroupName);
+ aPage->setTitle(ModuleBase_Tools::translate(
+ myWidgetApi->myFeatureId, aGroupName.toStdString()));
aResult = aPage;
}
else if (theType == WDG_OPTIONALBOX) {
aResult = aPage;
}
else if (theType == WDG_OPTIONALBOX) {
diff --git
a/src/PartSet/PartSet_WidgetSketchCreator.cpp
b/src/PartSet/PartSet_WidgetSketchCreator.cpp
index 9cb8ab40154d34824504753624e699c697543978..de888dc755b59345e113b6dda7c47620de5435f8 100644
(file)
--- a/
src/PartSet/PartSet_WidgetSketchCreator.cpp
+++ b/
src/PartSet/PartSet_WidgetSketchCreator.cpp
@@
-82,7
+82,7
@@
PartSet_WidgetSketchCreator::PartSet_WidgetSketchCreator(QWidget* theParent,
ModuleBase_Tools::adjustMargins(aLayout);
ModuleBase_Tools::adjustMargins(aLayout);
- QString aLabelText =
QString::fromStdString
(theData->widgetLabel());
+ QString aLabelText =
translate
(theData->widgetLabel());
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
// Size of the View control
QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
// Size of the View control
diff --git
a/src/XGUI/XGUI_MenuMgr.cpp
b/src/XGUI/XGUI_MenuMgr.cpp
index 8a6fce040eea66438bf3e15a06400e3e6f1acc27..cb004a243089402ed2eec83c880ef68c8f3f981d 100644
(file)
--- a/
src/XGUI/XGUI_MenuMgr.cpp
+++ b/
src/XGUI/XGUI_MenuMgr.cpp
@@
-40,6
+40,7
@@
#endif
#include <ModuleBase_IModule.h>
#endif
#include <ModuleBase_IModule.h>
+#include <ModuleBase_Tools.h>
#include <QObject>
#include <QAction>
#include <QObject>
#include <QAction>
@@
-74,15
+75,16
@@
void XGUI_MenuMgr::addFeature(const std::shared_ptr<Config_FeatureMessage>& theM
#endif
return;
}
#endif
return;
}
+ QString aWchName = ModuleBase_Tools::translate("workshop", theMessage->workbenchId());
#ifdef HAVE_SALOME
#ifdef HAVE_SALOME
- std::shared_ptr<XGUI_MenuWorkbench> aWorkbench = findWorkbench(theMessage->workbenchId());
+ std::string aWchNameString = aWchName.toStdString();
+ std::shared_ptr<XGUI_MenuWorkbench> aWorkbench = findWorkbench(aWchNameString);
std::shared_ptr<XGUI_MenuGroup> aGroup = aWorkbench->findGroup(theMessage->groupId());
aGroup->setFeatureInfo(theMessage);
#else
ActionInfo aFeatureInfo;
aFeatureInfo.initFrom(theMessage);
std::shared_ptr<XGUI_MenuGroup> aGroup = aWorkbench->findGroup(theMessage->groupId());
aGroup->setFeatureInfo(theMessage);
#else
ActionInfo aFeatureInfo;
aFeatureInfo.initFrom(theMessage);
- QString aWchName = QString::fromStdString(theMessage->workbenchId());
QStringList aNestedFeatures =
QString::fromStdString(theMessage->nestedFeatures()).split(" ", QString::SkipEmptyParts);
QList<QAction*> aNestedActList;
QStringList aNestedFeatures =
QString::fromStdString(theMessage->nestedFeatures()).split(" ", QString::SkipEmptyParts);
QList<QAction*> aNestedActList;