raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

move historycombo

Browse Source
This commit is contained in:
Tim Bentley 2016-04-01 17:56:54 +01:00
parent 2e58e45068
commit 203c7b9dd8
5 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/core/common/__init__.py
View File

@ -24,13 +24,12 @@ The :mod:`common` module contains most of the components and libraries that make
OpenLP work. OpenLP work.
""" """
import hashlib import hashlib
import re
import os
import logging import logging
import os
import re
import sys import sys
import traceback import traceback
from ipaddress import IPv4Address, IPv6Address, AddressValueError from ipaddress import IPv4Address, IPv6Address, AddressValueError
from codecs import decode, encode
from PyQt5 import QtCore from PyQt5 import QtCore
from PyQt5.QtCore import QCryptographicHash as QHash from PyQt5.QtCore import QCryptographicHash as QHash
@ -241,6 +240,5 @@ from .registryproperties import RegistryProperties
from .uistrings import UiStrings from .uistrings import UiStrings
from .settings import Settings from .settings import Settings
from .applocation import AppLocation from .applocation import AppLocation
from .historycombobox import HistoryComboBox
from .actions import ActionList from .actions import ActionList
from .languagemanager import LanguageManager from .languagemanager import LanguageManager

21
openlp/core/ui/lib/__init__.py Normal file
View File

@ -0,0 +1,21 @@
# -*- 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 #
###############################################################################

2
openlp/core/common/historycombobox.py → openlp/core/ui/lib/historycombobox.py
View File

@ -20,7 +20,7 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
""" """
The :mod:`~openlp.core.common.historycombobox` module contains the HistoryComboBox widget The :mod:`~openlp.core.ui.lib.historycombobox` module contains the HistoryComboBox widget
""" """
from PyQt5 import QtCore, QtWidgets from PyQt5 import QtCore, QtWidgets

21
tests/interfaces/openlp_core_ui_lib/__init__.py Normal file
View File

@ -0,0 +1,21 @@
# -*- 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 #
###############################################################################

3
tests/interfaces/openlp_core_common/test_historycombobox.py → tests/interfaces/openlp_core_ui_lib/test_historycombobox.py
View File

@ -28,9 +28,8 @@ from unittest import TestCase
from PyQt5 import QtWidgets from PyQt5 import QtWidgets
from openlp.core.common import Registry from openlp.core.common import Registry
from openlp.core.common import HistoryComboBox from openlp.core.ui.lib.historycombobox import HistoryComboBox
from tests.helpers.testmixin import TestMixin from tests.helpers.testmixin import TestMixin
from tests.interfaces import MagicMock, patch
class TestHistoryComboBox(TestCase, TestMixin): class TestHistoryComboBox(TestCase, TestMixin):