colorbutton2

openlp/core/lib/__init__.py

@@ -325,7 +325,7 @@ from .settingstab import SettingsTab
 from .serviceitem import ServiceItem, ServiceItemType, ItemCapabilities
 from .htmlbuilder import build_html, build_lyrics_format_css, build_lyrics_outline_css
 from .toolbar import OpenLPToolbar
-from .dockwidget import OpenLPDockWidget
+from openlp.core.ui.lib.dockwidget import OpenLPDockWidget
 from .imagemanager import ImageManager
 from .renderer import Renderer
 from .mediamanageritem import MediaManagerItem

openlp/core/lib/dockwidget.py

@@ -1,56 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2016 OpenLP Developers                                   #
-# --------------------------------------------------------------------------- #
-# 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  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-"""
-Provide additional functionality required by OpenLP from the inherited QDockWidget.
-"""
-
-import logging
-
-from PyQt5 import QtWidgets
-
-from openlp.core.lib import ScreenList, build_icon
-
-log = logging.getLogger(__name__)
-
-
-class OpenLPDockWidget(QtWidgets.QDockWidget):
-    """
-    Custom DockWidget class to handle events
-    """
-    def __init__(self, parent=None, name=None, icon=None):
-        """
-        Initialise the DockWidget
-        """
-        log.debug('Initialise the %s widget' % name)
-        super(OpenLPDockWidget, self).__init__(parent)
-        if name:
-            self.setObjectName(name)
-        if icon:
-            self.setWindowIcon(build_icon(icon))
-        # Sort out the minimum width.
-        screens = ScreenList()
-        main_window_docbars = screens.current['size'].width() // 5
-        if main_window_docbars > 300:
-            self.setMinimumWidth(300)
-        else:
-            self.setMinimumWidth(main_window_docbars)

openlp/plugins/alerts/lib/alertstab.py

@@ -23,8 +23,9 @@
 from PyQt5 import QtGui, QtWidgets
 
 from openlp.core.common import Settings, UiStrings, translate
-from openlp.core.lib import ColorButton, SettingsTab
+from openlp.core.lib import SettingsTab
 from openlp.core.lib.ui import create_valign_selection_widgets
+from openlp.core.ui.lib.colorbutton import ColorButton
 
 
 class AlertsTab(SettingsTab):

openlp/plugins/images/lib/imagetab.py

@@ -23,7 +23,8 @@
 from PyQt5 import QtWidgets
 
 from openlp.core.common import Settings, UiStrings, translate
-from openlp.core.lib import ColorButton, SettingsTab
+from openlp.core.lib import SettingsTab
+from openlp.core.ui.lib.colorbutton import ColorButton
 
 
 class ImageTab(SettingsTab):