Phill has proposed merging lp:~phill-ridout/openlp/tgcs_json_fix into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/tgcs_json_fix/+merge/330477
Thanks to TGC for his json fix
Also fixes some setting upgrades that I inadvertantly missed. As found by
superfly
lp:~phill-ridout/openlp/tgcs_json_fix (revision 2766)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2187/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2090/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1977/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1347/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1183/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/313/
[FAILURE] https://ci.openlp.io/job/Branch-05-AppVeyor-Tests/155/
Stopping after failure
Process finished with exit code 0
--
Your team OpenLP Core is requested to review the proposed merge of
lp:~phill-ridout/openlp/tgcs_json_fix into lp:openlp.
=== modified file 'openlp/core/common/json.py'
--- openlp/core/common/json.py 2017-08-26 16:50:54 +0000
+++ openlp/core/common/json.py 2017-09-09 20:14:45 +0000
@@ -40,7 +40,8 @@
self.kwargs = kwargs
if object_hook is None:
object_hook = self.custom_object_hook
- super().__init__(object_hook, parse_float, parse_int, parse_constant, strict, object_pairs_hook)
+ super().__init__(object_hook=object_hook, parse_float=parse_float, parse_int=parse_int,
+ parse_constant=parse_constant, strict=strict, object_pairs_hook=object_pairs_hook)
def custom_object_hook(self, obj):
"""
@@ -71,7 +72,9 @@
self.kwargs = kwargs
if default is None:
default = self.custom_default
- super().__init__(skipkeys, ensure_ascii, check_circular, allow_nan, sort_keys, indent, separators, default)
+ super().__init__(skipkeys=skipkeys, ensure_ascii=ensure_ascii, check_circular=check_circular,
+ allow_nan=allow_nan, sort_keys=sort_keys, indent=indent, separators=separators,
+ default=default)
def custom_default(self, obj):
"""
=== modified file 'openlp/core/common/settings.py'
--- openlp/core/common/settings.py 2017-09-03 10:18:14 +0000
+++ openlp/core/common/settings.py 2017-09-09 20:14:45 +0000
@@ -262,7 +262,10 @@
('core/recent files', 'core/recent files', [(file_names_conv, None)]),
('media/media files', 'media/media files', [(file_names_conv, None)]),
('presentations/presentations files', 'presentations/presentations files', [(file_names_conv, None)]),
- ('core/logo file', 'core/logo file', [(str_to_path, None)])
+ ('core/logo file', 'core/logo file', [(str_to_path, None)]),
+ ('presentations/last directory', 'presentations/last directory', [(str_to_path, None)]),
+ ('images/last directory', 'images/last directory', [(str_to_path, None)]),
+ ('media/last directory', 'media/last directory', [(str_to_path, None)])
]
@staticmethod
=== modified file 'openlp/plugins/images/imageplugin.py'
--- openlp/plugins/images/imageplugin.py 2017-09-03 10:18:14 +0000
+++ openlp/plugins/images/imageplugin.py 2017-09-09 20:14:45 +0000
@@ -41,6 +41,7 @@
'images/db hostname': '',
'images/db database': '',
'images/background color': '#000000',
+ 'images/last directory': None
}
=== modified file 'openlp/plugins/media/mediaplugin.py'
--- openlp/plugins/media/mediaplugin.py 2017-08-25 20:03:25 +0000
+++ openlp/plugins/media/mediaplugin.py 2017-09-09 20:14:45 +0000
@@ -42,7 +42,8 @@
# Some settings starting with "media" are in core, because they are needed for core functionality.
__default_settings__ = {
'media/media auto start': QtCore.Qt.Unchecked,
- 'media/media files': []
+ 'media/media files': [],
+ 'media/last directory': None
}
=== modified file 'openlp/plugins/presentations/presentationplugin.py'
--- openlp/plugins/presentations/presentationplugin.py 2017-08-26 15:06:11 +0000
+++ openlp/plugins/presentations/presentationplugin.py 2017-09-09 20:14:45 +0000
@@ -47,7 +47,8 @@
'presentations/presentations files': [],
'presentations/thumbnail_scheme': '',
'presentations/powerpoint slide click advance': QtCore.Qt.Unchecked,
- 'presentations/powerpoint control window': QtCore.Qt.Unchecked
+ 'presentations/powerpoint control window': QtCore.Qt.Unchecked,
+ 'presentations/last directory': None
}
_______________________________________________
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
