Skip to content

Commit 02a26ca

Browse files
timlinuxtimlinux
committedNov 28, 2012
Rebase failed - merging branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents c989673 + ee12df2 commit 02a26ca

36 files changed

+720
-173
lines changed
 

‎i18n/qgis_de.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ Folgende Feldnamen sind länger als 10 Zeichen:
10071007
<message>
10081008
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="26"/>
10091009
<source>Grid extent</source>
1010-
<translation>Rastergrenze</translation>
1010+
<translation>Gittergrenze von Layer</translation>
10111011
</message>
10121012
<message>
10131013
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="41"/>
@@ -1017,12 +1017,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
10171017
<message>
10181018
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="54"/>
10191019
<source>Update extents from canvas</source>
1020-
<translation>Layergrenzen aus aktueller Ansicht aktualisieren</translation>
1020+
<translation>Layergrenzen aus aktueller Ansicht</translation>
10211021
</message>
10221022
<message>
10231023
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="169"/>
10241024
<source>Align extents and resolution to selected raster layer</source>
1025-
<translation>Ausmaße und Auflösung am gewählten Rasterlayer ausrichten</translation>
1025+
<translation>Ausmaße und Auflösung am gewählten Layer ausrichten</translation>
10261026
</message>
10271027
<message>
10281028
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="179"/>
@@ -1047,12 +1047,12 @@ Folgende Feldnamen sind länger als 10 Zeichen:
10471047
<message>
10481048
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="286"/>
10491049
<source>Output grid as polygons</source>
1050-
<translation>Raster als Polygone ausgeben</translation>
1050+
<translation>Gitter als Polygone ausgeben</translation>
10511051
</message>
10521052
<message>
10531053
<location filename="../python/plugins/fTools/tools/frmVectorGrid.ui" line="296"/>
10541054
<source>Output grid as lines</source>
1055-
<translation>Raster als Linien ausgeben</translation>
1055+
<translation>Gitter als Linien ausgeben</translation>
10561056
</message>
10571057
<message>
10581058
<source>Line intersections</source>
@@ -44820,7 +44820,7 @@ Base Path (i.e. keep only filename from attribute)</source>
4482044820
</message>
4482144821
<message>
4482244822
<source>Vector grid</source>
44823-
<translation>Vektorraster</translation>
44823+
<translation>Vektorgitter</translation>
4482444824
</message>
4482544825
<message>
4482644826
<source>Select by location</source>

‎i18n/qgis_fr.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16111,22 +16111,22 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
1611116111
<message>
1611216112
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="74"/>
1611316113
<source>Title Font...</source>
16114-
<translation>Police du tite...</translation>
16114+
<translation>Police du titre...</translation>
1611516115
</message>
1611616116
<message>
1611716117
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="81"/>
1611816118
<source>Group Font...</source>
16119-
<translation>Groupe de police...</translation>
16119+
<translation>Police des groupes...</translation>
1612016120
</message>
1612116121
<message>
1612216122
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="88"/>
1612316123
<source>Layer Font...</source>
16124-
<translation>Police de la couche...</translation>
16124+
<translation>Police des couches...</translation>
1612516125
</message>
1612616126
<message>
1612716127
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="95"/>
1612816128
<source>Item Font...</source>
16129-
<translation>Police de l&apos;objet...</translation>
16129+
<translation>Police des objets...</translation>
1613016130
</message>
1613116131
<message>
1613216132
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="102"/>
@@ -16182,7 +16182,7 @@ Les classes existantes doivent-elles être effacées avant la classification ?</
1618216182
<message>
1618316183
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="205"/>
1618416184
<source>Wrap text on</source>
16185-
<translation>Retour à la ligne activé</translation>
16185+
<translation>Activer le retour à la ligne après</translation>
1618616186
</message>
1618716187
<message>
1618816188
<location filename="../src/ui/qgscomposerlegendwidgetbase.ui" line="240"/>

‎i18n/qgis_it.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,11 @@ sono stati ridotti a %2 dopo la semplificazione</translation>
830830
<source>Press Ctrl+C to copy results to the clipboard</source>
831831
<translation>Premi Ctrl+C per copiare i risultati negli appunti</translation>
832832
</message>
833+
<message>
834+
<location filename="../python/plugins/fTools/tools/frmVisual.ui" line="120"/>
835+
<source>Save errors location</source>
836+
<translation>Salva posizione errori</translation>
837+
</message>
833838
<message>
834839
<source>Sum line lengths</source>
835840
<translation>Somma lunghezza linee</translation>

