Skip to content

Commit

Permalink
another round of typo fixes (and use color instead of colour - like Q…
Browse files Browse the repository at this point in the history 
…t; no string updates)

git-svn-id: http://svn.osgeo.org/qgis/trunk@12600 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Dec 23, 2009
1 parent 3380930 commit e5cf709
Show file tree
Hide file tree
Showing 63 changed files with 213 additions and 399 deletions.
4 changes: 2 additions & 2 deletions ChangeLog
View file
Expand Up @@ -909,7 +909,7 @@ linking with -rdynamic and using dlopen()'s RTLD_GLOBAL flag.
Tidied up the SPIT gui to match the plugin template.
Fixed bug in scale bar which displayed the bar the wrong size!
Fixed all the plugins so they do not do multiple refreshes on exit.
Added colour selection for scale bar.
Added color selection for scale bar.

2004-06-09 [mcoletti] 0.3.0devel25
Added support for a feature type name in QgsFeature. The GDAL/OGR shape file
Expand Down Expand Up @@ -1474,7 +1474,7 @@ Version 0.1 'Moroz' February 25, 2004
**Symbol renderers for simple, graduated, and continuous symbols
**Raster support for most GDAL formats
**Raster implementation supports a variety of rendering settings including
semi transparent overlays, pallette inversion, flexible band to colour mapping
semi transparent overlays, pallette inversion, flexible band to color mapping
in multiband images and creation of pseudocolor.
**Change to a data provider architecture for vector layers. Addtional data
types can be supported by writing a provider plugin
Expand Down
4 changes: 2 additions & 2 deletions INSTALL
View file
Expand Up @@ -2266,7 +2266,7 @@ First thing we need to get is MSVC Express from here:
http://msdn2.microsoft.com/en-us/express/aa975050.aspx

