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

* src/DbManager.py: bug with creation/rename

Browse Source 
2008-01-07  Benny Malengier <benny.malengier@gramps-project.org>


svn: r9747
This commit is contained in:
Benny Malengier 2008-01-07 22:03:57 +00:00
parent e4a505f2e3
commit 080b47bb1a
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2008-01-07 Benny Malengier <benny.malengier@gramps-project.org>
* src/DbManager.py: bug with creation/rename
2008-01-07 Benny Malengier <benny.malengier@gramps-project.org> 2008-01-07 Benny Malengier <benny.malengier@gramps-project.org>
* src/DataViews/GrampletView.py: * src/DataViews/GrampletView.py:
* src/gramps_main.py: * src/gramps_main.py:

16
src/DbManager.py
View File

@ -194,9 +194,9 @@ class CLIDbManager:
self.current_names.append(title) self.current_names.append(title)
return new_path return new_path, title
def __create_new_db(self, title=None): def _create_new_db(self, title=None):
""" """
Create a new database, do extra stuff needed Create a new database, do extra stuff needed
""" """
@ -208,7 +208,7 @@ class CLIDbManager:
(name, ext) = os.path.splitext(os.path.basename(filename)) (name, ext) = os.path.splitext(os.path.basename(filename))
# create the database # create the database
new_path = self.__create_new_db(name) new_path, name = self._create_new_db(name)
trans = Config.TRANSACTIONS trans = Config.TRANSACTIONS
# get the import function using the filetype, but create a db # get the import function using the filetype, but create a db
@ -584,7 +584,7 @@ class DbManager(CLIDbManager):
Creates a new database, then extracts a revision from RCS and Creates a new database, then extracts a revision from RCS and
imports it into the db imports it into the db
""" """
new_path = self.__create_new_db("%s : %s" % (parent_name, name)) new_path, newname = self._create_new_db("%s : %s" % (parent_name, name))
trans = Config.TRANSACTIONS trans = Config.TRANSACTIONS
self.__start_cursor(_("Extracting archive...")) self.__start_cursor(_("Extracting archive..."))
@ -750,17 +750,17 @@ class DbManager(CLIDbManager):
message. message.
""" """
try: try:
self.__create_new_db() self._create_new_db()
except (OSError, IOError), msg: except (OSError, IOError), msg:
QuestionDialog.ErrorDialog(_("Could not create family tree"), QuestionDialog.ErrorDialog(_("Could not create family tree"),
str(msg)) str(msg))
def __create_new_db(self, title=None): def _create_new_db(self, title=None):
""" """
Create a new database, append to model Create a new database, append to model
""" """
new_path = self._create_new_db_cli(title) new_path, title = self._create_new_db_cli(title)
path_name = os.path.join(new_path, NAME_FILE) path_name = os.path.join(new_path, NAME_FILE)
node = self.model.append(None, [title, new_path, path_name, node = self.model.append(None, [title, new_path, path_name,
_("Never"), 0, False, '']) _("Never"), 0, False, ''])
@ -768,7 +768,7 @@ class DbManager(CLIDbManager):
path = self.model.get_path(node) path = self.model.get_path(node)
self.dblist.set_cursor(path, focus_column=self.column, self.dblist.set_cursor(path, focus_column=self.column,
start_editing=True) start_editing=True)
return new_path return new_path, title
def __drag_data_received(self, widget, context, xpos, ypos, selection, def __drag_data_received(self, widget, context, xpos, ypos, selection,
info, rtime): info, rtime):