Make Import photos button emit the signal it's supposed to.

diff --git a/chooseaction.py b/chooseaction.py
index 82c13aeff254c783dcf279840acb93d907fc4890..06deedeb98d7fb711ecf6b7595079d59a64a125e 100644 (file)
--- a/chooseaction.py
+++ b/chooseaction.py
@@ -31,7 +31,7 @@ class ChooseAction (QWidget):
        def editPerson(self):
                self.emit(QtCore.SIGNAL("editPerson()"))
        def importPhotos(self):
-               pass
+               self.emit(QtCore.SIGNAL("mergePhotos()"))
        def exportDocument(self):
                fileName = QFileDialog.getSaveFileName(self, "Save new file as:", ".", "OpenDocument Text Documents (*.odt)")
                if not fileName.isEmpty():

diff --git a/mainapp.py b/mainapp.py
index 1c96c10f2fd456f1e171d18358538ae790e03953..8d0296953d10eebc19c1f598251f83217f4911d7 100644 (file)
--- a/mainapp.py
+++ b/mainapp.py
@@ -46,6 +46,7 @@ class MainApp (QMainWindow):
                self.fileQuitAction = QAction("&Quit",self)
                QObject.connect( self.fileQuitAction, SIGNAL("triggered()"), self.quit)
                QObject.connect( self.chooseaction, SIGNAL("editPerson()"), self.editPersonSlot)
+               QObject.connect( self.chooseaction, SIGNAL("mergePhotos()"), self.mergePhotos)
                QObject.connect( self.chooseaction, SIGNAL("exportDocument(QString)"), self.exportDocumentSlot)
                QObject.connect( self.editperson, SIGNAL("done()"), self.returnToMainMenu)
                QObject.connect( self, SIGNAL("databaseChanged(QString)"), self.editperson.updateDB)