‎python/console/console.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ def openHelp(self):
360360
self.helpDlg.activateWindow()
361361

362362
def openSettings(self):
363-
#options = optionsDialog()
364363
self.options.exec_()
365364

366365
def prefChanged(self):

‎python/console/console_sci.py

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,6 @@ def __init__(self, parent=None):
7272
self.setCaretWidth(2)
7373

7474
# Set Python lexer
75-
# Set style for Python comments (style number 1) to a fixed-width
76-
# courier.
7775
self.setLexers()
7876

7977
# Indentation
@@ -130,19 +128,16 @@ def commandConsole(self, command):
130128
self.setSelection(line, 4, line, selCmdLenght)
131129
self.removeSelectedText()
132130
if command == "iface":
133-
"""Import QgisInterface class"""
131+
# import QgisInterface class
134132
self.append('from qgis.utils import iface')
135133
elif command == "sextante":
136-
"""Import Sextante class"""
137-
self.append('from sextante.core.Sextante import Sextante')
138-
elif command == "cLayer":
139-
"""Retrieve current Layer from map camvas"""
140-
self.append('cLayer = iface.mapCanvas().currentLayer()')
134+
# import Sextante class
135+
self.append('import sextante')
141136
elif command == "qtCore":
142-
"""Import QtCore class"""
137+
# import QtCore class
143138
self.append('from PyQt4.QtCore import *')
144139
elif command == "qtGui":
145-
"""Import QtGui class"""
140+
# import QtGui class
146141
self.append('from PyQt4.QtGui import *')
147142
self.entered()
148143
self.move_cursor_to_end()

‎python/core/qgspallabeling.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ class QgsPalLayerSettings
135135
bool reverseDirectionSymbol;
136136
DirectionSymbols placeDirectionSymbol; // whether to place left/right, above or below label
137137
unsigned int upsidedownLabels; // whether, or how, to show upsidedown labels
138+
double maxCurvedCharAngleIn; // maximum angle between inside curved label characters (defaults to 20.0, range 20.0 to 60.0)
139+
double maxCurvedCharAngleOut; // maximum angle between outside curved label characters (defaults to -20.0, range -20.0 to -95.0)
138140
bool fontSizeInMapUnits; //true if font size is in map units (otherwise in points)
139141
bool fontLimitPixelSize; // true is label should be limited by fontMinPixelSize/fontMaxPixelSize
140142
int fontMinPixelSize; // minimum pixel size for showing rendered map unit labels (1 - 1000)

‎python/core/symbology-ng/qgssvgcache.sip

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class QgsSvgCacheEntry
3434
/**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
3535
according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are
3636
the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. <circle fill="param(fill-color red)" stroke="param(pen-color black)" stroke-width="param(outline-width 1)"*/
37-
class QgsSvgCache
37+
class QgsSvgCache : QObject
3838
{
3939
%TypeHeaderCode
4040
#include <qgssvgcache.h>
@@ -56,7 +56,8 @@ class QgsSvgCache
5656
double& defaultOutlineWidth ) const;
5757

5858
protected:
59-
QgsSvgCache();
59+
//! protected constructor
60+
QgsSvgCache( QObject* parent = 0 );
6061

6162
/**Creates new cache entry and returns pointer to it*/
6263
QgsSvgCacheEntry* insertSVG( const QString& file, int size, const QColor& fill, const QColor& outline, double outlineWidth,

‎python/gui/qgisinterface.sip

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,12 +359,16 @@ class QgisInterface : QObject
359359
virtual QAction *actionAddPgLayer() = 0;
360360
virtual QAction *actionAddWmsLayer() = 0;
361361
virtual QAction *actionLayerSeparator1() = 0 /Deprecated/;
362+
/** @note added in 1.9 */
363+
virtual QAction *actionCopyLayerStyle() = 0;
364+
/** @note added in 1.9 */
365+
virtual QAction *actionPasteLayerStyle() = 0;
362366
virtual QAction *actionOpenTable() = 0;
363367
virtual QAction *actionToggleEditing() = 0;
364368
virtual QAction *actionLayerSaveAs() = 0;
365369
virtual QAction *actionLayerSelectionSaveAs() = 0;
366370
virtual QAction *actionRemoveLayer() = 0;
367-
/** @note added in 2.0 */
371+
/** @note added in 1.9 */
368372
virtual QAction *actionDuplicateLayer() = 0;
369373
virtual QAction *actionLayerProperties() = 0;
370374
virtual QAction *actionLayerSeparator2() = 0 /Deprecated/;

0 commit comments

Comments
 (0)
Please sign in to comment.