[Openlp-core] JavaScript Test Results: Passed
JavaScript tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/update-about into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] JavaScript Test Results: Passed
JavaScript tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/update-about into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/update-about into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Preview of the dialog: https://cloud.snyman.info/index.php/apps/gallery/s/RETCYmSQZ7pA2ct -- https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/update-about into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/update-about into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/update-about into
lp:openlp.
Commit message:
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/update-about/+merge/371706
Update the About dialog:
- Changed the license to GPL3
- Removed a lot of old contributors
- Simplified credit tab content
- Linked to all the dependent libraries
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/update-about into lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2019-08-18 09:15:51 +
+++ openlp/core/ui/aboutdialog.py 2019-08-23 03:23:33 +
@@ -41,21 +41,33 @@
"""
about_dialog.setObjectName('about_dialog')
about_dialog.setWindowIcon(UiIcons().main_icon)
-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.base_layout = QtWidgets.QVBoxLayout(about_dialog)
+self.base_layout.setContentsMargins(0, 0, 0, 0)
+self.base_layout.setSpacing(0)
+self.base_layout.setObjectName('base_layout')
self.logo_label = QtWidgets.QLabel(about_dialog)
self.logo_label.setPixmap(QtGui.QPixmap(':/graphics/openlp-about-logo.png'))
+self.logo_label.setStyleSheet('background-color: #fff')
+self.logo_label.setMargin(8)
self.logo_label.setObjectName('logo_label')
-self.about_dialog_layout.addWidget(self.logo_label)
+self.base_layout.addWidget(self.logo_label)
+self.line = QtWidgets.QFrame(about_dialog)
+self.line.setFrameShape(QtWidgets.QFrame.HLine)
+self.line.setFrameShadow(QtWidgets.QFrame.Sunken)
+self.line.setObjectName('line')
+self.base_layout.addWidget(self.line)
+self.about_dialog_layout = QtWidgets.QVBoxLayout()
+self.about_dialog_layout.setContentsMargins(8, 8, 8, 8)
+self.about_dialog_layout.setSpacing(8)
+self.about_dialog_layout.setObjectName('about_dialog_layout')
+self.base_layout.addLayout(self.about_dialog_layout)
self.about_notebook = QtWidgets.QTabWidget(about_dialog)
self.about_notebook.setObjectName('about_notebook')
self.about_tab = QtWidgets.QWidget()
self.about_tab.setObjectName('about_tab')
self.about_tab_layout = QtWidgets.QVBoxLayout(self.about_tab)
self.about_tab_layout.setObjectName('about_tab_layout')
-self.about_text_edit = QtWidgets.QPlainTextEdit(self.about_tab)
-self.about_text_edit.setReadOnly(True)
+self.about_text_edit = QtWidgets.QTextBrowser(self.about_tab)
self.about_text_edit.setObjectName('about_text_edit')
self.about_tab_layout.addWidget(self.about_text_edit)
self.about_notebook.addTab(self.about_tab, '')
@@ -63,8 +75,7 @@
self.credits_tab.setObjectName('credits_tab')
self.credits_tab_layout = QtWidgets.QVBoxLayout(self.credits_tab)
self.credits_tab_layout.setObjectName('credits_tab_layout')
-self.credits_text_edit = QtWidgets.QPlainTextEdit(self.credits_tab)
-self.credits_text_edit.setReadOnly(True)
+self.credits_text_edit = QtWidgets.QTextBrowser(self.credits_tab)
self.credits_text_edit.setObjectName('credits_text_edit')
self.credits_tab_layout.addWidget(self.credits_text_edit)
self.about_notebook.addTab(self.credits_tab, '')
@@ -72,14 +83,13 @@
self.license_tab.setObjectName('license_tab')
self.license_tab_layout = QtWidgets.QVBoxLayout(self.license_tab)
self.license_tab_layout.setObjectName('license_tab_layout')
-self.license_text_edit = QtWidgets.QPlainTextEdit(self.license_tab)
-self.license_text_edit.setReadOnly(True)
+self.license_text_edit = QtWidgets.QTextBrowser(self.license_tab)
self.license_text_edit.setObjectName('license_text_edit')
self.license_tab_layout.addWidget(self.license_text_edit)
self.about_notebook.addTab(self.license_tab, '')
self.about_dialog_layout.addWidget(self.about_notebook)
-self.volunteer_button = create_button(None, 'volunteer_button', icon=UiIcons().volunteer)
-self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.volunteer_button])
+self.contribute_button = create_button(None, 'contribute_button', icon=UiIcons().volunteer)
+self.button_box = create_button_box(about_dialog, 'button_box', ['close'], [self.contribute_button])
self.about_dialog_layout.addWidget(self.button_box)
self.retranslate_ui(about_dialog)
[Openlp-core] [Bug 1818358] Re: Presentations do not display properly in preview
I saw this on Windows when a backup was made on a large screen laptop and installed on a smaller screen laptop using version 2.4.6. I have not seen this happen on the 2892 version in Development. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1818358 Title: Presentations do not display properly in preview Status in OpenLP: New Bug description: OS = Fedora 29 Kernel Linux 4.20.11-200.fc29.x86_64 x86_64 OpenLP v2.4.6 Presentations do not display properly in the top panel of either preview or live. It appears that OpenLP is rendering everything in landscape mode in the top panel. The bottom panels on both preview and live display properly. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1818358/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832993] Re: Issues affecting custom formatting tags
Windows 10 32 bit This has been verified to not happen in trunk 2892 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832993 Title: Issues affecting custom formatting tags Status in OpenLP: Fix Committed Bug description: Add a custom formatting tag to a song causes some issues: 1. The closing tags shows on the main display 2. Other formatting tags do not render correctly when custom tags are used When inserting a custom tag by right clicking in the song editor the closing tag is inserted but with out the '/' To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832993/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832939] Re: Need to select a display when first run of app
This issue has been verified to happen on a clean install of trunk 2892 The way around it is to click on the screen in the FTW but do not check the box to use the display. You will get some errors as the FTW completes...ignore them! Once Openlp finishes loading, move the OpenLP window to the right of the screen...then go into settings and ensure the 'use this display' check box is checked and select the 'custom geometry' button. Set the width and height to a percentage of the full screen size...for me that is 1024 and 768. Now check the 'Display if single screen' box. Exit setting and restart OpenLP. When the logo screen covers most of the screen, select a theme then select the live display in the Service. Press the 'd' key and the logo screen will close. At this point you can use OpenLP...to see the 'live' display just press the 'd' key or use the Blank ICON under the Live Preview. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832939 Title: Need to select a display when first run of app Status in OpenLP: New Bug description: Windows 10 32 bit Revision 2880 of trunk run command: Python run_openlp.py The display is not initialized until you go into settings and select the display then reboot. There is an error that comes up that says something to the affect that the Live Display is disabled because there is no display. Once you go into settings and choose the display and reboot the error is no longer displayed on startup. If you are on a single display PC the logo screen appears and you will have to close the program by keystrokes as you can not get back to the app. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832939/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1832941] Re: Version 2880 start up error messages
This has been verified to happen on a clean install of trunk 2892
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1832941
Title:
Version 2880 start up error messages
Status in OpenLP:
New
Bug description:
Windows 10 32 bit
Trunk Version 2880
startup command python run_openlp.py
error log attached
In the terminal window the following is displayed;
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp>python
run_openlp.py
[1657c518] mmdevice audio output error: cannot initialize COM (error
0x80010106)
[16588b20] mmdevice audio output error: cannot initialize COM (error
0x80010106)
[16588058] mmdevice audio output error: cannot initialize COM (error
0x80010106)
[16586678] mmdevice audio output error: cannot initialize COM (error
0x80010106)
[16587590] mmdevice audio output error: cannot initialize COM (error
0x80010106)
sys:1: ResourceWarning: unclosed file <_io.BufferedWriter
name='C:\\Users\\Kathy\\AppData\\Roaming\\openlp\\error.log'>
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp
openlp.log>
2019-06-15 11:01:54,343 MainThread openlp.core.common.actions
WARNING Shortcut "" is removed from "fileExitItem" because
another action already uses this shortcut.
2019-06-15 11:01:54,390 MainThread openlp.core.common.actions
WARNING Shortcut "" is removed from "settingsConfigureItem"
because another action already uses this shortcut.
2019-06-15 11:01:56,236 MainThread openlp.core.common.__init__
ERRORFailed to import
openlp.plugins.presentations.lib.maclocontroller on path
plugins\presentations\lib\maclocontroller.py
Traceback (most recent call last):
File
"C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\common\__init__.py",
line 134, in extension_loader
importlib.import_module(module_name)
File
"C:\Users\Kathy\AppData\Local\Programs\Python\Python37-32\lib\importlib\__init__.py",
line 127, in import_module
return _bootstrap._gcd_import(name[level:], package, level)
File "", line 1006, in _gcd_import
File "", line 983, in _find_and_load
File "", line 967, in _find_and_load_unlocked
File "", line 677, in _load_unlocked
File "", line 728, in exec_module
File "", line 219, in _call_with_frames_removed
File
"C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\plugins\presentations\lib\maclocontroller.py",
line 26, in
from Pyro4 import Proxy
ModuleNotFoundError: No module named 'Pyro4'
2019-06-15 11:01:57,939 MainThread
openlp.core.lib.pluginmanager.PluginManager ERROROpenLP Error
trace
File run_openlp.py at line 71
called start()
File run_openlp.py at line 67
called main()
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\app.py
at line 450
called sys.exit(application.run(qt_args))
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\app.py
at line 127
called Registry().execute('bootstrap_post_set_up')
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\common\registry.py
at line 148
called result = function(*args, **kwargs)
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\lib\pluginmanager.py
at line 83
called self.initialise_plugins()
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\lib\pluginmanager.py
at line 170
called self.log_exception('Unable to initialise plugin
{plugin}'.format(plugin=plugin.name))
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\common\mixins.py
at line 108
called trace_error_handler(self.logger)
File
C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\common\__init__.py
at line 110
called for tb in traceback.extract_stack():
2019-06-15 11:01:57,939 MainThread
openlp.core.lib.pluginmanager.PluginManager ERRORUnable to
initialise plugin images
Traceback (most recent call last):
File
"C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\lib\pluginmanager.py",
line 166, in initialise_plugins
plugin.initialise()
File
"C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\core\lib\plugin.py",
line 288, in initialise
self.media_item.initialise()
File
"C:\Users\Kathy\Documents\Church\source\python\openlp-trunk-2880\openlp\openlp\plugins\images\lib\mediaitem.py",
line 116, in initialise
self.manager.get_all_objects(ImageFilenames,
[Openlp-core] [Bug 1832955] Re: v2880 groups act strange in service
This does not happen on a clean install of trunk 2892 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1832955 Title: v2880 groups act strange in service Status in OpenLP: New Bug description: Windows 10 32 bit Trunk Version 2880 startup command python run_openlp.py Load 3 images without a group into images Load 3 more images with a group into images add the first 3 images to the service one at a time add the group of images to the service below the first three images double click the first image in the service Use the keyboard to move through the images When you get to the group of images, pay attention to the live view, the live preview in the main window and the order of the images in the group. When you transition from the single images to the group of images, the last image in the group is displayed. if you move down one more image (using the keyboard) the middle image in the group is displayedif you "go back" one image you will now see the first image in the group. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1832955/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1839735] Re: version 2889 Bible secondary Bible option prevents search
This has been verified to happen on trunk 2892 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1839735 Title: version 2889 Bible secondary Bible option prevents search Status in OpenLP: New Bug description: Windows 10 32 bit OpenLP version 2889 If a second Bible is in the options the search function will not find and display any verses. To recreate... 1. Select the options tab in the Bible Plugin 2. Select KJV as the version 3. Select King James Version as the secondary. 4. Select the Find tab 5. Enter Romans 8:26-30 in the search box 6. Select the Search button Nothing will happen. Now go back and select the Blank line for the secondary Bible in options. Then switch back to the Find tab and select the Search button and you should see the verses. What Bibles and in what order you select them has no affect. If a secondary Bible is selected the search does not work. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1839735/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1839726] Re: Version 2889 Blank Error window when closing application
This has been verified to happen on trunk 2892 from a clean install -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1839726 Title: Version 2889 Blank Error window when closing application Status in OpenLP: New Bug description: Windows 10 32 bit OpenLP revision 2889 Clean install with no previous settings or data When closing the application a Blank window flashes to the screen. The window is titled "Error Occurred". The window closes as the application finishes closing. The error log is blank. Is there a way to only show this when there is an error? To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1839726/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1840092] Re: version 2889 song edit window 'save and preview' button only saves
This has been verified to still happen on trunk 2892 with a clean install. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1840092 Title: version 2889 song edit window 'save and preview' button only saves Status in OpenLP: New Bug description: Windown 10 32 bit Version 2889 of Trunk To recreate this; 1. select a song in the song plugin 2. select the edit button in the song library 3. modify a verse 4. select the 'save and preview' button 5. the edit window will close, but the preview never happens. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1840092/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1839736] Re: version 2889 Bible search box ICON is a wrench
This has bee verified on trunk 2892 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1839736 Title: version 2889 Bible search box ICON is a wrench Status in OpenLP: New Bug description: Windows 10 32 bit OpenLP version 2889 In the Bible Plugin the search box has a wrench to remove the search textit works, but the wrench is not a good ICON for a delete function. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1839736/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/fix-image-height into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371681 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371681 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Review: Approve -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371681 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fix-image-height into
lp:openlp.
Commit message:
Fix a bug where tall images were getting cut off at the top and bottom
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371681
Fix a bug where tall images were getting cut off at the top and bottom
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/fix-image-height into lp:openlp.
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2018-10-28 11:42:09 +
+++ MANIFEST.in 2019-08-22 17:42:56 +
@@ -16,3 +16,4 @@
include LICENSE
include README.txt
include openlp/.version
+include package.json
=== modified file 'karma.conf.js'
--- karma.conf.js 2017-10-04 07:44:08 +
+++ karma.conf.js 2019-08-22 17:42:56 +
@@ -60,7 +60,7 @@
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-browsers: ["PhantomJS"],
+browsers: ["Firefox"],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js 2019-08-21 19:13:27 +
+++ openlp/core/display/html/display.js 2019-08-22 17:42:56 +
@@ -374,7 +374,7 @@
* @param {string} text - The HTML for the verse, e.g. "line1line2"
* @param {string} footer_text - The HTML for the footer"
*/
- addTextSlide: function (verse, text, footer_text) {
+ addTextSlide: function (verse, text, footerText) {
var html = _prepareText(text);
if (this._slides.hasOwnProperty(verse)) {
var slide = $("#" + verse)[0];
@@ -390,11 +390,9 @@
slidesDiv.appendChild(slide);
var slides = $(".slides > section");
this._slides[verse] = slides.length - 1;
-
- console.debug(" footer_text: " + footer_text);
-
- var footerDiv = $(".footer")[0];
- footerDiv.innerHTML = footer_text;
+ if (footerText) {
+$(".footer")[0].innerHTML = footerText;
+ }
}
if ((arguments.length > 3) && (arguments[3] === true)) {
this.reinit();
@@ -429,7 +427,7 @@
section.setAttribute("style", "height: 100%; width: 100%;");
var img = document.createElement('img');
img.src = slide["path"];
- img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
+ img.setAttribute("style", "max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
section.appendChild(img);
slidesDiv.appendChild(section);
Display._slides[index.toString()] = index;
=== modified file 'package.json'
--- package.json 2019-04-13 13:00:22 +
+++ package.json 2019-08-22 17:42:56 +
@@ -11,15 +11,12 @@
"karma": "^3.1.4",
"karma-coverage": "^1.1.2",
"karma-jasmine": "^1.1.0",
-"karma-phantomjs-launcher": "^1.0.4",
-"phantomjs-prebuilt": "^2.1.16"
+"karma-firefox-launcher": "^1.2.0",
+"karma-log-reporter": "0.0.4"
},
"scripts": {
-"test": "karma start"
+"test": "karma start --single-run"
},
"author": "OpenLP Developers",
- "license": "GPL-3.0-or-later",
- "devDependencies": {
-"karma-log-reporter": "0.0.4"
- }
+ "license": "GPL-3.0-or-later"
}
=== modified file 'tests/js/test_display.js'
--- tests/js/test_display.js 2019-01-16 06:15:21 +
+++ tests/js/test_display.js 2019-08-22 17:42:56 +
@@ -1,3 +1,12 @@
+function _createDiv(attrs) {
+var div = document.createElement("div");
+for (key in attrs) {
+div.setAttribute(key, attrs[key]);
+}
+document.body.appendChild(div);
+return div;
+}
+
describe("The enumeration object", function () {
it("BackgroundType should exist", function () {
expect(BackgroundType).toBeDefined();
@@ -22,9 +31,7 @@
describe("The function", function () {
it("$() should return the right element", function () {
-var div = document.createElement("div");
-div.setAttribute("id", "dollar-test");
-document.body.appendChild(div);
+var div = _createDiv({"id": "dollar-test"});
expect($("#dollar-test")[0]).toBe(div);
});
@@ -39,10 +46,8 @@
});
it("_getStyle should return the correct style on an element", function () {
-var div = document.createElement("div");
+var div = _createDiv({"id": "style-test"});
div.style.setProperty("width", "100px");
-div.setAttribute("id", "style-test");
-document.body.appendChild(div);
expect(_getStyle($("#style-test")[0], "width")).toBe("100px");
});
@@ -120,10 +125,8 @@
expect(Display.clearSlides).toBeDefined();
document.body.innerHTML = "";
-var slidesDiv = document.createElement("div");
-slidesDiv.setAttribute("class", "slides");
+var slidesDiv = _createDiv({"class":
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/fix-image-height into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371679 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371679 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fix-image-height into
lp:openlp.
Commit message:
Fix a bug where tall images were getting cut off at the top and bottom
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371679
Fix a bug where tall images were getting cut off at the top and bottom
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/fix-image-height into lp:openlp.
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2018-10-28 11:42:09 +
+++ MANIFEST.in 2019-08-22 17:15:17 +
@@ -16,3 +16,4 @@
include LICENSE
include README.txt
include openlp/.version
+include package.json
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js 2019-08-21 19:13:27 +
+++ openlp/core/display/html/display.js 2019-08-22 17:15:17 +
@@ -374,7 +374,7 @@
* @param {string} text - The HTML for the verse, e.g. "line1line2"
* @param {string} footer_text - The HTML for the footer"
*/
- addTextSlide: function (verse, text, footer_text) {
+ addTextSlide: function (verse, text, footerText) {
var html = _prepareText(text);
if (this._slides.hasOwnProperty(verse)) {
var slide = $("#" + verse)[0];
@@ -390,11 +390,9 @@
slidesDiv.appendChild(slide);
var slides = $(".slides > section");
this._slides[verse] = slides.length - 1;
-
- console.debug(" footer_text: " + footer_text);
-
- var footerDiv = $(".footer")[0];
- footerDiv.innerHTML = footer_text;
+ if (footerText) {
+$(".footer")[0].innerHTML = footerText;
+ }
}
if ((arguments.length > 3) && (arguments[3] === true)) {
this.reinit();
@@ -429,7 +427,7 @@
section.setAttribute("style", "height: 100%; width: 100%;");
var img = document.createElement('img');
img.src = slide["path"];
- img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
+ img.setAttribute("style", "max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
section.appendChild(img);
slidesDiv.appendChild(section);
Display._slides[index.toString()] = index;
=== modified file 'package.json'
--- package.json 2019-04-13 13:00:22 +
+++ package.json 2019-08-22 17:15:17 +
@@ -15,7 +15,7 @@
"phantomjs-prebuilt": "^2.1.16"
},
"scripts": {
-"test": "karma start"
+"test": "karma start --single-run"
},
"author": "OpenLP Developers",
"license": "GPL-3.0-or-later",
=== modified file 'tests/js/test_display.js'
--- tests/js/test_display.js 2019-01-16 06:15:21 +
+++ tests/js/test_display.js 2019-08-22 17:15:17 +
@@ -1,3 +1,12 @@
+function _createDiv(attrs) {
+var div = document.createElement("div");
+for (key in attrs) {
+div.setAttribute(key, attrs[key]);
+}
+document.body.appendChild(div);
+return div;
+}
+
describe("The enumeration object", function () {
it("BackgroundType should exist", function () {
expect(BackgroundType).toBeDefined();
@@ -22,9 +31,7 @@
describe("The function", function () {
it("$() should return the right element", function () {
-var div = document.createElement("div");
-div.setAttribute("id", "dollar-test");
-document.body.appendChild(div);
+var div = _createDiv({"id": "dollar-test"});
expect($("#dollar-test")[0]).toBe(div);
});
@@ -39,10 +46,8 @@
});
it("_getStyle should return the correct style on an element", function () {
-var div = document.createElement("div");
+var div = _createDiv({"id": "style-test"});
div.style.setProperty("width", "100px");
-div.setAttribute("id", "style-test");
-document.body.appendChild(div);
expect(_getStyle($("#style-test")[0], "width")).toBe("100px");
});
@@ -120,10 +125,8 @@
expect(Display.clearSlides).toBeDefined();
document.body.innerHTML = "";
-var slidesDiv = document.createElement("div");
-slidesDiv.setAttribute("class", "slides");
+var slidesDiv = _createDiv({"class": "slides"});
slidesDiv.innerHTML = "";
-document.body.appendChild(slidesDiv);
Display.clearSlides();
expect($(".slides")[0].innerHTML).toEqual("");
@@ -143,17 +146,18 @@
describe("Display.addTextSlide", function () {
beforeEach(function() {
document.body.innerHTML = "";
-var slidesDiv = document.createElement("div");
-slidesDiv.setAttribute("class", "slides");
-document.body.appendChild(slidesDiv);
+_createDiv({"class": "slides"});
+_createDiv({"class": "footer"});
Display._slides = {};
});
it("should add a new slide", function () {
-var verse = "v1", text = "Amazing grace,\nhow sweet the sound";
+var verse = "v1",
+text = "Amazing grace,\nhow
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
The proposal to merge lp:~raoul-snyman/openlp/fix-image-height into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linting: Passed
Linting passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] Linux Test Results: Passed
Linux tests passed! -- https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674 Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-image-height into lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-image-height into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fix-image-height into
lp:openlp.
Commit message:
Fix a bug where tall images were getting cut off at the top and bottom
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-image-height/+merge/371674
Fix a bug where tall images were getting cut off at the top and bottom
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~raoul-snyman/openlp/fix-image-height into lp:openlp.
=== modified file 'openlp/core/display/html/display.js'
--- openlp/core/display/html/display.js 2019-08-21 19:13:27 +
+++ openlp/core/display/html/display.js 2019-08-22 16:48:28 +
@@ -374,7 +374,7 @@
* @param {string} text - The HTML for the verse, e.g. "line1line2"
* @param {string} footer_text - The HTML for the footer"
*/
- addTextSlide: function (verse, text, footer_text) {
+ addTextSlide: function (verse, text, footerText) {
var html = _prepareText(text);
if (this._slides.hasOwnProperty(verse)) {
var slide = $("#" + verse)[0];
@@ -390,11 +390,9 @@
slidesDiv.appendChild(slide);
var slides = $(".slides > section");
this._slides[verse] = slides.length - 1;
-
- console.debug(" footer_text: " + footer_text);
-
- var footerDiv = $(".footer")[0];
- footerDiv.innerHTML = footer_text;
+ if (footerText) {
+$(".footer")[0].innerHTML = footerText;
+ }
}
if ((arguments.length > 3) && (arguments[3] === true)) {
this.reinit();
@@ -429,7 +427,7 @@
section.setAttribute("style", "height: 100%; width: 100%;");
var img = document.createElement('img');
img.src = slide["path"];
- img.setAttribute("style", "max-width: 100%; height: auto; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
+ img.setAttribute("style", "max-width: 100%; max-height: 100%; margin: 0; position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);");
section.appendChild(img);
slidesDiv.appendChild(section);
Display._slides[index.toString()] = index;
=== modified file 'package.json'
--- package.json 2019-04-13 13:00:22 +
+++ package.json 2019-08-22 16:48:28 +
@@ -15,7 +15,7 @@
"phantomjs-prebuilt": "^2.1.16"
},
"scripts": {
-"test": "karma start"
+"test": "karma start --single-run"
},
"author": "OpenLP Developers",
"license": "GPL-3.0-or-later",
=== modified file 'tests/js/test_display.js'
--- tests/js/test_display.js 2019-01-16 06:15:21 +
+++ tests/js/test_display.js 2019-08-22 16:48:28 +
@@ -1,3 +1,12 @@
+function _createDiv(attrs) {
+var div = document.createElement("div");
+for (key in attrs) {
+div.setAttribute(key, attrs[key]);
+}
+document.body.appendChild(div);
+return div;
+}
+
describe("The enumeration object", function () {
it("BackgroundType should exist", function () {
expect(BackgroundType).toBeDefined();
@@ -22,9 +31,7 @@
describe("The function", function () {
it("$() should return the right element", function () {
-var div = document.createElement("div");
-div.setAttribute("id", "dollar-test");
-document.body.appendChild(div);
+var div = _createDiv({"id": "dollar-test"});
expect($("#dollar-test")[0]).toBe(div);
});
@@ -39,10 +46,8 @@
});
it("_getStyle should return the correct style on an element", function () {
-var div = document.createElement("div");
+var div = _createDiv({"id": "style-test"});
div.style.setProperty("width", "100px");
-div.setAttribute("id", "style-test");
-document.body.appendChild(div);
expect(_getStyle($("#style-test")[0], "width")).toBe("100px");
});
@@ -120,10 +125,8 @@
expect(Display.clearSlides).toBeDefined();
document.body.innerHTML = "";
-var slidesDiv = document.createElement("div");
-slidesDiv.setAttribute("class", "slides");
+var slidesDiv = _createDiv({"class": "slides"});
slidesDiv.innerHTML = "";
-document.body.appendChild(slidesDiv);
Display.clearSlides();
expect($(".slides")[0].innerHTML).toEqual("");
@@ -143,17 +146,18 @@
describe("Display.addTextSlide", function () {
beforeEach(function() {
document.body.innerHTML = "";
-var slidesDiv = document.createElement("div");
-slidesDiv.setAttribute("class", "slides");
-document.body.appendChild(slidesDiv);
+_createDiv({"class": "slides"});
+_createDiv({"class": "footer"});
Display._slides = {};
});
it("should add a new slide", function () {
-var verse = "v1", text = "Amazing grace,\nhow sweet the sound";
+var verse = "v1",
+text = "Amazing grace,\nhow sweet the sound",
+footer = "Public Domain";
spyOn(Display, "reinit");
-Display.addTextSlide(verse, text);
+Display.addTextSlide(verse, text, footer);
expect(Display._slides[verse]).toEqual(0);
[Openlp-core] [Merge] lp:~trb143/openlp/transfixes into lp:openlp
The proposal to merge lp:~trb143/openlp/transfixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~trb143/openlp/transfixes/+merge/371529 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp
Is there any reason the hint file isn't included? If it is not bundled with OpenLP, then where is the user supposed to get it from? -- https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/370364 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~trb143/openlp/transfixes into lp:openlp
The proposal to merge lp:~trb143/openlp/transfixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~trb143/openlp/transfixes/+merge/371529 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~trb143/openlp/transfixes into lp:openlp
Review: Approve -- https://code.launchpad.net/~trb143/openlp/transfixes/+merge/371529 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Merge] lp:~tomasgroth/openlp/image-scaling into lp:openlp
The proposal to merge lp:~tomasgroth/openlp/image-scaling into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~tomasgroth/openlp/image-scaling/+merge/371610 -- Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
