doc/index.dox

@@ -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

python/plugins/db_manager/db_manager.py

@@ -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
 
@@ -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
 
@@ -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)

python/plugins/db_manager/db_plugins/connector.py

@@ -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):

python/plugins/db_manager/table_viewer.py

@@ -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
 
@@ -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()
 
 

scripts/addcopyright.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# licensecheck -r src
+
+for i in $(<files); do
+	author=
+	authordate=
+	eval $(git log --reverse --pretty="export author='%an' authordate=\"\$(date --date='%ai' +'%%B %Y')\"" $i | head -1)
+	basename=$(basename $i)
+	authoryear=${authordate#* }
+	case $author in
+	wonder|"Martin Dobias")
+		authorname="Martin Dobias"
+		authoremail="wonder.sk at gmail.com"
+		;;
+
+	"Marco Hugentobler"|mhugent)
+		authorname="Marco Hugentobler"
+		authoremail="marco dot hugentobler at sourcepole dot ch"
+		;;
+
+	"Pirmin Kalberer")
+		authorname="Pirmin Kalberer"
+		authoremail="pka at sourcepole dot ch"
+		;;
+
+	rblazek)
+		authorname="Radim Blazek"
+		authoremail="radim dot blazek at gmail dot com"
+		;;
+
+	timlinux)
+		authorname="Tim Sutton"
+		authoremail="tim dot linfiniti at com"
+		;;
+
+	*)
+		echo "Author $author not found."
+		exit 1
+		;;
+	esac
+
+	src=$i
+	if [ -f "$i.nocopyright" ]; then
+		src=$i.nocopyright
+	fi
+
+	cat - $src >/tmp/new <<EOF
+/***************************************************************************
+    $basename
+    ---------------------
+    begin                : $authordate
+    copyright            : (C) $authoryear by $authorname
+    email                : $authoremail
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+EOF
+	[ -f $i.nocopyright ] || mv $i $i.nocopyright
+	cp /tmp/new $i
+done

src/analysis/interpolation/HalfEdge.cc

@@ -1,3 +1,17 @@
+/***************************************************************************
+    HalfEdge.cc
+    ---------------------
+    begin                : September 2009
+    copyright            : (C) 2009 by Marco Hugentobler
+    email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #include "HalfEdge.h"
 
 //empty file, all methods are inline

src/analysis/interpolation/TriangleInterpolator.cc

@@ -1,3 +1,17 @@
+/***************************************************************************
+    TriangleInterpolator.cc
+    ---------------------
+    begin                : September 2009
+    copyright            : (C) 2009 by Marco Hugentobler
+    email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #include "TriangleInterpolator.h"
 
 //empty file, all methods are inline

src/analysis/interpolation/Triangulation.cc

@@ -1,3 +1,17 @@
+/***************************************************************************
+    Triangulation.cc
+    ---------------------
+    begin                : September 2009
+    copyright            : (C) 2009 by Marco Hugentobler
+    email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #include "Triangulation.h"
 
 //empty file (abstract class)

src/analysis/raster/qgsrastercalcnode.cpp

@@ -1,3 +1,17 @@
+/***************************************************************************
+    qgsrastercalcnode.cpp
+    ---------------------
+    begin                : October 2010
+    copyright            : (C) 2010 by Marco Hugentobler
+    email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
 #include "qgsrastercalcnode.h"
 #include <cfloat>
 

src/app/composer/qgscomposerlegendlayersdialog.cpp

@@ -1,17 +1,17 @@
 /***************************************************************************
-                         qgscomposerlegendlayersdialog.cpp
-                         -------------------------------
- ***************************************************************************/
-
-/***************************************************************************
+    qgscomposerlegendlayersdialog.cpp
+    ---------------------
+    begin                : December 2010
+    copyright            : (C) 2010 by Tim Sutton
+    email                : tim dot linfiniti at com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 #include "qgscomposerlegendlayersdialog.h"
 
 #include <QStandardItem>

src/app/composer/qgscomposerlegendlayersdialog.h

@@ -1,17 +1,17 @@
 /***************************************************************************
-                         qgscomposerlegenditemdialog.h
-                         -----------------------------
- ***************************************************************************/
-
-/***************************************************************************
+    qgscomposerlegendlayersdialog.h
+    ---------------------
+    begin                : December 2010
+    copyright            : (C) 2010 by Tim Sutton
+    email                : tim dot linfiniti at com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-
 #ifndef QGSCOMPOSERLEGENDLAYERSDIALOG_H
 #define QGSCOMPOSERLEGENDLAYERSDIALOG_H
 

src/app/legend/qgslegendgroup.cpp

@@ -1,21 +1,16 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Tim Sutton                                      *
- *   aps02ts@macbuntu                                                      *
+    qgslegendgroup.cpp
+    ---------------------
+    begin                : January 2007
+    copyright            : (C) 2007 by Martin Dobias
+    email                : wonder.sk at gmail.com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "qgsapplication.h"
 #include "qgisapp.h"

src/app/legend/qgslegendgroup.h

@@ -1,21 +1,16 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Tim Sutton                                      *
- *   aps02ts@macbuntu                                                      *
+    qgslegendgroup.h
+    ---------------------
+    begin                : January 2007
+    copyright            : (C) 2007 by Martin Dobias
+    email                : wonder.sk at gmail.com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #ifndef QGSLEGENDGROUP_H
 #define QGSLEGENDGROUP_H

src/app/legend/qgslegenditem.cpp

@@ -1,21 +1,16 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Tim Sutton                                      *
- *   aps02ts@macbuntu                                                      *
+    qgslegenditem.cpp
+    ---------------------
+    begin                : January 2007
+    copyright            : (C) 2007 by Martin Dobias
+    email                : wonder.sk at gmail.com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "qgslegenditem.h"
 #include <QCoreApplication>

src/app/legend/qgslegenditem.h

@@ -1,21 +1,16 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Tim Sutton                                      *
- *   aps02ts@macbuntu                                                      *
+    qgslegenditem.h
+    ---------------------
+    begin                : January 2007
+    copyright            : (C) 2007 by Martin Dobias
+    email                : wonder.sk at gmail.com
+ ***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #ifndef QGSLEGENDITEM_H
 #define QGSLEGENDITEM_H