From b35de747ab6273ae0048a82e13aef50928b2d830 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 11 Mar 2014 20:58:49 +0200 Subject: [PATCH] Move HistoryComboBox to openlp.core.common --- openlp/core/common/__init__.py | 2 +- openlp/core/{lib => common}/historycombobox.py | 0 openlp/core/lib/__init__.py | 1 - openlp/plugins/songs/forms/songselectdialog.py | 3 ++- 4 files changed, 3 insertions(+), 3 deletions(-) rename openlp/core/{lib => common}/historycombobox.py (100%) diff --git a/openlp/core/common/__init__.py b/openlp/core/common/__init__.py index 8963213d3..c6f96a616 100644 --- a/openlp/core/common/__init__.py +++ b/openlp/core/common/__init__.py @@ -134,4 +134,4 @@ from .registrymixin import RegistryMixin from .uistrings import UiStrings from .settings import Settings from .applocation import AppLocation - +from .historycombobox import HistoryComboBox diff --git a/openlp/core/lib/historycombobox.py b/openlp/core/common/historycombobox.py similarity index 100% rename from openlp/core/lib/historycombobox.py rename to openlp/core/common/historycombobox.py diff --git a/openlp/core/lib/__init__.py b/openlp/core/lib/__init__.py index 197e74312..e6b7f4fe3 100644 --- a/openlp/core/lib/__init__.py +++ b/openlp/core/lib/__init__.py @@ -331,4 +331,3 @@ from .dockwidget import OpenLPDockWidget from .imagemanager import ImageManager from .renderer import Renderer from .mediamanageritem import MediaManagerItem -from .historycombobox import HistoryComboBox diff --git a/openlp/plugins/songs/forms/songselectdialog.py b/openlp/plugins/songs/forms/songselectdialog.py index 5eda9c497..a26d86c33 100644 --- a/openlp/plugins/songs/forms/songselectdialog.py +++ b/openlp/plugins/songs/forms/songselectdialog.py @@ -32,7 +32,8 @@ The :mod:`~openlp.plugins.songs.forms.songselectdialog` module contains the user from PyQt4 import QtCore, QtGui -from openlp.core.lib import HistoryComboBox, translate, build_icon +from openlp.core.common import HistoryComboBox +from openlp.core.lib import translate, build_icon from openlp.core.ui import SingleColumnTableWidget