X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetLineEdit.cpp;h=69f47b081e45a9a87340d0fcdf5453f9fa8f34a0;hb=ca925f26180f15699a77e76461679f11abd499ba;hp=273cc902016246860653d4168e7fa0b56e0fc197;hpb=7c64e78dcaac1421bc865a5c99694a7701e17ee6;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
index 273cc9020..69f47b081 100644
--- a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
@@ -1,14 +1,26 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-/*
- * ModuleBase_WidgetLineEdit.cpp
- *
- *  Created on: Aug 28, 2014
- *      Author: sbh
- */
+// 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_WidgetLineEdit.h>
 #include <ModuleBase_Tools.h>
+#include <ModuleBase_IconFactory.h>
 
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_Data.h>
@@ -28,9 +40,15 @@
 #include <memory>
 #include <string>
 
+/**
+* Customization of Line edit control
+*/
 class CustomLineEdit : public QLineEdit
 {
 public:
+  /// Constructor
+  /// \param theParent a parent widget
+  /// \param thePlaceHolder a string which is shown when text is empty
   CustomLineEdit( QWidget* theParent, const QString& thePlaceHolder )
     : QLineEdit( theParent ), myPlaceHolder( thePlaceHolder )
   {
@@ -40,6 +58,8 @@ public:
   {
   }
 
+  /// Redefiniotion of virtual method
+  /// \param theEvent a paint event
   virtual void paintEvent( QPaintEvent* theEvent )
   {
     QLineEdit::paintEvent( theEvent );
@@ -67,17 +87,16 @@ private:
 
 ModuleBase_WidgetLineEdit::ModuleBase_WidgetLineEdit(QWidget* theParent,
                                                      const Config_WidgetAPI* theData,
-                                                     const std::string& theParentId,
                                                      const std::string& thePlaceHolder )
-    : ModuleBase_ModelWidget(theParent, theData, theParentId)
+: ModuleBase_ModelWidget(theParent, theData)
 {
   QFormLayout* aMainLay = new QFormLayout(this);
   ModuleBase_Tools::adjustMargins(aMainLay);
-  QString aLabelText = QString::fromStdString(theData->widgetLabel());
+  QString aLabelText = translate(theData->widgetLabel());
   QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
   QLabel* aLabel = new QLabel(aLabelText, this);
   if (!aLabelIcon.isEmpty())
-    aLabel->setPixmap(QPixmap(aLabelIcon));
+    aLabel->setPixmap(ModuleBase_IconFactory::loadPixmap(aLabelIcon));
 
   myLineEdit = new CustomLineEdit( this, QString::fromStdString( thePlaceHolder ) );
   // Here we do not use the Qt's standard method setPlaceHolderText() since it
@@ -91,16 +110,16 @@ ModuleBase_WidgetLineEdit::ModuleBase_WidgetLineEdit(QWidget* theParent,
   aMainLay->addRow(aLabel, myLineEdit);
   this->setLayout(aMainLay);
 
-  connect(myLineEdit, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged()));
+  connect(myLineEdit, SIGNAL(textChanged(const QString&)), this, SIGNAL(valuesModified()));
 }
 
 ModuleBase_WidgetLineEdit::~ModuleBase_WidgetLineEdit()
 {
 }
 
-bool ModuleBase_WidgetLineEdit::storeValueCustom() const
+bool ModuleBase_WidgetLineEdit::storeValueCustom()
 {
-  // A rare case when plugin was not loaded. 
+  // A rare case when plugin was not loaded.
   if(!myFeature)
     return false;
   DataPtr aData = myFeature->data();
@@ -113,7 +132,7 @@ bool ModuleBase_WidgetLineEdit::storeValueCustom() const
 
 bool ModuleBase_WidgetLineEdit::restoreValueCustom()
 {
-  // A rare case when plugin was not loaded. 
+  // A rare case when plugin was not loaded.
   if(!myFeature)
     return false;
   DataPtr aData = myFeature->data();
@@ -133,7 +152,12 @@ QList<QWidget*> ModuleBase_WidgetLineEdit::getControls() const
   return result;
 }
 
-void ModuleBase_WidgetLineEdit::onTextChanged()
+bool ModuleBase_WidgetLineEdit::processEnter()
 {
-  storeValue();
+  bool isModified = getValueState() == ModifiedInPP;
+  if (isModified) {
+    emit valuesChanged();
+    myLineEdit->selectAll();
+  }
+  return isModified;
 }