Skip to content

Commit eab2d8a

Browse files
volayavolaya
committedJan 8, 2013
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents 964e842 + 45fab4b commit eab2d8a

File tree

12 files changed

+3881
-2565
lines changed

12 files changed

+3881
-2565
lines changed
 

‎doc/TRANSLATORS

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<style>table {font-size:80%;}th {text-align:left; }.bartodo{ background-color:red;width:100px;height:20px;}.bardone{ background-color:green;width:80px;height:20px;font-size:80%;text-align:center;padding-top:4px;height:16px;color:white;}</style><table><tr><th colspan="2" style="width:250px;">Language</th><th>Finished %</th><th>Translators</th></tr>
22

3-
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:8834 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:100px">100.0</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
4-
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8619 unfinished:28 untranslated:61" class="bartodo"><div class="bardone" style="width:97px">97.7</div></div></td><td>Xan Vieiro</td></tr>
3+
<tr><td><img src="qrc:/images/flags/de.png"></td><td>German</td><td><div title="finished:8834 unfinished:0 untranslated:0" class="bartodo"><div class="bardone" style="width:99px">99.9</div></div></td><td>Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho</td></tr>
4+
<tr><td><img src="qrc:/images/flags/gl_ES.png"></td><td>Galician (Spain)</td><td><div title="finished:8582 unfinished:119 untranslated:138" class="bartodo"><div class="bardone" style="width:97px">97.8</div></div></td><td>Xan Vieiro</td></tr>
55
<tr><td><img src="qrc:/images/flags/es.png"></td><td>Spanish</td><td><div title="finished:8438 unfinished:22 untranslated:58" class="bartodo"><div class="bardone" style="width:95px">95.6</div></div></td><td>Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo</td></tr>
66
<tr><td><img src="qrc:/images/flags/it.png"></td><td>Italian</td><td><div title="finished:7967 unfinished:28 untranslated:515" class="bartodo"><div class="bardone" style="width:90px">90.3</div></div></td><td>Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla</td></tr>
77
<tr><td><img src="qrc:/images/flags/sv.png"></td><td>Swedish</td><td><div title="finished:7316 unfinished:1131 untranslated:109" class="bartodo"><div class="bardone" style="width:89px">89.2</div></div></td><td>Lars Luthman, Magnus Homann, Victor Axbom</td></tr>
8-
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7573 unfinished:399 untranslated:543" class="bartodo"><div class="bardone" style="width:87px">88.0</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
8+
<tr><td><img src="qrc:/images/flags/nl.png"></td><td>Dutch</td><td><div title="finished:7573 unfinished:399 untranslated:543" class="bartodo"><div class="bardone" style="width:87px">87.9</div></div></td><td>Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk</td></tr>
99
<tr><td><img src="qrc:/images/flags/ja.png"></td><td>Japanese</td><td><div title="finished:7412 unfinished:461 untranslated:630" class="bartodo"><div class="bardone" style="width:86px">86.5</div></div></td><td>BABA Yoshihiko, Yoichi Kayama</td></tr>
10-
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:86px">86.5</div></div></td><td>Veiko Viil</td></tr>
11-
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7407 unfinished:449 untranslated:647" class="bartodo"><div class="bardone" style="width:86px">86.4</div></div></td><td>Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert</td></tr>
10+
<tr><td><img src="qrc:/images/flags/et_EE.png"></td><td>Estonian (Estonia)</td><td><div title="finished:7412 unfinished:452 untranslated:639" class="bartodo"><div class="bardone" style="width:86px">86.4</div></div></td><td>Veiko Viil</td></tr>
11+
<tr><td><img src="qrc:/images/flags/fr.png"></td><td>French</td><td><div title="finished:7407 unfinished:449 untranslated:647" class="bartodo"><div class="bardone" style="width:86px">86.3</div></div></td><td>Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert</td></tr>
1212
<tr><td><img src="qrc:/images/flags/pt_BR.png"></td><td>Portuguese (Brazil)</td><td><div title="finished:7412 unfinished:429 untranslated:662" class="bartodo"><div class="bardone" style="width:86px">86.3</div></div></td><td>Arthur Nanni</td></tr>
13-
<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7412 unfinished:419 untranslated:672" class="bartodo"><div class="bardone" style="width:86px">86.3</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
13+
<tr><td><img src="qrc:/images/flags/pl_PL.png"></td><td>Polish (Poland)</td><td><div title="finished:7412 unfinished:419 untranslated:672" class="bartodo"><div class="bardone" style="width:86px">86.2</div></div></td><td>Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader </td></tr>
1414
<tr><td><img src="qrc:/images/flags/ru.png"></td><td>Russian</td><td><div title="finished:7412 unfinished:407 untranslated:684" class="bartodo"><div class="bardone" style="width:86px">86.2</div></div></td><td>Artem Popov</td></tr>
15-
<tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:7337 unfinished:463 untranslated:703" class="bartodo"><div class="bardone" style="width:85px">85.7</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
15+
<tr><td><img src="qrc:/images/flags/cs_CZ.png"></td><td>Czech (Czech Republic)</td><td><div title="finished:7337 unfinished:463 untranslated:703" class="bartodo"><div class="bardone" style="width:85px">85.6</div></div></td><td>Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant</td></tr>
1616
<tr><td><img src="qrc:/images/flags/hu.png"></td><td>Hungarian</td><td><div title="finished:7249 unfinished:456 untranslated:798" class="bartodo"><div class="bardone" style="width:84px">84.6</div></div></td><td>Zoltan Siki</td></tr>
17-
<tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:7208 unfinished:440 untranslated:855" class="bartodo"><div class="bardone" style="width:84px">84.1</div></div></td><td>BJ Jang</td></tr>
17+
<tr><td><img src="qrc:/images/flags/ko_KR.png"></td><td>Korean (Korea, Republic of)</td><td><div title="finished:7208 unfinished:440 untranslated:855" class="bartodo"><div class="bardone" style="width:84px">84.0</div></div></td><td>BJ Jang</td></tr>
1818
<tr><td><img src="qrc:/images/flags/sl_SI.png"></td><td>Slovenian (Slovenia)</td><td><div title="finished:6891 unfinished:395 untranslated:1217" class="bartodo"><div class="bardone" style="width:80px">80.2</div></div></td><td>Jože Detečnik, Dejan Gregor</td></tr>
19-
<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:6507 unfinished:323 untranslated:1673" class="bartodo"><div class="bardone" style="width:75px">75.5</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
20-
<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5906 unfinished:654 untranslated:1943" class="bartodo"><div class="bardone" style="width:70px">70.6</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
19+
<tr><td><img src="qrc:/images/flags/zh_CN.png"></td><td>Chinese (China)</td><td><div title="finished:6507 unfinished:323 untranslated:1673" class="bartodo"><div class="bardone" style="width:75px">75.4</div></div></td><td>Calvin Ngei, Zhang Jun</td></tr>
20+
<tr><td><img src="qrc:/images/flags/lv.png"></td><td>Latvian</td><td><div title="finished:5906 unfinished:654 untranslated:1943" class="bartodo"><div class="bardone" style="width:70px">70.5</div></div></td><td>Maris Nartiss, Pēteris Brūns</td></tr>
2121
<tr><td><img src="qrc:/images/flags/sr_Latn.png"></td><td>Serbian ()</td><td><div title="finished:5610 unfinished:921 untranslated:1989" class="bartodo"><div class="bardone" style="width:68px">68.7</div></div></td><td>Goran Ivanković</td></tr>
2222
<tr><td><img src="qrc:/images/flags/sr_Cyrl.png"></td><td>Serbian ()</td><td><div title="finished:5646 unfinished:845 untranslated:2029" class="bartodo"><div class="bardone" style="width:68px">68.7</div></div></td><td>Goran Ivanković</td></tr>
2323
<tr><td><img src="qrc:/images/flags/pt_PT.png"></td><td>Portuguese (Portugal)</td><td><div title="finished:3913 unfinished:3151 untranslated:1439" class="bartodo"><div class="bardone" style="width:62px">62.1</div></div></td><td>Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva</td></tr>
24-
<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4803 unfinished:936 untranslated:2764" class="bartodo"><div class="bardone" style="width:59px">59.7</div></div></td><td>Januar V. Simarmata, I Made Anombawa</td></tr>
25-
<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4914 unfinished:557 untranslated:3032" class="bartodo"><div class="bardone" style="width:58px">58.8</div></div></td><td>Zoran Jankovic</td></tr>
24+
<tr><td><img src="qrc:/images/flags/id.png"></td><td>Indonesian</td><td><div title="finished:4803 unfinished:936 untranslated:2764" class="bartodo"><div class="bardone" style="width:59px">59.6</div></div></td><td>Januar V. Simarmata, I Made Anombawa</td></tr>
25+
<tr><td><img src="qrc:/images/flags/hr_HR.png"></td><td>Croatian (Croatia)</td><td><div title="finished:4914 unfinished:557 untranslated:3032" class="bartodo"><div class="bardone" style="width:58px">58.7</div></div></td><td>Zoran Jankovic</td></tr>
2626
<tr><td><img src="qrc:/images/flags/th.png"></td><td>Thai</td><td><div title="finished:4139 unfinished:1125 untranslated:3239" class="bartodo"><div class="bardone" style="width:53px">53.2</div></div></td><td>Man Chao</td></tr>
2727
<tr><td><img src="qrc:/images/flags/uk.png"></td><td>Ukrainian</td><td><div title="finished:3754 unfinished:1182 untranslated:3731" class="bartodo"><div class="bardone" style="width:49px">49.2</div></div></td><td>Сергей Якунин</td></tr>
28-
<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3698 unfinished:938 untranslated:3867" class="bartodo"><div class="bardone" style="width:47px">47.2</div></div></td><td>Osman Yilmaz</td></tr>
28+
<tr><td><img src="qrc:/images/flags/tr.png"></td><td>Turkish</td><td><div title="finished:3698 unfinished:938 untranslated:3867" class="bartodo"><div class="bardone" style="width:47px">47.1</div></div></td><td>Osman Yilmaz</td></tr>
2929
<tr><td><img src="qrc:/images/flags/zh_TW.png"></td><td>Chinese (Taiwan, Province of China)</td><td><div title="finished:2447 unfinished:2630 untranslated:3426" class="bartodo"><div class="bardone" style="width:42px">42.6</div></div></td><td>Nung-yao Lin</td></tr>
3030
<tr><td><img src="qrc:/images/flags/vi.png"></td><td>Vietnamese</td><td><div title="finished:2795 unfinished:1592 untranslated:4116" class="bartodo"><div class="bardone" style="width:40px">40.6</div></div></td><td>Bùi Hữu Mạnh</td></tr>
3131
<tr><td><img src="qrc:/images/flags/el_GR.png"></td><td>Greek, Modern (1453-) (Greece)</td><td><div title="finished:2989 unfinished:874 untranslated:4640" class="bartodo"><div class="bardone" style="width:38px">38.8</div></div></td><td>Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves</td></tr>
3232
<tr><td><img src="qrc:/images/flags/is.png"></td><td>Icelandic</td><td><div title="finished:2853 unfinished:662 untranslated:4988" class="bartodo"><div class="bardone" style="width:36px">36.0</div></div></td><td>Thordur Ivarsson</td></tr>
3333
<tr><td><img src="qrc:/images/flags/mn.png"></td><td>Mongolian</td><td><div title="finished:2488 unfinished:1098 untranslated:4917" class="bartodo"><div class="bardone" style="width:34px">34.4</div></div></td><td>Bayarmaa Enkhtur</td></tr>
34-
<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1547 unfinished:1226 untranslated:5730" class="bartodo"><div class="bardone" style="width:24px">24.5</div></div></td><td>Marko Jarvenpaa</td></tr>
34+
<tr><td><img src="qrc:/images/flags/fi.png"></td><td>Finnish</td><td><div title="finished:1547 unfinished:1226 untranslated:5730" class="bartodo"><div class="bardone" style="width:24px">24.4</div></div></td><td>Marko Jarvenpaa</td></tr>
3535
<tr><td><img src="qrc:/images/flags/da_DK.png"></td><td>Danish (Denmark)</td><td><div title="finished:1739 unfinished:788 untranslated:5976" class="bartodo"><div class="bardone" style="width:24px">24.1</div></div></td><td>Preben Lisby</td></tr>
3636
<tr><td><img src="qrc:/images/flags/ka_GE.png"></td><td>Georgian (Georgia)</td><td><div title="finished:1264 unfinished:1542 untranslated:5697" class="bartodo"><div class="bardone" style="width:23px">23.0</div></div></td><td>Shota Murtskhvaladze, George Machitidze</td></tr>
3737
<tr><td><img src="qrc:/images/flags/bg.png"></td><td>Bulgarian</td><td><div title="finished:1064 unfinished:1549 untranslated:5890" class="bartodo"><div class="bardone" style="width:20px">20.8</div></div></td><td>Захари Савов, Jordan Tzvetkov</td></tr>
3838
<tr><td><img src="qrc:/images/flags/ro.png"></td><td>Romanian</td><td><div title="finished:1100 unfinished:1443 untranslated:6255" class="bartodo"><div class="bardone" style="width:20px">20.6</div></div></td><td>Lonut Losifescu-Enescu, Bogdan Pacurar</td></tr>
3939
<tr><td><img src="qrc:/images/flags/sk.png"></td><td>Slovak</td><td><div title="finished:736 unfinished:2014 untranslated:5753" class="bartodo"><div class="bardone" style="width:19px">19.7</div></div></td><td>Lubos Balazovic</td></tr>
40-
<tr><td><img src="qrc:/images/flags/sq_AL.png"></td><td>Albanian (Albania)</td><td><div title="finished:844 unfinished:1396 untranslated:6263" class="bartodo"><div class="bardone" style="width:17px">17.5</div></div></td><td></td></tr>
40+
<tr><td><img src="qrc:/images/flags/sq_AL.png"></td><td>Albanian (Albania)</td><td><div title="finished:844 unfinished:1396 untranslated:6263" class="bartodo"><div class="bardone" style="width:17px">17.4</div></div></td><td></td></tr>
4141
<tr><td><img src="qrc:/images/flags/lo.png"></td><td>Lao</td><td><div title="finished:563 unfinished:1654 untranslated:6598" class="bartodo"><div class="bardone" style="width:15px">15.7</div></div></td><td>Anousak Souphavanh, Soukanh Lathsavong</td></tr>
4242
<tr><td><img src="qrc:/images/flags/fa.png"></td><td>Persian</td><td><div title="finished:240 unfinished:319 untranslated:7944" class="bartodo"><div class="bardone" style="width:4px">4.5</div></div></td><td>Mola Pahnadayan</td></tr>
4343
<tr><td><img src="qrc:/images/flags/ar.png"></td><td>Arabic</td><td><div title="finished:47 unfinished:255 untranslated:8201" class="bartodo"><div class="bardone" style="width:1px">2.0</div></div></td><td>Assem Kamal, Latif Jalil</td></tr>

