diff --git a/openlp/.version b/openlp/.version
index 6b4950e3d..437459cd9 100644
--- a/openlp/.version
+++ b/openlp/.version
@@ -1 +1 @@
-2.4
+2.5.0
diff --git a/openlp/core/ui/aboutdialog.py b/openlp/core/ui/aboutdialog.py
index 918e48e64..3f9034dcb 100644
--- a/openlp/core/ui/aboutdialog.py
+++ b/openlp/core/ui/aboutdialog.py
@@ -41,6 +41,7 @@ class UiAboutDialog(object):
about_dialog.setObjectName('about_dialog')
about_dialog.setWindowIcon(build_icon(':/icon/openlp-logo.svg'))
self.about_dialog_layout = QtWidgets.QVBoxLayout(about_dialog)
+ self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
self.about_dialog_layout.setObjectName('about_dialog_layout')
self.logo_label = QtWidgets.QLabel(about_dialog)
self.logo_label.setPixmap(QtGui.QPixmap(':/graphics/openlp-about-logo.png'))
diff --git a/openlp/core/ui/lib/mediadockmanager.py b/openlp/core/ui/lib/mediadockmanager.py
index ad786b3a0..1a7676465 100644
--- a/openlp/core/ui/lib/mediadockmanager.py
+++ b/openlp/core/ui/lib/mediadockmanager.py
@@ -54,7 +54,7 @@ class MediaDockManager(object):
match = True
break
if not match:
- self.media_dock.addItem(media_item, visible_title['title'])
+ self.media_dock.addItem(media_item, media_item.plugin.icon, visible_title['title'])
def remove_dock(self, media_item):
"""
diff --git a/openlp/core/ui/mainwindow.py b/openlp/core/ui/mainwindow.py
index b8bd126dd..6e6101562 100644
--- a/openlp/core/ui/mainwindow.py
+++ b/openlp/core/ui/mainwindow.py
@@ -52,19 +52,17 @@ from openlp.core.ui.lib.mediadockmanager import MediaDockManager
log = logging.getLogger(__name__)
MEDIA_MANAGER_STYLE = """
-QToolBox {
- padding-bottom: 2px;
-}
-QToolBox::tab {
+::tab {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 palette(button), stop: 1.0 palette(mid));
- border: 1px solid palette(mid);
- border-radius: 3px;
+ border: 0;
+ border-radius: 2px;
+ margin-top: 0;
+ margin-bottom: 0;
+ text-align: left;
}
-QToolBox::tab:selected {
- background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 palette(light), stop: 1.0 palette(button));
- border: 1px solid palette(mid);
+::tab:selected {
+ border: 1px solid palette(highlight);
font-weight: bold;
}
"""
diff --git a/openlp/core/ui/projector/sourceselectform.py b/openlp/core/ui/projector/sourceselectform.py
index c2b1c2a1b..62b0a2158 100644
--- a/openlp/core/ui/projector/sourceselectform.py
+++ b/openlp/core/ui/projector/sourceselectform.py
@@ -243,7 +243,7 @@ class SourceSelectTabs(QtWidgets.QDialog):
title = translate('OpenLP.SourceSelectForm', 'Select Projector Source')
self.setWindowTitle(title)
self.setObjectName('source_select_tabs')
- self.setWindowIcon(build_icon(':/icon/openlp-log-32x32.png'))
+ self.setWindowIcon(build_icon(':/icon/openlp-log.svg'))
self.setModal(True)
self.layout = QtWidgets.QVBoxLayout()
self.layout.setObjectName('source_select_tabs_layout')
@@ -395,7 +395,7 @@ class SourceSelectSingle(QtWidgets.QDialog):
else:
title = translate('OpenLP.SourceSelectForm', 'Select Projector Source')
self.setObjectName('source_select_single')
- self.setWindowIcon(build_icon(':/icon/openlp-log-32x32.png'))
+ self.setWindowIcon(build_icon(':/icon/openlp-log.svg'))
self.setModal(True)
self.edit = edit
diff --git a/resources/images/openlp-about-logo.png b/resources/images/openlp-about-logo.png
index a20534362..b2b141a17 100644
Binary files a/resources/images/openlp-about-logo.png and b/resources/images/openlp-about-logo.png differ
diff --git a/resources/images/openlp-logo.svg b/resources/images/openlp-logo.svg
index d1ff61bec..764ba8563 100644
--- a/resources/images/openlp-logo.svg
+++ b/resources/images/openlp-logo.svg
@@ -1,143 +1,115 @@
+
+
+ x="0px"
+ y="0px"
+ viewBox="0 0 453.02106 452.89808"
+ xml:space="preserve"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="openlp-logo.svg"
+ inkscape:export-filename="/home/raoul/Dropbox/OpenLPNewBrand/wiki.png"
+ inkscape:export-xdpi="23.68"
+ inkscape:export-ydpi="23.68"
+ width="453.02106"
+ height="452.89807">image/svg+xml
\ No newline at end of file
diff --git a/resources/images/openlp-splash-screen.png b/resources/images/openlp-splash-screen.png
index 618e47c6e..09785488a 100644
Binary files a/resources/images/openlp-splash-screen.png and b/resources/images/openlp-splash-screen.png differ
diff --git a/tests/functional/openlp_core_ui/test_aboutform.py b/tests/functional/openlp_core_ui/test_aboutform.py
index 612c6b887..47a685f9d 100644
--- a/tests/functional/openlp_core_ui/test_aboutform.py
+++ b/tests/functional/openlp_core_ui/test_aboutform.py
@@ -32,16 +32,30 @@ from tests.helpers.testmixin import TestMixin
class TestFirstTimeForm(TestCase, TestMixin):
- def test_on_volunteer_button_clicked(self):
+ @patch('openlp.core.ui.aboutform.webbrowser')
+ def test_on_volunteer_button_clicked(self, mocked_webbrowser):
"""
Test that clicking on the "Volunteer" button opens a web page.
"""
# GIVEN: A new About dialog and a mocked out webbrowser module
- with patch('openlp.core.ui.aboutform.webbrowser') as mocked_webbrowser:
- about_form = AboutForm(None)
+ about_form = AboutForm(None)
- # WHEN: The "Volunteer" button is "clicked"
- about_form.on_volunteer_button_clicked()
+ # WHEN: The "Volunteer" button is "clicked"
+ about_form.on_volunteer_button_clicked()
- # THEN: A web browser is opened
- mocked_webbrowser.open_new.assert_called_with('http://openlp.org/en/contribute')
+ # THEN: A web browser is opened
+ mocked_webbrowser.open_new.assert_called_with('http://openlp.org/en/contribute')
+
+ @patch('openlp.core.ui.aboutform.get_application_version')
+ def test_about_form_build_number(self, mocked_get_application_version):
+ """
+ Test that the build number is added to the about form
+ """
+ # GIVEN: A mocked out get_application_version function
+ mocked_get_application_version.return_value = {'version': '3.1.5', 'build': '3000'}
+
+ # WHEN: The about form is created
+ about_form = AboutForm(None)
+
+ # THEN: The build number should be in the text
+ assert 'OpenLP 3.1.5 build 3000' in about_form.about_text_edit.toPlainText()