diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 43bfe18ff..4d43b3856 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -20,7 +20,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from pluginutils import PluginUtils from pluginconfig import PluginConfig from plugin import Plugin -from settingstab import SettingsTab +from settingstabitem import SettingsTabItem from mediamanageritem import MediaManagerItem from event import Event from xmlrootclass import XmlRootClass @@ -29,5 +29,5 @@ from eventreceiver import Receiver from imageserviceitem import ImageServiceItem from toolbar import OpenLPToolbar -__all__ = ['PluginConfig', 'Plugin', 'PluginUtils', 'SettingsTab', 'MediaManagerItem', 'Event', +__all__ = ['PluginConfig', 'Plugin', 'PluginUtils', 'SettingsTabItem', 'MediaManagerItem', 'Event', 'XmlRootClass', 'ServiceItem', 'Receiver', 'ImageServiceItem', 'OpenLPToolbar'] diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py index ad2fbcdee..dbd1906a7 100644 --- a/openlp/core/lib/plugin.py +++ b/openlp/core/lib/plugin.py @@ -49,7 +49,7 @@ class Plugin(object): * add_export_menu_item(export_menu) Add an item to the Export menu. * get_settings_tab() - Returns an instance of SettingsTab to be used in the Settings dialog. + Returns an instance of SettingsTabItem to be used in the Settings dialog. * add_to_menu(menubar) A method to add a menu item to anywhere in the menu, given the menu bar. * handle_event(event) diff --git a/openlp/core/lib/settingstab.py b/openlp/core/lib/settingstabitem.py similarity index 92% rename from openlp/core/lib/settingstab.py rename to openlp/core/lib/settingstabitem.py index 56f065627..5c56eea76 100644 --- a/openlp/core/lib/settingstab.py +++ b/openlp/core/lib/settingstabitem.py @@ -21,9 +21,9 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtCore, QtGui from openlp.core.resources import * -class SettingsTab(QtGui.QWidget): +class SettingsTabItem(QtGui.QWidget): """ - SettingsTab is a helper widget for plugins to define Tabs for the settings dialog. + SettingsTabItem is a helper widget for plugins to define Tabs for the settings dialog. """ def __init__(self): """ diff --git a/openlp/core/ui/alertform.py b/openlp/core/ui/alertform.py index a0fe90cbb..3274f4a2d 100644 --- a/openlp/core/ui/alertform.py +++ b/openlp/core/ui/alertform.py @@ -21,7 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtCore, QtGui from openlp.core.resources import * -from openlp.core.lib import SettingsTab +from openlp.core.lib import SettingsTabItem class AlertForm(object): @@ -94,7 +94,7 @@ class AlertForm(object): def get_settings_tab_item(self): - self.SettingsTabItem= SettingsTab() + self.SettingsTabItem= SettingsTabItem() self.Alerts = QtGui.QWidget() self.Alerts.setObjectName("Alerts") diff --git a/openlp/core/ui/generalform.py b/openlp/core/ui/generalform.py index 09ea02230..a3505538a 100644 --- a/openlp/core/ui/generalform.py +++ b/openlp/core/ui/generalform.py @@ -21,7 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtCore, QtGui from openlp.core.resources import * -from openlp.core.lib import SettingsTab +from openlp.core.lib import SettingsTabItem class GeneralForm(object): """ @@ -33,7 +33,7 @@ class GeneralForm(object): pass def get_settings_tab_item(self): - self.SettingsTabItem= SettingsTab() + self.SettingsTabItem= SettingsTabItem() self.DisplayTab = QtGui.QWidget() self.DisplayTab.setObjectName("DisplayTab") diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py index 29afdb11b..f4deeeae4 100644 --- a/openlp/core/ui/mainwindow.py +++ b/openlp/core/ui/mainwindow.py @@ -27,7 +27,7 @@ from openlp.core.resources import * from openlp.core.ui import SlideController, ServiceManager from openlp.core.ui import AboutForm, AlertForm, SettingsForm, SlideController, GeneralForm -from openlp.core.lib import Plugin, MediaManagerItem, SettingsTab +from openlp.core.lib import Plugin, MediaManagerItem, SettingsTabItem from openlp.core import PluginManager import logging diff --git a/openlp/core/ui/settingsform.py b/openlp/core/ui/settingsform.py index 52051f691..65fa1bf53 100644 --- a/openlp/core/ui/settingsform.py +++ b/openlp/core/ui/settingsform.py @@ -21,7 +21,7 @@ Place, Suite 330, Boston, MA 02111-1307 USA from PyQt4 import QtCore, QtGui from PyQt4.QtGui import QDialog -from openlp.core.lib import SettingsTab +from openlp.core.lib import SettingsTabItem from openlp.core.resources import * from openlp.core.ui import AlertForm diff --git a/openlp/plugins/bibles/bibleplugin.py b/openlp/plugins/bibles/bibleplugin.py index 70edde70c..8c298c99b 100644 --- a/openlp/plugins/bibles/bibleplugin.py +++ b/openlp/plugins/bibles/bibleplugin.py @@ -24,7 +24,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * from openlp.core.resources import * -from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, Receiver, SettingsTab +from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, Receiver, SettingsTabItem from openlp.plugins.bibles.lib import BibleManager from openlp.plugins.bibles.forms import BibleImportForm @@ -54,7 +54,7 @@ class BiblePlugin(Plugin, PluginUtils): def get_settings_tab_item(self): - self.SettingsTabItem= SettingsTab() + self.SettingsTabItem= SettingsTabItem() self.Bibles = QtGui.QWidget() self.Bibles.setObjectName("Bibles") diff --git a/openlp/plugins/videos/videoplugin.py b/openlp/plugins/videos/videoplugin.py index 68b92311f..2568fac17 100644 --- a/openlp/plugins/videos/videoplugin.py +++ b/openlp/plugins/videos/videoplugin.py @@ -21,7 +21,7 @@ import os from PyQt4 import QtCore, QtGui from openlp.core.resources import * -from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, SettingsTab +from openlp.core.lib import Plugin,PluginUtils, MediaManagerItem, SettingsTabItem class VideoPlugin(Plugin, PluginUtils): def __init__(self): @@ -38,7 +38,7 @@ class VideoPlugin(Plugin, PluginUtils): def get_settings_tab_item(self): - self.SettingsTabItem= SettingsTab() + self.SettingsTabItem= SettingsTabItem() self.Videos = QtGui.QWidget() self.Videos.setObjectName("Videos")