‎i18n/qgis_gl_ES.ts

Lines changed: 3818 additions & 2523 deletions
Large diffs are not rendered by default.

‎python/plugins/GdalTools/tools/dialogSRS.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def __init__(self, title, parent=None):
4545
self.connect(buttonBox, SIGNAL("rejected()"), self.reject)
4646

4747
def authid(self):
48-
return str(self.selector.selectedAuthId()
48+
return str(self.selector.selectedAuthId())
4949

5050
def proj4string(self):
5151
return self.selector.selectedProj4String()

‎python/plugins/db_manager/db_plugins/postgis/plugins/qgis_topoview/__init__.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def run(item, action, mainwindow):
107107
# face
108108
layer = db.toSqlLayer(u'SELECT face_id, topology.ST_GetFaceGeometry(%s, face_id) as geom ' \
109109
'FROM %s.face WHERE face_id > 0' % (quoteStr(toponame), quoteId(toponame)),
110-
'geom', 'face_id', u'geom')
110+
'geom', 'face_id', u'%s.face' % toponame)
111111
layer.loadNamedStyle(os.path.join(template_dir, 'face.qml'))
112112
registry.addMapLayers([layer])
113113
legend.setLayerVisible(layer, False)
@@ -117,7 +117,7 @@ def run(item, action, mainwindow):
117117
# face_seed
118118
layer = db.toSqlLayer(u'SELECT face_id, ST_PointOnSurface(topology.ST_GetFaceGeometry(%s, face_id)) as geom ' \
119119
'FROM %s.face WHERE face_id > 0' % (quoteStr(toponame), quoteId(toponame)),
120-
'geom', 'face_id', u'seed')
120+
'geom', 'face_id', u'%s.face_seed' % toponame)
121121
layer.loadNamedStyle(os.path.join(template_dir, 'face_seed.qml'))
122122
registry.addMapLayers([layer])
123123
legend.setLayerVisible(layer, False)
@@ -134,7 +134,7 @@ def run(item, action, mainwindow):
134134

