Merge cleanups

openlp/core/lib/mediamanageritem.py

@@ -336,7 +336,6 @@ class MediaManagerItem(QtGui.QWidget):
         """
         Add a file to the list widget to make it available for showing
         """
-        print self.onNewFileMasks
         files = QtGui.QFileDialog.getOpenFileNames(
             self, self.onNewPrompt,
             SettingsManager.get_last_dir(self.settingsSection),

openlp/core/lib/serviceitem.py

@@ -462,7 +462,6 @@ class ServiceItem(object):
         """
         return os.path.join(self.get_frame_path(), self.get_frame_title())
 
-
     def get_frames(self):
         """
         Returns the frames for the ServiceItem
@@ -475,7 +474,6 @@ class ServiceItem(object):
     def get_rendered_frame(self, row):
         """
         Returns the correct frame for a given list and renders it if required.
-
         ``row``
             The service item slide to be returned
         """

openlp/core/ui/__init__.py

@@ -74,17 +74,8 @@ class AlertLocation(object):
 
 class DisplayControllerType(object):
     """
-    This is an enumeration class which controls where Alerts are placed on the
-    screen.
-
-    ``Top``
-        Place the text at the top of the screen.
-
-    ``Middle``
-        Place the text in the middle of the screen.
-
-    ``Bottom``
-        Place the text at the bottom of the screen.
+    This is an enumeration class which says where a display controller
+    originated from.
     """
     Live = 0
     Preview = 1
@@ -117,4 +108,4 @@ from thememanager import ThemeManager
 
 __all__ = ['SplashScreen', 'AboutForm', 'SettingsForm', 'MainDisplay',
     'SlideController', 'ServiceManager', 'ThemeManager', 'MediaDockManager',
-    'ServiceItemEditForm', u'FirstTimeForm']
+    'ServiceItemEditForm', 'FirstTimeForm']

openlp/core/ui/media/__init__.py

@@ -90,7 +90,7 @@ def get_media_players():
     else:
         overridden_player = u''
     saved_players_list = saved_players.replace(u'[', u'').\
-    replace(u']',u'').split(u',')
+        replace(u']',u'').split(u',')
     return saved_players_list, overridden_player
 
 

openlp/core/ui/media/mediacontroller.py

@@ -383,7 +383,6 @@ class MediaController(object):
             QtCore.QFileInfo(serviceItem.get_filename())
         display = self._define_display(controller)
         if controller.isLive:
-            #display = controller.display
             isValid = self._check_file_type(controller, display, serviceItem)
             display.override[u'theme'] = u''
             display.override[u'video'] = True
@@ -396,7 +395,6 @@ class MediaController(object):
                     display.serviceItem.start_time
                 controller.media_info.end_time = serviceItem.end_time
         elif controller.previewDisplay:
-            #display = controller.previewDisplay
             isValid = self._check_file_type(controller, display, serviceItem)
         if not isValid:
             # Media could not be loaded correctly
@@ -414,7 +412,7 @@ class MediaController(object):
         # Preview requested
         if not controller.isLive:
             autoplay = True
-        # Visible or background requested or Service Item wants autostart
+        # Visible or background requested or Service Item wants to autostart
         elif not hidden or controller.media_info.is_background or \
              serviceItem.will_auto_start:
             autoplay = True

openlp/core/ui/media/playertab.py

@@ -7,10 +7,11 @@
 # Copyright (c) 2008-2012 Raoul Snyman                                        #
 # Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
 # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
-# Meinert Jordan, Armin Köhler, Edwin Lunando, Joshua Miller, Stevan Pettit,  #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon      #
-# Tibble, Dave Warnock, Frode Woldsund                                        #
+# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Erode Woldsund, Martin Zibricky                                             #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/ui/media/vendor/__init__.py

@@ -4,13 +4,14 @@
 ###############################################################################
 # OpenLP - Open Source Lyrics Projection                                      #
 # --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2011 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2011 Tim Bentley, Gerald Britton, Jonathan      #
+# Copyright (c) 2008-2012 Raoul Snyman                                        #
+# Portions copyright (c) 2008-2012 Tim Bentley, Gerald Britton, Jonathan      #
 # Corwin, Samuel Findlay, Michael Gorven, Scott Guerrieri, Matthias Hub,      #
-# Meinert Jordan, Armin Köhler, Edwin Lunando, Joshua Miller, Stevan Pettit,  #
-# Andreas Preikschat, Mattias Põldaru, Christian Richter, Philip Ridout,      #
-# Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, Martin Thompson, Jon      #
-# Tibble, Dave Warnock, Frode Woldsund                                        #
+# Meinert Jordan, Armin Köhler, Eric Ludin, Edwin Lunando, Brian T. Meyer,    #
+# Joshua Miller, Stevan Pettit, Andreas Preikschat, Mattias Põldaru,          #
+# Christian Richter, Philip Ridout, Simon Scudder, Jeffrey Smith,             #
+# Maikel Stuivenberg, Martin Thompson, Jon Tibble, Dave Warnock,              #
+# Erode Woldsund, Martin Zibricky                                             #
 # --------------------------------------------------------------------------- #
 # This program is free software; you can redistribute it and/or modify it     #
 # under the terms of the GNU General Public License as published by the Free  #

openlp/core/ui/media/webkitplayer.py

@@ -333,7 +333,6 @@ class WebkitPlayer(MediaPlayer):
         return True
 
     def resize(self, display):
-        #controller = display.controller
         display.webView.resize(display.size())
 
     def play(self, display):

openlp/core/ui/servicemanager.py

@@ -925,8 +925,6 @@ class ServiceManager(QtGui.QWidget):
         item = self.findServiceItem()[0]
         self.serviceItems[item][u'service_item'].will_auto_start = \
             not self.serviceItems[item][u'service_item'].will_auto_start
-        a=1
-
 
     def onServiceItemEditForm(self):
         """

openlp/plugins/media/lib/mediaitem.py

@@ -222,7 +222,7 @@ class MediaMediaItem(MediaManagerItem):
 
     def initialise(self):
         self.listView.clear()
-        self.listView.setIconSize(QtCore.QSize(44, 25))
+        self.listView.setIconSize(QtCore.QSize(88, 50))
         self.loadList(SettingsManager.load_list(self.settingsSection, u'media'))
         self.populateDisplayTypes()