Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable Sqlite backend for all users

Browse Source
This commit is contained in:
Nick Hall
2017-12-11 22:18:39 +00:00
parent 00715fc530
commit f75a8f9497
5 changed files with 23 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/grampsapp.py
View File

@@ -399,11 +399,10 @@ def show_settings():
print(' version : %s' % bsddb_str) print(' version : %s' % bsddb_str)
print(' db version : %s' % bsddb_db_str) print(' db version : %s' % bsddb_db_str)
print(' location : %s' % bsddb_location_str) print(' location : %s' % bsddb_location_str)
if __debug__: print(' sqlite3 :')
print(' sqlite3 :') print(' version : %s' % sqlite3_version_str)
print(' version : %s' % sqlite3_version_str) print(' py version : %s' % sqlite3_py_version_str)
print(' py version : %s' % sqlite3_py_version_str) print(' location : %s' % sqlite3_location_str)
print(' location : %s' % sqlite3_location_str)
print('') print('')
def run(): def run():

6
gramps/gui/aboutdialog.py
View File

@@ -130,10 +130,8 @@ class GrampsAboutDialog(Gtk.AboutDialog):
if hasattr(os, "uname"): if hasattr(os, "uname"):
distro = "\n" + _("Distribution: %s") % ellipses(os.uname()[2]) distro = "\n" + _("Distribution: %s") % ellipses(os.uname()[2])
sqlite = '' sqlite = "sqlite" + COLON + " %s (%s)\n" % (sqlite3_version_str,
if __debug__: sqlite3_py_version_str)
sqlite = "sqlite" + COLON + " %s (%s)\n" % (sqlite3_version_str,
sqlite3_py_version_str)
return (("\n\n" + return (("\n\n" +
"GRAMPS" + COLON + " %s \n" + "GRAMPS" + COLON + " %s \n" +

31
gramps/gui/configure.py
View File

@@ -1463,23 +1463,22 @@ class GrampsPreferences(ConfigureDialog):
current_line = 0 current_line = 0
if __debug__: lwidget = BasicLabel(_("%s: ") % _('Database backend'))
lwidget = BasicLabel(_("%s: ") % _('Database backend')) grid.attach(lwidget, 1, current_line, 1, 1)
grid.attach(lwidget, 1, current_line, 1, 1) obox = self.__create_backend_combo()
obox = self.__create_backend_combo() grid.attach(obox, 2, current_line, 1, 1)
grid.attach(obox, 2, current_line, 1, 1) current_line += 1
current_line += 1
self.connection_widgets = [] self.connection_widgets = []
entry = self.add_entry(grid, _('Host'), current_line, entry = self.add_entry(grid, _('Host'), current_line,
'database.host', col_attach=1) 'database.host', col_attach=1)
self.connection_widgets.append(entry) self.connection_widgets.append(entry)
current_line += 1 current_line += 1
entry = self.add_entry(grid, _('Port'), current_line, entry = self.add_entry(grid, _('Port'), current_line,
'database.port', col_attach=1) 'database.port', col_attach=1)
self.connection_widgets.append(entry) self.connection_widgets.append(entry)
current_line += 1 current_line += 1
self.set_connection_widgets(config.get('database.backend')) self.set_connection_widgets(config.get('database.backend'))
self.dbpath_entry = Gtk.Entry() self.dbpath_entry = Gtk.Entry()
self.add_path_box(grid, self.add_path_box(grid,

3
gramps/gui/dbman.py
View File

@@ -285,9 +285,6 @@ class DbManager(CLIDbManager, ManagedWindow):
# Get the current selection # Get the current selection
store, node = selection.get_selected() store, node = selection.get_selected()
if not __debug__:
self.convert_btn.set_visible(False)
if not _RCS_FOUND: # it's not in Windows if not _RCS_FOUND: # it's not in Windows
self.rcs_btn.set_visible(False) self.rcs_btn.set_visible(False)

6
gramps/gui/logger/_errorreportassistant.py
View File

@@ -173,10 +173,8 @@ class ErrorReportAssistant(ManagedWindow, Gtk.Assistant):
if hasattr(os, "uname"): if hasattr(os, "uname"):
distribution = "Distribution: %s\n" % os.uname()[2] distribution = "Distribution: %s\n" % os.uname()[2]
sqlite = '' sqlite = "sqlite version: %s (%s) \n" % (sqlite3_version_str,
if __debug__: sqlite3_py_version_str)
sqlite = "sqlite version: %s (%s) \n" % (sqlite3_version_str,
sqlite3_py_version_str)
return "Gramps version: %s \n"\ return "Gramps version: %s \n"\
"Python version: %s \n"\ "Python version: %s \n"\