Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

More viewer settings migrations fixes

Browse Source
This commit is contained in:
Kovid Goyal 2019-09-29 19:23:12 +05:30
parent 162d836d90
commit 234b25da4d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/viewer/main.py
View File

@ -51,7 +51,7 @@ def migrate_previous_viewer_prefs():
for k in ('top', 'bottom'): for k in ('top', 'bottom'):
v = old_prefs.get(k + '_margin') v = old_prefs.get(k + '_margin')
if v != 20: if v != 20 and v is not None:
sd['margin_' + k] = v sd['margin_' + k] = v
v = old_prefs.get('side_margin') v = old_prefs.get('side_margin')
if v is not None and v != 40: if v is not None and v != 40:
@ -62,10 +62,10 @@ def migrate_previous_viewer_prefs():
cps = {'portrait': 0, 'landscape': 0} cps = {'portrait': 0, 'landscape': 0}
cp = old_prefs.get('cols_per_screen_portrait') cp = old_prefs.get('cols_per_screen_portrait')
if cp > 1: if cp and cp > 1:
cps['portrait'] = cp cps['portrait'] = cp
cl = old_prefs.get('cols_per_screen_landscape') cl = old_prefs.get('cols_per_screen_landscape')
if cl > 1: if cl and cl > 1:
cps['landscape'] = cp cps['landscape'] = cp
if cps['portrait'] or cps['landscape']: if cps['portrait'] or cps['landscape']:
sd['columns_per_screen'] = cps sd['columns_per_screen'] = cps