135135
# node
136136
uri.setDataSource(toponame, 'node', 'geom', '', 'node_id')
137-
layer = QgsVectorLayer(uri.uri(), u'geom', provider)
137+
layer = QgsVectorLayer(uri.uri(), u'%s.node' % toponame, provider)
138138
layer.loadNamedStyle(os.path.join(template_dir, 'node.qml'))
139139
registry.addMapLayers([layer])
140140
legend.setLayerVisible(layer, False)
@@ -143,7 +143,7 @@ def run(item, action, mainwindow):
143143

144144
# node labels
145145
uri.setDataSource(toponame, 'node', 'geom', '', 'node_id')
146-
layer = QgsVectorLayer(uri.uri(), u'node_id', provider)
146+
layer = QgsVectorLayer(uri.uri(), u'%s.node_id' % toponame, provider)
147147
layer.loadNamedStyle(os.path.join(template_dir, 'node_label.qml'))
148148
registry.addMapLayers([layer])
149149
legend.setLayerVisible(layer, False)
@@ -157,15 +157,15 @@ def run(item, action, mainwindow):
157157

158158
# edge
159159
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
160-
layer = QgsVectorLayer(uri.uri(), u'geom', provider)
160+
layer = QgsVectorLayer(uri.uri(), u'%s.edge' % toponame, provider)
161161
registry.addMapLayers([layer])
162162
legend.setLayerVisible(layer, False)
163163
legend.setLayerExpanded(layer, False)
164164
legend.moveLayer(layer, group)
165165

