forked from openlp/openlp
HEAD
This commit is contained in:
commit
dbcf4d2f78
@ -1,11 +1,9 @@
|
|||||||
*.pyc
|
*.pyc
|
||||||
*.*~
|
*.*~
|
||||||
\#*\#
|
\#*\#
|
||||||
*.eric4project
|
*eric[1-9]project
|
||||||
*.eric5project
|
|
||||||
*.ropeproject
|
*.ropeproject
|
||||||
*.e4*
|
*.e4*
|
||||||
.eric4project
|
|
||||||
.komodotools
|
.komodotools
|
||||||
*.komodoproject
|
*.komodoproject
|
||||||
list
|
list
|
||||||
@ -17,7 +15,6 @@ dist
|
|||||||
OpenLP.egg-info
|
OpenLP.egg-info
|
||||||
build
|
build
|
||||||
resources/innosetup/Output
|
resources/innosetup/Output
|
||||||
_eric4project
|
|
||||||
.pylint.d
|
.pylint.d
|
||||||
*.qm
|
*.qm
|
||||||
openlp/core/resources.py.old
|
openlp/core/resources.py.old
|
||||||
|
BIN
documentation/PJLink_Notes.odt
Normal file
BIN
documentation/PJLink_Notes.odt
Normal file
Binary file not shown.
BIN
documentation/PJLink_Notes.pdf
Normal file
BIN
documentation/PJLink_Notes.pdf
Normal file
Binary file not shown.
@ -40,7 +40,8 @@ class OpenLPJsonDecoder(JSONDecoder):
|
|||||||
self.kwargs = kwargs
|
self.kwargs = kwargs
|
||||||
if object_hook is None:
|
if object_hook is None:
|
||||||
object_hook = self.custom_object_hook
|
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):
|
def custom_object_hook(self, obj):
|
||||||
"""
|
"""
|
||||||
@ -71,7 +72,9 @@ class OpenLPJsonEncoder(JSONEncoder):
|
|||||||
self.kwargs = kwargs
|
self.kwargs = kwargs
|
||||||
if default is None:
|
if default is None:
|
||||||
default = self.custom_default
|
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):
|
def custom_default(self, obj):
|
||||||
"""
|
"""
|
||||||
|
@ -262,7 +262,10 @@ class Settings(QtCore.QSettings):
|
|||||||
('core/recent files', 'core/recent files', [(file_names_conv, None)]),
|
('core/recent files', 'core/recent files', [(file_names_conv, None)]),
|
||||||
('media/media files', 'media/media 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)]),
|
('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
|
@staticmethod
|
||||||
|
@ -41,6 +41,7 @@ __default_settings__ = {
|
|||||||
'images/db hostname': '',
|
'images/db hostname': '',
|
||||||
'images/db database': '',
|
'images/db database': '',
|
||||||
'images/background color': '#000000',
|
'images/background color': '#000000',
|
||||||
|
'images/last directory': None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -42,7 +42,8 @@ log = logging.getLogger(__name__)
|
|||||||
# Some settings starting with "media" are in core, because they are needed for core functionality.
|
# Some settings starting with "media" are in core, because they are needed for core functionality.
|
||||||
__default_settings__ = {
|
__default_settings__ = {
|
||||||
'media/media auto start': QtCore.Qt.Unchecked,
|
'media/media auto start': QtCore.Qt.Unchecked,
|
||||||
'media/media files': []
|
'media/media files': [],
|
||||||
|
'media/last directory': None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -47,7 +47,8 @@ __default_settings__ = {'presentations/override app': QtCore.Qt.Unchecked,
|
|||||||
'presentations/presentations files': [],
|
'presentations/presentations files': [],
|
||||||
'presentations/thumbnail_scheme': '',
|
'presentations/thumbnail_scheme': '',
|
||||||
'presentations/powerpoint slide click advance': QtCore.Qt.Unchecked,
|
'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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user