Add tab order and enable help button

DelazJ · m-kuhn · commit e1f5348a9707 · 2017-11-13T10:32:15.000+01:00
diff --git a/src/app/qgsattributesforminitcode.cpp b/src/app/qgsattributesforminitcode.cpp
@@ -35,6 +35,7 @@ QgsAttributesFormInitCode::QgsAttributesFormInitCode()
   mInitFileWidget->setFilter( tr( "Python files (*.py *.PY)" ) );
 
   connect( mInitCodeSourceComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged );
+  connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsAttributesFormInitCode::showHelp );
 }
 
 void QgsAttributesFormInitCode::setCodeSource( QgsEditFormConfig::PythonInitCodeSource initCodeSource )
@@ -81,3 +82,8 @@ void QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged( int
   mInitFileWidget->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );
   mInitCodeEditorPython->setVisible( codeSource == QgsEditFormConfig::CodeSourceDialog );
 }
+
+void QgsAttributesFormInitCode::showHelp()
+{
+  QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#enhance-your-form-with-custom-functions" ) );
+}
diff --git a/src/app/qgsattributesforminitcode.h b/src/app/qgsattributesforminitcode.h
@@ -49,6 +49,7 @@ class APP_EXPORT QgsAttributesFormInitCode: public QDialog, private Ui::QgsAttri
 
   private slots:
     void mInitCodeSourceComboBox_currentIndexChanged( int codeSource );
+    void showHelp();
 };
 
 #endif // QGSATTRIBUTESFORMINITCODE_H
diff --git a/src/ui/qgsattributesforminitcode.ui b/src/ui/qgsattributesforminitcode.ui
@@ -101,7 +101,7 @@ Reference in function name: my_form_open
       <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
@@ -143,6 +143,10 @@ Reference in function name: my_form_open
    <header>qgsfilewidget.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>mInitCodeSourceComboBox</tabstop>
+  <tabstop>mInitFunctionLineEdit</tabstop>
+ </tabstops>
  <resources/>
  <connections>
   <connection>

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ QgsAttributesFormInitCode::QgsAttributesFormInitCode()`
`35`	`35`	`mInitFileWidget->setFilter( tr( "Python files (.py .PY)" ) );`
`36`	`36`
`37`	`37`	`connect( mInitCodeSourceComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged );`
	`38`	`+ connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsAttributesFormInitCode::showHelp );`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`void QgsAttributesFormInitCode::setCodeSource( QgsEditFormConfig::PythonInitCodeSource initCodeSource )`
`@@ -81,3 +82,8 @@ void QgsAttributesFormInitCode::mInitCodeSourceComboBox_currentIndexChanged( int`
`81`	`82`	`mInitFileWidget->setVisible( codeSource == QgsEditFormConfig::CodeSourceFile );`
`82`	`83`	`mInitCodeEditorPython->setVisible( codeSource == QgsEditFormConfig::CodeSourceDialog );`
`83`	`84`	`}`
	`85`	`+`
	`86`	`+void QgsAttributesFormInitCode::showHelp()`
	`87`	`+{`
	`88`	`+ QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#enhance-your-form-with-custom-functions" ) );`
	`89`	`+}`