Skip to content

Commit 37ebcdd

Browse files
committed
[spellcheck] allow inwords checks and line skipping
spell check will be done automatically in words by default (when some conditions are fulfilled) possibility to avoid in words checking by adding :* at the end in spelling.dat one can add #spellok at the end of a line of code to skip spell check on this line
1 parent 1ad965b commit 37ebcdd

File tree

90 files changed

+280
-253
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+280
-253
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ matrix:
2323
- llvm-toolchain-precise-3.8
2424
- ubuntu-toolchain-r-test
2525
- george-edison55-precise-backports # doxygen 1.8.3
26-
# - laurent-boulard-devtools not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345
26+
# - laurent-boulard-devtools (for silver-search, not whitelisted yet https://github.com/travis-ci/apt-source-whitelist/pull/345)
2727
packages:
2828
- doxygen
2929
- bison
@@ -33,6 +33,7 @@ matrix:
3333
- libfcgi-dev
3434
- libfftw3-3
3535
- pkg-config
36+
- perl # lookahead regex in spell check script
3637
- poppler-utils
3738
- txt2tags
3839
- xvfb

NEWS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ This release has following new features:
9191
- Layer Legend: New option to zoom to a layer's visible scale range
9292
- Map Composer: New tools for drawing polygons and polylines
9393
- Map Composer: Embed atlas features into composer HTML source as GeoJSON
94-
- Map Composer: Parameterized svg support for composer svg images
94+
- Map Composer: Parametrized svg support for composer svg images
9595
- Map Composer: Easier use of HTML in labels
9696
- Map Composer: Relative links in composer labels
9797
- Map Composer: Georeference outputs (eg PDF) from composer

