diff --git a/.travis.yml b/.travis.yml index 315c1cfa22e..850a4991498 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,11 @@ language: python notifications: irc: channels: - - "chat.freenode.net#qgisdocs" - on_success: always # options: [always|never|change] default: always + - "chat.freenode.net#qgis-test" + on_success: change # options: [always|never|change] default: always on_failure: always # options: [always|never|change] default: always + skip_join: true + # webhooks: # urls: # - https://webhooks.gitter.im/e/7d967d9679efbbc43466 diff --git a/source/conf.py b/source/conf.py index aeac1190137..cf16afa035f 100644 --- a/source/conf.py +++ b/source/conf.py @@ -1162,3 +1162,190 @@ locale_dirs = ['../i18n/'] gettext_compact = False +# adding this because in pycookbook a lot of text is referencing classes, which cannot be found by sphinx +# eg: Map canvas is implemented as :class:`QgsMapCanvas` ... +# I hope somebody will create the real references for these so they can be removed here... +nitpick_ignore = [('py:class', 'QAction'), + ('py:class', 'QDomElement'), + ('py:class', 'QFileInfo'), + ('py:class', 'QGraphicsScene'), + ('py:class', 'QgsAccessControlFilter'), + ('py:class', 'QgsCategorizedSymbolRendererV2'), + ('py:class', 'QgsComposerItem'), + ('py:class', 'QgsComposition'), + ('py:class', 'QgsCoordinateReferenceSystem'), + ('py:class', 'QgsCoordinateTransform'), + ('py:class', 'QgsDataSourceURI'), + ('py:class', 'QgsDistanceArea'), + ('py:class', 'QgsEditError'), + ('py:class', 'QgsExpression'), + ('py:class', 'QgsFeature'), + ('py:class', 'QgsFeatureRendererV2'), + ('py:class', 'QgsFiels'), + ('py:class', 'QgsFillSymbolV2'), + ('py:class', 'QgsGeometry'), + ('py:class', 'QgsGraduatedSymbolRendererV2'), + ('py:class', 'QgsGraphAnalyzer'), + ('py:class', 'QgsInterface'), + ('py:class', 'QgisInterface'), + ('py:class', 'QgsLayerTreeMapCanvasBridge'), + ('py:class', 'QgsLineSymbolV2'), + ('py:class', 'QgsMapCanvas'), + ('py:class', 'QgsMapCanvasItem'), + ('py:class', 'QgsMapCanvasItem'), + ('py:class', 'QgsMapCanvasMap'), + ('py:class', 'QgsMapRenderer'), + ('py:class', 'QgsMapServiceException'), + ('py:class', 'QgsMapTool'), + ('py:class', 'QgsMapToolPan'), + ('py:class', 'QgsMapToolZoom'), + ('py:class', 'QgsMarkerSymbolV2'), + ('py:class', 'QgsMessageBar'), + ('py:class', 'QgsPoint'), + ('py:class', 'QgsProject'), + ('py:class', 'QgsRasterLayer'), + ('py:class', 'QgsRasterRenderer'), + ('py:class', 'QgsRendererV2AbstractMetadata'), + ('py:class', 'QgsRendererV2Registry'), + ('py:class', 'QgsRendererV2Widget'), + ('py:class', 'QgsRequestHandler'), + ('py:class', 'QgsRubberBand'), + ('py:class', 'QgsServerFilter'), + ('py:class', 'QgsServerInterface'), + ('py:class', 'QgsSingleSymbolRendererV2'), + ('py:class', 'QgsStyleV2'), + ('py:class', 'QgsSymbolLayerV2'), + ('py:class', 'QgsSymbolLayerV2Registry'), + ('py:class', 'QgsSymbolV2'), + ('py:class', 'QgsVectorColorRampV2'), + ('py:class', 'QgsVectorFileWriter'), + ('py:class', 'QgsVectorLayer'), + ('py:class', 'QgsVectorLayerEditUtils'), + ('py:class', 'QgsVertexMarker'), + ('py:class', 'QMenu'), + ('py:class', 'QSettings'), + + ('py:data', 'iface'), + ('py:data', 'qgis.utils.iface'), + + ('py:func', 'addFeatures'), + ('py:func', 'addPluginToDatabaseMenu'), + ('py:func', 'addPluginToMenu'), + ('py:func', 'addPluginToRasterMenu'), + ('py:func', 'addPluginToVectorMenu'), + ('py:func', 'addPluginToWebMenu'), + ('py:func', 'angle'), + ('py:func', 'asMultiPoint'), + ('py:func', 'asMultiPolygon'), + ('py:func', 'asMultiPolyline'), + ('py:func', 'beginEditCommand'), + ('py:func', 'capabilities'), + ('py:func', 'capabilitiesString'), + ('py:func', 'changed'), + ('py:func', 'classAttribute'), + ('py:func', 'classFactory'), + ('py:func', 'clone'), + ('py:func', 'color'), + ('py:func', 'commitChanges'), + ('py:func', 'contains'), + ('py:func', 'create*'), + ('py:func', 'createRenderer'), + ('py:func', 'createRendererWidget'), + ('py:func', 'createSimple'), + ('py:func', 'createSpatialIndex'), + ('py:func', 'createSymbolLayer'), + ('py:func', 'createSymbolLayerWidget'), + ('py:func', 'destroyEditCommand'), + ('py:func', 'difference'), + ('py:func', 'dijkstra'), + ('py:func', 'dump'), + ('py:func', 'endEditCommand'), + ('py:func', 'executeRequest'), + ('py:func', 'exitQgis'), + ('py:func', 'features'), + ('py:func', 'fields'), + ('py:func', 'getFeatures'), + ('py:func', 'hide'), + ('py:func', '__init__'), + ('py:func', 'initAttributes'), + ('py:func', 'initGui'), + ('py:func', 'initGui()'), + ('py:func', 'initQgis'), + ('py:func', 'instance'), + ('py:func', 'intersects'), + ('py:func', 'isEditable'), + ('py:func', 'isMultipart'), + ('py:func', 'isValid'), + ('py:func', 'label'), + ('py:func', 'layerType'), + ('py:func', 'mode'), + ('py:func', 'nextFeature'), + ('py:func', 'pendingFields'), + ('py:func', 'properties'), + ('py:func', 'QgsApplication.setPrefixPath'), + ('py:func', 'QgsCoordinateReferenceSystem.createFromString'), + ('py:func', 'QgsExpression.prepare'), + ('py:func', 'read()'), + ('py:func', 'read'), + ('py:func', 'registerFilter'), + ('py:func', 'renderer'), + ('py:func', 'renderPoint'), + ('py:func', 'renderPolygon'), + ('py:func', 'renderPolyline'), + ('py:func', 'requestReady'), + ('py:func', 'requestReady()'), + ('py:func', 'responseComplete'), + ('py:func', 'rollBack'), + ('py:func', 'selectedFeatures'), + ('py:func', 'sendResponse'), + ('py:func', 'sendResponse()'), + ('py:func', 'serverClassFactory'), + ('py:func', 'setClassAttribute'), + ('py:func', 'setColor'), + ('py:func', 'setDataSource'), + ('py:func', 'setIcon'), + ('py:func', 'setMapTool'), + ('py:func', 'setRenderer'), + ('py:func', 'setSelectedFeatures'), + ('py:func', 'setSelectionColor'), + ('py:func', 'setSymbol'), + ('py:func', 'setSymbolLayer'), + ('py:func', 'shortestTree'), + ('py:func', 'show'), + ('py:func', 'size'), + ('py:func', 'showPluginHelp'), + ('py:func', 'sourceColorRamp'), + ('py:func', 'sourceSymbol'), + ('py:func', 'startEditing'), + ('py:func', 'startRender'), + ('py:func', 'stopRender'), + ('py:func', 'symbol'), + ('py:func', 'symbolForFeature'), + ('py:func', 'symbolLayer'), + ('py:func', 'transform'), + ('py:func', 'type'), + ('py:func', 'union'), + ('py:func', 'unload'), + ('py:func', 'unload()'), + ('py:func', 'usedAttributes'), + ('py:func', 'value'), + ('py:func', 'value()'), + ('py:func', 'width'), + ('py:func', 'wkbType'), + ('py:func', 'write'), + ('py:func', 'writeEntry'), + ('py:func', 'x'), + ('py:func', 'y'), + + ('py:obj', 'QgsFeatureRequest'), + ('py:obj', 'QgsExpression'), + + ('py:const', 'EpsgCrsId'), + ('py:const', 'InternalCrsId'), + ('py:const', 'PostgisCrsId'), + ('py:const', 'True'), + + ('py:mod', 'qgis.core'), + ('py:mod', 'qgis.gui'), + ('py:mod', 'qgis.utils'), + ] \ No newline at end of file diff --git a/source/docs/pyqgis_developer_cookbook/plugins.rst b/source/docs/pyqgis_developer_cookbook/plugins.rst index 0eaec942d00..bfe16dd64ad 100644 --- a/source/docs/pyqgis_developer_cookbook/plugins.rst +++ b/source/docs/pyqgis_developer_cookbook/plugins.rst @@ -400,7 +400,7 @@ The documentation for the plugin can be written as HTML help files. The :mod:`qgis.utils` module provides a function, :func:`showPluginHelp` which will open the help file browser, in the same way as other QGIS help. -The :func:`showPluginHelp`` function looks for help files in the same +The :func:`showPluginHelp` function looks for help files in the same directory as the calling module. It will look for, in turn, :file:`index-ll_cc.html`, :file:`index-ll.html`, :file:`index-en.html`, :file:`index-en_us.html` and :file:`index.html`, displaying whichever it finds diff --git a/source/docs/user_manual/working_with_vector/vector_properties.rst b/source/docs/user_manual/working_with_vector/vector_properties.rst index 5db10f77e07..ac474e1c572 100644 --- a/source/docs/user_manual/working_with_vector/vector_properties.rst +++ b/source/docs/user_manual/working_with_vector/vector_properties.rst @@ -203,7 +203,9 @@ field 'budged'. Here a comment functionality is inserted. **Figure Symbology 6:** -.. figure:: /static/user_manual/working_with_vector/symbol_data_defined_edit.png +.. todo find the correct image "symbol_data_defined_edit.png" to put here. Temporarily (to not have build warning) put + +.. figure:: /static/user_manual/working_with_vector/rulesymbol_ng_line.png :align: center Data-defined symbol with Edit... menu