Skip to content

Commit

Permalink
Merge pull request #5469 from m-kuhn/constraintsOnForms
Browse files Browse the repository at this point in the history
[FEATURE] Show comments as tooltips on form
  • Loading branch information
m-kuhn authored Oct 27, 2017
2 parents 68179e2 + 869fc60 commit 19e212c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/gui/qgsattributeform.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,7 @@ void QgsAttributeForm::init()
tabWidget = nullptr;
WidgetInfo widgetInfo = createWidgetFromDef( widgDef, container, mLayer, mContext );
QLabel *label = new QLabel( widgetInfo.labelText );
label->setToolTip( QStringLiteral( "<b>%1</b><p>%2</p>" ).arg( widgetInfo.labelText, widgetInfo.hint ) );
if ( columnCount > 1 && !widgetInfo.labelOnTop )
{
label->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
Expand Down Expand Up @@ -1277,6 +1278,7 @@ void QgsAttributeForm::init()

// This will also create the widget
QLabel *l = new QLabel( fieldName );
l->setToolTip( QStringLiteral( "<b>%1</b><p>%2</p>" ).arg( fieldName, field.comment() ) );
QSvgWidget *i = new QSvgWidget();
i->setFixedSize( 18, 18 );

Expand Down Expand Up @@ -1599,6 +1601,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt

newWidgetInfo.labelOnTop = mLayer->editFormConfig().labelOnTop( fieldDef->idx() );
newWidgetInfo.labelText = mLayer->attributeDisplayName( fieldDef->idx() );
newWidgetInfo.hint = mLayer->fields().at( fieldDef->idx() ).comment();
newWidgetInfo.showLabel = widgetDef->showLabel();

break;
Expand Down Expand Up @@ -1687,6 +1690,7 @@ QgsAttributeForm::WidgetInfo QgsAttributeForm::createWidgetFromDef( const QgsAtt
else
{
QLabel *mypLabel = new QLabel( widgetInfo.labelText );
mypLabel->setToolTip( QStringLiteral( "<b>%1</b><p>%2</p>" ).arg( widgetInfo.labelText, widgetInfo.hint ) );
if ( columnCount > 1 && !widgetInfo.labelOnTop )
{
mypLabel->setAlignment( Qt::AlignRight | Qt::AlignVCenter );
Expand Down
1 change: 1 addition & 0 deletions src/gui/qgsattributeform.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ class GUI_EXPORT QgsAttributeForm : public QWidget

QWidget *widget = nullptr;
QString labelText;
QString hint;
bool labelOnTop = false;
bool labelAlignRight = false;
bool showLabel = true;
Expand Down

0 comments on commit 19e212c

Please sign in to comment.