Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 14 files changed
  • 0 commit comments
  • 1 contributor
View
8 examples/foss4g2011_example1_solution/Makefile
@@ -1,5 +1,5 @@
#/***************************************************************************
-# foss4g2011_example1_solutionset
+# foss4g2011_example1_solution
#
# Solution Set for Example #1 FOSS4G 2011 Workshop
# -------------------
@@ -19,13 +19,13 @@
# Makefile for a PyQGIS plugin
-PLUGINNAME = foss4g2011_example1_solutionset
+PLUGINNAME = foss4g2011_example1_solution
-PY_FILES = foss4g2011_example1_solutionset.py foss4g2011_example1_solutionsetdialog.py __init__.py
+PY_FILES = foss4g2011_example1_solution.py foss4g2011_example1_solutiondialog.py __init__.py
EXTRAS = icon.png
-UI_FILES = ui_foss4g2011_example1_solutionset.py
+UI_FILES = ui_foss4g2011_example1_solution.py
RESOURCE_FILES = resources.py
View
12 examples/foss4g2011_example1_solution/__init__.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1_solutionset
+ foss4g2011_example1_solution
A QGIS plugin
Solution Set for Example #1 FOSS4G 2011 Workshop
-------------------
@@ -20,9 +20,9 @@
This script initializes the plugin, making it known to QGIS.
"""
def name():
- return "foss4g2011_example1_solutionset"
+ return "foss4g2011_example1_solution"
def description():
- return "Solution Set for Example #1 FOSS4G 2011 Workshop"
+ return "Example #1 Solution FOSS4G 2011 Workshop"
def version():
return "Version 0.1"
def icon():
@@ -30,6 +30,6 @@ def icon():
def qgisMinimumVersion():
return "1.0"
def classFactory(iface):
- # load foss4g2011_example1_solutionset class from file foss4g2011_example1_solutionset
- from foss4g2011_example1_solutionset import foss4g2011_example1_solutionset
- return foss4g2011_example1_solutionset(iface)
+ # load foss4g2011_example1_solution class from file foss4g2011_example1_solution
+ from foss4g2011_example1_solution import foss4g2011_example1_solution
+ return foss4g2011_example1_solution(iface)
View
16 ...mple1_solution/foss4g2011_example1_solutionset.py → ...example1_solution/foss4g2011_example1_solution.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1
+ foss4g2011_example1_solution
A QGIS plugin
Example #1 for FOSS4G 2011 Workshop
-------------------
@@ -27,9 +27,9 @@
# Initialize Qt resources from file resources.py
import resources
# Import the code for the dialog
-from foss4g2011_example1_solutionsetdialog import foss4g2011_example1_solutionsetDialog
+from foss4g2011_example1_solutiondialog import foss4g2011_example1_solutionDialog
-class foss4g2011_example1_solutionset:
+class foss4g2011_example1_solution:
def __init__(self, iface):
# Save reference to the QGIS interface
@@ -39,7 +39,7 @@ def __init__(self, iface):
# the identify tool will emit a QgsPoint on every click
self.clickTool = QgsMapToolEmitPoint(self.canvas)
# create our GUI dialog
- self.dlg = foss4g2011_example1_solutionsetDialog()
+ self.dlg = foss4g2011_example1_solutionDialog()
# create a list to hold our selected feature ids
self.selectList = []
# current layer ref (set in handleLayerChange)
@@ -49,14 +49,14 @@ def __init__(self, iface):
def initGui(self):
# Create action that will start plugin configuration
- self.action = QAction(QIcon(":/plugins/foss4g2011_example1_solutionset/icon.png"), \
- "Example #1 for FOSS4G 2011 Workshop", self.iface.mainWindow())
+ self.action = QAction(QIcon(":/plugins/foss4g2011_example1_solution/icon.png"), \
+ "Example #1 Solution for FOSS4G 2011 Workshop", self.iface.mainWindow())
# connect the action to the run method
QObject.connect(self.action, SIGNAL("triggered()"), self.run)
# Add toolbar button and menu item
self.iface.addToolBarIcon(self.action)
- self.iface.addPluginToMenu("&Example #1 for FOSS4G 2011 Workshop", self.action)
+ self.iface.addPluginToMenu("&Example #1 Solution for FOSS4G 2011 Workshop", self.action)
# connect to the currentLayerChanged signal of QgsInterface
result = QObject.connect(self.iface, SIGNAL("currentLayerChanged(QgsMapLayer *)"), self.handleLayerChange)
@@ -67,7 +67,7 @@ def initGui(self):
def unload(self):
# Remove the plugin menu item and icon
- self.iface.removePluginMenu("Example #1 for FOSS4G 2011 Workshop",self.action)
+ self.iface.removePluginMenu("Example #1 Solution for FOSS4G 2011 Workshop",self.action)
self.iface.removeToolBarIcon(self.action)
View
8 ...solution/foss4g2011_example1_solutionsetdialog.py → ...e1_solution/foss4g2011_example1_solutiondialog.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1Dialog
+ foss4g2011_example1_solutionDialog
A QGIS plugin
Example #1 for FOSS4G 2011 Workshop
-------------------
@@ -20,14 +20,14 @@
"""
from PyQt4 import QtCore, QtGui
-from ui_foss4g2011_example1_solutionset import Ui_foss4g2011_example1_solutionset
+from ui_foss4g2011_example1_solution import Ui_foss4g2011_example1_solution
# create the dialog for zoom to point
-class foss4g2011_example1_solutionsetDialog(QtGui.QDialog):
+class foss4g2011_example1_solutionDialog(QtGui.QDialog):
def __init__(self):
QtGui.QDialog.__init__(self)
# Set up the user interface from Designer.
- self.ui = Ui_foss4g2011_example1_solutionset()
+ self.ui = Ui_foss4g2011_example1_solution()
self.ui.setupUi(self)
def setTextBrowser(self, output):
View
2  examples/foss4g2011_example1_solution/resources.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/plugins/foss4g2011_example1_solutionset" >
+ <qresource prefix="/plugins/foss4g2011_example1_solution" >
<file>icon.png</file>
</qresource>
</RCC>
View
10 ...e1_solution/ui_foss4g2011_example1_solutionset.ui → ...mple1_solution/ui_foss4g2011_example1_solution.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>foss4g2011_example1_solutionset</class>
- <widget class="QDialog" name="foss4g2011_example1_solutionset">
+ <class>foss4g2011_example1_solution</class>
+ <widget class="QDialog" name="foss4g2011_example1_solution">
<property name="geometry">
<rect>
<x>0</x>
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>foss4g2011_example1_solutionset</string>
+ <string>foss4g2011_example1_solution</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
@@ -45,7 +45,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>foss4g2011_example1_solutionset</receiver>
+ <receiver>foss4g2011_example1_solution</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -61,7 +61,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>foss4g2011_example1_solutionset</receiver>
+ <receiver>foss4g2011_example1_solution</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
View
10 examples/foss4g2011_example1_starter/Makefile
@@ -1,7 +1,7 @@
#/***************************************************************************
-# foss4g2011_example1
+# foss4g2011_example1_starter
#
-# Example #1 for FOSS4G 2011 Workshop
+# Example #1 Starter for FOSS4G 2011 Workshop
# -------------------
# begin : 2011-08-31
# copyright : (C) 2011 by FOSS4G
@@ -19,13 +19,13 @@
# Makefile for a PyQGIS plugin
-PLUGINNAME = foss4g2011_example1
+PLUGINNAME = foss4g2011_example1_starter
-PY_FILES = foss4g2011_example1.py foss4g2011_example1dialog.py __init__.py
+PY_FILES = foss4g2011_example1_starter.py foss4g2011_example1_starterdialog.py __init__.py
EXTRAS = icon.png
-UI_FILES = ui_foss4g2011_example1.py
+UI_FILES = ui_foss4g2011_example1_starter.py
RESOURCE_FILES = resources.py
View
12 examples/foss4g2011_example1_starter/__init__.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1
+ foss4g2011_example1_starter
A QGIS plugin
Example #1 for FOSS4G 2011 Workshop
-------------------
@@ -20,9 +20,9 @@
This script initializes the plugin, making it known to QGIS.
"""
def name():
- return "foss4g2011_example1"
+ return "foss4g2011_example1_starter"
def description():
- return "Example #1 for FOSS4G 2011 Workshop"
+ return "Example #1 Starter for FOSS4G 2011 Workshop"
def version():
return "Version 0.1"
def icon():
@@ -30,6 +30,6 @@ def icon():
def qgisMinimumVersion():
return "1.0"
def classFactory(iface):
- # load foss4g2011_example1 class from file foss4g2011_example1
- from foss4g2011_example1 import foss4g2011_example1
- return foss4g2011_example1(iface)
+ # load foss4g2011_example1_starter class from file foss4g2011_example1_starter
+ from foss4g2011_example1_starter import foss4g2011_example1_starter
+ return foss4g2011_example1_starter(iface)
View
16 ...oss4g2011_example1_starter/foss4g2011_example1.py → ...1_example1_starter/foss4g2011_example1_starter.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1
+ foss4g2011_example1_starter
A QGIS plugin
Example #1 for FOSS4G 2011 Workshop
-------------------
@@ -27,9 +27,9 @@
# Initialize Qt resources from file resources.py
import resources
# Import the code for the dialog
-from foss4g2011_example1dialog import foss4g2011_example1Dialog
+from foss4g2011_example1_starterdialog import foss4g2011_example1_starterDialog
-class foss4g2011_example1:
+class foss4g2011_example1_starter:
def __init__(self, iface):
# Save reference to the QGIS interface
@@ -39,7 +39,7 @@ def __init__(self, iface):
# the identify tool will emit a QgsPoint on every click
self.clickTool = QgsMapToolEmitPoint(self.canvas)
# create our GUI dialog
- self.dlg = foss4g2011_example1Dialog()
+ self.dlg = foss4g2011_example1_starterDialog()
# create a list to hold our selected feature ids
self.selectList = []
# current layer ref (set in handleLayerChange)
@@ -49,14 +49,14 @@ def __init__(self, iface):
def initGui(self):
# Create action that will start plugin configuration
- self.action = QAction(QIcon(":/plugins/foss4g2011_example1/icon.png"), \
- "Example #1 for FOSS4G 2011 Workshop", self.iface.mainWindow())
+ self.action = QAction(QIcon(":/plugins/foss4g2011_example1_starter/icon.png"), \
+ "Example #1 Starter for FOSS4G 2011 Workshop", self.iface.mainWindow())
# connect the action to the run method
QObject.connect(self.action, SIGNAL("triggered()"), self.run)
# Add toolbar button and menu item
self.iface.addToolBarIcon(self.action)
- self.iface.addPluginToMenu("&Example #1 for FOSS4G 2011 Workshop", self.action)
+ self.iface.addPluginToMenu("&Example #1 Starter for FOSS4G 2011 Workshop", self.action)
# connect to the currentLayerChanged signal of QgsInterface
result = QObject.connect(self.iface, SIGNAL("currentLayerChanged(QgsMapLayer *)"), self.handleLayerChange)
@@ -67,7 +67,7 @@ def initGui(self):
def unload(self):
# Remove the plugin menu item and icon
- self.iface.removePluginMenu("Example #1 for FOSS4G 2011 Workshop",self.action)
+ self.iface.removePluginMenu("Example #1 Starter for FOSS4G 2011 Workshop",self.action)
self.iface.removeToolBarIcon(self.action)
View
8 ...011_example1_starter/foss4g2011_example1dialog.py → ...ple1_starter/foss4g2011_example1_starterdialog.py
@@ -1,6 +1,6 @@
"""
/***************************************************************************
- foss4g2011_example1Dialog
+ foss4g2011_example1_starterDialog
A QGIS plugin
Example #1 for FOSS4G 2011 Workshop
-------------------
@@ -20,14 +20,14 @@
"""
from PyQt4 import QtCore, QtGui
-from ui_foss4g2011_example1 import Ui_foss4g2011_example1
+from ui_foss4g2011_example1_starter import Ui_foss4g2011_example1_starter
# create the dialog for zoom to point
-class foss4g2011_example1Dialog(QtGui.QDialog):
+class foss4g2011_example1_starterDialog(QtGui.QDialog):
def __init__(self):
QtGui.QDialog.__init__(self)
# Set up the user interface from Designer.
- self.ui = Ui_foss4g2011_example1()
+ self.ui = Ui_foss4g2011_example1_starter()
self.ui.setupUi(self)
def setTextBrowser(self, output):
View
73 examples/foss4g2011_example1_starter/resources.py
@@ -1,73 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Resource object code
-#
-# Created: Wed Aug 31 14:20:35 2011
-# by: The Resource Compiler for PyQt (Qt v4.6.3)
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore
-
-qt_resource_data = "\
-\x00\x00\x01\xaf\
-\x89\
-\x50\x4e\x47\x0d\x0a\x1a\x0a\x00\x00\x00\x0d\x49\x48\x44\x52\x00\
-\x00\x00\x17\x00\x00\x00\x18\x08\x06\x00\x00\x00\x11\x7c\x66\x75\
-\x00\x00\x00\x01\x73\x52\x47\x42\x00\xae\xce\x1c\xe9\x00\x00\x00\
-\x06\x62\x4b\x47\x44\x00\xff\x00\xff\x00\xff\xa0\xbd\xa7\x93\x00\
-\x00\x00\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\
-\x00\x9a\x9c\x18\x00\x00\x00\x07\x74\x49\x4d\x45\x07\xdb\x08\x1f\
-\x13\x17\x01\xe0\xc3\xe3\x6d\x00\x00\x00\x19\x74\x45\x58\x74\x43\
-\x6f\x6d\x6d\x65\x6e\x74\x00\x43\x72\x65\x61\x74\x65\x64\x20\x77\
-\x69\x74\x68\x20\x47\x49\x4d\x50\x57\x81\x0e\x17\x00\x00\x01\x0a\
-\x49\x44\x41\x54\x48\xc7\xed\x93\xb1\x4e\x02\x41\x10\x86\xbf\x33\
-\x47\x62\xe1\x13\x50\x59\x6f\x61\xa2\xc1\x04\x30\x01\x0a\x4b\xdf\
-\xc0\x98\x8d\x35\xfb\x10\x3c\xc4\xbe\xc0\x12\x0a\x7a\x6a\x8c\x58\
-\x08\xca\x35\x1a\xb3\x89\x0f\x60\xad\x26\xb4\x04\x9a\x29\x2e\xcb\
-\xdd\x11\xa1\xc0\xe2\xfe\x64\xb2\xbb\x33\x93\x7f\x76\xfe\x9d\x85\
-\x12\x25\xfe\x05\xa2\xd0\xa1\xb4\xbd\x01\x46\xc0\xb5\x77\x66\xac\
-\xb4\xfd\x02\x1e\xbc\x33\x77\x41\x5e\x07\xe8\x01\x6d\x00\xef\xcc\
-\x06\xd7\x51\x46\xc1\x3a\xb0\x04\x5e\x94\xb6\xa7\x40\x15\x78\xce\
-\xc8\xeb\x89\xe5\x22\x8f\xfc\xc3\x3b\xb3\x00\xae\xc4\x37\x0d\x93\
-\xbc\x33\x1d\xef\xcc\xe3\x56\x59\x94\xb6\x35\x60\xbe\x4d\xc3\xac\
-\xd6\x95\xb6\xab\xbc\x58\x2c\x81\x04\x88\x94\xb6\xb7\xc0\x00\xb8\
-\x00\xde\x81\x1f\xa0\xef\x9d\xe9\xee\xf2\xa0\xa1\x2c\x2d\xe0\x17\
-\x78\x93\x02\x27\xc0\xd3\xae\xd3\x12\xa7\x5b\x4b\x61\x99\xda\x0f\
-\x95\xb6\x43\xe0\x52\x3a\xfc\xdb\xcd\x45\xaf\x33\xf1\xdd\xcb\xf9\
-\x15\x98\x78\x67\x22\xb1\x64\x1f\x59\x1a\xb2\xce\x94\xb6\xc7\xc0\
-\x39\x30\xdb\xe7\x13\xc5\x01\xf9\x37\xf0\x09\x34\x81\x4a\x11\x79\
-\x28\x65\xd1\xd4\x94\x28\x71\x60\xac\x01\x0b\x93\x52\x95\x14\x90\
-\xef\x18\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60\x82\
-"
-
-qt_resource_name = "\
-\x00\x07\
-\x07\x3b\xe0\xb3\
-\x00\x70\
-\x00\x6c\x00\x75\x00\x67\x00\x69\x00\x6e\x00\x73\
-\x00\x13\
-\x01\xc5\x30\xe1\
-\x00\x66\
-\x00\x6f\x00\x73\x00\x73\x00\x34\x00\x67\x00\x32\x00\x30\x00\x31\x00\x31\x00\x5f\x00\x65\x00\x78\x00\x61\x00\x6d\x00\x70\x00\x6c\
-\x00\x65\x00\x31\
-\x00\x08\
-\x0a\x61\x5a\xa7\
-\x00\x69\
-\x00\x63\x00\x6f\x00\x6e\x00\x2e\x00\x70\x00\x6e\x00\x67\
-"
-
-qt_resource_struct = "\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
-\x00\x00\x00\x14\x00\x02\x00\x00\x00\x01\x00\x00\x00\x03\
-\x00\x00\x00\x40\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-"
-
-def qInitResources():
- QtCore.qRegisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-def qCleanupResources():
- QtCore.qUnregisterResourceData(0x01, qt_resource_struct, qt_resource_name, qt_resource_data)
-
-qInitResources()
View
2  examples/foss4g2011_example1_starter/resources.qrc
@@ -1,5 +1,5 @@
<RCC>
- <qresource prefix="/plugins/foss4g2011_example1" >
+ <qresource prefix="/plugins/foss4g2011_example1_starter" >
<file>icon.png</file>
</qresource>
</RCC>
View
32 examples/foss4g2011_example1_starter/ui_foss4g2011_example1.py
@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'ui_foss4g2011_example1.ui'
-#
-# Created: Wed Aug 31 14:20:35 2011
-# by: PyQt4 UI code generator 4.7.3
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt4 import QtCore, QtGui
-
-class Ui_foss4g2011_example1(object):
- def setupUi(self, foss4g2011_example1):
- foss4g2011_example1.setObjectName("foss4g2011_example1")
- foss4g2011_example1.resize(461, 514)
- self.buttonBox = QtGui.QDialogButtonBox(foss4g2011_example1)
- self.buttonBox.setGeometry(QtCore.QRect(-30, 470, 341, 32))
- self.buttonBox.setOrientation(QtCore.Qt.Horizontal)
- self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok)
- self.buttonBox.setObjectName("buttonBox")
- self.txtFeedback = QtGui.QTextBrowser(foss4g2011_example1)
- self.txtFeedback.setGeometry(QtCore.QRect(10, 20, 441, 441))
- self.txtFeedback.setObjectName("txtFeedback")
-
- self.retranslateUi(foss4g2011_example1)
- QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("accepted()"), foss4g2011_example1.accept)
- QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL("rejected()"), foss4g2011_example1.reject)
- QtCore.QMetaObject.connectSlotsByName(foss4g2011_example1)
-
- def retranslateUi(self, foss4g2011_example1):
- foss4g2011_example1.setWindowTitle(QtGui.QApplication.translate("foss4g2011_example1", "foss4g2011_example1", None, QtGui.QApplication.UnicodeUTF8))
-
View
10 ...4g2011_example1_starter/ui_foss4g2011_example1.ui → ...xample1_starter/ui_foss4g2011_example1_starter.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
- <class>foss4g2011_example1</class>
- <widget class="QDialog" name="foss4g2011_example1">
+ <class>foss4g2011_example1_starter</class>
+ <widget class="QDialog" name="foss4g2011_example1_starter">
<property name="geometry">
<rect>
<x>0</x>
@@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
- <string>foss4g2011_example1</string>
+ <string>foss4g2011_example1_starter</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
@@ -45,7 +45,7 @@
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
- <receiver>foss4g2011_example1</receiver>
+ <receiver>foss4g2011_example1_starter</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
@@ -61,7 +61,7 @@
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
- <receiver>foss4g2011_example1</receiver>
+ <receiver>foss4g2011_example1_starter</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">

No commit comments for this range

Something went wrong with that request. Please try again.