diff --git a/gramps2/src/Makefile.in b/gramps2/src/Makefile.in index fece68251..317ec03d3 100644 --- a/gramps2/src/Makefile.in +++ b/gramps2/src/Makefile.in @@ -73,6 +73,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/ansel_utf8.py b/gramps2/src/ansel_utf8.py index 9b6b9b717..1de8a10d1 100644 --- a/gramps2/src/ansel_utf8.py +++ b/gramps2/src/ansel_utf8.py @@ -278,7 +278,6 @@ _utoa = { def ansel_to_utf8(s): """Converts an ANSEL encoded string to UTF8""" - print s buff = cStringIO.StringIO() while s: c0 = ord(s[0]) @@ -288,23 +287,18 @@ def ansel_to_utf8(s): elif c0 > 127: l2 = s[0:2] l1 = s[0] - print "----------------------" if _twobyte.has_key(l2): head = _twobyte[l2] s = s[2:] - print "two" elif _onebyte.has_key(l1): head = _onebyte[l1] s = s[1:] - print "**8 one",l1,ord(l1),"*",_onebyte[l1], else: head = u'\xff\xfd' s = s[1:] - print "barf" else: head = s[0] s = s[1:] - print head,c0 buff.write(head) ans = buff.getvalue() buff.close() diff --git a/gramps2/src/calendars/Makefile.in b/gramps2/src/calendars/Makefile.in index 05b227c31..54ffc5af9 100644 --- a/gramps2/src/calendars/Makefile.in +++ b/gramps2/src/calendars/Makefile.in @@ -78,6 +78,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/const.py b/gramps2/src/const.py index fcb9929e1..59d5a6c88 100644 --- a/gramps2/src/const.py +++ b/gramps2/src/const.py @@ -44,6 +44,9 @@ convert = "convert" pixdir = "/usr/share/pixmaps" nautdir = "/usr/share/pixmaps/nautilus" +prefixdir = "/usr/local" + + #------------------------------------------------------------------------- # # Paths to files - assumes that files reside in the same directory as diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index fe35bd6a2..89bc56ad6 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -44,6 +44,8 @@ convert = "convert" pixdir = "/usr/share/pixmaps" nautdir = "/usr/share/pixmaps/nautilus" +prefixdir = "@GPREFIX@" + #------------------------------------------------------------------------- # # Paths to files - assumes that files reside in the same directory as diff --git a/gramps2/src/data/Makefile.in b/gramps2/src/data/Makefile.in index ea0ac70fc..be82afc61 100644 --- a/gramps2/src/data/Makefile.in +++ b/gramps2/src/data/Makefile.in @@ -73,6 +73,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/data/templates/Makefile.in b/gramps2/src/data/templates/Makefile.in index 0b89716b8..f447fdfb5 100644 --- a/gramps2/src/data/templates/Makefile.in +++ b/gramps2/src/data/templates/Makefile.in @@ -74,6 +74,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/docgen/Makefile.in b/gramps2/src/docgen/Makefile.in index de365f608..29f73f4ac 100644 --- a/gramps2/src/docgen/Makefile.in +++ b/gramps2/src/docgen/Makefile.in @@ -77,6 +77,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/filters/Makefile.in b/gramps2/src/filters/Makefile.in index 87645b93b..753b0b9f2 100644 --- a/gramps2/src/filters/Makefile.in +++ b/gramps2/src/filters/Makefile.in @@ -73,6 +73,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 874a9a8eb..55ffc0bab 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -76,7 +76,7 @@ - + True gtk-revert-to-saved 1 @@ -112,7 +112,7 @@ True - + True gtk-convert 1 @@ -128,12 +128,12 @@ True - Reload plugins + Re_load plugins True - + True gtk-refresh 1 @@ -176,12 +176,12 @@ True - Find... + _Find... True - + True gtk-find 1 @@ -202,7 +202,7 @@ - + True gtk-convert 1 @@ -231,7 +231,7 @@ True - Sidebar + _Sidebar True True @@ -241,7 +241,7 @@ True - Filter + _Filter True True @@ -270,7 +270,7 @@ - + True gtk-index 1 @@ -292,7 +292,7 @@ - + True gnome-stock-book-open 1 @@ -314,7 +314,7 @@ True - Go to bookmark + _Go to bookmark True @@ -364,7 +364,7 @@ - + True gtk-home 1 @@ -398,7 +398,7 @@ - + True gnome-stock-book-red 1 @@ -411,27 +411,6 @@ - - - True - _Writing extensions - True - - - - - True - gnome-stock-book-blue - 1 - 0.5 - 0.5 - 0 - 0 - - - - - True @@ -440,7 +419,7 @@ - + True gtk-jump-to 1 @@ -461,7 +440,7 @@ - + True gnome-stock-mail 1 @@ -492,6 +471,15 @@ + + + True + _Open example database + True + + + + True diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 327b92585..5c31ce711 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -105,8 +105,12 @@ class Gramps: (_('Birth date'),6,150),(_('Death date'),7,150), ('',5,0), ('',6,0), ('',7,0) ] - self.program = gnome.program_init("gramps",const.version) - + self.program = gnome.program_init('gramps',const.version) + self.program.set_property('app-libdir','%s/lib' % const.prefixdir) + self.program.set_property('app-datadir','%s/share/gramps' % const.prefixdir) + self.program.set_property('app-sysconfdir','%s/etc' % const.prefixdir) + self.program.set_property('app-prefix', const.prefixdir) + self.DataFilter = Filter.Filter("") self.parents_index = 0 self.active_person = None @@ -263,58 +267,58 @@ class Gramps: "on_removebtn_clicked" : self.remove_button_clicked, "on_alpha_switch_page" : self.change_alpha_page, "delete_event" : self.delete_event, - "destroy_passed_object" : Utils.destroy_passed_object, - "on_about_activate" : self.on_about_activate, - "on_add_bookmark_activate" : self.on_add_bookmark_activate, - "on_add_place_clicked" : self.place_view.on_add_place_clicked, - "on_add_source_clicked" : self.source_view.on_add_clicked, - "on_addperson_clicked" : self.load_new_person, - "on_apply_filter_clicked" : self.on_apply_filter_clicked, - "on_arrow_left_clicked" : self.pedigree_view.on_show_child_menu, - "on_canvas1_event" : self.pedigree_view.on_canvas1_event, - "on_contents_activate" : self.on_contents_activate, - "on_default_person_activate" : self.on_default_person_activate, - "on_delete_person_clicked" : self.delete_person_clicked, - "on_delete_place_clicked" : self.place_view.on_delete_clicked, - "on_delete_source_clicked" : self.source_view.on_delete_clicked, - "on_delete_media_clicked" : self.media_view.on_delete_clicked, - "on_edit_active_person" : self.load_active_person, - "on_edit_selected_people" : self.load_selected_people, - "on_edit_bookmarks_activate" : self.on_edit_bookmarks_activate, - "on_exit_activate" : self.on_exit_activate, - "on_family1_activate" : self.on_family1_activate, - "on_find_activate" : self.on_find_activate, - "on_findname_activate" : self.on_findname_activate, - "on_home_clicked" : self.on_home_clicked, - "on_new_clicked" : self.on_new_clicked, - "on_notebook1_switch_page" : self.on_views_switch_page, - "on_ok_button1_clicked" : self.on_ok_button1_clicked, - "on_open_activate" : self.on_open_activate, - "on_pedigree1_activate" : self.on_pedigree1_activate, - "on_person_list1_activate" : self.on_person_list1_activate, - "on_main_key_release_event" : self.on_main_key_release_event, - "on_media_activate" : self.on_media_activate, - "on_media_list_select_row" : self.media_view.on_select_row, - "on_media_list_drag_data_get" : self.media_view.on_drag_data_get, - "on_media_list_drag_data_received" : self.media_view.on_drag_data_received, - "on_merge_activate" : self.on_merge_activate, - "on_sidebar1_activate" : self.on_sidebar_activate, - "on_filter1_activate" : self.on_filter_activate, - "on_places_activate" : self.on_places_activate, - "on_preferences1_activate" : self.on_preferences_activate, - "on_reload_plugins_activate" : Plugins.reload_plugins, - "on_reports_clicked" : self.on_reports_clicked, - "on_revert_activate" : self.on_revert_activate, - "on_save_activate" : self.on_save_activate, - "on_save_as_activate" : self.on_save_as_activate, - "on_show_plugin_status" : self.on_show_plugin_status, - "on_source_list_button_press" : self.source_view.button_press, - "on_sources_activate" : self.on_sources_activate, - "on_tools_clicked" : self.on_tools_clicked, - "on_gramps_home_page_activate" : self.home_page_activate, - "on_gramps_report_bug_activate" : self.report_bug_activate, - "on_gramps_mailing_lists_activate" : self.mailing_lists_activate, - "on_writing_extensions_activate" : self.on_writing_extensions_activate, + "destroy_passed_object" : Utils.destroy_passed_object, + "on_about_activate" : self.on_about_activate, + "on_add_bookmark_activate" : self.on_add_bookmark_activate, + "on_add_place_clicked" : self.place_view.on_add_place_clicked, + "on_add_source_clicked" : self.source_view.on_add_clicked, + "on_addperson_clicked" : self.load_new_person, + "on_apply_filter_clicked" : self.on_apply_filter_clicked, + "on_arrow_left_clicked" : self.pedigree_view.on_show_child_menu, + "on_canvas1_event" : self.pedigree_view.on_canvas1_event, + "on_contents_activate" : self.on_contents_activate, + "on_default_person_activate" : self.on_default_person_activate, + "on_delete_person_clicked" : self.delete_person_clicked, + "on_delete_place_clicked" : self.place_view.on_delete_clicked, + "on_delete_source_clicked" : self.source_view.on_delete_clicked, + "on_delete_media_clicked" : self.media_view.on_delete_clicked, + "on_edit_active_person" : self.load_active_person, + "on_edit_selected_people" : self.load_selected_people, + "on_edit_bookmarks_activate" : self.on_edit_bookmarks_activate, + "on_exit_activate" : self.on_exit_activate, + "on_family1_activate" : self.on_family1_activate, + "on_find_activate" : self.on_find_activate, + "on_findname_activate" : self.on_findname_activate, + "on_home_clicked" : self.on_home_clicked, + "on_new_clicked" : self.on_new_clicked, + "on_notebook1_switch_page" : self.on_views_switch_page, + "on_ok_button1_clicked" : self.on_ok_button1_clicked, + "on_open_activate" : self.on_open_activate, + "on_pedigree1_activate" : self.on_pedigree1_activate, + "on_person_list1_activate" : self.on_person_list1_activate, + "on_main_key_release_event" : self.on_main_key_release_event, + "on_media_activate" : self.on_media_activate, + "on_media_list_select_row" : self.media_view.on_select_row, + "on_media_list_drag_data_get" : self.media_view.on_drag_data_get, + "on_media_list_drag_data_received" : self.media_view.on_drag_data_received, + "on_merge_activate" : self.on_merge_activate, + "on_sidebar1_activate" : self.on_sidebar_activate, + "on_filter1_activate" : self.on_filter_activate, + "on_places_activate" : self.on_places_activate, + "on_preferences1_activate" : self.on_preferences_activate, + "on_reload_plugins_activate" : Plugins.reload_plugins, + "on_reports_clicked" : self.on_reports_clicked, + "on_revert_activate" : self.on_revert_activate, + "on_save_activate" : self.on_save_activate, + "on_save_as_activate" : self.on_save_as_activate, + "on_show_plugin_status" : self.on_show_plugin_status, + "on_source_list_button_press" : self.source_view.button_press, + "on_sources_activate" : self.on_sources_activate, + "on_tools_clicked" : self.on_tools_clicked, + "on_gramps_home_page_activate" : self.home_page_activate, + "on_gramps_report_bug_activate" : self.report_bug_activate, + "on_gramps_mailing_lists_activate" : self.mailing_lists_activate, + "on_open_example" : self.open_example, }) self.enable_filter(self.use_filter) @@ -538,31 +542,7 @@ class Gramps: def on_contents_activate(self,obj): """Display the GRAMPS manual""" - - WarningDialog(_('HELP is currently not available'), - _('Documentation for GRAMPS is currently being ' - 'developed, but is not yet available for this ' - 'version.')) - -# url = gnome.help_display_with_doc_id(self.program, -# "", -# "gramps-manual.sgml", -# "") -# if url: -# url = "gnome-help:"+url -# gnome.help.goto(url) - - def on_writing_extensions_activate(self,obj): - """Display the Extending GRAMPS manual""" - WarningDialog(_('HELP is currently not available'), - _('Documentation for GRAMPS is currently being ' - 'developed, but is not yet available for this ' - 'version.')) -# import gnome.help -# url = gnome.help.file_find_file("extending-gramps","extending-gramps.sgml") -# if url: -# url = "gnome-help:"+url -# gnome.help.goto(url) + gnome.help_display('gramps-manual','index') def on_new_clicked(self,obj): """Prompt for permission to close the current database""" @@ -1539,11 +1519,42 @@ class Gramps: def on_main_key_release_event(self,obj,event): """Respond to the insert and delete buttons in the person list""" + pass #if event.keyval == GDK.Delete: # self.on_delete_person_clicked(obj) #elif event.keyval == GDK.Insert: # self.load_new_person(obj) + def open_example(self,obj): + import shutil + dest = os.path.expanduser("~/.gramps/example") + if not os.path.isdir(dest): + try: + os.mkdir(dest) + except IOError,msg: + ErrorDialog(_('Could not create database'), + _('The directgory ~/.gramps/example could not ' + 'be created.' + '\n' + str(msg) )) + except OSError,msg: + ErrorDialog(_('Could not create database'), + _('The directgory ~/.gramps/example could not ' + 'be created.' + '\n' + str(msg) )) + except: + ErrorDialog(_('Could not create database'), + _('The directgory ~/.gramps/example could not ' + 'be created.')) + + try: + dir = "%s/share/gramps/example" % const.prefixdir + for file in os.listdir(dir): + shutil.copy("%s/%s" % (dir,file), dest) + except IOError,msg: + ErrorDialog(_('Example database not created'),str(msg)) + except OSError,msg: + ErrorDialog(_('Example database not created'),str(msg)) + + self.read_file(dir) + DARKEN = 1.4 def ms_shift_color_component (component, shift_by): diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in index ce68504bd..5e0ad42ac 100644 --- a/gramps2/src/plugins/Makefile.in +++ b/gramps2/src/plugins/Makefile.in @@ -78,6 +78,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ diff --git a/gramps2/src/plugins/ReadGedcom.py b/gramps2/src/plugins/ReadGedcom.py index 8e29755b5..f32bb20f5 100644 --- a/gramps2/src/plugins/ReadGedcom.py +++ b/gramps2/src/plugins/ReadGedcom.py @@ -75,6 +75,14 @@ def nocnv(s): photo_types = [ "jpeg", "bmp", "pict", "pntg", "tpic", "png", "gif", "jpg", "tiff", "pcx" ] +file_systems = { + 'VFAT' : _('Windows 9x file system'), + 'FAT' : _('Windows 9x file system'), + "NTFS" : _('Windows NT file system'), + "ISO9660" : _('CD ROM'), + "SMBFS" : _('Networked Windows file system') + } + #------------------------------------------------------------------------- # # GEDCOM events to GRAMPS events conversion @@ -215,6 +223,8 @@ class GedcomParser: self.backoff = 0 self.cnv = nocnv + self.geddir = os.path.dirname(os.path.normpath(os.path.abspath(file))) + self.trans = string.maketrans('','') self.delc = self.trans[0:31] @@ -231,6 +241,7 @@ class GedcomParser: self.errors_obj = window.get_widget("errors") self.close_done = window.get_widget('close_done') self.error_text_obj = window.get_widget("error_text") + self.info_text_obj = window.get_widget("info_text") self.error_count = 0 @@ -241,24 +252,34 @@ class GedcomParser: self.gedattr[map[val]] = val if self.window: - self.update(self.file_obj,file) + self.update(self.file_obj,os.path.basename(file)) self.code = 0 self.search_paths = [] try: - f = open("/etc/fstab","r") + mypaths = [] + f = open("/proc/mounts","r") for line in f.readlines(): paths = string.split(line) - if len(paths) < 3: - continue - first = string.strip(paths[0]) - if first[0] == '#': - continue - if paths[2].upper() in ["VFAT","FAT","NTFS"]: + ftype = paths[2].upper() + if ftype in file_systems.keys(): + mypaths.append((paths[1],file_systems[ftype])) self.search_paths.append(paths[1]) f.close() + + if len(mypaths): + self.infomsg(_("Windows style path names for images will use the following mount " + "points to try to find the images. These paths are based on Windows " + "compatible file systems available on this system:\n\n")) + for p in mypaths: + self.infomsg("\t%s : %s\n" % p) + + self.infomsg('\n') + self.infomsg(_("Images that cannot be found in the specfied path in the GEDCOM file " + "will be searched for in the same directory in which the GEDCOM file " + "exists (%s).\n") % self.geddir) except: pass @@ -268,23 +289,34 @@ class GedcomParser: except TypeError: self.error_text_obj.get_buffer().insert_at_cursor(msg,len(msg)) + def infomsg(self,msg): + try: + self.info_text_obj.get_buffer().insert_at_cursor(msg) + except TypeError: + self.info_text_obj.get_buffer().insert_at_cursor(msg,len(msg)) + def find_file(self,fullname,altpath): + tries = [] fullname = string.replace(fullname,'\\','/') + tries.append(fullname) + if os.path.isfile(fullname): - return fullname + return (1,fullname) other = os.path.join(altpath,os.path.basename(fullname)) + tries.append(other) if os.path.isfile(other): - return other + return (1,other) if len(fullname) > 3: if fullname[1] == ':': fullname = fullname[2:] for path in self.search_paths: - other = os.path.join(path,os.path.basename(fullname)) + other = os.path.normpath("%s/%s" % (path,fullname)) + tries.append(other) if os.path.isfile(other): - return other - return "" + return (1,other) + return (0,tries) else: - return "" + return (0,tries) def update(self,field,text): field.set_text(text) @@ -317,8 +349,6 @@ class GedcomParser: msg = "%s\n\t%s\n" % (msg,self.text) self.errmsg(msg) self.error_count = self.error_count + 1 - if self.window: - self.update(self.errors_obj,str(self.error_count)) self.groups = (999, "XXX", "XXX") self.backoff = 0 return self.groups @@ -334,7 +364,6 @@ class GedcomParser: if self.window: self.errmsg(msg) self.error_count = self.error_count + 1 - self.update(self.errors_obj,str(self.error_count)) else: print msg self.ignore_sub_junk(level) @@ -343,7 +372,6 @@ class GedcomParser: if self.window: self.errmsg(msg) self.error_count = self.error_count + 1 - self.update(self.errors_obj,str(self.error_count)) else: print msg @@ -371,8 +399,7 @@ class GedcomParser: t = time.time() - t msg = _('Import Complete: %d seconds') % t if self.window: - self.errmsg(msg) - return self.close_done.get_active() + self.infomsg("\n%s" % msg) else: print msg return None @@ -901,9 +928,12 @@ class GedcomParser: url.set_description(title) self.person.addUrl(url) else: - path = self.find_file(file,self.dir_path) - if path == "": - self.warn(_("Could not import %s") % file + "\n") + (ok,path) = self.find_file(file,self.dir_path) + if not ok: + self.warn(_("Warning: could not import %s") % file + "\n") + self.warn(_("\tThe following paths were tried:\n\t\t")) + self.warn(string.join(path,"\n\t\t")) + self.warn('\n') else: photo = RelLib.Photo() photo.setPath(path) @@ -936,9 +966,12 @@ class GedcomParser: self.barf(level+1) if form: - path = self.find_file(file,self.dir_path) - if path == "": - self.warn(_("Could not import %s") % file + "\n") + (ok,path) = self.find_file(file,self.dir_path) + if not ok: + self.warn(_("Warning: could not import %s") % file + "\n") + self.warn(_("\tThe following paths were tried:\n\t\t")) + self.warn(string.join(path,"\n\t\t")) + self.warn('\n') else: photo = RelLib.Photo() photo.setPath(path) @@ -971,9 +1004,12 @@ class GedcomParser: self.barf(level+1) if form: - path = self.find_file(file,self.dir_path) - if path == "": - self.warn(_("Could not import %s") % file) + (ok,path) = self.find_file(file,self.dir_path) + if not ok: + self.warn(_("Warning: could not import %s") % file + "\n") + self.warn(_("\tThe following paths were tried:\n\t\t")) + self.warn(string.join(path,"\n\t\t")) + self.warn('\n') else: photo = RelLib.Photo() photo.setPath(path) diff --git a/gramps2/src/plugins/gedcomimport.glade b/gramps2/src/plugins/gedcomimport.glade index a61575b40..90befce33 100644 --- a/gramps2/src/plugins/gedcomimport.glade +++ b/gramps2/src/plugins/gedcomimport.glade @@ -9,8 +9,8 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True - 500 - 450 + 600 + 500 True False @@ -45,8 +45,8 @@ 12 True - 11 - 3 + 10 + 5 False 6 12 @@ -100,12 +100,12 @@ - + True - Version: + <b>Status</b> False - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False 0 @@ -114,34 +114,10 @@ 0 - 1 - 2 - 3 - 4 - fill - - - - - - - True - Families: - False - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 5 - 6 + 0 + 5 + 0 + 1 fill @@ -164,20 +140,76 @@ 1 2 - 6 - 7 + 3 + 4 fill - + True - Errors: + True + False + True + 0 + + True + * + False + + + 2 + 3 + 3 + 4 + + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 5 + 6 + 7 + fill + + + + + + True + <b>Information</b> False - False - GTK_JUSTIFY_CENTER + True + GTK_JUSTIFY_LEFT False False 0 @@ -186,15 +218,96 @@ 0 - 1 - 2 - 7 - 8 + 0 + 5 + 5 + 6 fill + + + True + <b>Warning messages</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 5 + 8 + 9 + fill + + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + False + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 1 + 5 + 9 + 10 + fill + + + + + + True + True + False + True + 0 + + True + * + False + + + 2 + 3 + 1 + 2 + + + + True @@ -210,30 +323,30 @@ 0 - 1 - 2 - 4 - 5 + 3 + 4 + 1 + 2 fill - + True True False True - 0 + 10 True * False - 2 - 3 + 4 + 5 1 2 @@ -267,38 +380,41 @@ True False True - 0 + 10 True * False - 2 - 3 - 3 - 4 + 4 + 5 + 2 + 3 - + True - True - False - True - 0 - - True - * - False + Version: + False + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 - 2 - 3 - 4 - 5 + 3 + 4 + 2 + 3 + fill @@ -316,84 +432,21 @@ False - 2 - 3 - 5 - 6 + 4 + 5 + 3 + 4 - + True - True - False - True - 0 - - True - * - False - - - 2 - 3 - 6 - 7 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 2 - 3 - 7 - 8 - - - - - - - True - True - _Close window when complete - True - GTK_RELIEF_NORMAL - False - False - True - - - 2 - 3 - 8 - 9 - fill - - - - - - - True - <b>Status</b> + Families: False - True - GTK_JUSTIFY_LEFT + False + GTK_JUSTIFY_CENTER False False 0 @@ -402,73 +455,14 @@ 0 - 0 - 3 - 0 - 1 + 3 + 4 + 3 + 4 fill - - - - True - <b>Messages</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 9 - 10 - fill - - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 1 - 3 - 10 - 11 - fill - - 0 @@ -482,7 +476,7 @@ 12 True GTK_BUTTONBOX_END - 30 + 12 @@ -498,7 +492,7 @@ 0 - True + False True diff --git a/gramps2/src/po/Makefile.in b/gramps2/src/po/Makefile.in index f28c546b9..c6234ef97 100644 --- a/gramps2/src/po/Makefile.in +++ b/gramps2/src/po/Makefile.in @@ -73,6 +73,7 @@ GNOMEHELP = @GNOMEHELP@ GNOMEINC = @GNOMEINC@ GNOMELIB = @GNOMELIB@ GPREF = @GPREF@ +GPREFIX = @GPREFIX@ HAVE_JW = @HAVE_JW@ HAVE_PKG_CONFIG = @HAVE_PKG_CONFIG@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@