Fix warnings, add missing sip bindings

python/core/qgsvectorlayer.sip

@@ -1242,6 +1242,24 @@ class QgsVectorLayer : QgsMapLayer
      */
     bool simplifyDrawingCanbeApplied( const QgsRenderContext& renderContext, QgsVectorSimplifyMethod::SimplifyHint simplifyHint ) const;
 
+    /**
+     * @brief Return the field properties that have been set for the given field.
+     * Field UI properties hold extra UI information for a field that can be used in the UI.
+     * @param fieldName The field name to get the field properties for.
+     * @return Return the UI properties set for the field.  Returns a new QgsFieldUIProperties if
+     * none is currently set for the field.
+     * @note added in QGIS 2.12
+     */
+    QgsFieldUIProperties fieldUIProperties( QString fieldName );
+
+    /**
+     * @brief Set the the field UI properties for a given field.
+     * @param fieldName The field name.
+     * @param props The properties to assign to a field.
+     * @note added in QGIS 2.12
+     */
+    void setFieldUIProperties( QString fieldName, QgsFieldUIProperties props );
+
   public slots:
     /**
      * Select feature by its ID

python/gui/attributetable/qgsfieldconditionalformatwidget.sip

@@ -0,0 +1,44 @@
+
+/** \ingroup gui
+ * \class QgsFieldConditionalFormatWidget
+ * A widget for customising conditional formatting options.
+ * \note added in QGIS 2.12
+ */
+class QgsFieldConditionalFormatWidget : QWidget
+{
+%TypeHeaderCode
+#include <attributetable/qgsfieldconditionalformatwidget.h>
+%End
+
+  public:
+
+    /** Constructor for QgsFieldConditionalFormatWidget.
+     * @param parent parent widget
+     */
+    explicit QgsFieldConditionalFormatWidget( QWidget *parent /TransferThis/ = 0 );
+
+    /** Switches the widget to the rules page.
+     */
+    void viewRules();
+
+    /** Sets the vector layer associated with the widget.
+     * @param theLayer vector layer
+     */
+    void setLayer( QgsVectorLayer* theLayer );
+
+    /** Switches the widget to the edit style mode for the specified style.
+     * @param index index of conditional style to edit
+     * @param style initial conditional styling options
+     */
+    void editStyle( int index, QgsConditionalStyle style );
+
+    /** Resets the formatting options to their default state.
+     */
+    void reset();
+
+  signals:
+
+    /** Emitted when the conditional styling rules are updated.
+     */
+    void rulesUpdates();
+};

python/gui/gui.sip

@@ -131,6 +131,7 @@
 %Include attributetable/qgsfeaturelistviewdelegate.sip
 %Include attributetable/qgsfeaturemodel.sip
 %Include attributetable/qgsfeatureselectionmodel.sip
+%Include attributetable/qgsfieldconditionalformatwidget.sip
 %Include attributetable/qgsifeatureselectionmanager.sip
 
 %Include layertree/qgscustomlayerorderwidget.sip

src/core/qgsvectorlayer.h

@@ -1758,15 +1758,17 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      * @brief Return the field properties that have been set for the given field.
      * Field UI properties hold extra UI information for a field that can be used in the UI.
      * @param fieldName The field name to get the field properties for.
-     * @return Return the UI properties set for the field.  Returns a new \class QgsFieldUIProperties if
-     * the none is currently set for the field.
+     * @return Return the UI properties set for the field.  Returns a new QgsFieldUIProperties if
+     * none is currently set for the field.
+     * @note added in QGIS 2.12
      */
     QgsFieldUIProperties fieldUIProperties( QString fieldName );
 
     /**
      * @brief Set the the field UI properties for a given field.
      * @param fieldName The field name.
      * @param props The properties to assign to a field.
+     * @note added in QGIS 2.12
      */
     void setFieldUIProperties( QString fieldName, QgsFieldUIProperties props );