X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetLineEdit.cpp;h=273cc902016246860653d4168e7fa0b56e0fc197;hb=5303dd1fa6ad4411e38f8d36103c72109957e05c;hp=9c4a1b00f068fd36b0ef838b9320ca9f5a9f0a5b;hpb=3c0b551f57002a6e5195ef959f8056aa9df72baf;p=modules%2Fshaper.git

diff --git a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
index 9c4a1b00f..273cc9020 100644
--- a/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetLineEdit.cpp
@@ -22,21 +22,73 @@
 #include <QLineEdit>
 #include <QObject>
 #include <QString>
+#include <QPainter>
+#include <QResizeEvent>
 
 #include <memory>
 #include <string>
 
+class CustomLineEdit : public QLineEdit
+{
+public:
+  CustomLineEdit( QWidget* theParent, const QString& thePlaceHolder )
+    : QLineEdit( theParent ), myPlaceHolder( thePlaceHolder )
+  {
+  }
+
+  virtual ~CustomLineEdit()
+  {
+  }
+
+  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()));
@@ -59,7 +111,7 @@ bool ModuleBase_WidgetLineEdit::storeValueCustom() const
   return true;
 }
 
-bool ModuleBase_WidgetLineEdit::restoreValue()
+bool ModuleBase_WidgetLineEdit::restoreValueCustom()
 {
   // A rare case when plugin was not loaded. 
   if(!myFeature)