Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
merge from trunk r12050:12100
git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@12132 c8812cc2-4d05-0410-92ff-de0c093fc19c
- Loading branch information
Showing
with
10,670 additions
and 9,260 deletions.
- +79 −83 i18n/qgis_ar.ts
- +79 −83 i18n/qgis_cs_CZ.ts
- +1,190 −934 i18n/qgis_de.ts
- +79 −83 i18n/qgis_el_GR.ts
- +91 −83 i18n/qgis_es.ts
- +177 −149 i18n/qgis_fr.ts
- +79 −83 i18n/qgis_he.ts
- +102 −94 i18n/qgis_hu.ts
- +79 −83 i18n/qgis_id.ts
- +2,327 −1,499 i18n/qgis_it.ts
- +79 −83 i18n/qgis_ja.ts
- +79 −83 i18n/qgis_ka_GE.ts
- +79 −83 i18n/qgis_lo.ts
- +79 −83 i18n/qgis_lt.ts
- +79 −83 i18n/qgis_lv.ts
- +79 −83 i18n/qgis_mn.ts
- +1,375 −1,599 i18n/qgis_nl.ts
- +110 −102 i18n/qgis_pl_PL.ts
- +79 −83 i18n/qgis_pt_BR.ts
- +79 −83 i18n/qgis_ro.ts
- +91 −83 i18n/qgis_ru.ts
- +79 −83 i18n/qgis_sk.ts
- +79 −83 i18n/qgis_sq_AL.ts
- +91 −83 i18n/qgis_sv.ts
- +91 −83 i18n/qgis_th.ts
- +79 −83 i18n/qgis_tr.ts
- +91 −83 i18n/qgis_uk.ts
- +42 −34 i18n/qgis_vi.ts
- +34 −38 i18n/qgis_xh.ts
- +34 −38 i18n/qgis_zh_CN.ts
- +34 −38 i18n/qgis_zh_TW.ts
- +1 −1 images/themes/CMakeLists.txt
- +6 −0 images/themes/newgis/CMakeLists.txt
- +32 −0 images/themes/newgis/LICENSE.TXT
- BIN images/themes/newgis/grass/grass_add_raster.png
- BIN images/themes/newgis/grass/grass_add_vector.png
- BIN images/themes/newgis/grass/grass_add_vertex.png
- BIN images/themes/newgis/grass/grass_close_edit.png
- BIN images/themes/newgis/grass/grass_close_mapset.png
- BIN images/themes/newgis/grass/grass_delete_line.png
- BIN images/themes/newgis/grass/grass_delete_vertex.png
- BIN images/themes/newgis/grass/grass_edit.png
- BIN images/themes/newgis/grass/grass_edit_attributes.png
- BIN images/themes/newgis/grass/grass_move_line.png
- BIN images/themes/newgis/grass/grass_move_vertex.png
- BIN images/themes/newgis/grass/grass_new_boundary.png
- BIN images/themes/newgis/grass/grass_new_centroid.png
- BIN images/themes/newgis/grass/grass_new_line.png
- BIN images/themes/newgis/grass/grass_new_mapset.png
- BIN images/themes/newgis/grass/grass_new_point.png
- BIN images/themes/newgis/grass/grass_new_vector_layer.png
- BIN images/themes/newgis/grass/grass_open_mapset.png
- BIN images/themes/newgis/grass/grass_region.png
- BIN images/themes/newgis/grass/grass_region_edit.png
- BIN images/themes/newgis/grass/grass_split_line.png
- BIN images/themes/newgis/grass/grass_tools.png
- BIN images/themes/newgis/mActionAddGPSLayer.png
- BIN images/themes/newgis/mActionAddImage.png
- BIN images/themes/newgis/mActionAddIsland.png
- BIN images/themes/newgis/mActionAddLayer.png
- BIN images/themes/newgis/mActionAddLegend.png
- BIN images/themes/newgis/mActionAddMap.png
- BIN images/themes/newgis/mActionAddOgrLayer.png
- BIN images/themes/newgis/mActionAddRasterLayer.png
- BIN images/themes/newgis/mActionAddRing.png
- BIN images/themes/newgis/mActionAddSpatiaLiteLayer.png
- BIN images/themes/newgis/mActionAddVertex.png
- BIN images/themes/newgis/mActionAddWfsLayer.png
- BIN images/themes/newgis/mActionAddWmsLayer.png
- BIN images/themes/newgis/mActionCaptureLine.png
- BIN images/themes/newgis/mActionCapturePoint.png
- BIN images/themes/newgis/mActionCapturePolygon.png
- BIN images/themes/newgis/mActionDeletePart.png
- BIN images/themes/newgis/mActionDeleteRing.png
- BIN images/themes/newgis/mActionDeleteSelected.png
- BIN images/themes/newgis/mActionDeleteVertex.png
- BIN images/themes/newgis/mActionDraw.png
- BIN images/themes/newgis/mActionEditCopy.png
- BIN images/themes/newgis/mActionEditCut.png
- BIN images/themes/newgis/mActionEditPaste.png
- BIN images/themes/newgis/mActionFileNew.png
- BIN images/themes/newgis/mActionFileOpen.png
- BIN images/themes/newgis/mActionFilePrint.png
- BIN images/themes/newgis/mActionFileSave.png
- BIN images/themes/newgis/mActionFileSaveAs.png
- BIN images/themes/newgis/mActionGroupItems.png
- BIN images/themes/newgis/mActionHelpContents.png
- BIN images/themes/newgis/mActionHideAllLayers.png
- BIN images/themes/newgis/mActionIdentify.png
- BIN images/themes/newgis/mActionInOverview.png
- BIN images/themes/newgis/mActionLabel.png
- BIN images/themes/newgis/mActionMapTips.png
- BIN images/themes/newgis/mActionMeasure.png
- BIN images/themes/newgis/mActionMeasureArea.png
- BIN images/themes/newgis/mActionMergeFeatures.png
- BIN images/themes/newgis/mActionMoveFeature.png
- BIN images/themes/newgis/mActionMoveItemContent.png
- BIN images/themes/newgis/mActionMoveVertex.png
- BIN images/themes/newgis/mActionNewBookmark.png
- BIN images/themes/newgis/mActionNewVectorLayer.png
- BIN images/themes/newgis/mActionNodeTool.png
- BIN images/themes/newgis/mActionOpenTable.png
- BIN images/themes/newgis/mActionPan.png
- BIN images/themes/newgis/mActionRedo.png
- BIN images/themes/newgis/mActionRemoveLayer.png
- BIN images/themes/newgis/mActionReshape.png
- BIN images/themes/newgis/mActionSaveAsPDF.png
- BIN images/themes/newgis/mActionSaveAsSVG.png
- BIN images/themes/newgis/mActionSaveMapAsImage.png
- BIN images/themes/newgis/mActionScaleBar.png
- BIN images/themes/newgis/mActionSelect.png
- BIN images/themes/newgis/mActionSelectPan.png
- BIN images/themes/newgis/mActionShowAllLayers.png
- BIN images/themes/newgis/mActionShowBookmarks.png
- BIN images/themes/newgis/mActionSimplify.png
- BIN images/themes/newgis/mActionSplitFeatures.png
- BIN images/themes/newgis/mActionToggleEditing.png
- BIN images/themes/newgis/mActionUndo.png
- BIN images/themes/newgis/mActionUngroupItems.png
- BIN images/themes/newgis/mActionUnselectAttributes.png
- BIN images/themes/newgis/mActionZoomFullExtent.png
- BIN images/themes/newgis/mActionZoomIn.png
- BIN images/themes/newgis/mActionZoomLast.png
- BIN images/themes/newgis/mActionZoomNext.png
- BIN images/themes/newgis/mActionZoomOut.png
- BIN images/themes/newgis/mActionZoomToLayer.png
- BIN images/themes/newgis/mActionZoomToSelected.png
- BIN images/themes/newgis/plugins/coordinate_capture/coordinate_capture.png
- BIN images/themes/newgis/plugins/copyright_label.png
- BIN images/themes/newgis/plugins/delimited_text.png
- BIN images/themes/newgis/plugins/dxf2shp_converter.png
- BIN images/themes/newgis/plugins/georeferencer.png
- BIN images/themes/newgis/plugins/gps_importer.png
- BIN images/themes/newgis/plugins/interpolation.png
- BIN images/themes/newgis/plugins/north_arrow.png
- BIN images/themes/newgis/plugins/ogr_converter.png
- BIN images/themes/newgis/plugins/quick_print.png
- BIN images/themes/newgis/plugins/scale_bar.png
- BIN images/themes/newgis/plugins/spit.png
- BIN images/themes/newgis/plugins/wfs.png
- +548 −220 mac/xcode/Qgis.xcodeproj/project.pbxproj
- +2 −0 mac/xcode/qgis_settings.xcconfig
- +8 −8 python/CMakeLists.txt
- +26 −4 python/core/qgsvectorlayer.sip
- +54 −32 python/plugins/fTools/tools/doVisual.py
- +20 −8 python/plugins/fTools/tools/frmVisual.ui
- +2 −10 python/plugins/mapserver_export/qgsmapserverexportbase.ui
- +1 −1 resources/context_help/308026563_de_DE
- +1 −1 resources/context_help/308026563_en_US
- +1 −1 resources/context_help/308026563_ru_RU
- +1 −1 resources/context_help/308026563_sk_SK
- +1 −1 resources/context_help/308026563_sv_SE
- +1 −1 resources/context_help/689216579_pl_PL
- +4 −1 resources/context_help/contextids.txt
- +1 −1 src/analysis/CMakeLists.txt
- +47 −24 src/analysis/vector/qgsoverlayanalyzer.cpp
- +2 −1 src/analysis/vector/qgsoverlayanalyzer.h
- +4 −0 src/app/CMakeLists.txt
- +1 −1 src/app/attributetable/qgsattributetabledelegate.cpp
- +26 −172 src/app/composer/qgscomposer.cpp
- +8 −9 src/app/composer/qgscomposer.h
- +159 −0 src/app/composer/qgscomposermanager.cpp
- +51 −0 src/app/composer/qgscomposermanager.h
- +1 −3 src/app/composer/qgscomposermapwidget.cpp
- +63 −94 src/app/composer/qgscompositionwidget.cpp
- +8 −6 src/app/composer/qgscompositionwidget.h
- +17 −32 src/app/legend/qgslegend.cpp
- +2 −6 src/app/legend/qgslegend.h
- +2 −2 src/app/legend/qgslegendgroup.cpp
- +1 −1 src/app/legend/qgslegendgroup.h
- +3 −3 src/app/legend/qgslegendlayer.cpp
- +101 −76 src/app/qgisapp.cpp
- +16 −9 src/app/qgisapp.h
- +9 −6 src/app/qgisappinterface.cpp
- +147 −56 src/app/qgsattributedialog.cpp
- +14 −10 src/app/qgsattributedialog.h
- +225 −69 src/app/qgsattributeeditor.cpp
- +5 −1 src/app/qgsattributeeditor.h
- +17 −0 src/app/qgsattributetypedialog.cpp
- +14 −2 src/app/qgsattributetypedialog.h
- +62 −106 src/app/qgsidentifyresults.cpp
- +3 −8 src/app/qgsidentifyresults.h
- +0 −1 src/app/qgslabeldialog.cpp
- +7 −4 src/app/qgsmapserverexport.cpp
- +3 −1 src/app/qgsmapserverexport.h
- +1 −1 src/app/qgsmaptooladdfeature.cpp
- +3 −8 src/app/qgsnewconnection.cpp
- +1 −3 src/app/qgsnewconnection.h
- +10 −10 src/app/qgsspatialitesourceselect.cpp
- +4 −4 src/app/qgsspatialitesourceselect.h
- +31 −0 src/app/qgsvectorlayerproperties.cpp
- +2 −0 src/app/qgsvectorlayerproperties.h
- +12 −5 src/app/qgswmssourceselect.cpp
- +6 −2 src/app/qgswmssourceselect.h
- +1 −0 src/core/CMakeLists.txt
- +6 −1 src/core/composer/qgscomposerpicture.cpp
- +66 −29 src/core/qgsmaplayer.cpp
- +51 −1 src/core/qgsvectorlayer.cpp
- +15 −0 src/core/qgsvectorlayer.h
- +27 −58 src/helpviewer/qgshelpviewerbase.ui
- +0 −2 src/plugins/coordinate_capture/CMakeLists.txt
- +0 −78 src/plugins/coordinate_capture/coordinatecaptureguibase.ui
- +6 −0 src/plugins/diagram_overlay/qgslinearlyscalingdialogbase.ui
- +50 −67 src/plugins/diagram_overlay/qgssvgdiagramfactorywidgetbase.ui
- +41 −41 src/plugins/diagram_overlay/qgswkndiagramfactorywidgetbase.ui
- +1 −1 src/plugins/gps_importer/qgsgpsplugin.cpp
- +1 −1 src/plugins/wfs/qgswfsplugin.cpp
- +6 −6 src/ui/qgsaddattrdialogbase.ui
- +202 −193 src/ui/qgsattributeactiondialogbase.ui
- +0 −71 src/ui/qgsattributedialogbase.ui
- +60 −2 src/ui/qgsattributetypeedit.ui
- +4 −22 src/ui/qgscomposerbase.ui
- +108 −0 src/ui/qgscomposermanagerbase.ui
- +51 −4 src/ui/qgscomposermapwidgetbase.ui
- +53 −71 src/ui/qgscomposerscalebarwidgetbase.ui
- +80 −136 src/ui/qgscompositionwidgetbase.ui
- +25 −43 src/ui/qgsidentifyresultsbase.ui
- +422 −588 src/ui/qgslabeldialogbase.ui
- +147 −183 src/ui/qgsmapserverexportbase.ui
- +14 −32 src/ui/qgsmessageviewer.ui
- +1 −1 src/ui/qgsopenvectorlayerdialogbase.ui
- +27 −1 src/ui/qgssinglesymboldialogbase.ui
- +89 −140 src/ui/qgsspatialitesourceselectbase.ui
- +23 −6 src/ui/qgsvectorlayerpropertiesbase.ui
- +151 −187 src/ui/qgswmssourceselectbase.ui
Oops, something went wrong.