Skip to content

Commit

Permalink
UX - Review tooltip about dimensions in QGIS server dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
Gustry authored and nyalldawson committed Feb 13, 2022
1 parent a673230 commit 80e845d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
16 changes: 16 additions & 0 deletions src/gui/vector/qgswmsdimensiondialog.cpp
Expand Up @@ -33,6 +33,10 @@ QgsWmsDimensionDialog::QgsWmsDimensionDialog( QgsVectorLayer *layer, QStringList
return;
}

const QString nameToolTip = tr( "OAPIF supports \"Name\" and \"Date\" only. For \"WMS\", \"Time\" and \"Elevation\" are predefined values according to OGC specifications but it can be user-defined." );
mNameLabel->setToolTip( nameToolTip );
mNameComboBox->setToolTip( nameToolTip );

// Set field combobox
mFieldComboBox->setLayer( mLayer );
mEndFieldComboBox->setLayer( mLayer );
Expand Down Expand Up @@ -68,6 +72,8 @@ QgsWmsDimensionDialog::QgsWmsDimensionDialog( QgsVectorLayer *layer, QStringList

mReferenceValueLabel->setEnabled( false );
mReferenceValueComboBox->setEnabled( false );

fieldChanged();
}

void QgsWmsDimensionDialog::setInfo( const QgsMapLayerServerProperties::WmsDimensionInfo &info )
Expand Down Expand Up @@ -140,6 +146,10 @@ void QgsWmsDimensionDialog::nameChanged( const QString &name )
mUnitSymbolLabel->setEnabled( true );
mUnitSymbolLineEdit->setEnabled( true );
mUnitSymbolLineEdit->clear();
mFieldLabel->setToolTip( QString() );
mEndFieldLabel->setToolTip( QString() );
mFieldComboBox->setToolTip( QString() );
mEndFieldComboBox->setToolTip( QString() );

// Is the name a predefined value?
if ( mNameComboBox->findText( name ) != -1 )
Expand All @@ -159,6 +169,12 @@ void QgsWmsDimensionDialog::nameChanged( const QString &name )
mUnitsLineEdit->setEnabled( false );
mUnitSymbolLabel->setEnabled( false );
mUnitSymbolLineEdit->setEnabled( false );

const QString fieldToolTip = tr( "If a string is used, it must be formatted according to <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO8601</a>." );
mFieldLabel->setToolTip( fieldToolTip );
mEndFieldLabel->setToolTip( fieldToolTip );
mFieldComboBox->setToolTip( fieldToolTip );
mEndFieldComboBox->setToolTip( fieldToolTip );
}
if ( data == QgsMapLayerServerProperties::DATE )
{
Expand Down
6 changes: 3 additions & 3 deletions src/ui/qgswmsdimensiondialogbase.ui
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Add WMS Dimension</string>
<string>Add WMS/OAPIF Dimension</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="4" column="1">
Expand Down Expand Up @@ -53,15 +53,15 @@
<item row="0" column="0">
<widget class="QLabel" name="mNameLabel">
<property name="toolTip">
<string>OAPIF supports &quot;Name&quot; and &quot;Date&quot; only, &quot;WMS&quot; does not support &quot;Date&quot;</string>
<string/>
</property>
<property name="text">
<string>Name</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="mEndFiledLabel">
<widget class="QLabel" name="mEndFieldLabel">
<property name="text">
<string>End attribute (optional)</string>
</property>
Expand Down

0 comments on commit 80e845d

Please sign in to comment.