166166
# directed edge
167167
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
168-
layer = QgsVectorLayer(uri.uri(), u'directed_geom', provider)
168+
layer = QgsVectorLayer(uri.uri(), u'%s.directed_edge' % toponame, provider)
169169
layer.loadNamedStyle(os.path.join(template_dir, 'edge.qml'))
170170
registry.addMapLayers([layer])
171171
legend.setLayerVisible(layer, False)
@@ -175,7 +175,7 @@ def run(item, action, mainwindow):
175175

176176
# edge labels
177177
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
178-
layer = QgsVectorLayer(uri.uri(), u'edge_id', provider)
178+
layer = QgsVectorLayer(uri.uri(), u'%s.edge_id' % toponame, provider)
179179
layer.loadNamedStyle(os.path.join(template_dir, 'edge_label.qml'))
180180
registry.addMapLayers([layer])
181181
legend.setLayerVisible(layer, False)
@@ -184,7 +184,7 @@ def run(item, action, mainwindow):
184184

185185
# face_left
186186
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
187-
layer = QgsVectorLayer(uri.uri(), u'face_left', provider)
187+
layer = QgsVectorLayer(uri.uri(), u'%s.face_left' % toponame, provider)
188188
layer.loadNamedStyle(os.path.join(template_dir, 'face_left.qml'))
189189
registry.addMapLayers([layer])
190190
legend.setLayerVisible(layer, False)
@@ -193,7 +193,7 @@ def run(item, action, mainwindow):
193193

