[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
[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/341547
Add some small items from wish lists
Various cleanups.
lp:~trb143/openlp/cleanups02182 (revision 2834)
https://ci.openlp.io/job/Branch-01-Pull/2476/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2377/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/164/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/86/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/79/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1548/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1361/[SUCCESS]
--
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-16 20:48:40 +
@@ -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-16 20:48:40 +
@@ -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 len(MY_IP4) == 1:
-if 'lo' in MY_IP4:
+if len(my_ip4) == 1:
+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/341270 -- 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
For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341270
Add some small items from wish lists
Various cleanups.
lp:~trb143/openlp/cleanups02182 (revision 2833)
https://ci.openlp.io/job/Branch-01-Pull/2470/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2371/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/158/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/80/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/74/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1542/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1355/[SUCCESS]
--
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-09 22:06:33 +
@@ -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-09 22:06:33 +
@@ -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 len(MY_IP4) == 1:
-if 'lo' in MY_IP4:
+if len(my_ip4) == 1:
+if 'lo' in my_ip4:
# No active interfaces - so leave localhost in there
[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/341268 -- 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: Needs Fixing
Been coding a lot in C recently? ;-)
Diff comments:
>
> === modified file 'openlp/core/ui/slidecontroller.py'
> --- openlp/core/ui/slidecontroller.py 2018-02-03 11:32:49 +
> +++ openlp/core/ui/slidecontroller.py 2018-03-09 21:16:28 +
> @@ -1381,6 +1387,14 @@
> if new_item:
> self.add_service_item(new_item)
>
> +def on_clear(self):
> +"""
> +Clear the preview bar.
> +"""
> +self.preview_widget.clear_list()
> +self.toolbar.set_widget_visible("editSong", False)
Single quotes
> +self.toolbar.set_widget_visible("clear", False)
Single quotes
> +
> def on_preview_add_to_service(self):
> """
> From the preview display request the Item to be added to service
>
> === modified file 'openlp/plugins/songs/lib/mediaitem.py'
> --- openlp/plugins/songs/lib/mediaitem.py 2018-01-19 21:31:36 +
> +++ openlp/plugins/songs/lib/mediaitem.py 2018-03-09 21:16:28 +
> @@ -572,10 +572,19 @@
> service_item.add_capability(ItemCapabilities.OnLoadUpdate)
> service_item.add_capability(ItemCapabilities.AddIfNewItem)
> service_item.add_capability(ItemCapabilities.CanSoftBreak)
> +service_item.add_capability(ItemCapabilities.HasMetaData)
> song = self.plugin.manager.get_object(Song, item_id)
> service_item.theme = song.theme_name
> service_item.edit_id = item_id
> verse_list = SongXML().get_verses(song.lyrics)
> +if Settings().value('songs/add songbook slide') and
> song.songbook_entries:
> +first_slide = "\n"
Single quotes
> +for songbook_entry in song.songbook_entries:
> +first_slide = first_slide +
> "{book}/{num}/{pub}\n\n".format(book=songbook_entry.songbook.name,
Single quotes
> +
> num=songbook_entry.entry,
> +
> pub=songbook_entry.songbook.publisher)
> +
> +service_item.add_from_text(first_slide, "O1")
Single quotes
> # no verse list or only 1 space (in error)
> verse_tags_translated = False
> if VerseType.from_translated_string(str(verse_list[0][0]['type']))
> is not None:
> @@ -622,6 +631,9 @@
> if song.media_files:
> service_item.add_capability(ItemCapabilities.HasBackgroundAudio)
> service_item.background_audio = [m.file_path for m in
> song.media_files]
> +item.metadata.append("{label}: {media}".
Single quotes
> +
> format(label=translate('SongsPlugin.MediaItem', 'Media'),
> +media=service_item.background_audio))
> return True
>
> def generate_footer(self, item, song):
> @@ -685,6 +697,23 @@
> if Settings().value('core/ccli number'):
> item.raw_footer.append(translate('SongsPlugin.MediaItem',
> 'CCLI License: ') +
> Settings().value('core/ccli number'))
> +item.metadata.append("{label}:
> {title}".format(label=translate('SongsPlugin.MediaItem', 'Title'),
Single quotes
> +
> title=song.title))
> +if song.alternate_title:
> +item.metadata.append("{label}: {title}".
Single quotes
> +
> format(label=translate('SongsPlugin.MediaItem', 'Alt Title'),
> +title=song.alternate_title))
> +if song.songbook_entries:
> +for songbook_entry in song.songbook_entries:
> +item.metadata.append("{label}: {book}/{num}/{pub}".
Single quotes
> +
> format(label=translate('SongsPlugin.MediaItem', 'Songbook'),
> +
> book=songbook_entry.songbook.name,
> +num=songbook_entry.entry,
> +
> pub=songbook_entry.songbook.publisher))
> +if song.topics:
> +for topics in song.topics:
> +item.metadata.append("{label}: {topic}".
Single quotes
> +
> format(label=translate('SongsPlugin.MediaItem', 'Topic'), topic=topics.name))
> return authors_all
>
> def service_load(self, item):
>
> === modified file
> 'tests/functional/openlp_core/api/endpoint/test_controller.py'
> --- tests/functional/openlp_core/api/endpoint/test_controller.py
> 2018-02-03 14:41:18 +
> +++ tests/functional/openlp_core/api/endpoint/test_controller.py
> 2018-03-09 21:16:28 +
> @@ -52,3 +52,25 @@
> results = ret['results']
> assert isinstance(results['item'], MagicMock)
> assert len(results['slides']) == 0
> +
> +def
[Openlp-core] [Merge] lp:~trb143/openlp/cleanups02182 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/cleanups02182 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
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
For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/341268
Add some small items from wish lists
Various cleanups.
lp:~trb143/openlp/cleanups02182 (revision 2832)
https://ci.openlp.io/job/Branch-01-Pull/2469/ [SUCCESS]
https://ci.openlp.io/job/Branch-02a-Linux-Tests/2370/ [SUCCESS]
https://ci.openlp.io/job/Branch-02b-macOS-Tests/157/ [FAILURE]
https://ci.openlp.io/job/Branch-03a-Build-Source/79/ [SUCCESS]
https://ci.openlp.io/job/Branch-03b-Build-macOS/73/[SUCCESS]
https://ci.openlp.io/job/Branch-04a-Code-Analysis/1541/[SUCCESS]
https://ci.openlp.io/job/Branch-04b-Test-Coverage/1354/[SUCCESS]
https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/287/ [RUNNING]
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/cleanups02182 into 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-09 21:16:28 +
@@ -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-09 21:16:28 +
@@ -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 len(MY_IP4) == 1:
-if 'lo' in MY_IP4:
+
[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/339422 -- Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/cleanups02182 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:~trb143/openlp/cleanups02182 into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/cleanups02182 into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
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
For more details, see:
https://code.launchpad.net/~trb143/openlp/cleanups02182/+merge/339422
Add some small items from wish lists
Various cleanups.
Jenkins is broken and will not return results!
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~trb143/openlp/cleanups02182 into 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-02-23 16:58:19 +
@@ -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/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py 2018-01-21 07:40:26 +
+++ openlp/core/lib/serviceitem.py 2018-02-23 16:58:19 +
@@ -121,6 +121,9 @@
``HasThumbnails``
The item has related thumbnails available
+
+``HasMetaData``
+The item has Meta Data about item
"""
CanPreview = 1
CanEdit = 2
@@ -143,6 +146,7 @@
HasDisplayTitle = 19
HasNotes = 20
HasThumbnails = 21
+HasMetaData = 22
class ServiceItem(RegistryProperties):
@@ -200,6 +204,7 @@
self.will_auto_start = False
self.has_original_files = True
self._new_item()
+self.metadata = []
def _new_item(self):
"""
@@ -375,7 +380,8 @@
'background_audio': self.background_audio,
'theme_overwritten': self.theme_overwritten,
'will_auto_start': self.will_auto_start,
-'processor': self.processor
+'processor': self.processor,
+'metadata': self.metadata
}
service_data = []
if self.service_item_type == ServiceItemType.Text:
@@ -426,6 +432,7 @@
self.will_auto_start = header.get('will_auto_start', False)
self.processor = header.get('processor', None)
self.has_original_files = True
+self.metadata = header.get('item_meta_data', [])
if 'background_audio' in header:
self.background_audio = []
for file_path in header['background_audio']:
=== modified file 'openlp/core/ui/firsttimewizard.py'
--- openlp/core/ui/firsttimewizard.py 2018-01-13 23:24:26 +
+++ openlp/core/ui/firsttimewizard.py 2018-02-23 16:58:19 +
@@ -127,9 +127,6 @@
self.media_check_box.setChecked(True)
self.media_check_box.setObjectName('media_check_box')
self.plugin_layout.addWidget(self.media_check_box)
-self.remote_check_box = QtWidgets.QCheckBox(self.plugin_page)
-self.remote_check_box.setObjectName('remote_check_box')
-self.plugin_layout.addWidget(self.remote_check_box)
self.song_usage_check_box = QtWidgets.QCheckBox(self.plugin_page)
self.song_usage_check_box.setChecked(True)
self.song_usage_check_box.setObjectName('song_usage_check_box')
@@ -138,13 +135,6 @@
self.alert_check_box.setChecked(True)
self.alert_check_box.setObjectName('alert_check_box')
self.plugin_layout.addWidget(self.alert_check_box)
-self.projectors_check_box =
