From fc0db1a78d8b4137c1d05005ecb2f493c53e15bf Mon Sep 17 00:00:00 2001 From: nri Date: Fri, 16 May 2003 07:41:41 +0000 Subject: [PATCH] NRI : Rename resources and library. Update mechanism of loading resources and engine. --- src/GEOMGUI/{GeometryGUI_icons.po => GEOM_icons.po} | 0 src/GEOMGUI/{GeometryGUI_msg_en.po => GEOM_msg_en.po} | 0 src/GEOMGUI/{GeometryGUI_msg_fr.po => GEOM_msg_fr.po} | 0 src/GEOMGUI/GeometryGUI.cxx | 11 +++++++---- src/GEOMGUI/Makefile.in | 8 ++++---- 5 files changed, 11 insertions(+), 8 deletions(-) rename src/GEOMGUI/{GeometryGUI_icons.po => GEOM_icons.po} (100%) rename src/GEOMGUI/{GeometryGUI_msg_en.po => GEOM_msg_en.po} (100%) rename src/GEOMGUI/{GeometryGUI_msg_fr.po => GEOM_msg_fr.po} (100%) diff --git a/src/GEOMGUI/GeometryGUI_icons.po b/src/GEOMGUI/GEOM_icons.po similarity index 100% rename from src/GEOMGUI/GeometryGUI_icons.po rename to src/GEOMGUI/GEOM_icons.po diff --git a/src/GEOMGUI/GeometryGUI_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po similarity index 100% rename from src/GEOMGUI/GeometryGUI_msg_en.po rename to src/GEOMGUI/GEOM_msg_en.po diff --git a/src/GEOMGUI/GeometryGUI_msg_fr.po b/src/GEOMGUI/GEOM_msg_fr.po similarity index 100% rename from src/GEOMGUI/GeometryGUI_msg_fr.po rename to src/GEOMGUI/GEOM_msg_fr.po diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index c284b6f4f..2792459fc 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -337,7 +337,7 @@ GeometryGUI* GeometryGUI::GetOrCreateGeometryGUI( QAD_Desktop* desktop ) GeomGUI->myShadingColor = Quantity_Color( Quantity_NOC_GOLDENROD ); - Engines::Component_var comp = desktop->getEngine("FactoryServer", "Geometry"); + Engines::Component_var comp = desktop->getEngine("FactoryServer", "GEOM"); GeomGUI->myComponentGeom = GEOM::GEOM_Gen::_narrow(comp); /* GetCurrentStudy */ @@ -4990,7 +4990,8 @@ bool GeometryGUI::Import( ) father = aStudyBuilder->NewComponent("GEOM"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + // aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "GEOM" ) ); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap->SetPixMap( "ICON_OBJBROWSER_Geometry" ); @@ -5194,7 +5195,8 @@ bool GeometryGUI::Display( GEOM::GEOM_Shape_ptr aShape, father = aStudyBuilder->NewComponent("GEOM"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + // aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "GEOM" ) ); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap->SetPixMap( "ICON_OBJBROWSER_Geometry" ); @@ -5308,7 +5310,8 @@ bool GeometryGUI::AddInStudy( bool selection, father = aStudyBuilder->NewComponent("GEOM"); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributeName"); aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + // aName->SetValue( tr("GEOM_MEN_COMPONENT") ); + aName->SetValue( QAD_Application::getDesktop()->getComponentUserName( "GEOM" ) ); anAttr = aStudyBuilder->FindOrCreateAttribute(father, "AttributePixMap"); aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); aPixmap->SetPixMap( "ICON_OBJBROWSER_Geometry" ); diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index 1da6a3390..59655d0b8 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -20,12 +20,12 @@ EXPORT_HEADERS= GeometryGUI_Swig.hxx \ # ressources files : PO_FILES = \ - GeometryGUI_icons.po \ - GeometryGUI_msg_en.po \ - GeometryGUI_msg_fr.po + GEOM_icons.po \ + GEOM_msg_en.po \ + GEOM_msg_fr.po # Libraries targets -LIB = libGeometryGUI.la +LIB = libGEOMGUI.la LIB_SRC = GeometryGUI.cxx \ GeometryGUI_SpinBox.cxx \ GeometryGUI_TransparencyDlg.cxx \ -- 2.39.2