194194
# face_right
195195
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
196-
layer = QgsVectorLayer(uri.uri(), u'face_right', provider)
196+
layer = QgsVectorLayer(uri.uri(), u'%s.face_right' % toponame, provider)
197197
layer.loadNamedStyle(os.path.join(template_dir, 'face_right.qml'))
198198
registry.addMapLayers([layer])
199199
legend.setLayerVisible(layer, False)
@@ -202,7 +202,7 @@ def run(item, action, mainwindow):
202202

203203
# next_left
204204
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
205-
layer = QgsVectorLayer(uri.uri(), u'next_left', provider)
205+
layer = QgsVectorLayer(uri.uri(), u'%s.next_left' % toponame, provider)
206206
layer.loadNamedStyle(os.path.join(template_dir, 'next_left.qml'))
207207
registry.addMapLayers([layer])
208208
legend.setLayerVisible(layer, False)
@@ -211,7 +211,7 @@ def run(item, action, mainwindow):
211211

212212
# next_right
213213
uri.setDataSource(toponame, 'edge_data', 'geom', '', 'edge_id')
214-
layer = QgsVectorLayer(uri.uri(), u'next_right', provider)
214+
layer = QgsVectorLayer(uri.uri(), u'%s.next_right' % toponame, provider)
215215
layer.loadNamedStyle(os.path.join(template_dir, 'next_right.qml'))
216216
registry.addMapLayers([layer])
217217
legend.setLayerVisible(layer, False)

