NRI : Dialog box is updated taking into account Component_UserName field.

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 15ae1cc2df476af3bde3abb75fe50e6c10770e95..7dd7affe4c077dfde91e430e894b56685f43d743 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -135,6 +135,10 @@ ToolsGUI_CatalogGeneratorDlg::ToolsGUI_CatalogGeneratorDlg( QWidget* parent, con
   myCompName->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   myCompName->setMinimumSize( myMinimumSize );
 
+  myCompUserName = new QLineEdit(supplGrp , "myCompUserName");
+  myCompUserName->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  myCompUserName->setMinimumSize( MIN_EDIT_SIZE*0.3, 0 );
+
   myCompType = new QLineEdit(supplGrp , "myCompType");
   myCompType->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   myCompType->setMinimumSize( myMinimumSize );
@@ -151,12 +155,14 @@ ToolsGUI_CatalogGeneratorDlg::ToolsGUI_CatalogGeneratorDlg( QWidget* parent, con
   supplGrpLayout->addWidget( myAuthorEdit, 0, 1 );
   supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_COMP_NAME" ), supplGrp ), 0, 2);
   supplGrpLayout->addWidget(myCompName,0,3);
-  supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_COMP_TYPE" ), supplGrp ), 0, 4);
-  supplGrpLayout->addWidget(myCompType,0,5);
+  supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_COMP_USERNAME" ), supplGrp ), 0, 4);
+  supplGrpLayout->addWidget(myCompUserName,0,5);
   supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_VERSION" ), supplGrp ), 1, 0);
   supplGrpLayout->addWidget( myVersionEdit, 1, 1);
   supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_COMP_MULTISTD" ), supplGrp ), 1, 2);
   supplGrpLayout->addWidget(myCompMultiStd,1,3);
+  supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_COMP_TYPE" ), supplGrp ), 1, 4);
+  supplGrpLayout->addWidget(myCompType,1,5);
   supplGrpLayout->addWidget( new QLabel( tr( "TOOLS_PNG_FILE" ), supplGrp ), 2, 0);
   supplGrpLayout->addMultiCellWidget( myPngEdit, 2,2,1,4 );
   supplGrpLayout->addWidget( myBrowsePngBtn, 2, 5 );
@@ -254,6 +260,15 @@ QString ToolsGUI_CatalogGeneratorDlg::getCompName()
   return myCompName->text().stripWhiteSpace();
 }
 
+//=================================================================================
+// function : getCompUserName()
+// purpose  : gets username of the component
+//=================================================================================
+QString ToolsGUI_CatalogGeneratorDlg::getCompUserName()
+{
+  return myCompUserName->text().stripWhiteSpace();
+}
+
 //=================================================================================
 // function : getCompType()
 // purpose  : gets type of the component
@@ -335,6 +350,7 @@ void ToolsGUI_CatalogGeneratorDlg::onApply()
   QString Version = getVersion();
   QString PngFile = getPngFile();
   QString CompName = getCompName(); //gets component name 
+  QString CompUserName = getCompUserName(); //gets component username 
   QString CompType = getCompType(); //gets component type
   QString CompMultiStd = getCompMultiStd();
 
@@ -348,7 +364,7 @@ void ToolsGUI_CatalogGeneratorDlg::onApply()
     else {
       QString command = "";
       if ( getenv("KERNEL_ROOT_DIR")  )
-       command = QString( getenv( "KERNEL_ROOT_DIR" ) ) + "/bin/runIDLparser -Wbcatalog=" + XmlFile;
+       command = QString( getenv( "KERNEL_ROOT_DIR" ) ) + "/bin/salome/runIDLparser -Wbcatalog=" + XmlFile;
       else {
        QAD_MessageBox::error1( this, 
                                tr("TOOLS_ERR_ERROR"), 
@@ -363,6 +379,7 @@ void ToolsGUI_CatalogGeneratorDlg::onApply()
        command += QString(",icon=") + QString(aFile.ToCString());
       }
       if (!CompName.isEmpty()) command += ",name=" + CompName;
+      if (!CompUserName.isEmpty()) command += ",username=" + CompUserName;
       if (!CompType.isEmpty()) command += ",type=" + CompType;
       if (!CompMultiStd.isEmpty()) command += ",multistudy=" + CompMultiStd;
       command += " " + IdlFile;

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
index d0e593458e2c1fbf06db0a9ce0264e4f2db443bc..58343ce45d02c6506d95ee0e22cc0812a7449f56 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
@@ -52,6 +52,7 @@ public:
     QString getAuthor();
     QString getVersion();
     QString getCompName();
+    QString getCompUserName();
     QString getCompType();
     QString getCompMultiStd();
 
@@ -67,6 +68,7 @@ private:
     QLineEdit*     myVersionEdit;
     QLineEdit*     myAuthorEdit;
     QLineEdit*     myCompName;
+    QLineEdit*     myCompUserName;
     QLineEdit*     myCompType;
     QLineEdit*     myCompMultiStd;
     QPushButton*   myBrowseIdlBtn;

diff --git a/src/TOOLSGUI/ToolsGUI_msg_en.po b/src/TOOLSGUI/ToolsGUI_msg_en.po
index 7859d5e12689a1e5ce52afca95f94429b2929321..09ad7be8906316694a2c2a074bbc4d56c904a601 100644 (file)
--- a/src/TOOLSGUI/ToolsGUI_msg_en.po
+++ b/src/TOOLSGUI/ToolsGUI_msg_en.po
@@ -76,6 +76,9 @@ msgstr "Version : "
 msgid "ToolsGUI_CatalogGeneratorDlg::TOOLS_COMP_NAME"
 msgstr "Name : "
 
+msgid "ToolsGUI_CatalogGeneratorDlg::TOOLS_COMP_USERNAME"
+msgstr "UserName : "
+
 msgid "ToolsGUI_CatalogGeneratorDlg::TOOLS_COMP_TYPE"
 msgstr "Type : "