help and suppress form

signedav · signedav · commit 7e2ee74da806 · 2017-11-06T16:34:05.000+01:00
help from attributetypedialog is handled over the help of vectorlayerproperties
suppress form combo takes the default value from the settings
fixed troubles on loading gui
diff --git a/src/app/qgsattributesformproperties.cpp b/src/app/qgsattributesformproperties.cpp
@@ -78,6 +78,7 @@ void QgsAttributesFormProperties::init()
 
   initLayoutConfig();
   initInitPython();
+  initSuppressCombo();
 
   mAttributeTypeDialog->setEnabled( false );
   mAttributeRelationEdit->setEnabled( false );
@@ -158,10 +159,19 @@ void QgsAttributesFormProperties::initFormLayoutTree()
 
 void QgsAttributesFormProperties::initSuppressCombo()
 {
-  //mFormSuppressCmbBx->addItem( tr( "" ) );
-  //mFormSuppressCmbBx->addItem( tr( "Load from external file" ) );
-  //mFormSuppressCmbBx->addItem( tr( "Provide code in this dialog" ) );
-  //mFormSuppressCmbBx->addItem( tr( "Load from the environment" ) );
+  QgsSettings settings;
+
+  if ( settings.value( QStringLiteral( "qgis/digitizing/disable_enter_attribute_values_dialog" ), false ).toBool() )
+  {
+    mFormSuppressCmbBx->addItem( tr( "Hide form on add feature (global settings)" ) );
+  }
+  else
+  {
+    mFormSuppressCmbBx->addItem( tr( "Show form on add feature (global settings)" ) );
+  }
+  mFormSuppressCmbBx->addItem( tr( "Hide form on add feature" ) );
+  mFormSuppressCmbBx->addItem( tr( "Show form on add feature" ) );
+
   mFormSuppressCmbBx->setCurrentIndex( mLayer->editFormConfig().suppress() );
 
 
diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp
@@ -400,8 +400,3 @@ QStandardItem *QgsAttributeTypeDialog::currentItem() const
   QStandardItemModel *widgetTypeModel = qobject_cast<QStandardItemModel *>( mWidgetTypeComboBox->model() );
   return widgetTypeModel->item( mWidgetTypeComboBox->currentIndex() );
 }
-
-void QgsAttributeTypeDialog::showHelp()
-{
-  QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) );
-}
diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h
@@ -200,8 +200,6 @@ class APP_EXPORT QgsAttributeTypeDialog: public QWidget, private Ui::QgsAttribut
 
     void defaultExpressionChanged();
 
-    void showHelp();
-
   private:
     QgsVectorLayer *mLayer = nullptr;
     int mFieldIdx;
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -1528,7 +1528,14 @@ void QgsVectorLayerProperties::updateFieldsPropertiesDialog()
 
 void QgsVectorLayerProperties::showHelp()
 {
-  QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html" ) );
+  if ( mOptionsListWidget->currentIndex().data().toString() == "Form" )
+  {
+    QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) );
+  }
+  else
+  {
+    QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html" ) );
+  }
 }
 
 void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )
diff --git a/src/ui/qgsattributesformproperties.ui b/src/ui/qgsattributesformproperties.ui
@@ -65,21 +65,6 @@ Use this function to add extra logic to your forms.</string>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <item>
-         <property name="text">
-          <string>Use default show form config</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Show form on add feature</string>
-         </property>
-        </item>
-        <item>
-         <property name="text">
-          <string>Hide form on add feature</string>
-         </property>
-        </item>
        </widget>
       </item>
      </layout>

Original file line number	Diff line number	Diff line change
`@@ -400,8 +400,3 @@ QStandardItem *QgsAttributeTypeDialog::currentItem() const`
`400`	`400`	`QStandardItemModel widgetTypeModel = qobject_cast<QStandardItemModel >( mWidgetTypeComboBox->model() );`
`401`	`401`	`return widgetTypeModel->item( mWidgetTypeComboBox->currentIndex() );`
`402`	`402`	`}`
`403`		`-`
`404`		`-void QgsAttributeTypeDialog::showHelp()`
`405`		`-{`
`406`		`- QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) );`
`407`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,14 @@ void QgsVectorLayerProperties::updateFieldsPropertiesDialog()`
`1528`	`1528`
`1529`	`1529`	`void QgsVectorLayerProperties::showHelp()`
`1530`	`1530`	`{`
`1531`		`- QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html" ) );`
	`1531`	`+ if ( mOptionsListWidget->currentIndex().data().toString() == "Form" )`
	`1532`	`+ {`
	`1533`	`+ QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#configure-the-field-behavior" ) );`
	`1534`	`+ }`
	`1535`	`+ else`
	`1536`	`+ {`
	`1537`	`+ QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html" ) );`
	`1538`	`+ }`
`1532`	`1539`	`}`
`1533`	`1540`
`1534`	`1541`	`void QgsVectorLayerProperties::updateAuxiliaryStoragePage( bool reset )`