X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetLineEdit.cpp;h=7f7e187b8319149030c1d77e65de0b407dfec026;hb=8cd56d486b6e96b8814002f9f0f4acadd6cea11b;hp=3930efe15081bbb2bb67ca10e5536c226f1cef09;hpb=b25922145a97fccf8d2613d0ef52a283d3ce0987;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
index 3930efe15..7f7e187b8 100644
--- a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
@@ -22,31 +22,91 @@
 #include <QLineEdit>
 #include <QObject>
 #include <QString>
+#include <QPainter>
+#include <QResizeEvent>
 
 #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 )
+  {
+  }
+
+  virtual ~CustomLineEdit()
+  {
+  }
+
+  /// Redefiniotion of virtual method
+  /// \param theEvent a paint event
+  virtual void paintEvent( QPaintEvent* theEvent )
+  {
+    QLineEdit::paintEvent( theEvent );
+    if( text().isEmpty() && !myPlaceHolder.isEmpty() )
+    {
+      QPainter aPainter( this );
+      QRect aRect = rect();
+      int aHorMargin = 5;
+      aRect.adjust( aHorMargin, 0, 0, 0 );
+
+      QColor aColor = palette().text().color();
+      aColor.setAlpha( 128 );
+      QPen anOldpen = aPainter.pen();
+      aPainter.setPen( aColor );
+      QFontMetrics aFontMetrics = fontMetrics();
+      QString elidedText = aFontMetrics.elidedText( myPlaceHolder, Qt::ElideRight, aRect.width() );
+      aPainter.drawText( aRect, Qt::AlignLeft | Qt::AlignVCenter, elidedText );
+      aPainter.setPen( anOldpen );
+    }
+  }
+
+private:
+  QString myPlaceHolder;
+};
+
 ModuleBase_WidgetLineEdit::ModuleBase_WidgetLineEdit(QWidget* theParent,
                                                      const Config_WidgetAPI* theData,
-                                                     const std::string& theParentId)
+                                                     const std::string& theParentId,
+                                                     const std::string& thePlaceHolder )
     : ModuleBase_ModelWidget(theParent, theData, theParentId)
 {
   QFormLayout* aMainLay = new QFormLayout(this);
   ModuleBase_Tools::adjustMargins(aMainLay);
-  QString aTitle = QString::fromStdString(theData->widgetLabel());
-  myLineEdit = new QLineEdit(this);
+  QString aLabelText = QString::fromStdString(theData->widgetLabel());
+  QString aLabelIcon = QString::fromStdString(theData->widgetIcon());
+  QLabel* aLabel = new QLabel(aLabelText, this);
+  if (!aLabelIcon.isEmpty())
+    aLabel->setPixmap(QPixmap(aLabelIcon));
+
+  myLineEdit = new CustomLineEdit( this, QString::fromStdString( thePlaceHolder ) );
+  // Here we do not use the Qt's standard method setPlaceHolderText() since it
+  // draws the place holder only if there is no focus on widget;
+  // we would like to see the place holder in the case of empty text
+  // even if the widget is focused.
+  // The corresponding patch appears in Qt only since version 5.x
+
   myLineEdit->setMinimumHeight(20);
-  aMainLay->addRow(aTitle, myLineEdit);
+
+  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::storeValue() const
+bool ModuleBase_WidgetLineEdit::storeValueCustom() const
 {
   // A rare case when plugin was not loaded. 
   if(!myFeature)
@@ -59,7 +119,7 @@ bool ModuleBase_WidgetLineEdit::storeValue() const
   return true;
 }
 
-bool ModuleBase_WidgetLineEdit::restoreValue()
+bool ModuleBase_WidgetLineEdit::restoreValueCustom()
 {
   // A rare case when plugin was not loaded. 
   if(!myFeature)
@@ -81,7 +141,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;
 }