reverted some changes to avoid conflicts + clean up

openlp.pyw

@@ -26,12 +26,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-# Import uuid now, to avoid the rare bug described in the support system:
-# http://support.openlp.org/issues/102
-# If https://bugs.gentoo.org/show_bug.cgi?id=317557 is fixed, the import can be
-# removed.
-import uuid
-
 from openlp.core import main
 
 

openlp/core/ui/servicemanager.py

@@ -352,8 +352,8 @@ class ServiceManager(QtGui.QWidget):
         self._fileName = unicode(fileName)
         self.mainwindow.setServiceModified(self.isModified(),
             self.shortFileName())
-        QtCore.QSettings().setValue(
-            u'servicemanager/last file',QtCore.QVariant(fileName))
+        QtCore.QSettings(). \
+            setValue(u'servicemanager/last file',QtCore.QVariant(fileName))
 
     def fileName(self):
         """
@@ -372,7 +372,8 @@ class ServiceManager(QtGui.QWidget):
         Triggered when Config dialog is updated.
         """
         self.expandTabs = QtCore.QSettings().value(
-            u'advanced/expand service item', QtCore.QVariant(u'False')).toBool()
+            u'advanced/expand service item',
+            QtCore.QVariant(u'False')).toBool()
 
     def supportedSuffixes(self, suffix):
         self.suffixes.append(suffix)
@@ -443,8 +444,8 @@ class ServiceManager(QtGui.QWidget):
         self.setFileName(u'')
         self.serviceId += 1
         self.setModified(False)
-        QtCore.QSettings().setValue(
-            u'servicemanager/last file',QtCore.QVariant(u''))
+        QtCore.QSettings(). \
+            setValue(u'servicemanager/last file',QtCore.QVariant(u''))
         Receiver.send_message(u'servicemanager_new_service')
 
     def saveFile(self):
@@ -468,7 +469,8 @@ class ServiceManager(QtGui.QWidget):
         service_file_name = '%s.osd' % basename
         log.debug(u'ServiceManager.saveFile - %s', path_file_name)
         SettingsManager.set_last_dir(
-            self.mainwindow.serviceManagerSettingsSection, path)
+            self.mainwindow.serviceManagerSettingsSection,
+            path)
         service = []
         write_list = []
         audio_files = []
@@ -730,8 +732,8 @@ class ServiceManager(QtGui.QWidget):
         service was last closed. Can be blank if there was no service
         present.
         """
-        fileName = QtCore.QSettings().value(
-            u'servicemanager/last file',QtCore.QVariant(u'')).toString()
+        fileName = QtCore.QSettings(). \
+            value(u'servicemanager/last file',QtCore.QVariant(u'')).toString()
         if fileName:
             self.loadFile(fileName)
 
@@ -748,7 +750,7 @@ class ServiceManager(QtGui.QWidget):
         self.maintainAction.setVisible(False)
         self.notesAction.setVisible(False)
         self.timeAction.setVisible(False)
-        if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanEdit) \
+        if serviceItem[u'service_item'].is_capable(ItemCapabilities.CanEdit)\
             and serviceItem[u'service_item'].edit_id:
             self.editAction.setVisible(True)
         if serviceItem[u'service_item']\
@@ -1103,7 +1105,8 @@ class ServiceManager(QtGui.QWidget):
         self.service_theme = unicode(self.themeComboBox.currentText())
         self.mainwindow.renderer.set_service_theme(self.service_theme)
         QtCore.QSettings().setValue(
-            self.mainwindow.serviceManagerSettingsSection + u'/service theme',
+            self.mainwindow.serviceManagerSettingsSection +
+                u'/service theme',
             QtCore.QVariant(self.service_theme))
         self.regenerateServiceItems(True)