* src/gramps_main.py: re-present the open dialog box on

a failure to open a file.
* src/gramps.glade: change Home button from stock version
to something we can translate


svn: r2098
This commit is contained in:
Don Allingham 2003-09-07 14:16:25 +00:00
parent 0b6082e997
commit fd6da64350
2 changed files with 8 additions and 3 deletions

View File

@ -778,8 +778,9 @@
<widget class="button" id="button97"> <widget class="button" id="button97">
<property name="visible">True</property> <property name="visible">True</property>
<property name="tooltip" translatable="yes">Make the Home Person the active person</property> <property name="tooltip" translatable="yes">Make the Home Person the active person</property>
<property name="label">gtk-home</property> <property name="label" translatable="yes">_Home</property>
<property name="use_stock">True</property> <property name="use_underline">True</property>
<property name="stock_pixmap">gtk-home</property>
<signal name="clicked" handler="on_home_clicked"/> <signal name="clicked" handler="on_home_clicked"/>
</widget> </widget>
</child> </child>

View File

@ -967,7 +967,6 @@ class Gramps:
def new_database_response(self): def new_database_response(self):
import DbPrompter import DbPrompter
self.clear_database(2)
DbPrompter.DbPrompter(self,1) DbPrompter.DbPrompter(self,1)
def clear_person_tabs(self): def clear_person_tabs(self):
@ -1173,12 +1172,15 @@ class Gramps:
elif base == "autosave.gramps": elif base == "autosave.gramps":
filename = os.path.dirname(filename) filename = os.path.dirname(filename)
elif not os.path.isdir(filename): elif not os.path.isdir(filename):
import DbPrompter
DbPrompter.DbPrompter(self,0)
self.displayError(_("Database could not be opened"), self.displayError(_("Database could not be opened"),
_("%s is not a directory.") % filename + ' ' + \ _("%s is not a directory.") % filename + ' ' + \
_("You should select a directory that contains a " _("You should select a directory that contains a "
"data.gramps file or a gramps.zodb file.")) "data.gramps file or a gramps.zodb file."))
return return
self.clear_database(2)
if self.load_database(filename) == 1: if self.load_database(filename) == 1:
if filename[-1] == '/': if filename[-1] == '/':
filename = filename[:-1] filename = filename[:-1]
@ -1448,6 +1450,8 @@ class Gramps:
if os.path.exists(filename): if os.path.exists(filename):
if not os.path.isdir(filename): if not os.path.isdir(filename):
import DbPrompter
DbPrompter.DbPrompter(self,0)
self.displayError(_("Database could not be opened"), self.displayError(_("Database could not be opened"),
_("%s is not a directory.") % filename + ' ' + \ _("%s is not a directory.") % filename + ' ' + \
_("You should select a directory that contains a " _("You should select a directory that contains a "