← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~smpettit/openlp/lowercase into lp:openlp

 

Stevan Pettit has proposed merging lp:~smpettit/openlp/lowercase into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~smpettit/openlp/lowercase/+merge/68984

Bug #798976

Changed plugin names to lowercase.

Removed .lower() reference from plugin.name where appropriate
-- 
https://code.launchpad.net/~smpettit/openlp/lowercase/+merge/68984
Your team OpenLP Core is requested to review the proposed merge of lp:~smpettit/openlp/lowercase into lp:openlp.
=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2011-07-01 16:59:56 +0000
+++ openlp/core/lib/mediamanageritem.py	2011-07-24 02:24:35 +0000
@@ -96,7 +96,7 @@
         self.plugin = plugin
         visible_title = self.plugin.getString(StringContent.VisibleName)
         self.title = unicode(visible_title[u'title'])
-        self.settingsSection = self.plugin.name.lower()
+        self.settingsSection = self.plugin.name
         self.icon = None
         if icon:
             self.icon = build_icon(icon)
@@ -113,7 +113,7 @@
         self.retranslateUi()
         self.auto_select_id = -1
         QtCore.QObject.connect(Receiver.get_receiver(),
-            QtCore.SIGNAL(u'%s_service_load' % self.plugin.name.lower()),
+            QtCore.SIGNAL(u'%s_service_load' % self.plugin.name),
             self.serviceLoad)
 
     def requiredIcons(self):
@@ -558,7 +558,7 @@
                 QtGui.QMessageBox.information(self, UiStrings().NISs,
                     translate('OpenLP.MediaManagerItem',
                         'You must select an existing service item to add to.'))
-            elif self.plugin.name.lower() == serviceItem.name.lower():
+            elif self.plugin.name == serviceItem.name:
                 self.generateSlideData(serviceItem)
                 self.plugin.serviceManager.addServiceItem(serviceItem,
                     replace=True)

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2011-06-12 16:02:52 +0000
+++ openlp/core/lib/plugin.py	2011-07-24 02:24:35 +0000
@@ -152,7 +152,7 @@
             self.version = version
         else:
             self.version = get_application_version()[u'version']
-        self.settingsSection = self.name.lower()
+        self.settingsSection = self.name
         self.icon = None
         self.media_item_class = media_item_class
         self.settings_tab_class = settings_tab_class

=== modified file 'openlp/core/ui/mediadockmanager.py'
--- openlp/core/ui/mediadockmanager.py	2011-06-12 16:02:52 +0000
+++ openlp/core/ui/mediadockmanager.py	2011-07-24 02:24:35 +0000
@@ -66,7 +66,7 @@
         match = False
         for dock_index in range(0, self.media_dock.count()):
             if self.media_dock.widget(dock_index).settingsSection == \
-                media_item.plugin.name.lower():
+                media_item.plugin.name:
                 match = True
                 break
         if not match:
@@ -84,6 +84,6 @@
         for dock_index in range(0, self.media_dock.count()):
             if self.media_dock.widget(dock_index):
                 if self.media_dock.widget(dock_index).settingsSection == \
-                    media_item.plugin.name.lower():
+                    media_item.plugin.name:
                     self.media_dock.widget(dock_index).setVisible(False)
                     self.media_dock.removeItem(dock_index)

