[Openlp-core] [Bug 1751626] Re: -d flag is used in a very confusing way
I'm leaning toward agreeing with Simon. The upgrade tests should just mock out the version number (that's why we use mock in the first place), and I'm pretty sure they do already. At minimum I'd suggest using the flags in the registry instead of depending on sys.argv, and collecting the bzr version code to a single place that is used in both setup.py and OpenLP as a whole. -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1751626 Title: -d flag is used in a very confusing way Status in OpenLP: Won't Fix Bug description: in the startup code the parameters accepted include --dev-version (-d). What's irritating is that it's not actually used there. The values are also not actually passed along somewhere else. However the about dialog still correctly displays the bzr revision if started with -d. So a little searching showed the following. The argument is defined in openlp.core.app.parse_options but only used in openlp.core.version.get_version Since the dev_version is not stored somewhere or passed to some place, get_version actually checks sys.argv searching for "-d" or "--dev- version" This is not very nice to people reading the code. It very much looks like the argument definition is not actually used. My request: * either completely remove the functionality * or properly use the parsed value, so it's clear it actually does something. also having the bzr check code in openlp.core.version.get_version is probably not the best idea. Especially since the code includes a comment that it's a duplicate of code in setup.py Further rants: in setup.py the code is not actually exactly the same, there are modifications and there is a comment that it is a duplicate of the no longer existing openlp.core.common.checkversions.py This illustrates that comments are bad for the reason that they are often not updated when the code changes. This can lead to comments confusing more than helping. In short: Remove the flag, remove the code from get_version and only have it in setup.py The flag is only useful for people running from bzr so devs, which should know what they are running and even if they don't they should know how to get that information without reverting to the about tab. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1751626/+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
Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-q into lp:openlp
which fix is clashing? I tried a merge from trunk and it merged fine. -- https://code.launchpad.net/~alisonken1/openlp/pjlink2-q/+merge/341563 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:~alisonken1/openlp/pjlink2-q into lp:openlp
> Sorry will clash with one of my fixes which has been merged
>
> See question
>> 'ACKN': {'version': ['2', ],
>> + 'default': '2',
>Why do we have a missing slot?
2 new commands in PJLink are only valid for version 2 and have no version 1
equivalent.
Missing slot is to maintain compatibility with version checker.
>> -def process_clss(self, data):
>> +def process_clss(self, data, *args, **kwargs):
>why args
Some commands take host,port arguments but not all of them do.
Since there is a common entry point, need to keep availability of consuming
extra args/kwargs without causing exception due to extra parameters.
(Yes, there should be no args passed only keyword args, but better safe than
sorry)
--
https://code.launchpad.net/~alisonken1/openlp/pjlink2-q/+merge/341563
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:~alisonken1/openlp/pjlink2-q into lp:openlp
Review: Needs Fixing
Sorry will clash with one of my fixes which has been merged
See question
Diff comments:
>
> === modified file 'openlp/core/projectors/constants.py'
> --- openlp/core/projectors/constants.py 2018-01-03 00:35:14 +
> +++ openlp/core/projectors/constants.py 2018-03-17 17:48:23 +
> @@ -154,110 +154,137 @@
> S_INFO
> ]
>
> -# NOTE: Changed format to account for some commands are both class 1 and 2
> +# NOTE: Changed format to account for some commands are both class 1 and 2.
> +# Make sure the sequence of 'version' is lowest-to-highest.
> PJLINK_VALID_CMD = {
> 'ACKN': {'version': ['2', ],
> + 'default': '2',
Why do we have a missing slot?
> 'description': translate('OpenLP.PJLinkConstants',
>'Acknowledge a PJLink SRCH command -
> returns MAC address.')
> },
> 'AVMT': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Blank/unblank video and/or mute
> audio.')
> },
> 'CLSS': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query projector PJLink class
> support.')
> },
> 'ERST': {'version': ['1', '2'],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query error status from projector. '
>'Returns
> fan/lamp/temp/cover/filter/other error status.')
> },
> 'FILT': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query number of hours on filter.')
> },
> 'FREZ': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Freeze or unfreeze current image
> being projected.')
> },
> 'INF1': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query projector manufacturer name.')
> },
> 'INF2': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query projector product name.')
> },
> 'INFO': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query projector for other information
> set by manufacturer.')
> },
> 'INNM': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query specified input source name')
> },
> 'INPT': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Switch to specified video source.')
> },
> 'INST': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query available input sources.')
> },
> 'IRES': {'version:': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query current input resolution.')
> },
> 'LAMP': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query lamp time and on/off status.
> Multiple lamps supported.')
> },
> 'LKUP': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
>'UDP Status - Projector is now
> available on network. Includes MAC address.')
> },
> 'MVOL': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Adjust microphone volume by 1 step.')
> },
> 'NAME': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
>'Query customer-set projector name.')
> },
> 'PJLINK': {'version': ['1', ],
> + 'default': '1',
> 'description':
[Openlp-core] [Merge] lp:~trb143/openlp/media2018a into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/media2018a into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
Related bugs:
Bug #1589675 in OpenLP: "OpenLP on Linux crashes on startup when VLC not
installed"
https://bugs.launchpad.net/openlp/+bug/1589675
For more details, see:
https://code.launchpad.net/~trb143/openlp/media2018a/+merge/341592
Fix issues with VLC
lp:~trb143/openlp/media2018a (revision 2838)
https://ci.openlp.io/job/Branch-01-Pull/2481/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2382/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/169/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/91/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/84/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1553/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1366/[SUCCESS]
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/media2018a into lp:openlp.
=== modified file 'openlp/core/ui/media/mediacontroller.py'
--- openlp/core/ui/media/mediacontroller.py 2018-02-23 15:54:25 +
+++ openlp/core/ui/media/mediacontroller.py 2018-03-18 18:27:55 +
@@ -459,26 +459,16 @@
log.debug('use %s controller' % self.current_media_players[controller.controller_type].display_name)
return True
-def media_length(self, service_item):
+@staticmethod
+def media_length(service_item):
"""
-Loads and starts a media item to obtain the media length
+Uses Media Info to obtain the media length
:param service_item: The ServiceItem containing the details to be played.
"""
media_info = MediaInfo()
media_info.volume = 0
media_info.file_info = QtCore.QFileInfo(service_item.get_frame_path())
-# display = controller.preview_display
-suffix = '*.%s' % media_info.file_info.suffix().lower()
-used_players = get_media_players()[0]
-player = self.media_players[used_players[0]]
-if suffix not in player.video_extensions_list and suffix not in player.audio_extensions_list:
-# Media could not be loaded correctly
-critical_error_message_box(
-translate('MediaPlugin.MediaItem', 'Unsupported Media File'),
-translate('MediaPlugin.MediaItem', 'File {file_path} not supported using player {player_name}'
- ).format(file_path=service_item.get_frame_path(), player_name=used_players[0]))
-return False
media_data = MediaInfoWrapper.parse(service_item.get_frame_path())
# duration returns in milli seconds
service_item.set_media_length(media_data.tracks[0].duration)
@@ -573,16 +563,6 @@
if not title:
continue
player = self.media_players[title]
-# The system player may not return what files it can play so add it now
-# and check whether it can play the file later
-if title == 'system':
-if not controller.media_info.is_background or controller.media_info.is_background and \
-player.can_background:
-self.resize(display, player)
-if player.load(display):
-self.current_media_players[controller.controller_type] = player
-controller.media_info.media_type = MediaType.Video
-return True
if suffix in player.video_extensions_list:
if not controller.media_info.is_background or controller.media_info.is_background and \
player.can_background:
=== modified file 'openlp/core/ui/media/vlcplayer.py'
--- openlp/core/ui/media/vlcplayer.py 2017-12-29 09:15:48 +
+++ openlp/core/ui/media/vlcplayer.py 2018-03-18 18:27:55 +
@@ -66,7 +66,15 @@
"""
if 'openlp.core.ui.media.vendor.vlc' in sys.modules:
# If VLC has already been imported, no need to do all the stuff below again
-return sys.modules['openlp.core.ui.media.vendor.vlc']
+is_vlc_available = False
+try:
+is_vlc_available = bool(sys.modules['openlp.core.ui.media.vendor.vlc'].get_default_instance())
+except:
+pass
+if is_vlc_available:
+return sys.modules['openlp.core.ui.media.vendor.vlc']
+else:
+return None
is_vlc_available = False
try:
if is_macosx():
@@ -89,6 +97,7 @@
except (ImportError, NameError, NotImplementedError):
pass
except OSError as e:
+# this will get raised the first time
if is_win():
if not isinstance(e, WindowsError) and e.winerror != 126:
raise
===
[Openlp-core] [Bug 1589675] Re: OpenLP on Linux crashes on startup when VLC not installed
** Branch linked: lp:~trb143/openlp/media2018a
** Changed in: openlp
Assignee: (unassigned) => Tim Bentley (trb143)
** Changed in: openlp
Status: Confirmed => In Progress
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1589675
Title:
OpenLP on Linux crashes on startup when VLC not installed
Status in OpenLP:
In Progress
Bug description:
Similar to bug #966086
**OpenLP Bug Report**
Version: {'build': None, 'version': '2.4.1', 'full': '2.4.1'}
--- Details of the Exception. ---
this occurred as OpenLP was opened
--- Exception Traceback ---
Traceback (most recent call last):
File "/usr/bin/openlp", line 44, in
main()
File "/usr/share/openlp/openlp/core/__init__.py", line 391, in main
sys.exit(application.run(qt_args))
File "/usr/share/openlp/openlp/core/__init__.py", line 142, in run
Registry().execute('bootstrap_initialise')
File "/usr/share/openlp/openlp/core/common/registry.py", line 137, in
execute
result = function(*args, **kwargs)
File "/usr/share/openlp/openlp/core/lib/pluginmanager.py", line 60, in
bootstrap_initialise
self.hook_media_manager()
File "/usr/share/openlp/openlp/core/lib/pluginmanager.py", line 122, in
hook_media_manager
plugin.create_media_manager_item()
File "/usr/share/openlp/openlp/core/lib/plugin.py", line 204, in
create_media_manager_item
self.media_item =
self.media_item_class(self.main_window.media_dock_manager.media_dock, self)
File "/usr/share/openlp/openlp/plugins/media/lib/mediaitem.py", line 58, in
__init__
super(MediaMediaItem, self).__init__(parent, plugin)
File "/usr/share/openlp/openlp/core/lib/mediamanageritem.py", line 82, in
__init__
self.setup_item()
File "/usr/share/openlp/openlp/plugins/media/lib/mediaitem.py", line 90, in
setup_item
self.media_controller.setup_display(self.display_controller.preview_display,
False)
File "/usr/share/openlp/openlp/core/ui/media/mediacontroller.py", line 322,
in setup_display
player.setup(display)
File "/usr/share/openlp/openlp/core/ui/media/vlcplayer.py", line 157, in
setup
display.vlc_instance = vlc.Instance(command_line_options)
File "/usr/share/openlp/openlp/core/ui/media/vendor/vlc.py", line 1411, in
__new__
return libvlc_new(len(args), args)
File "/usr/share/openlp/openlp/core/ui/media/vendor/vlc.py", line 3630, in
libvlc_new
ctypes.c_void_p, ctypes.c_int, ListPOINTER(ctypes.c_char_p))
File "/usr/share/openlp/openlp/core/ui/media/vendor/vlc.py", line 246, in
_Cfunction
raise NameError('no function %r' % (name,))
NameError: no function 'libvlc_new'
--- System information ---
Platform: Linux-4.2.0-36-generic-i686-with-Ubuntu-15.10-wily
Desktop: GNOME
--- Library Versions ---
Python: 3.4.3+
Qt5: 5.4.2
PyQt5: 5.4.2
QtWebkit: 538.1
SQLAlchemy: 1.0.8
SQLAlchemy Migrate: -
BeautifulSoup: 4.3.2
lxml: 3.4.4
Chardet: 2.3.0
PyEnchant: 1.6.6
Mako: 1.0.2
pyICU: -
pyUNO bridge: 5.0
VLC: -
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1589675/+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 1544260] Re: Moving Song in Service Manager, Hover Text says "Service Manager"
** Changed in: openlp
Status: In Progress => Fix Committed
** Changed in: openlp
Milestone: None => 2.9.1
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1544260
Title:
Moving Song in Service Manager, Hover Text says "Service Manager"
Status in OpenLP:
Fix Committed
Bug description:
When changing the order of songs in Service Manager, the hover text
says "Service Manager", rather than the title of the song.
See this function in core/ui/servicemanager.py:
def mouseMoveEvent(self, event):
"""
Drag and drop event does not care what data is selected as the
recipient will use events to request the data
move just tell it what plugin to call
:param event:
"""
if event.buttons() != QtCore.Qt.LeftButton:
event.ignore()
return
if not self.itemAt(self.mapFromGlobal(QtGui.QCursor.pos())):
event.ignore()
return
drag = QtGui.QDrag(self)
mime_data = QtCore.QMimeData()
drag.setMimeData(mime_data)
mime_data.setText('ServiceManager')
drag.exec(QtCore.Qt.CopyAction)
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1544260/+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 1016078] Re: Can't clear preview pane
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1016078 Title: Can't clear preview pane Status in OpenLP: Fix Committed Bug description: Version 1.9.9 (Windows XP Home) Basically, I miss a feature from the older 1.x versions wherein it was possible to clear the preview pane. I often accidentally preview something, and then to have it staying on the screen with no way to remove it easily can be distracting. Furthermore, some of our less experienced operators get confused by it, and try to change the verses there instead of in the live pane. I realise it is possible to just hide the preview pane, but I'd rather just be able to clear it. I also see a good argument for it clearing itself after either going live with it or adding it to the service. I think this is a natural thing that you preview something and then you take an action based on that. 1) Go live. If it's live, it doesn't need to be in the preview pane any longer, since it's now in the Live pane. It should basically just "hop across". 2) Add to service: The user has decided that they want this song, and so they add it to the service. They are probably finished previewing the song, so I think it's safe to clear the preview (and users will become accustomed to this). 3) Just clear the preview. It wasn't the song you wanted, you're done searching for songs, etc, you just want it out of the way. 4) Edit the item. You preview it and decide it needs some changes, you make the changes and then you'll want to preview those changes. After which you'll again probably want to do one of action 1/2/3/4. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1016078/+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 1512689] Re: automatically created slides
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1512689 Title: automatically created slides Status in OpenLP: Fix Committed Bug description: In our service some people want to read the songs with lyrics in the paper songbooks (if available). So it would good to have an additional option in settings or Service Manager to display the songbook and songnumber (and probably which verses will be used) as first slide of a song. To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1512689/+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 1449477] Re: lyric title via api contoller text
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1449477 Title: lyric title via api contoller text Status in OpenLP: Fix Committed Bug description: Hello, Thanks for OpenLP. I know that it's not big bug but it's good to fix this for stage view. I made some chord formatting and stage view and print view. (http://forums.openlp.org/discussion/2544/chords-in-openlp) I have some problem to show lyric's title in print view via api (/api/controller/live/text) when this lyric is not in service list. I know that in "/api/service/list" I can get title, but only when song is in servicelist. Is it possible to add title to this api - "/api/controller/live/text" ? Thanks Tomas Windows 7, OpenLP 2.1.4 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1449477/+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 1651823] Re: Make it possible to clone a Custom Slide
** Changed in: openlp Status: In Progress => Fix Committed ** Changed in: openlp Milestone: None => 2.9.1 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1651823 Title: Make it possible to clone a Custom Slide Status in OpenLP: Fix Committed Bug description: The title says it all... To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1651823/+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 1755822] Re: translate source string #1237
** Changed in: openlp
Status: In Progress => Fix Committed
** Changed in: openlp
Milestone: None => 2.9.1
--
You received this bug notification because you are a member of OpenLP
Core, which is subscribed to OpenLP.
https://bugs.launchpad.net/bugs/1755822
Title:
translate source string #1237
Status in OpenLP:
Fix Committed
Bug description:
there is missiung brackets in string #1237 (transifex)
The theme_name export failed because this error occurred: {err}
I think it should be
The {theme_name} export failed because this error occurred: {err}
To manage notifications about this bug go to:
https://bugs.launchpad.net/openlp/+bug/1755822/+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:~trb143/openlp/cleanups02182 into lp:openlp
The proposal to merge lp:~trb143/openlp/cleanups02182 into lp:openlp has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341574 -- 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/cleanups02182 into lp:openlp
Review: Approve -- https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341574 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/cleanups02182 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/cleanups02182 into lp:openlp.
Requested reviews:
Raoul Snyman (raoul-snyman)
Related bugs:
Bug #1016078 in OpenLP: "Can't clear preview pane"
https://bugs.launchpad.net/openlp/+bug/1016078
Bug #1449477 in OpenLP: "lyric title via api contoller text"
https://bugs.launchpad.net/openlp/+bug/1449477
Bug #1512689 in OpenLP: "automatically created slides"
https://bugs.launchpad.net/openlp/+bug/1512689
Bug #1544260 in OpenLP: "Moving Song in Service Manager, Hover Text says
"Service Manager""
https://bugs.launchpad.net/openlp/+bug/1544260
Bug #1651823 in OpenLP: "Make it possible to clone a Custom Slide"
https://bugs.launchpad.net/openlp/+bug/1651823
Bug #1755822 in OpenLP: "translate source string #1237"
https://bugs.launchpad.net/openlp/+bug/1755822
For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341574
Add some small items from wish lists
Various cleanups.
lp:~trb143/openlp/cleanups02182 (revision 2835)
https://ci.openlp.io/job/Branch-01-Pull/2480/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2381/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/168/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/90/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/83/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1552/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1365/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/297/ [FAILURE]
--
Your team OpenLP Core is subscribed to branch lp:openlp.
=== modified file 'openlp/core/api/endpoint/controller.py'
--- openlp/core/api/endpoint/controller.py 2017-12-29 09:15:48 +
+++ openlp/core/api/endpoint/controller.py 2018-03-18 07:58:29 +
@@ -91,6 +91,7 @@
item['text'] = str(frame['title'])
item['html'] = str(frame['title'])
item['selected'] = (live_controller.selected_row == index)
+item['title'] = current_item.title
data.append(item)
json_data = {'results': {'slides': data}}
if current_item:
@@ -117,12 +118,11 @@
return {'results': {'success': True}}
-@controller_endpoint.route('{action:next|previous}')
+@controller_endpoint.route('{controller}/{action:next|previous}')
@requires_auth
def controller_direction(request, controller, action):
"""
Handles requests for setting service items in the slide controller
-11
:param request: The http request object.
:param controller: the controller slides forward or backward.
:param action: the controller slides forward or backward.
@@ -137,7 +137,7 @@
def controller_direction_api(request, controller, action):
"""
Handles requests for setting service items in the slide controller
-11
+
:param request: The http request object.
:param controller: the controller slides forward or backward.
:param action: the controller slides forward or backward.
=== modified file 'openlp/core/common/__init__.py'
--- openlp/core/common/__init__.py 2018-02-11 21:52:04 +
+++ openlp/core/common/__init__.py 2018-03-18 07:58:29 +
@@ -62,7 +62,7 @@
"""
# Get the local IPv4 active address(es) that are NOT localhost (lo or '127.0.0.1')
log.debug('Getting local IPv4 interface(es) information')
-MY_IP4 = {}
+my_ip4 = {}
for iface in QNetworkInterface.allInterfaces():
if not iface.isValid() or not (iface.flags() & (QNetworkInterface.IsUp | QNetworkInterface.IsRunning)):
continue
@@ -70,25 +70,25 @@
ip = address.ip()
# NOTE: Next line will skip if interface is localhost - keep for now until we decide about it later
# if (ip.protocol() == QAbstractSocket.IPv4Protocol) and (ip != QHostAddress.LocalHost):
-if (ip.protocol() == QAbstractSocket.IPv4Protocol):
-MY_IP4[iface.name()] = {'ip': ip.toString(),
+if ip.protocol() == QAbstractSocket.IPv4Protocol:
+my_ip4[iface.name()] = {'ip': ip.toString(),
'broadcast': address.broadcast().toString(),
'netmask': address.netmask().toString(),
'prefix': address.prefixLength(),
'localnet': QHostAddress(address.netmask().toIPv4Address() &
-ip.toIPv4Address()).toString()
+ ip.toIPv4Address()).toString()
}
log.debug('Adding {iface} to active list'.format(iface=iface.name()))
-if
[Openlp-core] [Merge] lp:~trb143/openlp/cleanups02182 into lp:openlp
The proposal to merge lp:~trb143/openlp/cleanups02182 into lp:openlp has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341547 -- 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