doc/api_break.dox

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
205205
<tr><td>QgsApplication<td>userStyleV2Path<td>userStylePath
206206
<tr><td>QgsComposerShape<td>setUseSymbolV2<td>setUseSymbol
207207
<tr><td>QgsIFeatureSelectionManager<td>selectedFeaturesIds<td>selectedFeatureIds
208-
<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName
208+
<tr><td>QgsMapLayer<td>capitaliseLayerName<td>capitalizeLayerName <!--#spellok-->
209209
<tr><td>QgsSymbolLayerUtils<td>createSymbolLayerV2ListFromSld<td>createSymbolLayerListFromSld
210210
<tr><td>QgsVectorLayer<td>editorWidgetV2Config<td>editorWidgetConfig
211211
<tr><td>QgsVectorLayer<td>editorWidgetV2Text<td>editorWidgetText
@@ -582,6 +582,7 @@ QgsComposerNodesItem {#qgis_api_break_3_0_QgsComposerNodesItem}
582582

583583
- _readXMLStyle() has been renamed to _readXmlStyle()
584584
- _writeXMLStyle() has been renamed to _writeXMLStyle()
585+
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
585586

586587

587588
QgsComposerPicture {#qgis_api_break_3_0_QgsComposerPicture}
@@ -610,6 +611,11 @@ QgsComposerTableV2 {#qgis_api_break_3_0_QgsComposerTableV2}
610611

611612
- rowsVisible(), rowRange(), drawHorizontalGridLines() and
612613
drawVerticalGridLines() were removed.
614+
615+
QgsComposerView {#qgis_api_break_3_0_QgsComposerView}
616+
--------------------
617+
618+
- unselectNode() has been renamed to deselectNode() <!--#spellok-->
613619

614620

615621
QgsComposition {#qgis_api_break_3_0_QgsComposition}
@@ -625,6 +631,7 @@ were removed. Use setSnapTolerance() and snapTolerance() instead.
625631
- pixelFontSize(), pointFontSize(), relativeResizeRect(), relativePosition() were removed. Use the corresponding methods in QgsComposerUtils instead.
626632
- sortZList() was removed. Use refreshZList() instead.
627633
- addComposerTable(), composerTableAdded() were removed.
634+
- setAllUnselected() has been renamed to setAllDeselected. <!--#spellok-->
628635

629636

630637
QgsCoordinateReferenceSystem {#qgis_api_break_3_0_QgsCoordinateReferenceSystem}
@@ -1189,7 +1196,7 @@ screenUpdateRequested() were removed. These members have had no effect for a num
11891196
- drawLabels() method was removed. It used old deprecated labeling. Replaced by labeling based on PAL library, see QgsLabelingEngine.
11901197
- readLayerXML() was renamed to readLayerXml()
11911198
- writeLayerXML() was renamed to writeLayerXml()
1192-
- capitaliseLayerName() was renamed to capitalizeLayerName()
1199+
- capitaliseLayerName() was renamed to capitalizeLayerName() <!--#spellok-->
11931200

11941201

11951202
QgsMapLayerRegistry {#qgis_api_break_3_0_QgsMapLayerRegistry}

doc/news.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ <H1>1. What's new in Version 2.16 'Nødebo'?</H1>
171171
<LI>Layer Legend: New option to zoom to a layer's visible scale range
172172
<LI>Map Composer: New tools for drawing polygons and polylines
173173
<LI>Map Composer: Embed atlas features into composer HTML source as GeoJSON
174-
<LI>Map Composer: Parameterized svg support for composer svg images
174+
<LI>Map Composer: Parametrized svg support for composer svg images
175175
<LI>Map Composer: Easier use of HTML in labels
176176
<LI>Map Composer: Relative links in composer labels
177177
<LI>Map Composer: Georeference outputs (e.g., PDF) from composer

doc/news.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ This release has following new features:
8585
- Layer Legend: New option to zoom to a layer's visible scale range
8686
- Map Composer: New tools for drawing polygons and polylines
8787
- Map Composer: Embed atlas features into composer HTML source as GeoJSON
88-
- Map Composer: Parameterized svg support for composer svg images
88+
- Map Composer: Parametrized svg support for composer svg images
8989
- Map Composer: Easier use of HTML in labels
9090
- Map Composer: Relative links in composer labels
9191
- Map Composer: Georeference outputs (eg PDF) from composer

doc/release-sponsors.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ <h3 class="text-muted"><img src="images/projects/thumbnails/0e2f6fb1efc89d41120c
121121
<p>April 17, 2016 - April 17, 2017</p>
122122
<p>Bronze : 500 EUR or more</p>
123123
<p><img src="images/projects/thumbnails/e24951be1e5ff2d6fd591f9760871e38a684bed0.png.100x50_q85.png" /></p>
124-
<p><a href="http://www.gfi-gis.de/">GFI - Gesellschaft für Informationstechnologie mbH</a></p>
124+
<p><a href="http://www.gfi-gis.de/">GFI - Gesellschaft für Informationstechnologie mbH</a></p> <!--#spellok-->
125125
<p>April 15, 2016 - April 15, 2017</p>
126126
<p>Bronze : 500 EUR or more</p>
127127
<p><img src="images/projects/thumbnails/44113fc21a8e2cd84d93459d0f00b3a64850095c.png.100x50_q85.jpg" /></p>

python/console/console_editor.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ def __init__(self, parent=None):
168168
self.newShortcutCS.activated.connect(self.autoCompleteKeyBinding)
169169
self.runScut = QShortcut(QKeySequence(Qt.CTRL + Qt.Key_E), self)
170170
self.runScut.setContext(Qt.WidgetShortcut)
171-
self.runScut.activated.connect(self.runSelectedCode)
171+
self.runScut.activated.connect(self.runSelectedCode) #spellok
172172
self.runScriptScut = QShortcut(QKeySequence(Qt.SHIFT + Qt.CTRL + Qt.Key_E), self)
173173
self.runScriptScut.setContext(Qt.WidgetShortcut)
174174
self.runScriptScut.activated.connect(self.runScriptCode)
@@ -307,9 +307,9 @@ def contextMenuEvent(self, e):
307307
syntaxCheck = menu.addAction(iconSyntaxCk,
308308
QCoreApplication.translate("PythonConsole", "Check Syntax"),
309309
self.syntaxCheck, 'Ctrl+4')
310-
runSelected = menu.addAction(iconRun,
310+
runSelected = menu.addAction(iconRun, #spellok
311311
QCoreApplication.translate("PythonConsole", "Run Selected"),
312-
self.runSelectedCode, 'Ctrl+E')
312+
self.runSelectedCode, 'Ctrl+E') #spellok
313313
menu.addAction(iconRunScript,
314314
QCoreApplication.translate("PythonConsole", "Run Script"),
315315
self.runScriptCode, 'Shift+Ctrl+E')
@@ -358,14 +358,14 @@ def contextMenuEvent(self, e):
358358
pasteAction.setEnabled(False)
359359
codePadAction.setEnabled(False)
360360
cutAction.setEnabled(False)
361-
runSelected.setEnabled(False)
361+
runSelected.setEnabled(False) #spellok
362362
copyAction.setEnabled(False)
363363
selectAllAction.setEnabled(False)
364364
undoAction.setEnabled(False)
365365
redoAction.setEnabled(False)
366366
showCodeInspection.setEnabled(False)
367367
if self.hasSelectedText():
368-
runSelected.setEnabled(True)
368+
runSelected.setEnabled(True) #spellok
369369
copyAction.setEnabled(True)
370370
cutAction.setEnabled(True)
371371
codePadAction.setEnabled(True)
@@ -600,7 +600,7 @@ def runScriptCode(self):
600600
self.parent.pc.shell.runCommand(u"exec(open(u'{0}'.encode('{1}')).read())"
601601
.format(filename.replace("\\", "/"), sys.getfilesystemencoding()))
602602

603-
def runSelectedCode(self):
603+
def runSelectedCode(self): #spellok
604604
cmd = self.selectedText()
605605
self.parent.pc.shell.insertFromDropPaste(cmd)
606606
self.parent.pc.shell.entered()

python/console/console_sci.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ def commandConsole(self, commands):
166166
if not self.is_cursor_on_last_line():
167167
self.move_cursor_to_end()
168168
line, pos = self.getCursorPosition()
169-
selCmdLenght = len(self.text(line))
170-
self.setSelection(line, 4, line, selCmdLenght)
169+
selCmdLength = len(self.text(line))
170+
self.setSelection(line, 4, line, selCmdLength)
171171
self.removeSelectedText()
172172
for cmd in commands:
173173
self.append(cmd)
@@ -348,8 +348,8 @@ def clearHistorySession(self):
348348
def showPrevious(self):
349349
if self.historyIndex < len(self.history) and self.history:
350350
line, pos = self.getCursorPosition()
351-
selCmdLenght = len(self.text(line))
352-
self.setSelection(line, 4, line, selCmdLenght)
351+
selCmdLength = len(self.text(line))
352+
self.setSelection(line, 4, line, selCmdLength)
353353
self.removeSelectedText()
354354
self.historyIndex += 1
355355
if self.historyIndex == len(self.history):
@@ -363,8 +363,8 @@ def showPrevious(self):
363363
def showNext(self):
364364
if self.historyIndex > 0 and self.history:
365365
line, pos = self.getCursorPosition()
366-
selCmdLenght = len(self.text(line))
367-
self.setSelection(line, 4, line, selCmdLenght)
366+
selCmdLength = len(self.text(line))
367+
self.setSelection(line, 4, line, selCmdLength)
368368
self.removeSelectedText()
369369
self.historyIndex -= 1
370370
if self.historyIndex == len(self.history):

python/core/auth/qgsauthcertutils.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class QgsAuthCertUtils
138138
/** Get the general name for certificate trust */
139139
static QString getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust );
140140

141-
/** Get string with colon delimeters every 2 characters */
141+
/** Get string with colon delimiters every 2 characters */
142142
static QString getColonDelimited( const QString& txt );
143143

144144
/** Get the sha1 hash for certificate

python/core/composer/qgscomposernodesitem.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class QgsComposerNodesItem: QgsComposerItem
7474

7575
/** Deselect a node.
7676
*/
77-
void unselectNode();
77+
void deselectNode();
7878

7979
/** Stores state in Dom element
8080
* @param elem is Dom element corresponding to 'Composer' tag

0 commit comments

Comments
 (0)