From 181c7c99468157bc968b9f7d0eb1aff94f414257 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Thu, 4 Mar 2010 22:03:43 +0000
Subject: [PATCH] Event clean ups and fixes

---
 openlp.pyw                       |  1 -
 openlp/core/ui/servicemanager.py | 68 ++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/openlp.pyw b/openlp.pyw
index cb08e419c..6763ea6c1 100755
--- a/openlp.pyw
+++ b/openlp.pyw
@@ -60,7 +60,6 @@ QToolBar
   padding: 0;
 }
 """
-log = logging.getLogger(__name__)
 
 class OpenLP(QtGui.QApplication):
     """
diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index e28826696..6a9223508 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -42,37 +42,47 @@ class ServiceManagerList(QtGui.QTreeWidget):
     def __init__(self, parent=None, name=None):
         QtGui.QTreeWidget.__init__(self,parent)
         self.parent = parent
+        self.setExpandsOnDoubleClick(False)
+
+    def mousePressEvent(self, event):
+        #Implement item selection
+        item = self.itemAt(event.pos())
+        if item is not None:
+            self.setCurrentItem(item)
+            parentitem = item.parent()
+            if event.button() == QtCore.Qt.RightButton:
+                self.parent.noteAction.setVisible(False)
+                if parentitem is None:
+                    pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
+                    self.parent.noteAction.setVisible(True)
+                else:
+                    pos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]
+                serviceItem = self.parent.serviceItems[pos - 1]
+                if serviceItem[u'service_item'].is_text():
+                    self.parent.themeMenu.menuAction().setVisible(True)
+                else:
+                    self.parent.themeMenu.menuAction().setVisible(False)
+                if serviceItem[u'service_item'].edit_enabled:
+                    self.parent.editAction.setVisible(True)
+                else:
+                    self.parent.editAction.setVisible(False)
+                event.accept()
+            elif event.button() == QtCore.Qt.LeftButton:
+                if parentitem is None:
+                    if self.isItemExpanded(item):
+                        self.collapseItem(item)
+                    else:
+                        self.expandItem(item)
+            else:
+                event.accept()
+        else:
+            event.accept()
 
     def mouseDoubleClickEvent(self, event):
         self.parent.makeLive()
-        event.ignore()
-
-    def mousePressEvent(self, event):
-        if event.button() == QtCore.Qt.RightButton:
-            item = self.itemAt(event.pos())
-            parentitem = item.parent()
-            self.parent.noteAction.setVisible(False)
-            if parentitem is None:
-                pos = item.data(0, QtCore.Qt.UserRole).toInt()[0]
-                self.parent.noteAction.setVisible(True)
-            else:
-                pos = parentitem.data(0, QtCore.Qt.UserRole).toInt()[0]
-            serviceItem = self.parent.serviceItems[pos - 1]
-            self.parent.menuServiceItem = serviceItem
-            if serviceItem[u'service_item'].is_text():
-                self.parent.themeMenu.menuAction().setVisible(True)
-            else:
-                self.parent.themeMenu.menuAction().setVisible(False)
-            if serviceItem[u'service_item'].edit_enabled:
-                self.parent.editAction.setVisible(True)
-            else:
-                self.parent.editAction.setVisible(False)
-            event.accept()
-        else:
-            event.ignore()
+        event.accept()
 
     def keyPressEvent(self, event):
-        print event.isAutoRepeat()
         if type(event) == QtGui.QKeyEvent:
             #here accept the event and do something
             if event.key() == QtCore.Qt.Key_Enter:
@@ -256,10 +266,11 @@ class ServiceManager(QtGui.QWidget):
         self.presentation_types = presentation_types
 
     def onServiceItemNoteForm(self):
+        item, count = self.findServiceItem()
         self.serviceItemNoteForm.textEdit.setPlainText(
-            self.menuServiceItem[u'service_item'].notes)
+            self.serviceItems[item][u'service_item'].notes)
         if self.serviceItemNoteForm.exec_():
-            self.menuServiceItem[u'service_item'].notes = \
+            self.serviceItems[item][u'service_item'].notes = \
                 self.serviceItemNoteForm.textEdit.toPlainText()
 
     def nextItem(self):
@@ -650,7 +661,6 @@ class ServiceManager(QtGui.QWidget):
         """
         Send the current item to the Live slide controller
         """
-        print "ml"
         item, count = self.findServiceItem()
         self.parent.LiveController.addServiceManagerItem(
             self.serviceItems[item][u'service_item'], count)