‎src/app/legend/qgslegendlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
498498
}
499499

500500
if ( !vlayer->isEditable() && vlayer->dataProvider()->supportsSubsetString() && vlayer->vectorJoins().isEmpty() )
501-
theMenu.addAction( tr( "&Query..." ), QgisApp::instance(), SLOT( layerSubsetString() ) );
501+
theMenu.addAction( tr( "&Filter..." ), QgisApp::instance(), SLOT( layerSubsetString() ) );
502502

503503
//show number of features in legend if requested
504504
QAction* showNFeaturesAction = new QAction( tr( "Show Feature Count" ), &theMenu );

‎src/app/qgsattributedialog.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -348,19 +348,23 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
348348
.arg( vl->id() )
349349
.arg(( unsigned long ) vl );
350350

351-
QString feature = QString( "_qgis_feature_%1 = wrapinstance( %2, qgis.core.QgsFeature )" )
352-
.arg( mFeature->id() )
351+
// Generate the unique ID of this feature. We used to use feature ID but some providers
352+
// return a ID that is an invalid python variable when we have new unsaved features.
353+
QDateTime dt = QDateTime::currentDateTime();
354+
QString featurevarname = QString( "_qgis_feature_%1" ).arg( dt.toString( "yyyyMMddhhmmsszzz" ) );
355+
QString feature = QString( "%1 = wrapinstance( %2, qgis.core.QgsFeature )" )
356+
.arg( featurevarname )
353357
.arg(( unsigned long ) mFeature );
354358

355359
QgsPythonRunner::run( form );
356360
QgsPythonRunner::run( feature );
357361
QgsPythonRunner::run( layer );
358362

359-
QString expr = QString( "%1(_qgis_featureform_%2, _qgis_layer_%3, _qgis_feature_%4)" )
363+
QString expr = QString( "%1(_qgis_featureform_%2, _qgis_layer_%3, %4)" )
360364
.arg( vl->editFormInit() )
361365
.arg( mFormNr )
362366
.arg( vl->id() )
363-
.arg( mFeature->id() );
367+
.arg( featurevarname );
364368

365369
QgsDebugMsg( QString( "running featureForm init: %1" ).arg( expr ) );
366370
QgsPythonRunner::run( expr );

‎src/plugins/sqlanywhere/sasourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ SaSourceSelect::SaSourceSelect( QWidget *parent, Qt::WFlags fl )
6262
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
6363
mAddButton->setEnabled( false );
6464

65-
mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );
65+
mBuildQueryButton = new QPushButton( tr( "&Set Filter" ) );
6666
buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
6767
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
6868
mBuildQueryButton->setEnabled( false );

‎src/providers/mssql/qgsmssqlsourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WFlags fl, bool
135135
mAddButton = new QPushButton( tr( "&Add" ) );
136136
mAddButton->setEnabled( false );
137137

138-
mBuildQueryButton = new QPushButton( tr( "&Build query" ) );
139-
mBuildQueryButton->setToolTip( tr( "Build query" ) );
138+
mBuildQueryButton = new QPushButton( tr( "&Set Filter" ) );
139+
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
140140
mBuildQueryButton->setDisabled( true );
141141

142142
if ( !mManagerMode )

‎src/providers/postgres/qgspgsourceselect.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WFlags fl, bool manag
132132
mAddButton = new QPushButton( tr( "&Add" ) );
133133
mAddButton->setEnabled( false );
134134

135-
mBuildQueryButton = new QPushButton( tr( "&Build query" ) );
136-
mBuildQueryButton->setToolTip( tr( "Build query" ) );
135+
mBuildQueryButton = new QPushButton( tr( "&Set Filter" ) );
136+
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
137137
mBuildQueryButton->setDisabled( true );
138138

139139
if ( !mManagerMode )

‎src/providers/spatialite/qgsspatialitesourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget * parent, Qt::WFla
6161
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addClicked() ) );
6262
mAddButton->setEnabled( false );
6363

64-
mBuildQueryButton = new QPushButton( tr( "&Build Query" ) );
64+
mBuildQueryButton = new QPushButton( tr( "&Set Filter" ) );
6565
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
6666
mBuildQueryButton->setEnabled( false );
6767

