Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix translation string
  • Loading branch information
jef-n committed Aug 22, 2015
1 parent 97c8e1a commit 93d45a0
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
18 changes: 10 additions & 8 deletions python/core/qgsconditionalstyle.sip
@@ -1,4 +1,4 @@
/** \class QgsCondtionalStyle
/** \class QgsConditionalStyle
* \ingroup core
* Conditional styling for a rule.
*/
Expand All @@ -18,6 +18,7 @@ class QgsConditionalStyle
* @return True of the rule matches against the given feature
*/
bool matches( QVariant value, QgsExpressionContext& context ) const;

/**
* @brief Render a preview icon of the rule.
* @return QPixmap preview of the style
Expand All @@ -26,8 +27,8 @@ class QgsConditionalStyle

/**
* @brief Set the rule for the style. Rules should be of QgsExpression syntax.
* Special value of @value is replaced at run time with the check value
* @param value
* Special value of \@value is replaced at run time with the check value
* @param value The QgsExpression style rule to use for this style
*/
void setRule( QString value );

Expand Down Expand Up @@ -56,14 +57,14 @@ class QgsConditionalStyle
void setSymbol( QgsSymbolV2* value );

/**
* @brief The symbol used to generate the icon for the style
* @return The QgsSymbolV2 used for the icon
* @brief The icon set for style generated from the set symbol
* @return A QPixmap that was set for the icon using the symbol
*/
QgsSymbolV2* symbol() const;

/**
* @brief The icon set for style
* @return A QPixmap that was set for the icon
* @brief The symbol used to generate the icon for the style
* @return The QgsSymbolV2 used for the icon
*/
QPixmap icon() const;

Expand All @@ -85,11 +86,12 @@ class QgsConditionalStyle
QFont font() const;

/**
* @brief The condtion rule set for the style. Rule may contain variable @value
* @brief The condition rule set for the style. Rule may contain variable \@value
* to represent the current value
* @return QString of the current set rule
*/
QString rule() const;

/**
* @brief isValid Check if this rule is valid. A valid rule has one or more properties
* set.
Expand Down
8 changes: 4 additions & 4 deletions python/core/qgsfielduiproperties.sip
Expand Up @@ -2,7 +2,7 @@
* \ingroup core
* Holds extra UI properties for a field.
*
* Currently this object holds informations about condtional styles but in future will hold
* Currently this object holds information about conditional styles but in future will hold
* things like field widgets, etc
*/
class QgsFieldUIProperties
Expand All @@ -14,14 +14,14 @@ class QgsFieldUIProperties
QgsFieldUIProperties();

/**
* @brief Set the condtional styles for the field UI properties.
* @brief Set the conditional styles for the field UI properties.
* @param styles
*/
void setConditionalStyles( QList<QgsConditionalStyle> styles );

/**
* @brief Returns the condtional styles set for the field UI properties
* @return A list of condtional styles that have been set.
* @brief Returns the conditional styles set for the field UI properties
* @return A list of conditional styles that have been set.
*/
const QList<QgsConditionalStyle> getConditionalStyles() const;

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsconditionalstyle.h
Expand Up @@ -98,7 +98,7 @@ class CORE_EXPORT QgsConditionalStyle
QFont font() const { return mFont; }

/**
* @brief The condtion rule set for the style. Rule may contain variable \@value
* @brief The condition rule set for the style. Rule may contain variable \@value
* to represent the current value
* @return QString of the current set rule
*/
Expand Down
10 changes: 5 additions & 5 deletions src/core/qgsfielduiproperties.h
Expand Up @@ -10,7 +10,7 @@
/** \class QgsFieldUIProperties
* Holds extra UI properties for a field.
*
* Currently this object holds informations about condtional styles but in future will hold
* Currently this object holds information about conditional styles but in future will hold
* things like field widgets, etc
*
* TODO Move UI field related stuff from QgsVectorLayer here
Expand All @@ -21,14 +21,14 @@ class CORE_EXPORT QgsFieldUIProperties
QgsFieldUIProperties();

/**
* @brief Set the condtional styles for the field UI properties.
* @brief Set the conditional styles for the field UI properties.
* @param styles
*/
void setConditionalStyles( QList<QgsConditionalStyle> styles );

/**
* @brief Returns the condtional styles set for the field UI properties
* @return A list of condtional styles that have been set.
* @brief Returns the conditional styles set for the field UI properties
* @return A list of conditional styles that have been set.
*/
QList<QgsConditionalStyle> getConditionalStyles() const;

Expand All @@ -40,7 +40,7 @@ class CORE_EXPORT QgsFieldUIProperties
* @return A list of conditional styles that matches the value and context.
* @see matchingConditionalStyle
*/
QList<QgsConditionalStyle> matchingConditionalStyles(QVariant value, QgsExpressionContext& context ) const;
QList<QgsConditionalStyle> matchingConditionalStyles( QVariant value, QgsExpressionContext& context ) const;

/**
* @brief Find and return the matching style for the value and context.
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsfieldconditionalformatwidget.ui
Expand Up @@ -41,7 +41,7 @@
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Condtional Format Rules</string>
<string>Conditional Format Rules</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
Expand Down

0 comments on commit 93d45a0

Please sign in to comment.