From c3f588e69381893f03429a777037861f28f83682 Mon Sep 17 00:00:00 2001
From: Drew Fisher <drew.m.fisher@gmail.com>
Date: Fri, 21 Aug 2009 22:44:16 -0500
Subject: [PATCH] Make Import photos button emit the signal it's supposed to.

---
 chooseaction.py | 2 +-
 mainapp.py      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/chooseaction.py b/chooseaction.py
index 82c13ae..06deede 100644
--- 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 1c96c10..8d02969 100644
--- 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)
-- 
2.39.5