anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Collapsable -> Collapsible (part 5)

Browse Source 
Preferences update and prefs2prefs routine.

This was forgotten in the process.
This commit is contained in:
Juergen Spitzmueller 2017-11-02 16:26:45 +01:00
parent 7e51b5f301
commit 891a7ef79f
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/configure.py
View File

@ -1794,7 +1794,7 @@ if __name__ == '__main__':
lyx_check_config = True lyx_check_config = True
lyx_kpsewhich = True lyx_kpsewhich = True
outfile = 'lyxrc.defaults' outfile = 'lyxrc.defaults'
lyxrc_fileformat = 24 lyxrc_fileformat = 25
rc_entries = '' rc_entries = ''
lyx_keep_temps = False lyx_keep_temps = False
version_suffix = '' version_suffix = ''

9
lib/scripts/prefs2prefs_prefs.py
View File

@ -102,6 +102,9 @@
# Incremented to format 24, by lasgouttes # Incremented to format 24, by lasgouttes
# Remove use_qimage preference # Remove use_qimage preference
# Incremented to format 25, by spitz
# Rename collapsable to collapsible
# NOTE: The format should also be updated in LYXRC.cpp and # NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py. # in configure.py.
@ -390,6 +393,9 @@ def remove_use_qimage(line):
return no_match return no_match
return (True, "") return (True, "")
def rename_collapsible(line):
return simple_renaming(line, "\\set_color \"collapsable", "\\set_color \"collapsible")
# End conversions for LyX 2.3 to 2.4 # End conversions for LyX 2.3 to 2.4
#################################### ####################################
@ -428,5 +434,6 @@ conversions = [
[ 21, []], [ 21, []],
[ 22, []], [ 22, []],
[ 23, []], [ 23, []],
[ 24, [remove_use_qimage]] [ 24, [remove_use_qimage]],
[ 25, [rename_collapsible]]
] ]

2
src/LyXRC.cpp
View File

@ -59,7 +59,7 @@ namespace {
// The format should also be updated in configure.py, and conversion code // The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py. // should be added to prefs2prefs_prefs.py.
static unsigned int const LYXRC_FILEFORMAT = 24; // lasgouttes: remove qimage static unsigned int const LYXRC_FILEFORMAT = 25; // spitz: rename collapsible
// when adding something to this array keep it sorted! // when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = { LexerKeyword lyxrcTags[] = {