Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
Jean-Roc committed May 25, 2012
2 parents c4db2e0 + afcd5b6 commit 0cda325
Show file tree
Hide file tree
Showing 210 changed files with 5,572 additions and 3,167 deletions.
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -144,7 +144,7 @@ install: build
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

# remove unwanted files
rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/installdox ] || rm debian/tmp/usr/share/qgis/doc/api/installdox
! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js

# Install menu pixmap
Expand Down
94 changes: 47 additions & 47 deletions doc/TRANSLATORS

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/index.dox
Expand Up @@ -5,7 +5,7 @@
/*! \mainpage Quantum GIS

\section index_intro Introduction
\htmlonly<img src="http://download.qgis.org/qgis-icon-60x60.png" alt="QGIS"
\htmlonly<img src="http://hub.qgis.org/projects/quantum-gis/repository/revisions/master/entry/images/icons/qgis-icon-60x60.png" alt="QGIS"
align="left"><a href="http://qgis.org">Quantum GIS</a>\endhtmlonly\latexonly
Quantum GIS \endlatexonly (QGIS) is a user friendly Open Source Geographic
Information System (GIS) that runs on Linux, Unix, Mac OSX, and Windows. QGIS
Expand Down
3,974 changes: 1,965 additions & 2,009 deletions i18n/qgis_de.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion python/gui/qgsmapcanvas.sip
Expand Up @@ -62,7 +62,7 @@ class QgsMapCanvas : QGraphicsView

QgsMapCanvasMap* map();

QgsMapRenderer* mapRenderer();
QgsMapRenderer* mapRenderer() /Transfer/;

//! Accessor for the canvas pixmap
// @deprecated use canvasPaintDevice()
Expand Down
10 changes: 5 additions & 5 deletions python/plugins/db_manager/db_manager.py
Expand Up @@ -223,7 +223,7 @@ def registerAction(self, action, menuName, callback=None):
# get the placeholder's position to insert before it
pos = 0
for pos in range(len(menuActions)):
if menuActions[pos].isSeparator() and menuActions[pos].text() == "placeholder":
if menuActions[pos].isSeparator() and menuActions[pos].objectName().endsWith("_placeholder"):
menuActions[pos].setVisible(True)
break

Expand Down Expand Up @@ -301,7 +301,7 @@ def unregisterAction(self, action, menuName):
# hide the placeholder if there're no other registered actions
if len(self._registeredDbActions[menuName]) <= 0:
for i in range(len(menuActions)):
if menuActions[i].isSeparator() and menuActions[i].text() == "placeholder":
if menuActions[i].isSeparator() and menuActions[i].objectName().endsWith("_placeholder"):
menuActions[i].setVisible(False)
break

Expand Down Expand Up @@ -369,18 +369,18 @@ def setupUi(self):
# create menus' actions

# menu DATABASE
sep = self.menuDb.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuDb.addSeparator(); sep.setObjectName("DB_Manager_DbMenu_placeholder"); sep.setVisible(False)
self.actionRefresh = self.menuDb.addAction( QIcon(":/db_manager/actions/refresh"), "&Refresh", self.refreshActionSlot, QKeySequence("F5") )
self.actionSqlWindow = self.menuDb.addAction( QIcon(":/db_manager/actions/sql_window"), "&SQL window", self.runSqlWindow, QKeySequence("F2") )
self.menuDb.addSeparator()
self.actionClose = self.menuDb.addAction( QIcon(), "&Exit", self.close, QKeySequence("CTRL+Q") )

# menu SCHEMA
sep = self.menuSchema.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuSchema.addSeparator(); sep.setObjectName("DB_Manager_SchemaMenu_placeholder"); sep.setVisible(False)
actionMenuSchema.setVisible(False)

# menu TABLE
sep = self.menuTable.addAction("placeholder"); sep.setSeparator(True); sep.setVisible(False)
sep = self.menuTable.addSeparator(); sep.setObjectName("DB_Manager_TableMenu_placeholder"); sep.setVisible(False)
actionMenuTable.setVisible(False)
self.actionShowSystemTables = self.menuTable.addAction("Show system tables/views", self.showSystemTables)
self.actionShowSystemTables.setCheckable(True)
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/db_manager/db_plugins/connector.py
Expand Up @@ -60,13 +60,13 @@ def hasTableColumnEditingSupport(self):
return False


def execution_error_types():
def execution_error_types(self):
raise Exception("DBConnector.execution_error_types() is an abstract method")

def connection_error_types():
def connection_error_types(self):
raise Exception("DBConnector.connection_error_types() is an abstract method")

def error_types():
def error_types(self):
return self.connection_error_types() + self.execution_error_types()

def _execute(self, cursor, sql):
Expand Down
11 changes: 9 additions & 2 deletions python/plugins/db_manager/table_viewer.py
Expand Up @@ -67,7 +67,12 @@ def setDirty(self, val=True):

def _clear(self):
if self.item is not None:
self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
try:
self.disconnect(self.item, SIGNAL('aboutToChange'), self.setDirty)
except:
# do not raise any error if self.item was deleted
pass

self.item = None
self.dirty = False

Expand All @@ -83,11 +88,13 @@ def _loadTableData(self, table):
self.setModel( table.tableDataModel(self) )

except DbError, e:
QApplication.restoreOverrideCursor()
DlgDbError.showError(e, self)
return

else:
self.update()

finally:
QApplication.restoreOverrideCursor()


Expand Down
4 changes: 2 additions & 2 deletions python/plugins/fTools/tools/doGeometry.py
Expand Up @@ -620,11 +620,11 @@ def polygon_centroids( self ):
self.emit( SIGNAL( "runStatus( PyQt_PyObject )" ), nElement )
inGeom = inFeat.geometry()
atMap = inFeat.attributeMap()
outGeom = QgsGeometry( inGeom.centroid() )
outGeom = inGeom.centroid()
if outGeom is None:
return "math_error"
outFeat.setAttributeMap( atMap )
outFeat.setGeometry( outGeom )
outFeat.setGeometry( QgsGeometry( outGeom ) )
writer.addFeature( outFeat )
del writer
return True
Expand Down

0 comments on commit 0cda325

Please sign in to comment.