TODO : To ask GUI experts git add -- SalomeApp/SalomeApp_ListView.cxx Session/SALOME_...

diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index 62bc4aa4097aa138a7c5a4aa84c6370743ddf641..112ccd0903ece16dcd6a88dbc48b389db5ca14f8 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -1110,7 +1110,7 @@ myCancelBtn(0)
 
     QPixmap anIcon;
     if( mgr )
-      anIcon = mgr->loadPixmap( "SalomeApp", tr( "ICON_APPLY" ), false );
+      anIcon = mgr->loadPixmap( "SalomeAppSL", tr( "ICON_APPLY" ), false );
 
     myApplyBtn->setIcon(anIcon);
     myApplyBtn->setEnabled(false);
@@ -1125,7 +1125,7 @@ myCancelBtn(0)
     myCancelBtn = new QToolButton(this);
     QPixmap anIcon;
     if( mgr )
-      anIcon = mgr->loadPixmap( "SalomeApp", tr( "ICON_CANCEL" ), false );
+      anIcon = mgr->loadPixmap( "SalomeAppSL", tr( "ICON_CANCEL" ), false );
     myCancelBtn->setIcon(anIcon);
     myCancelBtn->setEnabled(false);
     myCancelBtn->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 1ba5dad6fac877d4e0e903f92428c370ff69b298..75d582ce6dc15b20be939cc5b5c907dd6ee679f9 100644 (file)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -149,7 +149,7 @@ namespace
   class ResourceMgr : public SUIT_ResourceMgr
   {
   public:
-    ResourceMgr(const QString &appName = "SalomeApp") : SUIT_ResourceMgr(appName, "%1Config")
+    ResourceMgr(const QString &appName = "SalomeAppSL") : SUIT_ResourceMgr(appName, "%1Config")
     {
       customize(); // activate customization
       setCurrentFormat("xml");
@@ -167,7 +167,7 @@ namespace
       // This procedure is supposed to be done only once, at first call.
       if (myCustomAppName.isNull())
       {
-        SUIT_ResourceMgr mgr("SalomeApp", "%1Config");
+        SUIT_ResourceMgr mgr("SalomeAppSL", "%1Config");
         mgr.setCurrentFormat("xml");
         mgr.setWorkingMode(IgnoreUserValues); // prevent reading data from user's file
         mgr.loadLanguage("LightApp", "en");
@@ -461,8 +461,8 @@ int AbstractGUIAppMain(int argc, char **argv)
   QApplication::setOrganizationName("salome");
   QApplication::setApplicationName("salome");
   QApplication::setApplicationVersion(salomeVersion());
-  //int vvvv(90);
-  //std::cin >> vvvv;
+  int vvvv(90);
+  std::cin >> vvvv;
   // Install Qt debug messages handler
   MsgHandler msgHandler;
   qInstallMessageHandler(QtxMsgHandler);
@@ -494,11 +494,11 @@ int AbstractGUIAppMain(int argc, char **argv)
   ResourceMgr resMgr;
   resMgr.setWorkingMode(ResourceMgr::IgnoreUserValues);
   resMgr.loadLanguage("LightApp", "en");
-  resMgr.loadLanguage("SalomeApp", "en");
+  resMgr.loadLanguage(NamingServiceImplementation::LibName, "en");
   resMgr.loadLanguage("Session");
 
   // Set-up application settings configuration possible customized via resources
-  if (resMgr.customName() != "SalomeApp")
+  //if (resMgr.customName() != NamingServiceImplementation::LibName)
   {
     QApplication::setApplicationName(resMgr.customName());
     QApplication::setApplicationVersion(resMgr.version());