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

Fix #1849939 [When changing language in installer it doesn't change the default installation directory.](https://bugs.launchpad.net/calibre/+bug/1849939)

Browse Source
This commit is contained in:
Kovid Goyal 2019-11-07 09:21:26 +05:30
parent 19089ac3ad
commit 9e1bbdf5b4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/gui2/wizard/__init__.py
View File

@ -646,6 +646,7 @@ class LibraryPage(QWizardPage, LibraryUI):
def __init__(self): def __init__(self):
QWizardPage.__init__(self) QWizardPage.__init__(self)
self.initial_library_location = None
self.setupUi(self) self.setupUi(self)
self.registerField('library_location', self.location) self.registerField('library_location', self.location)
self.button_change.clicked.connect(self.change) self.button_change.clicked.connect(self.change)
@ -718,6 +719,9 @@ class LibraryPage(QWizardPage, LibraryUI):
enable_plugin(name) enable_plugin(name)
except: except:
pass pass
lp = self.location.text()
if lp == self.initial_library_location:
self.set_initial_library_location()
def is_library_dir_suitable(self, x): def is_library_dir_suitable(self, x):
from calibre.db.legacy import LibraryDatabase from calibre.db.legacy import LibraryDatabase
@ -766,7 +770,7 @@ class LibraryPage(QWizardPage, LibraryUI):
_('You must choose an empty folder for ' _('You must choose an empty folder for '
'the calibre library. %s is not empty.')%x, show=True) 'the calibre library. %s is not empty.')%x, show=True)
def initializePage(self): def set_initial_library_location(self):
lp = prefs['library_path'] lp = prefs['library_path']
self.default_library_name = None self.default_library_name = None
if not lp: if not lp:
@ -788,6 +792,10 @@ class LibraryPage(QWizardPage, LibraryUI):
except ValueError: except ValueError:
lp = QDir.homePath().replace('/', os.sep) lp = QDir.homePath().replace('/', os.sep)
self.location.setText(lp) self.location.setText(lp)
self.initial_library_location = lp
def initializePage(self):
self.set_initial_library_location()
# Hide the library location settings if we are a portable install # Hide the library location settings if we are a portable install
for x in ('location', 'button_change', 'libloc_label1', for x in ('location', 'button_change', 'libloc_label1',
'libloc_label2'): 'libloc_label2'):