diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 4c890ba92..b3f7ce602 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,28 @@ +2004-05-11 Don Allingham + * src/GrampsCfg.py: remove unused options + * src/gramps.glade: remove unused panels in preferences + * src/Plugins.py: removed xpm images + * src/EventEdit.py: get full event list + * src/plugins/AncestorChart.py: remove xpm image + * src/plugins/AncestorChart2.py: remove xpm image + * src/plugins/AncestorReport.py: remove xpm image + * src/plugins/Ancestors.py: remove xpm image + * src/plugins/BookReport.py: remove xpm image + * src/plugins/CustomBookText.py: remove xpm image + * src/plugins/DesGraph.py: remove xpm image + * src/plugins/DescendReport.py: remove xpm image + * src/plugins/DetAncestralReport.py: remove xpm image + * src/plugins/DetDescendantReport.py: remove xpm image + * src/plugins/FamilyGroup.py: remove xpm image + * src/plugins/FtmStyleAncestors.py: remove xpm image + * src/plugins/FtmStyleDescendants.py: remove xpm image + * src/plugins/IndivComplete.py: remove xpm image + * src/plugins/IndivSummary.py: remove xpm image + * src/plugins/Makefile.in: remove xpm image + * src/plugins/SimpleBookTitle.py: remove xpm image + * src/plugins/WebPage.py: remove xpm image + * src/RelLib.py: secondary index for event names + 2004-05-11 Alex Roitman * src/plugins/EventCmp.py: Remove extra code. * src/plugins/eventcmp.glade: Remove extra widgets. diff --git a/gramps2/TODO b/gramps2/TODO index ec9687e3a..9e6845d7f 100644 --- a/gramps2/TODO +++ b/gramps2/TODO @@ -16,4 +16,5 @@ * Now that the completeness flag exists, create filters that are using it (both individual and family). * Add autofill feature for City, Church parish, County, State and Country? +* Move LDS temple info out of const.py and into an XML file * And a whole lot more.... diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index 08cc301dc..ac06b2d35 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -57,7 +57,7 @@ from QuestionDialog import WarningDialog #------------------------------------------------------------------------- class EventEditor: - def __init__(self,parent,name,list,trans,event,def_placename,read_only,cb, + def __init__(self,parent,name,elist,trans,event,def_placename,read_only,cb, def_event=None): self.parent = parent self.db = self.parent.db @@ -75,7 +75,16 @@ class EventEditor: self.callback = cb self.plist = [] self.pmap = {} - self.elist = list + + values = {} + for v in elist: + values[v] = 1 + for v in self.db.get_eventnames(): + print v + values[v] = 1 + + self.elist = values.keys() + self.elist.sort() for key in self.parent.db.get_place_id_keys(): p = self.parent.db.get_place_display(key) @@ -91,7 +100,7 @@ class EventEditor: # add the name to the list if it is not already there. This tends to occur # in translated languages with the 'Death' event, which is a partial match # to other events - if not transname in list: + if not transname in elist: list.append(transname) else: self.srcreflist = [] @@ -151,7 +160,7 @@ class EventEditor: self.top.get_widget('edit_witness'), self.top.get_widget('del_witness')) - AutoComp.AutoCombo(self.event_menu,list) + AutoComp.AutoCombo(self.event_menu,self.elist) AutoComp.AutoEntry(self.place_field,self.pmap.keys()) if event != None: diff --git a/gramps2/src/GrampsCfg.py b/gramps2/src/GrampsCfg.py index ac95c512b..a618cfc6b 100644 --- a/gramps2/src/GrampsCfg.py +++ b/gramps2/src/GrampsCfg.py @@ -107,18 +107,16 @@ _name_format_list = [ panellist = [ (_("Database"), [( _("General"), 1), - ( _("Media Objects"), 9), - ( _("GRAMPS internal IDs"), 10), - ( _("Revision Control"),2)]), + ( _("Media Objects"), 7), + ( _("GRAMPS internal IDs"), 8)]), (_("Display"), - [( _("General"), 5), - ( _("Dates and Calendars"), 6), - ( _("Toolbar and Statusbar"), 4)]), + [( _("General"), 3), + ( _("Dates and Calendars"), 4), + ( _("Toolbar and Statusbar"), 2)]), (_("Usage"), - [( _("Find"), 3), - ( _("Report Preferences"), 8), - ( _("Researcher Information"), 7), - ( _("Data Guessing"), 11)]), + [( _("Report Preferences"), 6), + ( _("Researcher Information"), 5), + ( _("Data Guessing"), 9)]), ] @@ -134,12 +132,7 @@ sprefix = "S%04d" pprefix = "P%04d" fprefix = "F%04d" autoload = 0 -autosave_int = 0 uselds = 0 -autocomp = 1 -usevc = 0 -vc_comment = 0 -uncompress = 0 lastfile = None nameof = Utils.normal_name display_name = Utils.normal_name @@ -198,18 +191,13 @@ def make_path(path): #------------------------------------------------------------------------- def loadConfig(call): global autoload - global autosave_int global uselds - global autocomp global calendar - global usevc global iprefix global fprefix global pprefix global oprefix global sprefix - global vc_comment - global uncompress global id_edit global index_visible global lastfile @@ -237,14 +225,10 @@ def loadConfig(call): _callback = call lastfile = get_string("/apps/gramps/recent-file") uselds = get_bool("/apps/gramps/use-lds") - ac = get_bool("/apps/gramps/disable-auto-complete",0) mediaref = get_bool("/apps/gramps/make-reference",1) globalprop = get_bool("/apps/gramps/media-global",1) localprop = get_bool("/apps/gramps/media-local",1) calendar = get_bool("/apps/gramps/show-calendar") - usevc = get_bool("/apps/gramps/version-control") - vc_comment = get_bool("/apps/gramps/use-comment") - uncompress = get_bool("/apps/gramps/dont-compress-xml") id_edit = get_bool("/apps/gramps/id-edit") index_visible = get_bool("/apps/gramps/index-visible") status_bar = get_int("/apps/gramps/statusbar") @@ -265,7 +249,6 @@ def loadConfig(call): familyview = get_int("/apps/gramps/familyview") autoload = get_bool("/apps/gramps/autoload",0) - autosave_int = get_int("/apps/gramps/auto-save-interval") dateFormat = get_int("/apps/gramps/date-format") dateEntry = get_int("/apps/gramps/date-entry") paper_preference = get_string("/apps/gramps/paper-preference") @@ -319,8 +302,6 @@ def loadConfig(call): if oprefix == None: oprefix = "O" - autocomp = not ac - Calendar.set_format_code(dateFormat) Calendar.Calendar.ENTRYCODE = dateEntry @@ -577,25 +558,18 @@ class GrampsPreferences: def build(self): auto = self.top.get_widget("autoload") - asave_int = self.top.get_widget("autosave_interval") idedit = self.top.get_widget("gid_edit") # cap = self.top.get_widget('capitalize') index_vis = self.top.get_widget("show_child_id") lds = self.top.get_widget("uselds") - ac = self.top.get_widget("autocomp") mr = self.top.get_widget("mediaref") mc = self.top.get_widget("mediacopy") dg = self.top.get_widget("globalprop") dl = self.top.get_widget("localprop") cal = self.top.get_widget("calendar") - vc = self.top.get_widget("use_vc") - vcom = self.top.get_widget("vc_comment") - compress = self.top.get_widget("uncompress") auto.set_active(autoload) - asave_int.set_value(int(autosave_int)) lds.set_active(uselds) - ac.set_active(autocomp) if mediaref: mr.set_active(1) else: @@ -603,9 +577,6 @@ class GrampsPreferences: dg.set_active(globalprop) dl.set_active(localprop) cal.set_active(calendar) - vc.set_active(usevc) - vcom.set_active(vc_comment) - compress.set_active(uncompress) idedit.set_active(id_edit) # cap.set_active(capitalize) index_vis.set_active(index_visible) @@ -820,20 +791,15 @@ class GrampsPreferences: global display_name global display_surname global uselds - global autocomp - global autosave_int global mediaref global globalprop global localprop global calendar - global usevc global iprefix global fprefix global pprefix global sprefix global oprefix - global vc_comment - global uncompress global id_edit global index_visible global status_bar @@ -851,16 +817,11 @@ class GrampsPreferences: global autoload autoload = self.top.get_widget("autoload").get_active() - autosave_int = self.top.get_widget("autosave_interval").get_value_as_int() uselds = self.top.get_widget("uselds").get_active() - autocomp = self.top.get_widget("autocomp").get_active() mediaref = self.top.get_widget("mediaref").get_active() localprop = self.top.get_widget("localprop").get_active() globalprop = self.top.get_widget("globalprop").get_active() calendar = self.top.get_widget("calendar").get_active() - usevc = self.top.get_widget("use_vc").get_active() - vc_comment = self.top.get_widget("vc_comment").get_active() - uncompress = self.top.get_widget("uncompress").get_active() id_edit = self.top.get_widget("gid_edit").get_active() index_visible = self.top.get_widget("show_child_id").get_active() @@ -923,14 +884,10 @@ class GrampsPreferences: goutput_preference = goutput_obj.get_data(DATA) set_bool("/apps/gramps/use-lds",uselds) - set_bool("/apps/gramps/disable-auto-complete",not autocomp) set_bool("/apps/gramps/make-reference",mediaref) set_bool("/apps/gramps/media-global",globalprop) set_bool("/apps/gramps/media-local",localprop) set_bool("/apps/gramps/show-calendar",calendar) - set_bool("/apps/gramps/version-control",usevc) - set_bool("/apps/gramps/use-comment",vc_comment) - set_bool("/apps/gramps/dont-compress-xml",uncompress) set_bool("/apps/gramps/id-edit",id_edit) set_bool("/apps/gramps/index-visible",index_visible) set_int("/apps/gramps/statusbar",status_bar) @@ -941,12 +898,6 @@ class GrampsPreferences: set_string("/apps/gramps/output-preference",output_preference) set_string("/apps/gramps/goutput-preference",goutput_preference) set_bool("/apps/gramps/autoload",autoload) - set_int("/apps/gramps/auto-save-interval",autosave_int) - - if autosave_int != 0: - Utils.enable_autosave(None,autosave_int) - else: - Utils.disable_autosave() set_string("/apps/gramps/report-directory",report_dir) set_string("/apps/gramps/website-directory",web_dir) diff --git a/gramps2/src/Plugins.py b/gramps2/src/Plugins.py index 36f052d2d..c563442bc 100644 --- a/gramps2/src/Plugins.py +++ b/gramps2/src/Plugins.py @@ -151,7 +151,6 @@ class PluginDialog: self.tree.append_column(col) self.tree.set_model(self.store) - self.img = self.dialog.get_widget("image") self.description = self.dialog.get_widget("description") if label: self.description.set_text(label) @@ -228,18 +227,16 @@ class PluginDialog: title = data[0] task = data[1] doc = data[2] - xpm = data[3] - status = data[4] - author = data[5] - email = data[6] + status = data[3] + author = data[4] + email = data[5] self.description.set_text(doc) self.status.set_text(status) - self.title.set_text(title) + self.title.set_text('%s' % title) + self.title.set_use_markup(1) self.author_name.set_text(author) self.author_email.set_text(email) - - self.title.set_text(title) self.run_tool = task def build_tree(self,list): @@ -257,7 +254,7 @@ class PluginDialog: # build the tree items and group together based on the category name item_hash = {} for report in list: - t = (report[2],report[0],report[3],report[4],report[5],report[6],report[7]) + t = (report[2],report[0],report[3],report[4],report[5],report[6]) if item_hash.has_key(report[1]): item_hash[report[1]].append(t) else: @@ -481,9 +478,6 @@ def register_report(task, name, ): """Register a report with the plugin system""" - if xpm == None: - xpm = no_image() - del_index = -1 for i in range(0,len(_reports)): val = _reports[i] @@ -491,19 +485,16 @@ def register_report(task, name, del_index = i if del_index != -1: del _reports[del_index] - _reports.append((task, category, name, description, xpm, status, author_name, author_email)) + _reports.append((task, category, name, description, status, author_name, author_email)) def register_tool(task, name, category=_("Uncategorized"), description=_unavailable, - xpm=None, status=_("Unknown"), author_name=_("Unknown"), author_email=_("Unknown") ): """Register a tool with the plugin system""" - if xpm == None: - xpm = no_image() del_index = -1 for i in range(0,len(_tools)): val = _tools[i] @@ -511,7 +502,7 @@ def register_tool(task, name, del_index = i if del_index != -1: del _tools[del_index] - _tools.append((task, category, name, description, xpm, status, author_name, author_name)) + _tools.append((task, category, name, description, status, author_name, author_name)) #------------------------------------------------------------------------- # @@ -800,66 +791,3 @@ def get_draw_doc_menu(main_menu,callback=None,obj=None): callback(menuitem) index = index + 1 main_menu.set_menu(myMenu) - -#------------------------------------------------------------------------- -# -# no_image -# -#------------------------------------------------------------------------- -def no_image(): - """Returns XPM data for basic 48x48 icon""" - return [ - "48 48 5 1", - " c None", - ". c #999999", - "+ c #FFFFCC", - "@ c #000000", - "# c #CCCCCC", - " ", - " ", - " ", - " ", - " ", - " ", - " .......... ", - " .++++++++. ", - " .++++++++. ", - " @@@.++++++++. ", - " @##.++++++++. ", - " @# .++++++++. ", - " .......... @# .......... ", - " .++++++++. @# ", - " .++++++++. @# ", - " @@@.++++++++.@@@@# ", - " @##.++++++++.###@# .......... ", - " @# .++++++++. @# .++++++++. ", - " @# .......... @# .++++++++. ", - " @# @@@.++++++++. ", - " @# ##.++++++++. ", - " @# .++++++++. ", - " .......... @# .......... ", - " .++++++++. @# ", - " .++++++++. @# ", - " .++++++++.@@@@# ", - " .++++++++.###@# ", - " .++++++++. @# .......... ", - " .......... @# .++++++++. ", - " @# .++++++++. ", - " @# @@@.++++++++. ", - " @# @##.++++++++. ", - " @# .......... @# .++++++++. ", - " @# .++++++++. @# .......... ", - " @# .++++++++. @# ", - " @@@.++++++++.@@@@# ", - " ##.++++++++.###@# ", - " .++++++++. @# .......... ", - " .......... @# .++++++++. ", - " @# .++++++++. ", - " @@@.++++++++. ", - " ##.++++++++. ", - " .++++++++. ", - " .......... ", - " ", - " ", - " ", - " "] diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 0919f0793..2a8e89e9d 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -2366,6 +2366,9 @@ except ImportError: # try python2.2 def find_surname(key,data): return str(data[2].get_surname()) +def find_eventname(key,data): + return str(data[1]) + #------------------------------------------------------------------------- # # GrampsDB @@ -2397,6 +2400,7 @@ class GrampsDB: self.media_map = None self.event_map = None self.surnames = None + self.eventnames = None self.metadata = None def load(self,name,callback): @@ -2420,7 +2424,13 @@ class GrampsDB: self.surnames.set_flags(db.DB_DUP) self.surnames.open(name, "surnames", db.DB_HASH, flags=db.DB_CREATE) + self.eventnames = db.DB(self.env) + self.eventnames.set_flags(db.DB_DUP) + self.eventnames.open(name, "eventnames", db.DB_HASH, flags=db.DB_CREATE) + self.person_map.associate(self.surnames, find_surname, db.DB_CREATE) + self.event_map.associate(self.eventnames, find_eventname, db.DB_CREATE) + self.bookmarks = self.metadata.get('bookmarks') if self.bookmarks == None: self.bookmarks = [] @@ -2454,6 +2464,7 @@ class GrampsDB: self.metadata['bookmarks'] = self.bookmarks self.metadata.close() self.surnames.close() + self.eventnames.close() self.env.close() self.person_map = None @@ -2697,7 +2708,16 @@ class GrampsDB: names = self.surnames.keys() a = {} for name in names: - a[name] = 1 + a[unicode(name)] = 1 + vals = a.keys() + vals.sort() + return vals + + def get_eventnames(self): + names = self.eventnames.keys() + a = {} + for name in names: + a[unicode(name)] = 1 vals = a.keys() vals.sort() return vals diff --git a/gramps2/src/Utils.py b/gramps2/src/Utils.py index 08868e074..6be7c8ce8 100644 --- a/gramps2/src/Utils.py +++ b/gramps2/src/Utils.py @@ -57,46 +57,11 @@ from gettext import gettext as _ # modified flag # #------------------------------------------------------------------------- -_modifiedFlag = 0 _history_brokenFlag = 0 -_autotime_val = 1 -_autosave_fun = None -_autosave_tim = None -_autosave_val = None LISTOBJ = "s" OBJECT = "o" -#------------------------------------------------------------------------- -# -# Sets the modified flag, which is used to determine if the database -# needs to be saved. Anytime a routine modifies data, it should call -# this routine. -# -#------------------------------------------------------------------------- -def modified(): - global _modifiedFlag, _autosave_tim - if _autosave_fun and not _autosave_tim: - _autosave_tim = gtk.timeout_add(60000*_autotime_val,_autosave_fun) - _modifiedFlag = 1 - -def enable_autosave(fun,value): - global _autosave_fun - global _autosave_val - if fun != None: - _autosave_fun = fun - _autosave_val = value - -def disable_autosave(): - global _autosave_fun - _autosave_fun = None - -def clear_timer(): - global _autosave_tim - if _autosave_tim: - gtk.timeout_remove(_autosave_tim) - _autosave_tim = None - def history_broken(): global _history_brokenFlag _history_brokenFlag = 1 @@ -119,22 +84,10 @@ def force_unicode(n): # Clears the modified flag. Should be called after data is saved. # #------------------------------------------------------------------------- -def clearModified(): - global _modifiedFlag - _modifiedFlag = 0 - def clearHistory_broken(): global _history_brokenFlag _history_brokenFlag = 0 -#------------------------------------------------------------------------- -# -# Returns the modified flag -# -#------------------------------------------------------------------------- -def wasModified(): - return _modifiedFlag - def wasHistory_broken(): return _history_brokenFlag @@ -211,14 +164,6 @@ def destroy_passed_object(obj): while gtk.events_pending(): gtk.main_iteration() -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- -def get_detail_flags(obj,priv=1): - return "" - #------------------------------------------------------------------------- # # @@ -331,61 +276,6 @@ def strip_id(text): text = string.rstrip(text) return text -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- -def attach_places(values,combo,place): - l = gtk.Label("") - l.show() - l.set_alignment(0,0.5) - c = gtk.ListItem() - c.add(l) - c.set_data(LISTOBJ,None) - c.show() - sel_child = c - list = [c] - mymap = {} - placenamemap = {} - for src in values: - placenamemap["%s [%s]" % (src.get_title(),src.get_id())] = src - placenames = placenamemap.keys() - placenames.sort() - for key in placenames: - src = placenamemap[key] - l = gtk.Label(key) - l.show() - l.set_alignment(0,0.5) - c = gtk.ListItem() - c.add(l) - c.set_data(LISTOBJ,src) - c.show() - list.append(c) - if src == place: - sel_child = c - mymap[src] = c - - combo.disable_activate() - combo.list.clear_items(0,-1) - combo.list.append_items(list) - combo.list.select_child(sel_child) - - for v in mymap.keys(): - combo.set_item_string(mymap[v],v.get_title()) - -#------------------------------------------------------------------------- -# -# -# -#------------------------------------------------------------------------- -def get_place_from_list(obj): - select = obj.list.get_selection() - if len(select) == 0: - return None - else: - return select[0].get_data(LISTOBJ) - def nautilus_icon(icon,type): import GrampsCfg @@ -446,16 +336,9 @@ def get_mime_description(type): #------------------------------------------------------------------------- # -# Short hand function to return either the person's birthday, or an empty -# string if the person is None +# # #------------------------------------------------------------------------- -def birthday(person): - if person: - return person.get_birth().get_quote_date() - else: - return "" - def thumb_path(dir,mobj): type = mobj.get_mime_type() @@ -646,92 +529,3 @@ def unbold_label(label): label.set_text(text) label.set_use_markup(0) -#------------------------------------------------------------------------ -# -# XPM Image for reports and tools -# -#------------------------------------------------------------------------ -def get_xpm_image(): - return [ - "48 48 33 1", - " c None", - ". c #1A1A1A", - "+ c #847B6E", - "@ c #B7AC9C", - "# c #D1D1D0", - "$ c #EEE2D0", - "% c #6A655C", - "& c #868686", - "* c #F1EADF", - "= c #5C5854", - "- c #B89C73", - "; c #E2C8A1", - "> c #55524C", - ", c #F5EEE6", - "' c #4F4E4C", - ") c #A19C95", - "! c #B3966E", - "~ c #CDC8BF", - "{ c #F6F2ED", - "] c #A6A5A4", - "^ c #413F3F", - "/ c #D8D1C5", - "( c #968977", - "_ c #BAB9B6", - ": c #FAFAF9", - "< c #BEA27B", - "[ c #E9DAC2", - "} c #9D9385", - "| c #E4E3E3", - "1 c #7A7062", - "2 c #E6D3B4", - "3 c #BAA488", - "4 c #322E2B", - " ", - " ", - " (+(+++++111%1%%%%===%1 ", - " +______________@_@)&==1 ", - " +_::::::::::::::*|#_&&}> ", - " &_:::::::::::::::{|#]1~}^ ", - " +_::::::::::::::::{|#=|~&4 ", - " +_::::]]]]]]]]:::::|{':|~&4 ", - " +_::::::::::::::::::{'::|~&4 ", - " +_:::::::::::::::::::'*::|~&^ ", - " +_:::::::::::::::::::'|*::|~}> ", - " 1_::::]]]]]]]]]]]]:::'~|{::|_}% ", - " 1_:::::::::::::::::::'..4^'=1+%1 ", - " +_::::]]]]]]]]]]]]:::|__])&+%=^% ", - " 1_::::::::::::::::::::|#__)&&+'^ ", - " 1_::::]]]]]]]]]::::::::|#~_])&%^ ", - " 1_::::::::::::::::::::{||#~_])14 ", - " 1_::::]]]]]]]]]]]]]]]]]]&}#~_]+4 ", - " 1_::::::::::::::::::{{{{||#~~@&4 ", - " %_::::]]]]]]]]]]]]]]]])))}(~~~&4 ", - " %_:::::::::::::::::{{{{{*|#/~_(4 ", - " %_::::]]]]]]]]]]]]]]])))))}2;/}4 ", - " %_:::::::::::::::{{{{{***||[#~}4 ", - " %_::::]]]]]]]]]])]))))))))}2/;)4 ", - " %_::::::::::::::{{{{{**|$$[/2~!4 ", - " %_::::]]]]]]]]){{{{******$$[2/}4 ", - " %_::::::::::::{{{{****$$$$$[2/!4 ", - " =_::::]]]]]]])]))))))))})}}[2/!4 ", - " %_:::::::::{{{{{{**|$$$$$$[[2;)4 ", - " =_::::]]]])]]))))))))))}}}}[22!4 ", - " %_::::::::{{{{{|**|$$[$[[[[[22}4 ", - " =_::::]]])])))))))))}}}}}}}222-4 ", - " =_:::::{{{{{|{*|$$$$$[[[[22222!4 ", - " =_::::)]])))))))))}}}}}}(}(2;2-4 ", - " =_:::{{{{{{***|$$$$$[[[[22222;-4 ", - " =_:::{])))))))))}}}}}}}(}((2;;<4 ", - " >_:{{{{{{**|$$$$$[[[[22222;2;;-4 ", - " >_{{{{)))))))}}}}}}}(!(((((;;;-4 ", - " >_{{{{|**|*$$$$$[[[[22222;;;;;!4 ", - " '_{{{{****$$$$$2[[222222;2;;;;-4 ", - " '@{{****$$$$$[[[2[222;;2;;;;;;!4 ", - " >]{******$$$[$[2[[2222;;;;;;;;!4 ", - " '_****$$$$[$[[[[2222;2;;;;;;;;!4 ", - " '@__@@@@@@@33<3<<<<<<-<-!!!!!!!4 ", - " 44444444444444444444444444444444 ", - " ", - " ", - " "] diff --git a/gramps2/src/autogen.sh b/gramps2/src/autogen.sh deleted file mode 100755 index df6b07842..000000000 --- a/gramps2/src/autogen.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -PKG_NAME="the package." - -(test -f $srcdir/configure.in) || { - echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" - echo " top-level directory" - exit 1 -} - -which gnome-autogen.sh || { - echo "You need to install gnome-common from the GNOME CVS" - exit 1 -} -USE_GNOME2_MACROS=1 . gnome-autogen.sh diff --git a/gramps2/src/gramps.glade b/gramps2/src/gramps.glade index 302139484..ffdbf8a21 100644 --- a/gramps2/src/gramps.glade +++ b/gramps2/src/gramps.glade @@ -17941,58 +17941,12 @@ 12 True - 5 + 3 4 False 6 12 - - - True - A_utosave interval: - True - False - GTK_JUSTIFY_CENTER - False - False - 0 - 0.5 - 0 - 0 - autosave_interval - - - 1 - 2 - 3 - 4 - fill - - - - - - - True - True - 1 - 0 - True - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 10 - - - 2 - 3 - 3 - 4 - - - - True @@ -18011,32 +17965,8 @@ 1 2 - 4 - 5 - fill - - - - - - - True - minutes - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 3 - 4 - 3 - 4 + 2 + 3 fill @@ -18094,30 +18024,8 @@ 2 4 - 4 - 5 - - - - - - - True - True - _Do not compress XML data file - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 4 2 3 - fill @@ -18176,245 +18084,6 @@ - - - True - False - 0 - - - - 12 - True - 3 - 3 - False - 6 - 12 - - - - True - <b>Revision control</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 0 - 1 - fill - - - - - - - True - True - _Use revision control - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - _Prompt for comment on save - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 1 - 2 - 2 - 3 - fill - - - - - - - True - True - 0 - - - - True - - - - True - RCS - True - - - - - - - 2 - 3 - 1 - 2 - - - - - - 0 - True - True - - - - - False - True - - - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - True - False - 0 - - - - 12 - True - 2 - 3 - False - 6 - 12 - - - - True - <b>Find</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 3 - 0 - 1 - fill - - - - - - - True - True - _Enable autocompletion - True - GTK_RELIEF_NORMAL - True - True - False - True - - - - 1 - 3 - 1 - 2 - - - - - - 0 - True - True - - - - - False - True - - - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - True diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 7acfe536a..1ab55308a 100755 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -757,8 +757,7 @@ class Gramps: if self.find_person: self.find_person.show() else: - self.find_person = Find.FindPerson(self.find_goto_person,self.db, - self.people_view.id2col) + self.find_person = Find.FindPerson(self.find_goto_person,self.db,None) def on_findname_activate(self,obj): """Display the find box""" @@ -1575,39 +1574,6 @@ class Gramps: self.setup_bookmarks() - try: - mylist = self.db.get_person_event_types() - for type in mylist: - ntype = const.display_pevent(type) - if ntype not in const.personalEvents: - const.personalEvents.append(ntype) - - mylist = self.db.get_family_event_types() - for type in mylist: - ntype = const.display_fevent(type) - if ntype not in const.marriageEvents: - const.marriageEvents.append(ntype) - - mylist = self.db.get_person_attribute_types() - for type in mylist: - ntype = const.display_pattr(type) - if ntype not in const.personalAttributes: - const.personalAttributes.append(ntype) - - mylist = self.db.get_family_attribute_types() - for type in mylist: - ntype = const.display_fattr(type) - if ntype not in const.familyAttributes: - const.familyAttributes.append(ntype) - - mylist = self.db.get_family_relation_types() - for type in mylist: - ntype = const.display_frel(type) - if ntype not in const.familyRelations: - const.familyRelations.append(ntype) - except: - pass - GrampsCfg.save_last_file(name) self.gtop.get_widget("filter").set_text("") diff --git a/gramps2/src/plugins.glade b/gramps2/src/plugins.glade index 48144d79b..3aded359b 100644 --- a/gramps2/src/plugins.glade +++ b/gramps2/src/plugins.glade @@ -13,6 +13,11 @@ True False gramps.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST False @@ -34,6 +39,7 @@ gtk-cancel True GTK_RELIEF_NORMAL + True 0 @@ -63,6 +69,8 @@ True True False + False + True GTK_JUSTIFY_LEFT GTK_WRAP_NONE False @@ -97,6 +105,11 @@ True False gramps.png + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST @@ -119,6 +132,7 @@ gtk-close True GTK_RELIEF_NORMAL + True @@ -132,6 +146,7 @@ True GTK_RELIEF_NORMAL + True @@ -232,17 +247,6 @@ - - - True - - - 0 - False - True - - - True diff --git a/gramps2/src/plugins/AncestorChart.py b/gramps2/src/plugins/AncestorChart.py index 476f3c881..a8f579370 100644 --- a/gramps2/src/plugins/AncestorChart.py +++ b/gramps2/src/plugins/AncestorChart.py @@ -49,7 +49,6 @@ import Errors import FontScale from QuestionDialog import ErrorDialog from SubstKeywords import SubstKeywords -from Utils import get_xpm_image from gettext import gettext as _ _BORN = _('b.') @@ -424,7 +423,6 @@ register_report( category=_("Graphical Reports"), status=(_("Beta")), description=_("Produces a graphical ancestral tree graph"), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/AncestorChart2.py b/gramps2/src/plugins/AncestorChart2.py index b3db49073..134270526 100644 --- a/gramps2/src/plugins/AncestorChart2.py +++ b/gramps2/src/plugins/AncestorChart2.py @@ -46,7 +46,6 @@ import Errors import FontScale from QuestionDialog import ErrorDialog from SubstKeywords import SubstKeywords -from Utils import get_xpm_image from gettext import gettext as _ _BORN = _('b.') @@ -709,7 +708,6 @@ register_report( category=_("Graphical Reports"), status=(_("Beta")), description=_("Produces a graphical ancestral tree graph"), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index 1a6cbe228..f33084c31 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -39,7 +39,6 @@ import Report import BaseDoc import RelLib import Errors -from Utils import get_xpm_image from QuestionDialog import ErrorDialog from gettext import gettext as _ @@ -446,7 +445,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description= _("Produces a textual ancestral report"), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index 07f8ca8b1..6143ed61c 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -34,7 +34,6 @@ import BaseDoc import RelLib import Errors import Plugins -from Utils import get_xpm_image from QuestionDialog import ErrorDialog from gettext import gettext as _ @@ -1099,7 +1098,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description= _("Produces a detailed ancestral report."), - xpm=get_xpm_image(), author_name="Tim Waugh", author_email="twaugh@redhat.com" ) diff --git a/gramps2/src/plugins/BookReport.py b/gramps2/src/plugins/BookReport.py index 3b14623cc..48419c66f 100644 --- a/gramps2/src/plugins/BookReport.py +++ b/gramps2/src/plugins/BookReport.py @@ -996,7 +996,6 @@ Plugins.register_report( category=_("Books"), status=(_("Unstable")), description=_("Creates a book containing several reports."), - xpm=Utils.get_xpm_image(), author_name="Alex Roitman", author_email="shura@alex.neuro.umn.edu" ) diff --git a/gramps2/src/plugins/CustomBookText.py b/gramps2/src/plugins/CustomBookText.py index 3e378f856..6f0fecad4 100644 --- a/gramps2/src/plugins/CustomBookText.py +++ b/gramps2/src/plugins/CustomBookText.py @@ -275,96 +275,6 @@ def write_book_item(database,person,doc,options,newpage=0): import DisplayTrace DisplayTrace.DisplayTrace() -#------------------------------------------------------------------------ -# -# -# -#------------------------------------------------------------------------ -def get_xpm_image(): - return [ - "48 48 33 1", - " c None", - ". c #1A1A1A", - "+ c #847B6E", - "@ c #B7AC9C", - "# c #D1D1D0", - "$ c #EEE2D0", - "% c #6A655C", - "& c #868686", - "* c #F1EADF", - "= c #5C5854", - "- c #B89C73", - "; c #E2C8A1", - "> c #55524C", - ", c #F5EEE6", - "' c #4F4E4C", - ") c #A19C95", - "! c #B3966E", - "~ c #CDC8BF", - "{ c #F6F2ED", - "] c #A6A5A4", - "^ c #413F3F", - "/ c #D8D1C5", - "( c #968977", - "_ c #BAB9B6", - ": c #FAFAF9", - "< c #BEA27B", - "[ c #E9DAC2", - "} c #9D9385", - "| c #E4E3E3", - "1 c #7A7062", - "2 c #E6D3B4", - "3 c #BAA488", - "4 c #322E2B", - " ", - " ", - " (+(+++++111%1%%%%===%1 ", - " +______________@_@)&==1 ", - " +_::::::::::::::*|#_&&}> ", - " &_:::::::::::::::{|#]1~}^ ", - " +_::::::::::::::::{|#=|~&4 ", - " +_::::]]]]]]]]:::::|{':|~&4 ", - " +_::::::::::::::::::{'::|~&4 ", - " +_:::::::::::::::::::'*::|~&^ ", - " +_:::::::::::::::::::'|*::|~}> ", - " 1_::::]]]]]]]]]]]]:::'~|{::|_}% ", - " 1_:::::::::::::::::::'..4^'=1+%1 ", - " +_::::]]]]]]]]]]]]:::|__])&+%=^% ", - " 1_::::::::::::::::::::|#__)&&+'^ ", - " 1_::::]]]]]]]]]::::::::|#~_])&%^ ", - " 1_::::::::::::::::::::{||#~_])14 ", - " 1_::::]]]]]]]]]]]]]]]]]]&}#~_]+4 ", - " 1_::::::::::::::::::{{{{||#~~@&4 ", - " %_::::]]]]]]]]]]]]]]]])))}(~~~&4 ", - " %_:::::::::::::::::{{{{{*|#/~_(4 ", - " %_::::]]]]]]]]]]]]]]])))))}2;/}4 ", - " %_:::::::::::::::{{{{{***||[#~}4 ", - " %_::::]]]]]]]]]])]))))))))}2/;)4 ", - " %_::::::::::::::{{{{{**|$$[/2~!4 ", - " %_::::]]]]]]]]){{{{******$$[2/}4 ", - " %_::::::::::::{{{{****$$$$$[2/!4 ", - " =_::::]]]]]]])]))))))))})}}[2/!4 ", - " %_:::::::::{{{{{{**|$$$$$$[[2;)4 ", - " =_::::]]]])]]))))))))))}}}}[22!4 ", - " %_::::::::{{{{{|**|$$[$[[[[[22}4 ", - " =_::::]]])])))))))))}}}}}}}222-4 ", - " =_:::::{{{{{|{*|$$$$$[[[[22222!4 ", - " =_::::)]])))))))))}}}}}}(}(2;2-4 ", - " =_:::{{{{{{***|$$$$$[[[[22222;-4 ", - " =_:::{])))))))))}}}}}}}(}((2;;<4 ", - " >_:{{{{{{**|$$$$$[[[[22222;2;;-4 ", - " >_{{{{)))))))}}}}}}}(!(((((;;;-4 ", - " >_{{{{|**|*$$$$$[[[[22222;;;;;!4 ", - " '_{{{{****$$$$$2[[222222;2;;;;-4 ", - " '@{{****$$$$$[[[2[222;;2;;;;;;!4 ", - " >]{******$$$[$[2[[2222;;;;;;;;!4 ", - " '_****$$$$[$[[[[2222;2;;;;;;;;!4 ", - " '@__@@@@@@@33<3<<<<<<-<-!!!!!!!4 ", - " 44444444444444444444444444444444 ", - " ", - " ", - " "] - #------------------------------------------------------------------------ # # diff --git a/gramps2/src/plugins/DesGraph.py b/gramps2/src/plugins/DesGraph.py index f66d24f02..53248952f 100644 --- a/gramps2/src/plugins/DesGraph.py +++ b/gramps2/src/plugins/DesGraph.py @@ -48,7 +48,6 @@ import BaseDoc import Errors from SubstKeywords import SubstKeywords -from Utils import get_xpm_image from gettext import gettext as _ from QuestionDialog import ErrorDialog @@ -500,7 +499,6 @@ register_report( category=_("Graphical Reports"), description=_("Generates a graph of descendants of the active person"), status=(_("Alpha")), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index 16f9bafd1..0f00cb44b 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -39,7 +39,6 @@ import BaseDoc import Errors import Date import Sort -from Utils import get_xpm_image from QuestionDialog import ErrorDialog from gettext import gettext as _ @@ -334,7 +333,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description=_("Generates a list of descendants of the active person"), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 491fc43a2..bfff188c8 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -28,7 +28,6 @@ import Errors from gettext import gettext as _ from QuestionDialog import ErrorDialog -from Utils import get_xpm_image import Report import BaseDoc @@ -1218,7 +1217,6 @@ register_report( status=(_("Beta")), category=_("Text Reports"), description= _("Produces a detailed ancestral report"), - xpm= get_xpm_image(), author_name="Bruce DeGrasse", author_email="bdegrasse1@attbi.com" ) diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index fb8c4f941..bddd72b9c 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -27,7 +27,6 @@ import os import Errors from QuestionDialog import ErrorDialog -from Utils import get_xpm_image from gettext import gettext as _ import Report @@ -1230,7 +1229,6 @@ register_report( status=(_("Beta")), category=_("Text Reports"), description= _("Produces a detailed descendant report"), - xpm= get_xpm_image(), author_name="Bruce DeGrasse", author_email="bdegrasse1@attbi.com" ) diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index af1cb2283..e6bd4a735 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -40,7 +40,6 @@ import Report import BaseDoc import Errors import Utils -from Utils import get_xpm_image from gettext import gettext as _ from QuestionDialog import ErrorDialog @@ -725,7 +724,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description=_("Creates a family group report, showing information on a set of parents and their children."), - xpm=get_xpm_image() ) # (name,category,options_dialog,write_book_item,options,style_name,style_file,make_default_style) diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 7f6d016f4..0675dee77 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -38,7 +38,6 @@ import BaseDoc import RelLib import Errors from QuestionDialog import ErrorDialog -from Utils import get_xpm_image from gettext import gettext as _ #------------------------------------------------------------------------ @@ -1241,7 +1240,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description= _("Produces a textual ancestral report similar to Family Tree Maker."), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" ) diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index c9e7aa43c..1c148c95e 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -45,7 +45,6 @@ import RelLib import Errors import Utils from QuestionDialog import ErrorDialog -from Utils import get_xpm_image from gettext import gettext as _ #------------------------------------------------------------------------ @@ -1675,7 +1674,6 @@ register_report( category=_("Text Reports"), status=(_("Beta")), description= _("Produces a textual descendant report similar to Family Tree Maker."), - xpm=get_xpm_image(), author_name="Alex Roitman", author_email="shura@alex.neuro.umn.edu" ) diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index f514efabe..3e54c086c 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -39,7 +39,6 @@ import StyleEditor import Report import GenericFilter import Errors -from Utils import get_xpm_image from QuestionDialog import ErrorDialog from gettext import gettext as _ @@ -755,7 +754,6 @@ register_report( status=(_("Beta")), category=_("Text Reports"), description=_("Produces a complete report on the selected people."), - xpm=get_xpm_image() ) register_book_item( diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index 7fc2913dc..977a0d26b 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -48,7 +48,6 @@ import StyleEditor import Report import Errors from QuestionDialog import ErrorDialog -from Utils import get_xpm_image from gettext import gettext as _ #------------------------------------------------------------------------ @@ -560,7 +559,6 @@ register_report( status=(_("Beta")), category=_("Text Reports"), description=_("Produces a detailed report on the selected person."), - xpm=get_xpm_image(), author_name="Donald N. Allingham", author_email="dallingham@users.sourceforge.net" diff --git a/gramps2/src/plugins/Makefile.in b/gramps2/src/plugins/Makefile.in index f94fb33ae..ff1e80998 100644 --- a/gramps2/src/plugins/Makefile.in +++ b/gramps2/src/plugins/Makefile.in @@ -141,7 +141,7 @@ pkgpython_PYTHON = \ BookReport.py\ ChangeTypes.py\ Check.py\ - count_anc.py\ + CountAncestors.py\ Desbrowser.py\ DescendReport.py\ DesGraph.py\ @@ -163,7 +163,7 @@ pkgpython_PYTHON = \ ReadNative.py\ RelCalc.py\ ReorderIds.py\ - soundgen.py\ + SoundGen.py\ Summary.py\ TimeLine.py\ Verify.py\ @@ -173,8 +173,8 @@ pkgpython_PYTHON = \ WritePkg.py\ WriteCD.py\ rel_ru.py\ - eval.py\ - leak.py\ + Eval.py\ + Leak.py\ SimpleBookTitle.py\ CustomBookText.py\ RelGraph.py\ diff --git a/gramps2/src/plugins/SimpleBookTitle.py b/gramps2/src/plugins/SimpleBookTitle.py index 1a1507b32..76bb14e18 100644 --- a/gramps2/src/plugins/SimpleBookTitle.py +++ b/gramps2/src/plugins/SimpleBookTitle.py @@ -461,96 +461,6 @@ def write_book_item(database,person,doc,options,newpage=0): import DisplayTrace DisplayTrace.DisplayTrace() -#------------------------------------------------------------------------ -# -# -# -#------------------------------------------------------------------------ -def get_xpm_image(): - return [ - "48 48 33 1", - " c None", - ". c #1A1A1A", - "+ c #847B6E", - "@ c #B7AC9C", - "# c #D1D1D0", - "$ c #EEE2D0", - "% c #6A655C", - "& c #868686", - "* c #F1EADF", - "= c #5C5854", - "- c #B89C73", - "; c #E2C8A1", - "> c #55524C", - ", c #F5EEE6", - "' c #4F4E4C", - ") c #A19C95", - "! c #B3966E", - "~ c #CDC8BF", - "{ c #F6F2ED", - "] c #A6A5A4", - "^ c #413F3F", - "/ c #D8D1C5", - "( c #968977", - "_ c #BAB9B6", - ": c #FAFAF9", - "< c #BEA27B", - "[ c #E9DAC2", - "} c #9D9385", - "| c #E4E3E3", - "1 c #7A7062", - "2 c #E6D3B4", - "3 c #BAA488", - "4 c #322E2B", - " ", - " ", - " (+(+++++111%1%%%%===%1 ", - " +______________@_@)&==1 ", - " +_::::::::::::::*|#_&&}> ", - " &_:::::::::::::::{|#]1~}^ ", - " +_::::::::::::::::{|#=|~&4 ", - " +_::::]]]]]]]]:::::|{':|~&4 ", - " +_::::::::::::::::::{'::|~&4 ", - " +_:::::::::::::::::::'*::|~&^ ", - " +_:::::::::::::::::::'|*::|~}> ", - " 1_::::]]]]]]]]]]]]:::'~|{::|_}% ", - " 1_:::::::::::::::::::'..4^'=1+%1 ", - " +_::::]]]]]]]]]]]]:::|__])&+%=^% ", - " 1_::::::::::::::::::::|#__)&&+'^ ", - " 1_::::]]]]]]]]]::::::::|#~_])&%^ ", - " 1_::::::::::::::::::::{||#~_])14 ", - " 1_::::]]]]]]]]]]]]]]]]]]&}#~_]+4 ", - " 1_::::::::::::::::::{{{{||#~~@&4 ", - " %_::::]]]]]]]]]]]]]]]])))}(~~~&4 ", - " %_:::::::::::::::::{{{{{*|#/~_(4 ", - " %_::::]]]]]]]]]]]]]]])))))}2;/}4 ", - " %_:::::::::::::::{{{{{***||[#~}4 ", - " %_::::]]]]]]]]]])]))))))))}2/;)4 ", - " %_::::::::::::::{{{{{**|$$[/2~!4 ", - " %_::::]]]]]]]]){{{{******$$[2/}4 ", - " %_::::::::::::{{{{****$$$$$[2/!4 ", - " =_::::]]]]]]])]))))))))})}}[2/!4 ", - " %_:::::::::{{{{{{**|$$$$$$[[2;)4 ", - " =_::::]]]])]]))))))))))}}}}[22!4 ", - " %_::::::::{{{{{|**|$$[$[[[[[22}4 ", - " =_::::]]])])))))))))}}}}}}}222-4 ", - " =_:::::{{{{{|{*|$$$$$[[[[22222!4 ", - " =_::::)]])))))))))}}}}}}(}(2;2-4 ", - " =_:::{{{{{{***|$$$$$[[[[22222;-4 ", - " =_:::{])))))))))}}}}}}}(}((2;;<4 ", - " >_:{{{{{{**|$$$$$[[[[22222;2;;-4 ", - " >_{{{{)))))))}}}}}}}(!(((((;;;-4 ", - " >_{{{{|**|*$$$$$[[[[22222;;;;;!4 ", - " '_{{{{****$$$$$2[[222222;2;;;;-4 ", - " '@{{****$$$$$[[[2[222;;2;;;;;;!4 ", - " >]{******$$$[$[2[[2222;;;;;;;;!4 ", - " '_****$$$$[$[[[[2222;2;;;;;;;;!4 ", - " '@__@@@@@@@33<3<<<<<<-<-!!!!!!!4 ", - " 44444444444444444444444444444444 ", - " ", - " ", - " "] - #------------------------------------------------------------------------ # # diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index 8a4a9e7e1..9719c5773 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -1597,97 +1597,6 @@ class MiniTree: def report(database,person): WebReportDialog(database,person) -#------------------------------------------------------------------------ -# -# -# -#------------------------------------------------------------------------ -def get_xpm_image(): - return [ - "48 48 33 1", - " c None", - ". c #191B1E", - "+ c #746F5F", - "@ c #6EA2C9", - "# c #F2E8DA", - "$ c #B4A766", - "% c #2F383A", - "& c #9F8F53", - "* c #BBB774", - "= c #6E614B", - "- c #506E8C", - "; c #2B559A", - "> c #E1CB95", - ", c #5992CD", - "' c #5A584F", - ") c #86827D", - "! c #CBCAC7", - "~ c #294A76", - "{ c #E3D0B6", - "] c #7B7D7C", - "^ c #D5BE97", - "/ c #FBFAF8", - "( c #EADECB", - "_ c #4E84C7", - ": c #474943", - "< c #95A992", - "[ c #ADA69B", - "} c #3F72B7", - "| c #C4A985", - "1 c #9B9383", - "2 c #213C60", - "3 c #BBB9AF", - "4 c #7F959D", - " )11)1))))))]]+++=='='' ", - " 13!!!{!!!!^!!!!!33[<]')= ", - " 1!////////////#/##!![]<4: ", - " 1!////////////////#(![[3): ", - " )!////////////////##(33(3]% ", - " 1!//////////////////#3>>$4,4<,};;~2-#///////#!!331)=: ", - " ;-$>>>>>>><@4<*];}~22;!///////#!!33[]' ", - " ;_@>>##((>>*@4$*<-;;~2%-!#/////#((!33):. ", - " ~},<(##(##(>>*$*$+-;;~22%[##/////#(!!^1'. ", - " -_@!(####(>>>>**$-}};;2222!(#////#(({3['. ", - " ;}_,!##//#(>(>**&&]}}};2222)!(#/#/##{!![=. ", - " ;_,@>/#//##>>>^$)}}}};;~22%;!!(/#/##({^['. ", - " ;_,@!#///#>>>>*&__}}};;;22.:###/#>>>*&___}_};;~22%%+3!(####({{|'. ", - " ~}_,@@(###><<<$4,_,_}}};;22%.+[!{###(({{[=. ", - " 2},,,@*#((@@@@4,_,___};;~22%%+[3!(###({{|=. ", - " ~}_,,@@*(><@<@@4,,_}}};;~2.2.-[3!{(##({{[=. ", - " 2;_,,,@@*>*<*,,,____}};~~2.%%'[[!{((#({{|=. ", - " ~}__,@,@,<*!<,___}}}};;~~22..-[[3{((((({[=. ", - " ;}_,,,@@@,<<<_}}}}}};;~2222%+[[!{(((({{|=. ", - " ~}}_,,,@,,,,<}]44};;;;222..:11[^!((({{{|=. ", - " ;;}_,,,,@@@,,$&&&)-;22222.2'1[[^{{{(({{|=. ", - " ;}}___,,,,_)&<&&+='~222..211[[^{({{({>|=. ", - " ~;}}____,__&&&&+++'22.2.%=11[3^{({({{>|=. ", - " ;}}}}}}}}}]&&]+=:::22..2)11|3{{{{{{{{|=. ", - " ;;}}}}}}}=]]+='::%%.2%)11[|^{{({{{>>|=. ", - " ;;;;;};;;=''::::%.%.)11[[|!>{{>{>>>|=. ", - " ;;;};;;~%::%%:%%%%1111[|^{{({{>{>>|=. ", - " ~~;~;~~2%:%%%%.=]11[[|3{{{{{{{>>^|=. ", - " '~~~~%%:%%.')1111[[^^>{{{{>>>>^|=. ", - " :+-''::'&111[1[||3{{{{{>>>>^>^|=. ", - " '1*$[$[1[1[1[[[3^^{{{{{>{>^>^^|=. ", - " '<333[[[[[[||3^^{{{{{{>>>^>^^^|=. ", - " '3({!!^^3^3^^!{{{{{{{>>>>^>^^^|=. ", - " =3((({!{!{!{{{{{{{{{>>>^^>^^^^|=. ", - " '3###((({(({((({{{{{>{>>^^^^^^|=. ", - " =3!!!!!^!^^^^|^^|^|||||||||||||'. ", - " :++++++=+======================:. ", - " ............................. ", - " ", - " ", - " "] - - #------------------------------------------------------------------------- # # @@ -1701,6 +1610,5 @@ register_report( category=_("Web Page"), status=(_("Beta")), description=_("Generates web (HTML) pages for individuals, or a set of individuals."), - xpm=get_xpm_image() )