‎src/providers/sqlanywhere/qgssqlanywhereprovider.cpp

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ QgsSqlAnywhereProvider::findKeyColumn()
557557
"FROM SYSTABCOL "
558558
"WHERE table_id = %1 "
559559
"AND column_name = %2 "
560-
"AND base_type_str IN ( 'int', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) " )
560+
"AND base_type_str IN ( 'int', 'integer', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) " )
561561
.arg( mTableId )
562562
.arg( quotedValue( mKeyColumn ) );
563563
stmt = mConnRO->execute_direct( sql );
@@ -630,7 +630,7 @@ QgsSqlAnywhereProvider::findKeyColumn()
630630
"'SELECT * FROM %1', 1 ) dq1 "
631631
"WHERE is_key_column = 1 "
632632
"AND is_added_key_column = 0 "
633-
"AND domain_name IN ( 'int', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) "
633+
"AND domain_name IN ( 'int', 'integer', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) "
634634
"AND NOT EXISTS ( "
635635
"SELECT column_number "
636636
"FROM sa_describe_query( "
@@ -662,7 +662,7 @@ QgsSqlAnywhereProvider::findKeyColumn()
662662
"AND c.column_id = ic.column_id "
663663
"WHERE i.table_id = %1 "
664664
"AND i.\"unique\" IN ( 1, 2 ) "
665-
"AND c.base_type_str IN ( 'int', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) "
665+
"AND c.base_type_str IN ( 'int', 'integer', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) "
666666
"AND NOT EXISTS ( "
667667
"SELECT column_id "
668668
"FROM SYSIDXCOL ic2 "
@@ -686,7 +686,7 @@ QgsSqlAnywhereProvider::findKeyColumn()
686686
sql = QString( "SELECT column_name "
687687
"FROM SYSTABCOL "
688688
"WHERE table_id = %1 "
689-
"AND base_type_str IN ( 'int', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) " )
689+
"AND base_type_str IN ( 'int', 'integer', 'unsigned int', 'smallint', 'unsigned smallint', 'tinyint' ) " )
690690
.arg( mTableId );
691691
stmt = mConnRO->execute_direct( sql );
692692
while ( stmt->isValid() && stmt->fetchNext() )
@@ -1018,6 +1018,7 @@ QgsSqlAnywhereProvider::uniqueValues( int index, QList < QVariant > &uniqueValue
10181018
}
10191019
} // QgsSqlAnywhereProvider::uniqueValues()
10201020

1021+
10211022
QString
10221023
QgsSqlAnywhereProvider::getDefaultValue( QString attrName )
10231024
{
@@ -1582,6 +1583,10 @@ QgsSqlAnywhereProvider::changeGeometryValues( QgsGeometryMap & gmap )
15821583
return ok;
15831584
} // QgsSqlAnywhereProvider::changeGeometryValues()
15841585

1586+
QgsAttributeList QgsSqlAnywhereProvider::attributeIndexes()
1587+
{
1588+
return mAttributeFields.keys();
1589+
}
15851590

15861591
bool
15871592
QgsSqlAnywhereProvider::ensureConnRO()

‎src/providers/sqlanywhere/qgssqlanywhereprovider.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,22 @@ class QgsSqlAnywhereProvider: public QgsVectorDataProvider
152152
* @param limit maximum number of values (added in 1.4) */
153153
virtual void uniqueValues( int index, QList < QVariant > &uniqueValues, int limit = -1 );
154154

155+
/** Returns the possible enum values of an attribute.
156+
* Returns an empty stringlist if a provider does not support enum types
157+
* or if the given attribute is not an enum type.
158+
* @param index the index of the attribute
159+
* @param enumList reference to the list to fill
160+
* @note: added in version 1.2
161+
* SQLAnywhere does not currently support enumerated types.
162+
*/
163+
//virtual void enumValues( int index, QStringList& enumList );
164+
155165
/**Returns true if layer is valid
156166
*/
157167
bool isValid() { return mValid; }
158168

169+
QgsAttributeList attributeIndexes();
170+
159171
/**Returns the default value for field specified by @c fieldId */
160172
QVariant defaultValue( int fieldId ) { return mAttributeDefaults[fieldId]; }
161173

0 commit comments

Comments
 (0)
Please sign in to comment.