Issue #2428: Do not activate name widget on start of the operation

[modules/shaper.git] / src / ModuleBase / ModuleBase_IconFactory.cpp

diff --git a/src/ModuleBase/ModuleBase_IconFactory.cpp b/src/ModuleBase/ModuleBase_IconFactory.cpp
index 2e8311e523940c4cffed70404601dc48a820ffad..a691efd3242079f656ea640db9d3df7c32e8a379 100644 (file)
--- a/src/ModuleBase/ModuleBase_IconFactory.cpp
+++ b/src/ModuleBase/ModuleBase_IconFactory.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        ModuleBase_IconFactory.cpp
-// Created:     28 Jul 2015
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include "ModuleBase_IconFactory.h"
 
@@ -39,15 +53,30 @@ QIcon ModuleBase_IconFactory::getIcon(ObjectPtr theIcon)
 }
 
 QIcon ModuleBase_IconFactory::loadIcon(const QString& theValue)
+{
+  return QIcon(loadPixmap(theValue));
+}
+
+QPixmap ModuleBase_IconFactory::loadPixmap(const QString& theValue)
 {
   QPixmap aPixmap(theValue);
 
   if (aPixmap.isNull()) {
-    std::string aPluginPath = Config_XMLReader::pluginConfigFile();
-    QString anIconPath = QString::fromStdString(aPluginPath) + QDir::separator() +
-                         theValue;
-    if (QFile::exists(anIconPath))
-      aPixmap = QPixmap(anIconPath);
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      aPixmap = QPixmap(QString::fromStdString(aPath));
+  }
+  return aPixmap;
+}
+
+QImage ModuleBase_IconFactory::loadImage(const QString& theValue)
+{
+  QImage anImage(theValue);
+
+  if (anImage.isNull()) {
+    std::string aPath = Config_XMLReader::findConfigFile(theValue.toStdString());
+    if (!aPath.empty())
+      anImage = QImage(QString::fromStdString(aPath));
   }
-  return QIcon(aPixmap);
+  return anImage;
 }