diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in index 93d6e7614..d6d078224 100644 --- a/resources/SalomeApp.xml.in +++ b/resources/SalomeApp.xml.in @@ -5,6 +5,7 @@ +
@@ -105,9 +106,9 @@
- +
- +
diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index e1010522b..7826f6e22 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -5631,6 +5631,74 @@ shells and solids on the other hand. TOOL_IMPORTEXPORT Import / Export XAO + + INFO_WELCOME_TO_GEOM + Welcome to Geometry + + + INFO_GRP_CREATE_MODEL + Create model + + + INFO_VERTICES + vertices + + + INFO_EDGES + edges + + + INFO_WIRES + wires + + + INFO_FACES + faces + + + INFO_SHELLS + shells + + + INFO_SOLIDS + solids + + + INFO_BOTTOM_UP_CONSTRUCTION + Bottom-up construction + + + INFO_BOX + box + + + INFO_CYLINDER + cylinder + + + INFO_CONE + cone + + + INFO_PRIMITIVES + Primitives construction + + + INFO_BOOLEANS + Boolean operations + + + INFO_TRANSFORMATIONS + Transformations + + + INFO_GRP_IMPORT_MODEL + Import and repair model + + + INFO_AVAILABLE_FORMATS + Available formats + BasicGUI_CurveDlg diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts index e00560044..03e346d33 100644 --- a/src/GEOMGUI/GEOM_msg_fr.ts +++ b/src/GEOMGUI/GEOM_msg_fr.ts @@ -5560,6 +5560,10 @@ le paramètre '%1' aux préférences du module Géométrie.GEOM_DIM_AXES Dimensions sur les axes locaux + + Create, import, repair CAD models + Create, import, repair CAD models + GeometryGUI @@ -5615,6 +5619,74 @@ le paramètre '%1' aux préférences du module Géométrie.TOOL_IMPORTEXPORT Import / Export XAO + + INFO_WELCOME_TO_GEOM + Welcome to Geometry + + + INFO_GRP_CREATE_MODEL + Create model + + + INFO_VERTICES + vertices + + + INFO_EDGES + edges + + + INFO_WIRES + wires + + + INFO_FACES + faces + + + INFO_SHELLS + shells + + + INFO_SOLIDS + solids + + + INFO_BOTTOM_UP_CONSTRUCTION + Bottom-up construction + + + INFO_BOX + box + + + INFO_CYLINDER + cylinder + + + INFO_CONE + cone + + + INFO_PRIMITIVES + Primitives construction + + + INFO_BOOLEANS + Boolean operations + + + INFO_TRANSFORMATIONS + Transformations + + + INFO_GRP_IMPORT_MODEL + Import and repair model + + + INFO_AVAILABLE_FORMATS + Available formats + BasicGUI_CurveDlg diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts index d63d7c2fd..c6708f292 100644 --- a/src/GEOMGUI/GEOM_msg_ja.ts +++ b/src/GEOMGUI/GEOM_msg_ja.ts @@ -5567,6 +5567,10 @@ HIDE_ALL_BTN 全非表示 + + Create, import, repair CAD models + Create, import, repair CAD models + GeometryGUI @@ -5622,6 +5626,74 @@ TOOL_IMPORTEXPORT インポート / エクスポート XAO + + INFO_WELCOME_TO_GEOM + Welcome to Geometry + + + INFO_GRP_CREATE_MODEL + Create model + + + INFO_VERTICES + vertices + + + INFO_EDGES + edges + + + INFO_WIRES + wires + + + INFO_FACES + faces + + + INFO_SHELLS + shells + + + INFO_SOLIDS + solids + + + INFO_BOTTOM_UP_CONSTRUCTION + Bottom-up construction + + + INFO_BOX + box + + + INFO_CYLINDER + cylinder + + + INFO_CONE + cone + + + INFO_PRIMITIVES + Primitives construction + + + INFO_BOOLEANS + Boolean operations + + + INFO_TRANSFORMATIONS + Transformations + + + INFO_GRP_IMPORT_MODEL + Import and repair model + + + INFO_AVAILABLE_FORMATS + Available formats + BasicGUI_CurveDlg diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index e10dae3f8..f2d36230a 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -91,6 +91,7 @@ #include #include +#include // External includes #include @@ -1840,12 +1841,58 @@ void GeometryGUI::addPluginActions() } } +namespace +{ + QString wrap(const QString& text, const QString& tag) + { return QString("<%1>%2").arg(tag).arg(text).arg(tag);} +} + //======================================================================= // function : GeometryGUI::activateModule() // purpose : Called when GEOM module is activated //======================================================================= bool GeometryGUI::activateModule( SUIT_Study* study ) { + // Fill in: Help Panel + SalomeApp_Application* app = dynamic_cast( application() ); + app->infoPanel()->setTitle(tr("INFO_WELCOME_TO_GEOM")); + + int gb = app->infoPanel()->addGroup(tr("INFO_GRP_CREATE_MODEL")); + QString lab; + QStringList items; + items << wrap(tr("INFO_VERTICES"), "li") + << wrap(tr("INFO_EDGES"), "li") + << wrap(tr("INFO_WIRES"), "li") + << wrap(tr("INFO_FACES"), "li") + << wrap(tr("INFO_SHELLS"), "li") + << wrap(tr("INFO_SOLIDS"), "li"); + lab = tr("INFO_BOTTOM_UP_CONSTRUCTION") + ":" + wrap(items.join(""), "ul"); + items.clear(); + + items << wrap(tr("INFO_BOX"), "li") + << wrap(tr("INFO_CYLINDER"), "li") + << wrap(tr("INFO_CONE"), "li") + << wrap("...", "li"); + lab = lab + tr("INFO_PRIMITIVES") + ":" + wrap(items.join(""), "ul"); + items.clear(); + + lab = lab + tr("INFO_BOOLEANS") + "
"; + lab = lab + tr("INFO_TRANSFORMATIONS"); + + app->infoPanel()->addLabel(lab, gb); + + gb = app->infoPanel()->addGroup(tr("INFO_GRP_IMPORT_MODEL")); + items << wrap("BREP", "li") + << wrap("STEP", "li") + << wrap("IGES", "li") + << wrap("STL", "li") + << wrap("XAO", "li"); + lab = tr("INFO_AVAILABLE_FORMATS") + ":" + wrap(items.join(""), "ul"); + items.clear(); + + app->infoPanel()->addLabel(lab, gb); + // << Help Panel + if ( CORBA::is_nil( myComponentGeom ) ) return false; @@ -1942,6 +1989,7 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) } Py_XDECREF(pluginsmanager); + return true; } @@ -2027,6 +2075,7 @@ void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win ) void GeometryGUI::windows( QMap& mappa ) const { mappa.insert( SalomeApp_Application::WT_ObjectBrowser, Qt::LeftDockWidgetArea ); + mappa.insert( SalomeApp_Application::WT_InfoPanel, Qt::RightDockWidgetArea ); mappa.insert( SalomeApp_Application::WT_NoteBook, Qt::LeftDockWidgetArea ); #ifndef DISABLE_PYCONSOLE mappa.insert( SalomeApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );