Skip to content
Permalink
Browse files

Use "customize" instead of "customise"

Since we default to US spelling, we should always be using "customize"
  • Loading branch information
nyalldawson committed May 26, 2018
1 parent fa5a7d2 commit 94cf3fc788e2ecaf306f0b6a4c2f86038f93dcb4
Showing with 66 additions and 64 deletions.
  1. +1 −1 NEWS
  2. +1 −1 doc/news.html
  3. +1 −1 doc/news.t2t
  4. +1 −1 python/core/auto_generated/layertree/qgslayertreenode.sip.in
  5. +1 −1 python/core/auto_generated/layout/qgslayoutexporter.sip.in
  6. +2 −2 python/core/auto_generated/layout/qgslayoutrendercontext.sip.in
  7. +2 −2 python/core/auto_generated/processing/qgsprocessingparameters.sip.in
  8. +1 −1 python/core/auto_generated/qgsvectordataprovider.sip.in
  9. +1 −1 python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in
  10. +1 −1 python/gui/auto_generated/editorwidgets/qgsmultiedittoolbutton.sip.in
  11. +1 −1 python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in
  12. +1 −1 python/gui/auto_generated/locator/qgslocatorwidget.sip.in
  13. +2 −2 python/gui/auto_generated/qgscolorbutton.sip.in
  14. +2 −2 python/gui/auto_generated/qgscolorrampbutton.sip.in
  15. +1 −1 python/gui/auto_generated/qgsfontbutton.sip.in
  16. +1 −1 python/gui/auto_generated/qgspropertyassistantwidget.sip.in
  17. +1 −1 python/gui/auto_generated/qgsshortcutsmanager.sip.in
  18. +3 −3 python/gui/auto_generated/qgstextformatwidget.sip.in
  19. +1 −1 python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in
  20. +2 −0 scripts/spell_check/spelling.dat
  21. +1 −1 src/app/layout/qgslayoutattributeselectiondialog.cpp
  22. +1 −1 src/app/layout/qgslayoutattributeselectiondialog.h
  23. +2 −2 src/app/layout/qgslayoutattributetablewidget.cpp
  24. +1 −1 src/app/layout/qgslayoutattributetablewidget.h
  25. +1 −1 src/app/layout/qgslayoutimageexportoptionsdialog.h
  26. +1 −1 src/app/layout/qgslayouttablebackgroundcolorsdialog.h
  27. +1 −1 src/app/qgscustomprojectiondialog.h
  28. +1 −1 src/core/layertree/qgslayertreenode.h
  29. +1 −1 src/core/layout/qgslayoutexporter.h
  30. +2 −2 src/core/layout/qgslayoutrendercontext.h
  31. +4 −4 src/core/processing/qgsprocessingparameters.h
  32. +1 −1 src/core/qgsvectordataprovider.h
  33. +1 −1 src/gui/attributetable/qgsfieldconditionalformatwidget.h
  34. +1 −1 src/gui/editorwidgets/qgsmultiedittoolbutton.h
  35. +1 −1 src/gui/effects/qgseffectstackpropertieswidget.cpp
  36. +1 −1 src/gui/effects/qgseffectstackpropertieswidget.h
  37. +1 −1 src/gui/locator/qgslocatorwidget.h
  38. +2 −2 src/gui/qgscolorbutton.h
  39. +2 −2 src/gui/qgscolorrampbutton.h
  40. +1 −1 src/gui/qgsfontbutton.h
  41. +1 −1 src/gui/qgspropertyassistantwidget.h
  42. +1 −1 src/gui/qgsshortcutsmanager.h
  43. +3 −3 src/gui/qgstextformatwidget.h
  44. +1 −1 src/gui/symbology/qgscategorizedsymbolrendererwidget.cpp
  45. +1 −1 src/gui/symbology/qgsnullsymbolrendererwidget.h
  46. +3 −3 src/ui/layout/qgslayoutattributetablewidgetbase.ui
  47. +1 −1 src/ui/layout/qgslayoutlegendwidgetbase.ui
  48. +1 −1 tests/src/core/testqgslayout.cpp
2 NEWS
@@ -435,7 +435,7 @@ This release has following new features:
- Map Composer : Atlas navigation improvements
- Map Composer : Custom format for grid annotations
- Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
- Map Composer : Advanced customisation of cell background color
- Map Composer : Advanced customization of cell background color
- Map Composer : Add fit page to contents option and options for cropping exports to contents
- Map Composer : Force vector layers to render as a raster images
- Map Composer : Data defined control over map layers and style presets
@@ -527,7 +527,7 @@ <H1>5. What's new in Version 2.12 'Lyon'?</H1>
<LI>Map Composer : Atlas navigation improvements
<LI>Map Composer : Custom format for grid annotations
<LI>Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
<LI>Map Composer : Advanced customisation of cell background color
<LI>Map Composer : Advanced customization of cell background color
<LI>Map Composer : Add fit page to contents option and options for cropping exports to contents
<LI>Map Composer : Force vector layers to render as a raster images
<LI>Map Composer : Data defined control over map layers and style presets
@@ -427,7 +427,7 @@ This release has following new features:
- Map Composer : Atlas navigation improvements
- Map Composer : Custom format for grid annotations
- Map Composer : Multiline text handling and automatic text wrapping in composer attribute tables
- Map Composer : Advanced customisation of cell background color
- Map Composer : Advanced customization of cell background color
- Map Composer : Add fit page to contents option and options for cropping exports to contents
- Map Composer : Force vector layers to render as a raster images
- Map Composer : Data defined control over map layers and style presets
@@ -145,7 +145,7 @@ Turn textual references to layers into map layer object from project.
This method should be called after readXml()
If ``looseMatching`` is true then a looser match will be used, where a layer
will match if the name, public source, and data provider match. This can be
used to match legend customisation from different projects where layers
used to match legend customization from different projects where layers
will have different layer IDs.

.. versionadded:: 3.0
@@ -355,7 +355,7 @@ The ``dpi`` argument can be set to the actual DPI of exported file, or left as -
%Docstring
Generates the file name for a page during export.

Subclasses can override this method to customise page file naming.
Subclasses can override this method to customize page file naming.
%End

};
@@ -167,7 +167,7 @@ whether they will be rendered in layout exports.
%Docstring
Sets the current item ``layer`` to draw while exporting. QgsLayoutItem subclasses
which support multi-layer SVG exports must check the currentExportLayer()
and customise their rendering based on the layer.
and customize their rendering based on the layer.

If ``layer`` is -1, all item layers will be rendered.

@@ -178,7 +178,7 @@ If ``layer`` is -1, all item layers will be rendered.
%Docstring
Returns the current item layer to draw while exporting. QgsLayoutItem subclasses
which support multi-layer SVG exports must check this
and customise their rendering based on the layer.
and customize their rendering based on the layer.

If ``layer`` is -1, all item layers should be rendered.

@@ -322,15 +322,15 @@ method.
QVariantMap &metadata();
%Docstring
Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
in order to customise their appearance and behavior.
in order to customize their appearance and behavior.

.. seealso:: :py:func:`setMetadata`
%End

void setMetadata( const QVariantMap &metadata );
%Docstring
Sets the parameter's freeform ``metadata``. This is mostly used by parameter widget wrappers
in order to customise their appearance and behavior.
in order to customize their appearance and behavior.

.. seealso:: :py:func:`metadata`
%End
@@ -487,7 +487,7 @@ Must be implemented by providers that support delete styles from db returning tr
Creates a new vector layer feature renderer, using provider backend specific information.

The ``configuration`` map can be used to pass provider-specific configuration maps to the provider to
allow customisation of the returned renderer. Support and format of ``configuration`` varies by provider.
allow customization of the returned renderer. Support and format of ``configuration`` varies by provider.

When called with an empty ``configuration`` map the provider's default renderer will be returned.

@@ -11,7 +11,7 @@
class QgsFieldConditionalFormatWidget : QWidget
{
%Docstring
A widget for customising conditional formatting options.
A widget for customizing conditional formatting options.

.. versionadded:: 2.12
%End
@@ -44,7 +44,7 @@ Returns the current displayed state of the button.

void setField( const QgsField &field );
%Docstring
Sets the field associated with this button. This is used to customise the widget menu
Sets the field associated with this button. This is used to customize the widget menu
and tooltips to match the field properties.

:param field: associated field
@@ -183,7 +183,7 @@ class QgsEffectStackCompactWidget: QgsPanelWidget
{
%Docstring
A small widget consisting of a checkbox for enabling/disabling an effect stack
and a button for opening an effect stack customisation dialog.
and a button for opening an effect stack customization dialog.

.. versionadded:: 2.9

@@ -39,7 +39,7 @@ Returns a pointer to the locator utilized by this widget.
void setMapCanvas( QgsMapCanvas *canvas );
%Docstring
Sets a map ``canvas`` to associate with the widget. This allows the
widget to customise the searches performed by its locator(), such
widget to customize the searches performed by its locator(), such
as prioritizing results which are near the current canvas extent.
%End

@@ -264,7 +264,7 @@ Returns the string used for the "no color" option in the button's drop-down menu
void setContext( const QString &context );
%Docstring
Sets the context string for the color button. The context string is passed to all color swatch
grids shown in the button's drop-down menu, to allow them to customise their display colors
grids shown in the button's drop-down menu, to allow them to customize their display colors
based on the context.

:param context: context string for the color button's color swatch grids
@@ -275,7 +275,7 @@ based on the context.
QString context() const;
%Docstring
Returns the context string for the color button. The context string is passed to all color swatch
grids shown in the button's drop-down menu, to allow them to customise their display colors
grids shown in the button's drop-down menu, to allow them to customize their display colors
based on the context.

:return: context string for the color button's color swatch grids
@@ -179,7 +179,7 @@ Returns true if the current color is null.
void setContext( const QString &context );
%Docstring
Sets the context string for the color ramp button. The context string is passed to all color ramp
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
preview icons shown in the button's drop-down menu, to (eventually) allow them to customize their display colors
based on the context.

:param context: context string for the color dialog button's color ramp preview icons
@@ -190,7 +190,7 @@ based on the context.
QString context() const;
%Docstring
Returns the context string for the color ramp button. The context string is passed to all color ramp
preview icons shown in the button's drop-down menu, to (eventually) allow them to customise their display colors
preview icons shown in the button's drop-down menu, to (eventually) allow them to customize their display colors
based on the context.

:return: context context string for the color dialog button's color ramp preview icons
@@ -12,7 +12,7 @@
class QgsFontButton : QToolButton
{
%Docstring
A button for customising QgsTextFormat settings.
A button for customizing QgsTextFormat settings.

The button will open a detailed text format settings dialog when clicked. An attached drop-down
menu allows for copying and pasting text styles, picking colors for the text, and for dropping
@@ -30,7 +30,7 @@ Shows a user-friendly assistant guiding users through the creation of QgsPropert
const QgsVectorLayer *layer = 0 );
%Docstring
Constructor for QgsPropertyAssistantWidget. Aside from a ``parent`` widget, the constructor accepts a
corresponding property ``definition`` from which it customises the displayed options (eg a color based
corresponding property ``definition`` from which it customizes the displayed options (eg a color based
property definition will show an assistant to allow creation of color based properties).
The ``initialState`` dictates the initial state to show in the widget. A corresponding ``layer``
can also be set to allow population of GUI widgets such as field selectors.
@@ -290,7 +290,7 @@ Returns a shortcut by its name, or None if nothing found

QString settingsPath() const;
%Docstring
Returns the root settings path used to store shortcut customisation.
Returns the root settings path used to store shortcut customization.
%End

};
@@ -15,7 +15,7 @@
class QgsTextFormatWidget : QWidget, protected Ui::QgsTextFormatWidgetBase
{
%Docstring
A widget for customising text formatting settings.
A widget for customizing text formatting settings.

QgsTextFormatWidget provides a widget for controlling the appearance of text rendered
using QgsTextRenderer. The widget includes all settings contained within
@@ -131,7 +131,7 @@ Updates label placement options to reflect current state of widget
class QgsTextFormatDialog : QDialog
{
%Docstring
A simple dialog for customising text formatting settings.
A simple dialog for customizing text formatting settings.

QgsTextFormatDialog provides a dialog for controlling the appearance of text rendered
using :py:class:`QgsTextRenderer`. The dialog includes all settings contained within
@@ -168,7 +168,7 @@ Returns the current formatting settings defined by the widget.
class QgsTextFormatPanelWidget : QgsPanelWidgetWrapper
{
%Docstring
A panel widget for customising text formatting settings.
A panel widget for customizing text formatting settings.

QgsTextFormatPanelWidget provides a panel widget for controlling the appearance of text rendered
using :py:class:`QgsTextRenderer`. The dialog includes all settings contained within
@@ -13,7 +13,7 @@
class QgsNullSymbolRendererWidget : QgsRendererWidget
{
%Docstring
Blank widget for customising QgsNullSymbolRenderer.
Blank widget for customizing QgsNullSymbolRenderer.

.. versionadded:: 2.16
%End
@@ -1888,6 +1888,8 @@ currenly:currently
currnt:current
curriculem:curriculum
customicable:customizable
customisation:customization
customise:customize
cxan:cyan
cyclinder:cylinder
cymk:CMYK
@@ -230,7 +230,7 @@ bool QgsLayoutAttributeTableColumnModel::setData( const QModelIndex &index, cons
switch ( index.column() )
{
case 0:
// also update column's heading, if it hasn't been customised
// also update column's heading, if it hasn't been customized
if ( column->heading().isEmpty() || ( column->heading() == column->attribute() ) )
{
column->setHeading( value.toString() );
@@ -87,7 +87,7 @@ class QgsLayoutAttributeTableColumnModel: public QAbstractTableModel

/**
* Resets the attribute table's columns to match the source layer's fields. Remove all existing
* attribute table columns and column customisations.
* attribute table columns and column customizations.
*/
void resetToLayer();

@@ -68,7 +68,7 @@ QgsLayoutAttributeTableWidget::QgsLayoutAttributeTableWidget( QgsLayoutFrame *fr
connect( mEmptyFrameCheckBox, &QCheckBox::toggled, this, &QgsLayoutAttributeTableWidget::mEmptyFrameCheckBox_toggled );
connect( mHideEmptyBgCheckBox, &QCheckBox::toggled, this, &QgsLayoutAttributeTableWidget::mHideEmptyBgCheckBox_toggled );
connect( mWrapBehaviorComboBox, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsLayoutAttributeTableWidget::mWrapBehaviorComboBox_currentIndexChanged );
connect( mAdvancedCustomisationButton, &QPushButton::clicked, this, &QgsLayoutAttributeTableWidget::mAdvancedCustomisationButton_clicked );
connect( mAdvancedCustomizationButton, &QPushButton::clicked, this, &QgsLayoutAttributeTableWidget::mAdvancedCustomizationButton_clicked );
setPanelTitle( tr( "Table Properties" ) );

mContentFontToolButton->setMode( QgsFontButton::ModeQFont );
@@ -887,7 +887,7 @@ void QgsLayoutAttributeTableWidget::mWrapBehaviorComboBox_currentIndexChanged( i
mTable->endCommand();
}

void QgsLayoutAttributeTableWidget::mAdvancedCustomisationButton_clicked()
void QgsLayoutAttributeTableWidget::mAdvancedCustomizationButton_clicked()
{
if ( !mTable )
{
@@ -84,7 +84,7 @@ class QgsLayoutAttributeTableWidget: public QgsLayoutItemBaseWidget, private Ui:
void mEmptyFrameCheckBox_toggled( bool checked );
void mHideEmptyBgCheckBox_toggled( bool checked );
void mWrapBehaviorComboBox_currentIndexChanged( int index );
void mAdvancedCustomisationButton_clicked();
void mAdvancedCustomizationButton_clicked();

//! Inserts a new maximum number of features into the spin box (without the spinbox emitting a signal)
void setMaximumNumberOfFeatures( int n );
@@ -23,7 +23,7 @@


/**
* A dialog for customising the properties of an exported image file.
* A dialog for customizing the properties of an exported image file.
* \since QGIS 3.0
*/
class QgsLayoutImageExportOptionsDialog: public QDialog, private Ui::QgsLayoutImageExportOptionsDialog
@@ -26,7 +26,7 @@ class QCheckBox;
class QgsColorButton;

/**
* A dialog for customisation of the cell background colors for a QgsLayoutTable
* A dialog for customization of the cell background colors for a QgsLayoutTable
* \since QGIS 3.0
*/
class QgsLayoutTableBackgroundColorsDialog: public QDialog, private Ui::QgsLayoutTableBackgroundDialog
@@ -26,7 +26,7 @@
class QDir;

/**
The custom projection widget is used to define the projection family, ellipsoid and paremters needed by proj4 to assemble a customised projection definition. The resulting projection will be store in an sqlite backend.
The custom projection widget is used to define the projection family, ellipsoid and paremters needed by proj4 to assemble a customized projection definition. The resulting projection will be store in an sqlite backend.
*/
class APP_EXPORT QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectionDialogBase
{
@@ -150,7 +150,7 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject
* This method should be called after readXml()
* If \a looseMatching is true then a looser match will be used, where a layer
* will match if the name, public source, and data provider match. This can be
* used to match legend customisation from different projects where layers
* used to match legend customization from different projects where layers
* will have different layer IDs.
* \since QGIS 3.0
*/
@@ -483,7 +483,7 @@ class CORE_EXPORT QgsLayoutExporter
/**
* Generates the file name for a page during export.
*
* Subclasses can override this method to customise page file naming.
* Subclasses can override this method to customize page file naming.
*/
virtual QString generateFileName( const PageExportDetails &details ) const;

@@ -166,7 +166,7 @@ class CORE_EXPORT QgsLayoutRenderContext : public QObject
/**
* Sets the current item \a layer to draw while exporting. QgsLayoutItem subclasses
* which support multi-layer SVG exports must check the currentExportLayer()
* and customise their rendering based on the layer.
* and customize their rendering based on the layer.
*
* If \a layer is -1, all item layers will be rendered.
*
@@ -177,7 +177,7 @@ class CORE_EXPORT QgsLayoutRenderContext : public QObject
/**
* Returns the current item layer to draw while exporting. QgsLayoutItem subclasses
* which support multi-layer SVG exports must check this
* and customise their rendering based on the layer.
* and customize their rendering based on the layer.
*
* If \a layer is -1, all item layers should be rendered.
*
@@ -384,22 +384,22 @@ class CORE_EXPORT QgsProcessingParameterDefinition

/**
* Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
* in order to customise their appearance and behavior.
* in order to customize their appearance and behavior.
* \see setMetadata()
* \note not available in Python bindings.
*/
SIP_SKIP QVariantMap metadata() const { return mMetadata; }

/**
* Returns the parameter's freeform metadata. This is mostly used by parameter widget wrappers
* in order to customise their appearance and behavior.
* in order to customize their appearance and behavior.
* \see setMetadata()
*/
QVariantMap &metadata() { return mMetadata; }

/**
* Sets the parameter's freeform \a metadata. This is mostly used by parameter widget wrappers
* in order to customise their appearance and behavior.
* in order to customize their appearance and behavior.
* \see metadata()
*/
void setMetadata( const QVariantMap &metadata ) { mMetadata = metadata; }
@@ -504,7 +504,7 @@ class CORE_EXPORT QgsProcessingParameterDefinition
//! Parameter flags
Flags mFlags;

//! Freeform metadata for parameter. Mostly used by widget wrappers to customise their appearance and behavior.
//! Freeform metadata for parameter. Mostly used by widget wrappers to customize their appearance and behavior.
QVariantMap mMetadata;

//! Pointer to algorithm which owns this parameter
@@ -488,7 +488,7 @@ class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeat
* Creates a new vector layer feature renderer, using provider backend specific information.
*
* The \a configuration map can be used to pass provider-specific configuration maps to the provider to
* allow customisation of the returned renderer. Support and format of \a configuration varies by provider.
* allow customization of the returned renderer. Support and format of \a configuration varies by provider.
*
* When called with an empty \a configuration map the provider's default renderer will be returned.
*
@@ -27,7 +27,7 @@
/**
* \ingroup gui
* \class QgsFieldConditionalFormatWidget
* A widget for customising conditional formatting options.
* A widget for customizing conditional formatting options.
* \since QGIS 2.12
*/
class GUI_EXPORT QgsFieldConditionalFormatWidget : public QWidget, private Ui::QgsFieldConditionalWidget

0 comments on commit 94cf3fc

Please sign in to comment.
You can’t perform that action at this time.