Sipify and astyle

qgis · Feb 24, 2018 · b768e6d · b768e6d
1 parent 0559e46
commit b768e6d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/python/core/qgsaction.sip.in b/python/core/qgsaction.sip.in
@@ -42,6 +42,7 @@ Create a new QgsAction
 :param description:   A human readable description string
 :param command:       The action text. Its interpretation depends on the type
 :param capture:       If this is set to true, the output will be captured when an action is run
+:param enabledOnlyWhenEditable: if true then action is only enable in editmode
 %End
 
     QgsAction( ActionType type, const QString &description, const QString &action, const QString &icon, bool capture, const QString &shortTitle = QString(), const QSet<QString> &actionScopes = QSet<QString>(), const QString &notificationMessage = QString() );
@@ -56,6 +57,7 @@ Create a new QgsAction
 :param shortTitle:           A short string used to label user interface elements like buttons
 :param actionScopes:         A set of scopes in which this action will be available
 :param notificationMessage:  A particular message which reception will trigger the action
+:param enabledOnlyWhenEditable: if true then action is only enable in editmode
 %End
 
     QString name() const;
@@ -118,6 +120,13 @@ The action type
 Whether to capture output for display when this action is run
 %End
 
+
+    bool isEnabledOnlyWhenEditable() const;
+%Docstring
+Return whether only enabled in editable mode
+%End
+
+
     bool runable() const;
 %Docstring
 Checks if the action is runable on the current platform

diff --git a/python/gui/qgsactionmenu.sip.in b/python/gui/qgsactionmenu.sip.in
@@ -71,6 +71,13 @@ Change the feature on which actions are performed
 
 :param feature:  A feature. Will not take ownership. It's the callers responsibility to keep the feature
 as long as the menu is displayed and the action is running.
+%End
+
+    void setMode( const QgsAttributeForm::Mode mode );
+%Docstring
+Change the mode of the actions
+
+:param mode: The mode of the attribute form
 %End
 
     void setExpressionContextScope( const QgsExpressionContextScope &scope );

diff --git a/python/gui/qgsattributeform.sip.in b/python/gui/qgsattributeform.sip.in
@@ -26,6 +26,7 @@ class QgsAttributeForm : QWidget
       MultiEditMode,
       SearchMode,
       AggregateSearchMode,
+      IdentifyMode
     };
 
     enum FilterType

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1404,8 +1404,8 @@ void QgsApplication::setCustomVariables( const QVariantMap &variables )
   QgsSettings settings;
 
   QVariantMap::const_iterator it = variables.constBegin();
-  settings.beginGroup("variables");
-  settings.remove("");
+  settings.beginGroup( "variables" );
+  settings.remove( "" );
   for ( ; it != variables.constEnd(); ++it )
   {
     settings.setValue( it.key(), it.value() );