The page is really confusing so don't feel bad if you cant actually find the
download at first! There are six coloured blocks on the page for the various
download at first! There are six colored blocks on the page for the various
studio family members (vb / c# / j# etc). Simply choose your language under
the 'select your language' combo under the yellow C++ block, and your download
will begin. Under internet explorer I had to disable popup blocking for the
Expand All @@ -2275,7 +2275,7 @@ download to be able to commence.
Once the setup commences you will be prompted with various options. Here is what
I chose :

* Send useage information to Microsoft (No)
* Send usage information to Microsoft (No)
* Install options:
* Graphical IDE (Yes)
* Microsoft MSDN Express Edition (No)
Expand Down
4 changes: 2 additions & 2 deletions doc/INSTALL.t2t
View file
Expand Up @@ -1999,7 +1999,7 @@ First thing we need to get is MSVC Express from here:
http://msdn2.microsoft.com/en-us/express/aa975050.aspx

The page is really confusing so don't feel bad if you cant actually find the
download at first! There are six coloured blocks on the page for the various
download at first! There are six colored blocks on the page for the various
studio family members (vb / c# / j# etc). Simply choose your language under
the 'select your language' combo under the yellow C++ block, and your download
will begin. Under internet explorer I had to disable popup blocking for the
Expand All @@ -2008,7 +2008,7 @@ download to be able to commence.
Once the setup commences you will be prompted with various options. Here is what
I chose :

* Send useage information to Microsoft (No)
* Send usage information to Microsoft (No)
* Install options:
* Graphical IDE (Yes)
* Microsoft MSDN Express Edition (No)
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsrasterlayer.sip
View file
Expand Up @@ -305,7 +305,7 @@ public:

/** \brief Returns a string representation of drawing style
*
* Implementaed mainly for serialisation / deserialisation of settings to xml.
* Implemented mainly for serialisation / deserialisation of settings to xml.
* NOTE: May be deprecated in the future!. DrawingStyle drawingStyle() instead.
* */
QString drawingStyleAsString() const;
Expand Down
2 changes: 1 addition & 1 deletion python/core/qgsrenderer.sip
View file
Expand Up @@ -7,7 +7,7 @@ class QgsRenderer
%End

public:
/** Default ctor sets up selection colour from project properties */
/** Default ctor sets up selection color from project properties */
QgsRenderer();
/** Virtual destructor because we have virtual methods... */
virtual ~QgsRenderer();
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsmapcanvas.sip
View file
Expand Up @@ -122,7 +122,7 @@ class QgsMapCanvas : QGraphicsView
/** Updates the full extent */
void updateFullExtent();

//! return the map layer at postion index in the layer stack
//! return the map layer at position index in the layer stack
QgsMapLayer *layer(int index);

//! return number of layers on the map
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/osm/OsmUploadDlg.py
View file
Expand Up @@ -1481,7 +1481,7 @@ def __authRequired(self,s,a,b):
We are really not interested in function parameters - we just cancel the connection.
"""

self.cancelUpload("Authentification failed. Please try again with correct login and password.")
self.cancelUpload("Authentication failed. Please try again with correct login and password.")


def __setProxy(self):
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/plugin_installer/installer_gui.py
View file
Expand Up @@ -500,7 +500,7 @@ def addItem(p):
a.setToolTip(4,"")
a.setText(5,repository)
a.setToolTip(5,p["url"])
# set fonts and colours
# set fonts and colors
for i in [0,1,2,3,4,5]:
if p["error"]:
a.setForeground(i,QBrush(QColor(Qt.red)))
Expand Down
30 changes: 15 additions & 15 deletions resources/context_help/QgsPluginInstallerDialog-en_US
View file
Expand Up @@ -12,26 +12,26 @@ Downloads and installs plugins from remote repositories.
<p align='justify'>
The <label>Plugins</label> tab contains a list of all locally installed Python plugins, as well as plugins available in
remote repositories. Each plugin can be either:
<ul>
<li> not installed - this means the plugin is available in the repository, but is not installed yet. In
order to install it, select the plugin from the list and click the <label>Install plugin</label> button.</li>
<li> new - this means that the plugin is newly available in the repository.</li>
<li> installed - this indicates that the plugin is already installed. If it is also available in any repository
<dl>
<dt>not installed</dt><dd>this means the plugin is available in the repository, but is not installed yet. In
order to install it, select the plugin from the list and click the <label>Install plugin</label> button.</dd>
<dt>new</dt><dd>this means that the plugin is newly available in the repository.</dd>
<dt>installed</dt><dd>this indicates that the plugin is already installed. If it is also available in any repository
the <label>Reinstall plugin</label> button will be enabled. If the available version is older than the installed
version, the <label>Downgrade plugin</label> button will appear instead.</li>
<li> upgradeable - this means that the plugin is installed, but there is an updated version available.
In this case, the <label>Upgrade plugin</label> button will be enabled.</li>
<li> invalid - this means that the plugin is installed, but is unavailable or broken. The reason will be
explained in the plugin description field.</li>
</ul>
version, the <label>Downgrade plugin</label> button will appear instead.</dd>
<dt>upgradeable</dt><dd>this means that the plugin is installed, but there is an updated version available.
In this case, the <label>Upgrade plugin</label> button will be enabled.</dd>
<dt>invalid</dt><dd>this means that the plugin is installed, but is unavailable or broken. The reason will be
explained in the plugin description field.</dd>
</dl>
</p>

To install a plugin, select it from the list and click the <label>Install plugin</label> button. The plugin is installed in its own directory in:
<table border=1>
<tr><td>OS</td><td>system plugins</td><td>plugins installed by user</td></tr>
<tr><td>Linux and other unices</td><td>./share/qgis/python/plugins</td><td>/home/$USERNAME/.qgis/python/plugins</td></tr>
<tr><td>Mac OS X</td><td>./Contents/MacOS/share/qgis/python/plugins</td><td>/Users/$USERNAME/.qgis/python/plugins</td></tr>
<tr><td>Windows</td><td>C:\Program Files\QGIS\python\plugins</td><td>C:\Documents and Settings\$USERNAME\.qgis\python\plugins</td></tr>
<tr><th>OS</th><th>system plugins</th><th>plugins installed by user</th></tr>
<tr><td>Linux and other unices</td><td>./share/qgis/python/plugins</td><td rowspan=2>$HOME/qgis/python/plugins</td></tr>
<tr><td>Mac OS X</td><td>./Contents/MacOS/share/qgis/python/plugins</td></tr>
<tr><td>Windows</td><td>(QGIS install directory)\python\plugins</td><td>%USERPROFILE%\.qgis\python\plugins</td></tr>
</table>
<br/>

Expand Down
2 changes: 1 addition & 1 deletion resources/context_help/QgsVectorLayerProperties-en_US
View file
Expand Up @@ -20,7 +20,7 @@ QGIS supports a number of symbology renderers to control how vector features are
<ul>
<li><label>Single symbol</label> - a single style is applied to every object in the layer.
<li><label>Graduated symbol</label> - objects within the layer are displayed with different symbols classified by the values of a particular field.
<li><label>Continuous color</label> - objects within the layer are displayed with a spread of colours classified by the numerical values within a specified field.
<li><label>Continuous color</label> - objects within the layer are displayed with a spread of colors classified by the numerical values within a specified field.
<li><label>Unique value</label> - objects are classified by the unique values within a specified field with each value having a different symbol.
</ul>

Expand Down
4 changes: 2 additions & 2 deletions scripts/chkspelling.sh
View file
Expand Up @@ -4,5 +4,5 @@
RE=$(echo $(cut -d: -f1 scripts/spelling.dat | sed -e 's/^/\\</; s/$/\\>|/;') | sed -e 's/| /|/g; s/|$//;')
EX="\.(svn-base|tmp|xpm|ts)|context_help|spelling\.dat"

egrep --color=always "$RE" -r . | egrep -v "$EX"
egrep --color=always "$RE" resources/context_help/*-en_US
egrep --color=always "$RE" -ir . | egrep -iv "$EX"
egrep --color=always "$RE" -i resources/context_help/*-en_US
7 changes: 6 additions & 1 deletion scripts/prepare-commit.sh
View file
Expand Up @@ -34,7 +34,12 @@ ASTYLEDIFF=astyle.r$REV.diff
# reformat
for f in $MODIFIED; do
case "$f" in
*.cpp|*.h|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
src/core/spatialite/*)
echo $f skipped
continue
;;

*.cpp|*.c|*.h|*.cxx|*.hxx|*.c++|*.h++|*.cc|*.hh|*.C|*.H)
;;

*)
Expand Down
18 changes: 18 additions & 0 deletions scripts/spelling.dat
View file
Expand Up @@ -428,3 +428,21 @@ immediatelly:immediately
actully:actually
disolve:dissolve
furter:further
instersction:intersection
traslates:translates
deimiter:delimiter
analysies:analyses
postion:position
rigth:right
syle:style
manger:manager
signto:sign to
attemtps:attempts
palletted:paletted
statics:statistics
useage:usage
aribitary:arbitrary
colour:color
recommeneded:recommended
implementaed:implemented
containging:containing
2 changes: 1 addition & 1 deletion src/analysis/interpolation/DualEdgeTriangulation.h
View file
Expand Up @@ -142,7 +142,7 @@ class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
unsigned int insertEdge( int dual, int next, int point, bool mbreak, bool forced );
/**inserts a forced segment between the points with the numbers p1 and p2 into the triangulation and returns the number of a HalfEdge belonging to this forced edge or -100 in case of failure*/
int insertForcedSegment( int p1, int p2, bool breakline );
/**Treshold for the leftOfTest to handle numerical instabilities*/
/**Threshold for the leftOfTest to handle numerical instabilities*/
//const static double leftOfTresh=0.00001;
/**Security to prevent endless loops in 'baseEdgeOfTriangle'. It there are more iteration then this number, the point will not be inserted*/
const static int nBaseOfRuns = 300000;
Expand Down
14 changes: 7 additions & 7 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -425,7 +425,7 @@ QgisApp::QgisApp( QSplashScreen *splash, QWidget * parent, Qt::WFlags fl )
QgsProject::instance()->setBadLayerHandler( new QgsProjectBadLayerGuiHandler() );

#if 0
// Set the background colour for toolbox and overview as they default to
// Set the background color for toolbox and overview as they default to
// white instead of the window color
QPalette myPalette = toolBox->palette();
myPalette.setColor( QPalette::Button, myPalette.window().color() );
Expand Down Expand Up @@ -2667,9 +2667,9 @@ void QgisApp::fileNew( bool thePromptToSaveFlag )

QSettings settings;

//set the colour for selections
//set the color for selections
//the default can be set in qgisoptions
//use project properties to override the colour on a per project basis
//use project properties to override the color on a per project basis
int myRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
int myGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
int myBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
Expand All @@ -2678,9 +2678,9 @@ void QgisApp::fileNew( bool thePromptToSaveFlag )
prj->writeEntry( "Gui", "/SelectionColorBluePart", myBlue );
QgsRenderer::setSelectionColor( QColor( myRed, myGreen, myBlue ) );

//set the canvas to the default background colour
//set the canvas to the default background color
//the default can be set in qgisoptions
//use project properties to override the colour on a per project basis
//use project properties to override the color on a per project basis
myRed = settings.value( "/qgis/default_canvas_color_red", 255 ).toInt();
myGreen = settings.value( "/qgis/default_canvas_color_green", 255 ).toInt();
myBlue = settings.value( "/qgis/default_canvas_color_blue", 255 ).toInt();
Expand Down Expand Up @@ -2945,7 +2945,7 @@ bool QgisApp::addProject( QString projectFile )
int myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
int myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
mMapCanvas->setCanvasColor( myColor ); //this is fill colour before rendering starts
mMapCanvas->setCanvasColor( myColor ); //this is fill color before rendering starts
QgsDebugMsg( "Canvas background color restored..." );

mMapCanvas->updateScale();
Expand Down Expand Up @@ -5124,7 +5124,7 @@ void QgisApp::projectProperties()
int myGreenInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorGreenPart", 255 );
int myBlueInt = QgsProject::instance()->readNumEntry( "Gui", "/CanvasColorBluePart", 255 );
QColor myColor = QColor( myRedInt, myGreenInt, myBlueInt );
mMapCanvas->setCanvasColor( myColor ); // this is fill colour before rendering onto canvas
mMapCanvas->setCanvasColor( myColor ); // this is fill color before rendering onto canvas

// Set the window title.
setTitleBarText_( *this );
Expand Down
34 changes: 17 additions & 17 deletions src/app/qgsoptions.cpp
View file
Expand Up @@ -181,11 +181,11 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
cbxIdentifyResultsDocked->setChecked( settings.value( "/qgis/dockIdentifyResults", false ).toBool() );
cbxAddPostgisDC->setChecked( settings.value( "/qgis/addPostgisDC", false ).toBool() );

//set the colour for selections
//set the color for selections
int myRed = settings.value( "/qgis/default_selection_color_red", 255 ).toInt();
int myGreen = settings.value( "/qgis/default_selection_color_green", 255 ).toInt();
int myBlue = settings.value( "/qgis/default_selection_color_blue", 0 ).toInt();
pbnSelectionColour->setColor( QColor( myRed, myGreen, myBlue ) );
pbnSelectionColor->setColor( QColor( myRed, myGreen, myBlue ) );

//set the default color for canvas background
myRed = settings.value( "/qgis/default_canvas_color_red", 255 ).toInt();
Expand All @@ -197,7 +197,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
myGreen = settings.value( "/qgis/default_measure_color_green", 180 ).toInt();
myBlue = settings.value( "/qgis/default_measure_color_blue", 180 ).toInt();
pbnMeasureColour->setColor( QColor( myRed, myGreen, myBlue ) );
pbnMeasureColor->setColor( QColor( myRed, myGreen, myBlue ) );

capitaliseCheckBox->setChecked( settings.value( "qgis/capitaliseLayerName", QVariant( false ) ).toBool() );

Expand Down Expand Up @@ -228,7 +228,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
myRed = settings.value( "/qgis/digitizing/line_color_red", 255 ).toInt();
myGreen = settings.value( "/qgis/digitizing/line_color_green", 0 ).toInt();
myBlue = settings.value( "/qgis/digitizing/line_color_blue", 0 ).toInt();
mLineColourToolButton->setColor( QColor( myRed, myGreen, myBlue ) );
mLineColorToolButton->setColor( QColor( myRed, myGreen, myBlue ) );

//default snap mode
mDefaultSnapModeComboBox->insertItem( 0, tr( "To vertex" ), "to vertex" );
Expand Down Expand Up @@ -327,12 +327,12 @@ QgsOptions::~QgsOptions()
settings.setValue( "/Windows/Options/row", listWidget->currentRow() );
}

void QgsOptions::on_pbnSelectionColour_clicked()
void QgsOptions::on_pbnSelectionColor_clicked()
{
QColor color = QColorDialog::getColor( pbnSelectionColour->color(), this );
QColor color = QColorDialog::getColor( pbnSelectionColor->color(), this );
if ( color.isValid() )
{
pbnSelectionColour->setColor( color );
pbnSelectionColor->setColor( color );
}
}

Expand All @@ -345,21 +345,21 @@ void QgsOptions::on_pbnCanvasColor_clicked()
}
}

void QgsOptions::on_pbnMeasureColour_clicked()
void QgsOptions::on_pbnMeasureColor_clicked()
{
QColor color = QColorDialog::getColor( pbnMeasureColour->color(), this );
QColor color = QColorDialog::getColor( pbnMeasureColor->color(), this );
if ( color.isValid() )
{
pbnMeasureColour->setColor( color );
pbnMeasureColor->setColor( color );
}
}

void QgsOptions::on_mLineColourToolButton_clicked()
void QgsOptions::on_mLineColorToolButton_clicked()
{
QColor color = QColorDialog::getColor( mLineColourToolButton->color(), this );
QColor color = QColorDialog::getColor( mLineColorToolButton->color(), this );
if ( color.isValid() )
{
mLineColourToolButton->setColor( color );
mLineColorToolButton->setColor( color );
}
}

Expand Down Expand Up @@ -497,8 +497,8 @@ void QgsOptions::saveOptions()
settings.setValue( "/qgis/measure/displayunits", "meters" );
}
settings.setValue( "/qgis/measure/ellipsoid", getEllipsoidAcronym( cmbEllipsoid->currentText() ) );
//set the colour for selections
QColor myColor = pbnSelectionColour->color();
//set the color for selections
QColor myColor = pbnSelectionColor->color();
settings.setValue( "/qgis/default_selection_color_red", myColor.red() );
settings.setValue( "/qgis/default_selection_color_green", myColor.green() );
settings.setValue( "/qgis/default_selection_color_blue", myColor.blue() );
Expand All @@ -510,7 +510,7 @@ void QgsOptions::saveOptions()
settings.setValue( "/qgis/default_canvas_color_blue", myColor.blue() );

//set the default color for the measure tool
myColor = pbnMeasureColour->color();
myColor = pbnMeasureColor->color();
settings.setValue( "/qgis/default_measure_color_red", myColor.red() );
settings.setValue( "/qgis/default_measure_color_green", myColor.green() );
settings.setValue( "/qgis/default_measure_color_blue", myColor.blue() );
Expand All @@ -520,7 +520,7 @@ void QgsOptions::saveOptions()

//digitizing
settings.setValue( "/qgis/digitizing/line_width", mLineWidthSpinBox->value() );
QColor digitizingColor = mLineColourToolButton->color();
QColor digitizingColor = mLineColorToolButton->color();
settings.setValue( "/qgis/digitizing/line_color_red", digitizingColor.red() );
settings.setValue( "/qgis/digitizing/line_color_green", digitizingColor.green() );
settings.setValue( "/qgis/digitizing/line_color_blue", digitizingColor.blue() );
Expand Down
14 changes: 7 additions & 7 deletions src/app/qgsoptions.h
View file
Expand Up @@ -64,24 +64,24 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
*/
bool newVisible();
/*!
* Slot to select the default map selection colour
* Slot to select the default map selection color
*/
void on_pbnSelectionColour_clicked();
void on_pbnSelectionColor_clicked();

/*!
* Slot to select the default measure tool colour
* Slot to select the default measure tool color
*/
void on_pbnMeasureColour_clicked();
void on_pbnMeasureColor_clicked();

/*!
* Slot to select the default map selection colour
* Slot to select the default map selection color
*/
void on_pbnCanvasColor_clicked();

/*!
* Slot to select the colour of the digitizing rubber band
* Slot to select the color of the digitizing rubber band
*/
void on_mLineColourToolButton_clicked();
void on_mLineColorToolButton_clicked();

/**Add a new URL to exclude from Proxy*/
void on_mAddUrlPushButton_clicked();
Expand Down

0 comments on commit e5cf709

Please sign in to comment.