=== modified file 'openlp/plugins/alerts/alertsplugin.py'
--- openlp/plugins/alerts/alertsplugin.py	2011-07-14 18:42:38 +0000
+++ openlp/plugins/alerts/alertsplugin.py	2011-07-24 02:24:35 +0000
@@ -43,7 +43,7 @@
     log.info(u'Alerts Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Alerts', plugin_helpers,
+        Plugin.__init__(self, u'alerts', plugin_helpers,
             settings_tab_class=AlertsTab)
         self.weight = -3
         self.icon_path = u':/plugins/plugin_alerts.png'

=== modified file 'openlp/plugins/bibles/bibleplugin.py'
--- openlp/plugins/bibles/bibleplugin.py	2011-07-11 16:32:25 +0000
+++ openlp/plugins/bibles/bibleplugin.py	2011-07-24 02:24:35 +0000
@@ -41,7 +41,7 @@
     log.info(u'Bible Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Bibles', plugin_helpers,
+        Plugin.__init__(self, u'bibles', plugin_helpers,
             BibleMediaItem, BiblesTab)
         self.weight = -9
         self.icon_path = u':/plugins/plugin_bibles.png'

=== modified file 'openlp/plugins/custom/customplugin.py'
--- openlp/plugins/custom/customplugin.py	2011-06-17 14:15:07 +0000
+++ openlp/plugins/custom/customplugin.py	2011-07-24 02:24:35 +0000
@@ -46,7 +46,7 @@
     log.info(u'Custom Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Custom', plugin_helpers,
+        Plugin.__init__(self, u'custom', plugin_helpers,
             CustomMediaItem, CustomTab)
         self.weight = -5
         self.manager = Manager(u'custom', init_schema)

=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/images/imageplugin.py	2011-07-24 02:24:35 +0000
@@ -36,7 +36,7 @@
     log.info(u'Image Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Images', plugin_helpers, ImageMediaItem)
+        Plugin.__init__(self, u'images', plugin_helpers, ImageMediaItem)
         self.weight = -7
         self.icon_path = u':/plugins/plugin_images.png'
         self.icon = build_icon(self.icon_path)

=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/media/mediaplugin.py	2011-07-24 02:24:35 +0000
@@ -39,7 +39,7 @@
     log.info(u'%s MediaPlugin loaded', __name__)
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'Media', plugin_helpers,
+        Plugin.__init__(self, u'media', plugin_helpers,
             MediaMediaItem, MediaTab)
         self.weight = -6
         self.icon_path = u':/plugins/plugin_media.png'

=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/presentations/presentationplugin.py	2011-07-24 02:24:35 +0000
@@ -52,7 +52,7 @@
         """
         log.debug(u'Initialised')
         self.controllers = {}
-        Plugin.__init__(self, u'Presentations', plugin_helpers)
+        Plugin.__init__(self, u'presentations', plugin_helpers)
         self.weight = -8
         self.icon_path = u':/plugins/plugin_presentations.png'
         self.icon = build_icon(self.icon_path)

=== modified file 'openlp/plugins/remotes/remoteplugin.py'
--- openlp/plugins/remotes/remoteplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/remotes/remoteplugin.py	2011-07-24 02:24:35 +0000
@@ -39,7 +39,7 @@
         """
         remotes constructor
         """
-        Plugin.__init__(self, u'Remotes', plugin_helpers,
+        Plugin.__init__(self, u'remotes', plugin_helpers,
             settings_tab_class=RemoteTab)
         self.icon_path = u':/plugins/plugin_remote.png'
         self.icon = build_icon(self.icon_path)

=== modified file 'openlp/plugins/songs/songsplugin.py'
--- openlp/plugins/songs/songsplugin.py	2011-06-12 16:02:52 +0000
+++ openlp/plugins/songs/songsplugin.py	2011-07-24 02:24:35 +0000
@@ -57,7 +57,7 @@
         """
         Create and set up the Songs plugin.
         """
-        Plugin.__init__(self, u'Songs', plugin_helpers, SongMediaItem, SongsTab)
+        Plugin.__init__(self, u'songs', plugin_helpers, SongMediaItem, SongsTab)
         self.weight = -10
         self.manager = Manager(u'songs', init_schema)
         self.icon_path = u':/plugins/plugin_songs.png'

=== modified file 'openlp/plugins/songusage/songusageplugin.py'
--- openlp/plugins/songusage/songusageplugin.py	2011-07-11 18:35:20 +0000
+++ openlp/plugins/songusage/songusageplugin.py	2011-07-24 02:24:35 +0000
@@ -45,7 +45,7 @@
     log.info(u'SongUsage Plugin loaded')
 
     def __init__(self, plugin_helpers):
-        Plugin.__init__(self, u'SongUsage', plugin_helpers)
+        Plugin.__init__(self, u'songusage', plugin_helpers)
         self.weight = -4
         self.icon = build_icon(u':/plugins/plugin_songusage.png')
         self.activeIcon = build_icon(u':/songusage/song_usage_active.png')


Follow ups