diff --git a/gramps/NEWS b/gramps/NEWS index 12b42f2ff..8692dfb52 100644 --- a/gramps/NEWS +++ b/gramps/NEWS @@ -41,6 +41,10 @@ Version 0.6.0pre * Reordering GRAMPS' ids attempts to preserve the integer originally assigned to the object. * The person view can be sorted by GRAMPS id. +* KWord format generated is now compatible with KWord 1.1. Images may + now be included in KWord documents (requires Python Imaging Library). + Tables are not working yet. I can figure out how to format a KWord + table. Version 0.5.1 * Bug fixes diff --git a/gramps/src/Filter.py b/gramps/src/Filter.py index 41a818fb7..92bdac432 100644 --- a/gramps/src/Filter.py +++ b/gramps/src/Filter.py @@ -26,10 +26,10 @@ import re import os import sys -import intl import gtk -_ = intl.gettext +from intl import gettext +_ = gettext #------------------------------------------------------------------------- # diff --git a/gramps/src/Find.py b/gramps/src/Find.py index c06986a8f..b779d8059 100644 --- a/gramps/src/Find.py +++ b/gramps/src/Find.py @@ -41,7 +41,7 @@ class Find: self.clist = clist self.task = task - self.xml = libglade.GladeXML(const.gladeFile,"find") + self.xml = libglade.GladeXML(const.findFile,"find") self.xml.signal_autoconnect({ "destroy_passed_object" : utils.destroy_passed_object, "on_next_clicked" : self.on_next_clicked, diff --git a/gramps/src/FindDoc.py b/gramps/src/FindDoc.py index 42a614f95..71c67838c 100644 --- a/gramps/src/FindDoc.py +++ b/gramps/src/FindDoc.py @@ -27,8 +27,9 @@ from TextDoc import * from DrawDoc import * import gtk import Config -import intl -_ = intl.gettext + +from intl import gettext +_ = gettext #------------------------------------------------------------------------- # diff --git a/gramps/src/LocEdit.py b/gramps/src/LocEdit.py index 756034061..ea6843fe7 100644 --- a/gramps/src/LocEdit.py +++ b/gramps/src/LocEdit.py @@ -30,12 +30,12 @@ import libglade # gramps modules # #------------------------------------------------------------------------- -import intl import const import utils from RelLib import * -_ = intl.gettext +from intl import gettext +_ = gettext #------------------------------------------------------------------------- # diff --git a/gramps/src/MediaView.py b/gramps/src/MediaView.py index bcaf6adc3..43e23d50c 100644 --- a/gramps/src/MediaView.py +++ b/gramps/src/MediaView.py @@ -28,6 +28,7 @@ from RelLib import * import utils import const import os +import Config from intl import gettext _ = gettext @@ -35,23 +36,83 @@ _ = gettext class MediaView: def __init__(self,db,glade,update): self.db = db - self.media_list = glade.get_widget("media_list") - self.mid = glade.get_widget("mid") - self.mtype = glade.get_widget("mtype") - self.mdesc = glade.get_widget("mdesc") - self.mpath = glade.get_widget("mpath") - self.mdetails = glade.get_widget("mdetails") - self.preview = glade.get_widget("preview") + self.media_list = glade.get_widget("media_list") + self.mid = glade.get_widget("mid") + self.mtype = glade.get_widget("mtype") + self.mdesc = glade.get_widget("mdesc") + self.mpath = glade.get_widget("mpath") + self.mdetails = glade.get_widget("mdetails") + self.mid_arrow = glade.get_widget("mid_arrow") + self.mdescr_arrow= glade.get_widget("mdescr_arrow") + self.mtype_arrow = glade.get_widget("mtype_arrow") + self.mpath_arrow = glade.get_widget("mpath_arrow") + self.preview = glade.get_widget("preview") + + self.sort_arrow = [self.mdescr_arrow, self.mid_arrow, + self.mtype_arrow, self.mpath_arrow] + self.sort_map = [5,1,2,3,-1] + self.sort_col = 5 + self.sort_dir = GTK.SORT_ASCENDING + self.media_list.connect('click-column',self.click_column) + + self.mid_arrow.hide() + self.mtype_arrow.hide() + self.mpath_arrow.hide() t = [ ('STRING', 0, 0), ('text/plain',0,0), ('text/uri-list',0,2), ('application/x-rootwin-drop',0,1)] - self.media_list.drag_source_set(GDK.BUTTON1_MASK|GDK.BUTTON3_MASK,t,GDK.ACTION_COPY) - self.media_list.drag_dest_set(GTK.DEST_DEFAULT_ALL,t,GDK.ACTION_COPY|GDK.ACTION_MOVE) + self.media_list.drag_source_set(GDK.BUTTON1_MASK|GDK.BUTTON3_MASK, + t, + GDK.ACTION_COPY) + self.media_list.drag_dest_set(GTK.DEST_DEFAULT_ALL, + t, + GDK.ACTION_COPY|GDK.ACTION_MOVE) self.update = update + self.media_list.set_column_visibility(4,Config.show_detail) + self.media_list.set_column_visibility(5,0) + self.media_list.connect('button-press-event',self.on_button_press_event) + + def click_column(self,obj,column): + + new_col = self.sort_map[column] + if new_col == -1: + return + + data = None + if len(obj.selection) == 1: + data = obj.get_row_data(obj.selection[0]) + + obj.freeze() + if new_col == self.sort_col: + if self.sort_dir == GTK.SORT_ASCENDING: + self.sort_dir = GTK.SORT_DESCENDING + else: + self.sort_dir = GTK.SORT_ASCENDING + else: + self.sort_dir = GTK.SORT_ASCENDING + + for a in self.sort_arrow: + a.hide() + + a = self.sort_arrow[column] + a.show() + if self.sort_dir == GTK.SORT_ASCENDING: + a.set(GTK.ARROW_DOWN,2) + else: + a.set(GTK.ARROW_UP,2) + + obj.set_sort_type(self.sort_dir) + obj.set_sort_column(new_col) + self.sort_col = new_col + obj.sort() + if data: + row = obj.find_row_from_data(data) + obj.moveto(row) + obj.thaw() def on_select_row(self,obj,row,b,c): mobj = obj.get_row_data(row) @@ -67,7 +128,15 @@ class MediaView: self.mpath.set_text(path) else: self.mpath.set_text("") - self.mdetails.set_text("") + self.mdetails.set_text(utils.get_detail_text(mobj,0)) + + def on_button_press_event(self,obj,event): + if event.button != 1 or event.type != GDK._2BUTTON_PRESS: + return + if len(self.media_list.selection) <= 0: + return + object = self.media_list.get_row_data(self.media_list.selection[0]) + ImageSelect.GlobalMediaProperties(self.db,object,self.load_media) def load_media(self): @@ -78,7 +147,9 @@ class MediaView: self.media_list.freeze() self.media_list.clear() - + self.media_list.set_column_visibility(1,Config.id_visible) + self.media_list.set_column_visibility(4,Config.show_detail) + index = 0 objects = self.db.getObjectMap().values() @@ -90,7 +161,9 @@ class MediaView: path = "" else: path = src.getPath() - self.media_list.append([id,title,type,path,""]) + details = utils.get_detail_flags(src,0) + stitle = string.upper(title) + self.media_list.append([title,id,type,path,details,stitle]) self.media_list.set_row_data(index,src) index = index + 1 diff --git a/gramps/src/MergeData.py b/gramps/src/MergeData.py index 3b4161198..c4eda09b9 100644 --- a/gramps/src/MergeData.py +++ b/gramps/src/MergeData.py @@ -19,11 +19,12 @@ # import RelLib -import intl import utils import Config import const -_ = intl.gettext + +from intl import gettext +_ = gettext import string import libglade diff --git a/gramps/src/NameEdit.py b/gramps/src/NameEdit.py index 6f0576167..168a21699 100644 --- a/gramps/src/NameEdit.py +++ b/gramps/src/NameEdit.py @@ -30,11 +30,11 @@ import libglade # gramps modules # #------------------------------------------------------------------------- -import intl import const import utils from RelLib import * +from intl import gettext _ = intl.gettext #------------------------------------------------------------------------- diff --git a/gramps/src/PlaceView.py b/gramps/src/PlaceView.py index 87bede463..c67567b9b 100644 --- a/gramps/src/PlaceView.py +++ b/gramps/src/PlaceView.py @@ -26,6 +26,7 @@ import string from RelLib import * import EditPlace import utils +import Config from intl import gettext _ = gettext @@ -60,16 +61,21 @@ class PlaceView: self.place_list.set_column_visibility(13,0) self.place_list.set_sort_column(self.sort_column+7) self.place_list.set_sort_type(self.sort_direct) + self.place_list.connect('button-press-event',self.on_button_press_event) + self.place_list.connect('select-row',self.select_row) + self.active = None def load_places(self): - self.place_list.freeze() - self.place_list.clear() - if len(self.place_list.selection) == 0: current_row = 0 else: current_row = self.place_list.selection[0] + self.place_list.freeze() + self.place_list.clear() + + self.place_list.set_column_visibility(1,Config.id_visible) + index = 0 places = self.db.getPlaceMap().values() @@ -94,9 +100,16 @@ class PlaceView: if index > 0: self.place_list.select_row(current_row,0) self.place_list.moveto(current_row) - + self.active = self.place_list.get_row_data(current_row) + else: + self.active = None + self.place_list.thaw() + def select_row(self,obj,row,b,c): + if row == obj.selection[0]: + self.active = self.place_list.get_row_data(row) + def merge(self): if len(self.place_list.selection) != 2: msg = _("Exactly two places must be selected to perform a merge") @@ -109,10 +122,9 @@ class PlaceView: def on_button_press_event(self,obj,event): if event.button == 1 and event.type == GDK._2BUTTON_PRESS: - if len(obj.selection) > 0: - index = obj.selection[0] - place = obj.get_row_data(index) - EditPlace.EditPlace(place,self.db,self.update_display_after_edit) + if self.active: + EditPlace.EditPlace(self.active,self.db, + self.update_display_after_edit) def on_click_column(self,obj,column): obj.freeze() diff --git a/gramps/src/SourceView.py b/gramps/src/SourceView.py index 270511f0f..77127c4d4 100644 --- a/gramps/src/SourceView.py +++ b/gramps/src/SourceView.py @@ -18,12 +18,20 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +#------------------------------------------------------------------------- +# +# standard python modules +# +#------------------------------------------------------------------------- +import string + #------------------------------------------------------------------------- # # GTK/Gnome modules # #------------------------------------------------------------------------- import GDK +import GTK import gnome.ui #------------------------------------------------------------------------- @@ -34,6 +42,7 @@ import gnome.ui from RelLib import * import EditSource import utils +import Config #------------------------------------------------------------------------- # @@ -44,23 +53,81 @@ from intl import gettext _ = gettext class SourceView: - def __init__(self,db,source_list,update): - self.source_list = source_list + def __init__(self,db,glade,update): + self.glade = glade self.db = db self.update = update + self.source_list = glade.get_widget("source_list") + self.title_arrow = glade.get_widget("title_arrow") + self.id_arrow = glade.get_widget("src_id_arrow") + self.author_arrow= glade.get_widget("author_arrow") + self.source_list.set_column_visibility(3,0) + self.source_list.set_column_visibility(4,0) + self.id_arrow.hide() + self.author_arrow.hide() + self.sort_map = [3,1,4,-1] + self.sort_dir = GTK.SORT_ASCENDING + self.sort_col = 3 + self.sort_arrow = [self.title_arrow, self.id_arrow, self.author_arrow] + self.source_list.connect('click-column',self.click_column) + def click_column(self,obj,column): + + new_col = self.sort_map[column] + if new_col == -1: + return + + data = None + if len(obj.selection) == 1: + data = obj.get_row_data(obj.selection[0]) + + obj.freeze() + if new_col == self.sort_col: + if self.sort_dir == GTK.SORT_ASCENDING: + self.sort_dir = GTK.SORT_DESCENDING + else: + self.sort_dir = GTK.SORT_ASCENDING + else: + self.sort_dir = GTK.SORT_ASCENDING + + for a in self.sort_arrow: + a.hide() + + a = self.sort_arrow[column] + a.show() + if self.sort_dir == GTK.SORT_ASCENDING: + a.set(GTK.ARROW_DOWN,2) + else: + a.set(GTK.ARROW_UP,2) + + obj.set_sort_type(self.sort_dir) + obj.set_sort_column(new_col) + self.sort_col = new_col + obj.sort() + if data: + row = obj.find_row_from_data(data) + obj.moveto(row) + obj.thaw() + def load_sources(self): - self.source_list.clear() - self.source_list.freeze() if len(self.source_list.selection) > 0: current_row = self.source_list.selection[0] else: current_row = 0 + self.source_list.clear() + self.source_list.freeze() + self.source_list.set_column_visibility(1,Config.id_visible) + index = 0 for src in self.db.getSourceMap().values(): - self.source_list.append([src.getTitle(),src.getAuthor()]) + id = src.getId() + title = src.getTitle() + author = src.getAuthor() + stitle = string.upper(title) + sauthor = string.upper(author) + self.source_list.append([title,id,author,stitle,sauthor]) self.source_list.set_row_data(index,src) index = index + 1 @@ -68,6 +135,7 @@ class SourceView: self.source_list.select_row(current_row,0) self.source_list.moveto(current_row) + self.source_list.sort() self.source_list.thaw() def on_button_press_event(self,obj,event): diff --git a/gramps/src/Sources.py b/gramps/src/Sources.py index 3b310c5b2..13e82b6d1 100644 --- a/gramps/src/Sources.py +++ b/gramps/src/Sources.py @@ -54,7 +54,7 @@ class SourceSelector: for s in self.orig: self.list.append(SourceRef(s)) self.update=update - self.top = libglade.GladeXML(const.gladeFile,"sourcesel") + self.top = libglade.GladeXML(const.srcselFile,"sourcesel") self.top.signal_autoconnect({ "destroy_passed_object" : utils.destroy_passed_object, "on_add_src_clicked" : self.on_add_src_clicked, @@ -117,7 +117,7 @@ class SourceEditor: self.parent = parent self.update = update self.source_ref = srcref - self.showSource = libglade.GladeXML(const.gladeFile, "sourceDisplay") + self.showSource = libglade.GladeXML(const.srcselFile, "sourceDisplay") self.showSource.signal_autoconnect({ "on_combo_insert_text" : utils.combo_insert_text, "on_sourceok_clicked" : self.on_sourceok_clicked, diff --git a/gramps/src/VersionControl.py b/gramps/src/VersionControl.py index b9f8c2779..3a2c30de9 100644 --- a/gramps/src/VersionControl.py +++ b/gramps/src/VersionControl.py @@ -74,7 +74,7 @@ class RevisionComment: def __init__(self,filename,save_file): self.filename = filename self.save = save_file - self.top = libglade.GladeXML(const.gladeFile, "revcom") + self.top = libglade.GladeXML(const.revisionFile, "revcom") self.top.signal_autoconnect({ "on_savecomment_clicked" : self.on_savecomment_clicked, }) @@ -97,7 +97,7 @@ class RevisionSelect: self.vc = vc self.load = load - dialog = libglade.GladeXML(const.gladeFile, "revselect") + dialog = libglade.GladeXML(const.revisionFile, "revselect") dialog.signal_autoconnect({ "destroy_passed_object" : utils.destroy_passed_object, "on_loadrev_clicked" : self.on_loadrev_clicked, diff --git a/gramps/src/const.py b/gramps/src/const.py index 40dee625b..faf16069f 100644 --- a/gramps/src/const.py +++ b/gramps/src/const.py @@ -82,6 +82,9 @@ editnoteFile = "%s/editnote.glade" % rootDir configFile = "%s/config.glade" % rootDir stylesFile = "%s/styles.glade" % rootDir dialogFile = "%s/dialog.glade" % rootDir +revisionFile = "%s/revision.glade" % rootDir +srcselFile = "%s/srcsel.glade" % rootDir +findFile = "%s/find.glade" % rootDir mergeFile = "%s/mergedata.glade" % rootDir pluginsDir = "%s/plugins" % rootDir filtersDir = "%s/filters" % rootDir diff --git a/gramps/src/find.glade b/gramps/src/find.glade new file mode 100644 index 000000000..1c1c5e9ba --- /dev/null +++ b/gramps/src/find.glade @@ -0,0 +1,183 @@ + + + + + Gramps + gramps + + src + + C + True + True + True + gramps.strings + + + + GnomeDialog + find + Gramps - Find person + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 375 + 175 + True + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox14 + False + 0 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area14 + GTK_BUTTONBOX_SPREAD + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + prev + True + True + + clicked + on_prev_clicked + find + Wed, 05 Sep 2001 02:55:37 GMT + + GNOME_STOCK_BUTTON_PREV + + + + GtkButton + next + True + True + True + + clicked + on_next_clicked + find + Wed, 05 Sep 2001 02:55:23 GMT + + GNOME_STOCK_BUTTON_NEXT + + + + GtkButton + button120 + True + True + + clicked + destroy_passed_object + find + Wed, 05 Sep 2001 02:55:07 GMT + + GNOME_STOCK_BUTTON_CLOSE + + + + + GtkVBox + vbox41 + False + 0 + + 0 + True + True + + + + GtkLabel + label238 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 10 + False + False + + + + + GtkHSeparator + hseparator22 + + 0 + False + False + + + + + GtkHBox + hbox31 + False + 0 + + 19 + True + True + + + + Placeholder + + + + GtkEntry + entry1 + 250 + True + True + True + True + 0 + + + 10 + True + True + + + + + Placeholder + + + + + + + diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade index a20dec927..3f105ed50 100644 --- a/gramps/src/gramps.glade +++ b/gramps/src/gramps.glade @@ -2321,17 +2321,185 @@ on_source_list_button_press_event Thu, 31 May 2001 17:22:45 GMT - 2 - 300,80 + 5 + 293,60,372,5,5 GTK_SELECTION_SINGLE True GTK_SHADOW_IN + + GtkHBox + CList:title + hbox53 + True + 0 + + + GtkHBox + hbox54 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + label288 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + title_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + + + + + GtkHBox + CList:title + hbox57 + True + 0 + + + GtkHBox + hbox58 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + label290 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + src_id_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + + + + + GtkHBox + CList:title + hbox55 + True + 0 + + + GtkHBox + hbox56 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + label289 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + author_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + + + GtkLabel CList:title - label215 - + label216a + GTK_JUSTIFY_CENTER False 0.5 @@ -2343,8 +2511,8 @@ GtkLabel CList:title - label216 - + label216b + GTK_JUSTIFY_CENTER False 0.5 @@ -2453,23 +2621,13 @@ GtkCList place_list True - - select_row - on_place_list_select_row - Fri, 17 Aug 2001 23:00:12 GMT - - - button_press_event - on_place_list_button_press_event - Fri, 17 Aug 2001 23:00:19 GMT - click_column on_place_list_click_column Tue, 30 Oct 2001 18:18:53 GMT - 12 - 222,47,102,88,77,80,5,5,5,5,5,5 + 14 + 222,47,102,88,77,80,20,5,5,5,5,5,5,5 GTK_SELECTION_EXTENDED True GTK_SHADOW_IN @@ -2643,6 +2801,7 @@ + GtkHBox CList:title @@ -3091,8 +3250,8 @@ GtkTable table27 - 4 - 6 + 5 + 3 False 0 0 @@ -3136,8 +3295,8 @@ 1 2 - 1 - 2 + 2 + 3 0 0 False @@ -3162,8 +3321,8 @@ 1 2 - 2 - 3 + 3 + 4 0 0 False @@ -3188,8 +3347,8 @@ 1 2 - 3 - 4 + 4 + 5 0 0 False @@ -3202,13 +3361,41 @@ - GtkEntry + GtkLabel + label268 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 2 + + 0 + 1 + 4 + 5 + 5 + 0 + False + False + False + False + True + False + + + + + GtkLabel mid - True - False - True - 0 - + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 5 + 0 2 3 @@ -3236,10 +3423,10 @@ 3 0 - 4 - 5 - 0 - 1 + 1 + 2 + 1 + 2 0 0 False @@ -3252,45 +3439,23 @@ - GtkEntry + GtkLabel mtype - True - False - True - 0 - - - 5 - 6 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkEntry - mdesc - True - False - True - 0 - + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 5 + 0 2 - 6 + 3 1 2 0 0 - True + False False False False @@ -3300,16 +3465,18 @@ - GtkEntry - mpath - True - False - True - 0 - + GtkLabel + mdesc + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 5 + 0 2 - 6 + 3 2 3 0 @@ -3324,16 +3491,18 @@ - GtkEntry - mdetails - True - False - True - 0 - + GtkLabel + mpath + + GTK_JUSTIFY_CENTER + False + 0 + 0.5 + 5 + 0 2 - 6 + 3 3 4 0 @@ -3349,22 +3518,22 @@ GtkLabel - label265 - + mdetails + GTK_JUSTIFY_CENTER False - 1 + 0 0.5 - 0 - 5 + 5 + 0 - 3 - 4 - 0 - 1 - 5 + 2 + 3 + 4 + 5 + 0 0 - False + True False False False @@ -3375,19 +3544,19 @@ GtkLabel - label264 - + label267 + GTK_JUSTIFY_CENTER False 1 0.5 0 - 5 + 2 0 1 - 0 - 1 + 3 + 4 5 0 False @@ -3408,33 +3577,7 @@ 1 0.5 0 - 5 - - 0 - 1 - 1 - 2 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label267 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 5 + 2 0 1 @@ -3453,19 +3596,45 @@ GtkLabel - label268 - + label265 + GTK_JUSTIFY_CENTER False 1 0.5 0 - 5 + 2 0 1 - 3 - 4 + 1 + 2 + 5 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label264 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 0 + 2 + + 0 + 1 + 0 + 1 5 0 False @@ -3512,62 +3681,234 @@ on_media_list_drag_data_received Thu, 11 Oct 2001 22:42:26 GMT - 5 - 33,331,104,168,80 + 6 + 294,58,104,168,80,5 GTK_SELECTION_SINGLE True GTK_SHADOW_IN - GtkLabel + GtkHBox CList:title - label259 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + hbox59 + True + 0 + + + GtkHBox + hbox60 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + label291 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + mdescr_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + - GtkLabel + GtkHBox CList:title - label260 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + hbox61 + True + 0 + + + GtkHBox + hbox62 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + mid_label + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + mid_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + - GtkLabel + GtkHBox CList:title - label261 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + hbox63 + True + 0 + + + GtkHBox + hbox64 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + mtype_label + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + mtype_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + - GtkLabel + GtkHBox CList:title - label262 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 + hbox65 + True + 0 + + + GtkHBox + hbox66 + False + 0 + + 0 + False + False + + + + GtkLabel + CList:title + mpath_label + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkArrow + mpath_arrow + 10 + 10 + GTK_ARROW_DOWN + GTK_SHADOW_OUT + 0.5 + 0.5 + 0 + 0 + + 5 + False + True + + + @@ -3582,6 +3923,19 @@ 0 0 + + + GtkLabel + CList:title + label263a + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + @@ -5760,629 +6114,6 @@ Unknown - - GnomeDialog - sourceDisplay - Gramps - Source Information - GTK_WINDOW_DIALOG - GTK_WIN_POS_NONE - True - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - vbox27 - 2 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - hbuttonbox17 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button94 - True - True - True - - clicked - on_sourceok_clicked - sourceDisplay - Tue, 16 Jan 2001 17:55:52 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button95 - True - True - - clicked - destroy_passed_object - sourceDisplay - Thu, 11 Jan 2001 04:15:44 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox28 - False - 0 - - 0 - True - True - - - - GtkLabel - sourceInfoTitle - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 5 - False - False - - - - - GtkHSeparator - hseparator13 - - 5 - True - True - - - - - GtkVBox - vbox29 - False - 0 - - 0 - True - True - - - - GtkTable - table18 - 4 - 2 - False - 0 - 0 - - 0 - True - True - - - - GtkLabel - label173 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label174 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label175 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkHSeparator - hseparator14 - - 0 - 2 - 3 - 4 - 0 - 0 - False - True - False - False - True - True - - - - - GtkLabel - sauthor - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 3 - 0 - - 1 - 2 - 1 - 2 - 5 - 5 - True - False - False - False - True - False - - - - - GtkLabel - spubinfo - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 3 - 0 - - 1 - 2 - 2 - 3 - 5 - 5 - True - False - False - False - True - False - - - - - GtkCombo - source_title - True - False - False - True - False - - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - GtkEntry - GtkCombo:entry - source - True - True - - changed - on_source_changed - source_title - Thu, 16 Aug 2001 19:46:31 GMT - - - insert_text - on_combo_insert_text - source_title - Thu, 18 Oct 2001 01:57:50 GMT - - False - True - 0 - - - - - - - GtkTable - table19 - 5 - 2 - False - 0 - 0 - - 0 - True - True - - - - GtkScrolledWindow - scrolledwindow20 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 1 - 2 - 4 - 5 - 5 - 5 - False - False - False - False - True - True - - - - GtkText - scomment - 300 - True - True - - - - - - GtkScrolledWindow - scrolledwindow21 - 250 - GTK_POLICY_NEVER - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 1 - 2 - 3 - 4 - 5 - 5 - False - False - False - False - True - True - - - - GtkText - stext - True - True - - - - - - GtkEntry - sdate - True - True - True - 0 - - - 1 - 2 - 2 - 3 - 5 - 5 - True - False - False - False - True - False - - - - - GtkEntry - spage - True - True - True - 0 - - - 1 - 2 - 1 - 2 - 5 - 5 - True - False - False - False - True - False - - - - - GtkLabel - label180 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - True - False - False - False - False - False - - - - - GtkLabel - label181 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - True - False - False - False - True - False - - - - - GtkLabel - label182 - - GTK_JUSTIFY_CENTER - False - 1 - 0 - 5 - 5 - - 0 - 1 - 3 - 4 - 0 - 0 - True - False - False - False - True - True - - - - - GtkLabel - label183 - - GTK_JUSTIFY_CENTER - False - 1 - 0 - 5 - 10 - - 0 - 1 - 4 - 5 - 0 - 0 - True - False - False - False - True - True - - - - - GtkLabel - label243 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - conf - True - Very Low -Low -Normal -High -Very High - - 2 - - 1 - 2 - 0 - 1 - 5 - 5 - False - False - False - False - True - False - - - - - - - - GnomeDialog addChild @@ -6881,172 +6612,6 @@ Unknown - - GnomeDialog - find - Gramps - Find person - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 375 - 175 - True - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox14 - False - 0 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area14 - GTK_BUTTONBOX_SPREAD - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - prev - True - True - - clicked - on_prev_clicked - find - Wed, 05 Sep 2001 02:55:37 GMT - - GNOME_STOCK_BUTTON_PREV - - - - GtkButton - next - True - True - True - - clicked - on_next_clicked - find - Wed, 05 Sep 2001 02:55:23 GMT - - GNOME_STOCK_BUTTON_NEXT - - - - GtkButton - button120 - True - True - - clicked - destroy_passed_object - find - Wed, 05 Sep 2001 02:55:07 GMT - - GNOME_STOCK_BUTTON_CLOSE - - - - - GtkVBox - vbox41 - False - 0 - - 0 - True - True - - - - GtkLabel - label238 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 10 - False - False - - - - - GtkHSeparator - hseparator22 - - 0 - False - False - - - - - GtkHBox - hbox31 - False - 0 - - 19 - True - True - - - - Placeholder - - - - GtkEntry - entry1 - 250 - True - True - True - True - 0 - - - 10 - True - True - - - - - Placeholder - - - - - - GnomeDialog addperson @@ -7372,719 +6937,4 @@ Unknown - - GnomeDialog - dbopen - Gramps - Open a database - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox15 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area15 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button127 - True - True - - clicked - on_ok_button1_clicked - dbopen - Wed, 03 Oct 2001 02:55:59 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button129 - True - True - - clicked - destroy_passed_object - dbopen - Wed, 03 Oct 2001 02:56:46 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox44 - False - 0 - - 0 - False - True - - - - GtkLabel - label245 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 5 - False - False - - - - - GtkHSeparator - hseparator24 - - 10 - True - True - - - - - GtkHBox - hbox33 - False - 0 - - 0 - True - True - - - - GtkLabel - label246 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 5 - 5 - - 0 - False - False - - - - - GnomeFileEntry - dbname - 400 - recentdbs - 15 - Open a GRAMPS Database - True - False - - 0 - True - True - - - - GtkEntry - GnomeEntry:entry - combo-entry2 - True - True - True - 0 - - - - - - - GtkCheckButton - getoldrev - 10 - True - - False - True - - 0 - False - False - - - - - - - - GnomeDialog - revselect - Gramps - Select an older revision - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox16 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area16 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button132 - True - True - - clicked - on_loadrev_clicked - revselect - Wed, 03 Oct 2001 04:33:08 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button134 - True - True - - clicked - destroy_passed_object - revselect - Wed, 03 Oct 2001 04:32:38 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox45 - False - 0 - - 0 - True - True - - - - GtkLabel - label247 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator25 - - 5 - False - True - - - - - GtkScrolledWindow - scrolledwindow29 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - revlist - 600 - 200 - True - 4 - 53,128,69,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label250 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label251 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label251a - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - comlabel - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - - - - GnomeDialog - revcom - Gramps - Revison Control Comment - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox17 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area17 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button135 - True - True - - clicked - on_savecomment_clicked - revcom - Thu, 04 Oct 2001 13:42:23 GMT - - GNOME_STOCK_BUTTON_OK - - - - - GtkVBox - vbox46 - False - 0 - - 0 - True - True - - - - GtkLabel - label252 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator26 - - 10 - False - False - - - - - GtkEntry - text - 350 - True - True - True - True - 0 - - - 0 - False - False - - - - - - - - GnomeDialog - sourcesel - Gramps - Source Reference Selection - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False - False - False - - - GtkVBox - GnomeDialog:vbox - dialog-vbox18 - False - 8 - - 4 - True - True - - - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area18 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - - - - GtkButton - button136 - True - True - - clicked - on_src_ok_clicked - slist - Sat, 06 Oct 2001 15:41:23 GMT - - GNOME_STOCK_BUTTON_OK - - - - GtkButton - button138 - True - True - - clicked - destroy_passed_object - sourcesel - Fri, 05 Oct 2001 02:26:38 GMT - - GNOME_STOCK_BUTTON_CANCEL - - - - - GtkVBox - vbox47 - False - 0 - - 0 - True - True - - - - GtkLabel - label253 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - 0 - False - False - - - - - GtkHSeparator - hseparator27 - - 5 - True - True - - - - - GtkScrolledWindow - scrolledwindow30 - 400 - 150 - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_UPDATE_CONTINUOUS - GTK_UPDATE_CONTINUOUS - - 0 - True - True - - - - GtkCList - slist - True - 2 - 80,80 - GTK_SELECTION_SINGLE - True - GTK_SHADOW_IN - - - GtkLabel - CList:title - label254 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkLabel - CList:title - label255 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - - - GtkHButtonBox - hbuttonbox26 - GTK_BUTTONBOX_SPREAD - 30 - 85 - 27 - 7 - 0 - - 0 - True - True - - - - GtkButton - button139 - True - True - - clicked - on_add_src_clicked - slist - Sat, 06 Oct 2001 15:47:16 GMT - - - GTK_RELIEF_NORMAL - - - - GtkButton - button140 - True - True - - clicked - on_edit_src_clicked - slist - Fri, 05 Oct 2001 02:49:15 GMT - - - GTK_RELIEF_NORMAL - - - - GtkButton - button141 - True - True - - clicked - on_del_src_clicked - slist - Sat, 06 Oct 2001 15:39:54 GMT - - - GTK_RELIEF_NORMAL - - - - - - diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index 042a183ea..d2369eb60 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -1022,7 +1022,7 @@ def on_child_list_row_move(clist,fm,to): utils.modified() def on_open_activate(obj): - wFs = libglade.GladeXML(const.gladeFile, "dbopen") + wFs = libglade.GladeXML(const.revisionFile, "dbopen") wFs.signal_autoconnect({ "on_ok_button1_clicked": on_ok_button1_clicked, "destroy_passed_object": utils.destroy_passed_object @@ -1871,7 +1871,6 @@ def main(arg): statusbar = gtop.get_widget("statusbar") topWindow = gtop.get_widget("gramps") person_list = gtop.get_widget("person_list") - source_list = gtop.get_widget("source_list") filter_list = gtop.get_widget("filter_list") notebook = gtop.get_widget(NOTEBOOK) nameArrow = gtop.get_widget("nameSort") @@ -1885,7 +1884,7 @@ def main(arg): statusbar,change_active_person,\ load_person) place_view = PlaceView(database,gtop,update_display) - source_view = SourceView(database,source_list,update_display) + source_view = SourceView(database,gtop,update_display) media_view = MediaView(database,gtop,update_display) cNameArrow = gtop.get_widget("cNameSort") @@ -1959,7 +1958,6 @@ def main(arg): "on_person_list_button_press" : on_person_list_button_press, "on_person_list_click_column" : on_person_list_click_column, "on_person_list_select_row" : on_person_list_select_row, - "on_place_list_button_press_event" : place_view.on_button_press_event, "on_place_list_click_column" : place_view.on_click_column, "on_main_key_release_event" : on_main_key_release_event, "on_add_media_clicked" : media_view.create_add_dialog, diff --git a/gramps/src/revision.glade b/gramps/src/revision.glade new file mode 100644 index 000000000..f7fa4b581 --- /dev/null +++ b/gramps/src/revision.glade @@ -0,0 +1,506 @@ + + + + + Gramps + gramps + + src + + C + True + True + True + gramps.strings + + + + GnomeDialog + dbopen + Gramps - Open a database + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox15 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area15 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button127 + True + True + + clicked + on_ok_button1_clicked + dbopen + Wed, 03 Oct 2001 02:55:59 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button129 + True + True + + clicked + destroy_passed_object + dbopen + Wed, 03 Oct 2001 02:56:46 GMT + + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox44 + False + 0 + + 0 + False + True + + + + GtkLabel + label245 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 5 + False + False + + + + + GtkHSeparator + hseparator24 + + 10 + True + True + + + + + GtkHBox + hbox33 + False + 0 + + 0 + True + True + + + + GtkLabel + label246 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 5 + 5 + + 0 + False + False + + + + + GnomeFileEntry + dbname + 400 + recentdbs + 15 + Open a GRAMPS Database + True + False + + 0 + True + True + + + + GtkEntry + GnomeEntry:entry + combo-entry2 + True + True + True + 0 + + + + + + + GtkCheckButton + getoldrev + 10 + True + + False + True + + 0 + False + False + + + + + + + + GnomeDialog + revselect + Gramps - Select an older revision + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox16 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area16 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button132 + True + True + + clicked + on_loadrev_clicked + revselect + Wed, 03 Oct 2001 04:33:08 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button134 + True + True + + clicked + destroy_passed_object + revselect + Wed, 03 Oct 2001 04:32:38 GMT + + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox45 + False + 0 + + 0 + True + True + + + + GtkLabel + label247 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkHSeparator + hseparator25 + + 5 + False + True + + + + + GtkScrolledWindow + scrolledwindow29 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + revlist + 600 + 200 + True + 4 + 53,128,69,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + label250 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label251 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label251a + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + comlabel + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + + + + GnomeDialog + revcom + Gramps - Revison Control Comment + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox17 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area17 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button135 + True + True + + clicked + on_savecomment_clicked + revcom + Thu, 04 Oct 2001 13:42:23 GMT + + GNOME_STOCK_BUTTON_OK + + + + + GtkVBox + vbox46 + False + 0 + + 0 + True + True + + + + GtkLabel + label252 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkHSeparator + hseparator26 + + 10 + False + False + + + + + GtkEntry + text + 350 + True + True + True + True + 0 + + + 0 + False + False + + + + + + + diff --git a/gramps/src/srcsel.glade b/gramps/src/srcsel.glade new file mode 100644 index 000000000..bceed72ee --- /dev/null +++ b/gramps/src/srcsel.glade @@ -0,0 +1,866 @@ + + + + + srcsel + gramps + + src + + C + True + True + True + gramps.strings + + + + GnomeDialog + sourceDisplay + Gramps - Source Information + GTK_WINDOW_DIALOG + GTK_WIN_POS_NONE + True + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + vbox27 + 2 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + hbuttonbox17 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button94 + True + True + True + + clicked + on_sourceok_clicked + sourceDisplay + Tue, 16 Jan 2001 17:55:52 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button95 + True + True + + clicked + destroy_passed_object + sourceDisplay + Thu, 11 Jan 2001 04:15:44 GMT + + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox28 + False + 0 + + 0 + True + True + + + + GtkLabel + sourceInfoTitle + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 5 + False + False + + + + + GtkHSeparator + hseparator13 + + 5 + True + True + + + + + GtkVBox + vbox29 + False + 0 + + 0 + True + True + + + + GtkTable + table18 + 4 + 2 + False + 0 + 0 + + 0 + True + True + + + + GtkLabel + label173 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label174 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + False + False + False + False + True + False + + + + + GtkLabel + label175 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkHSeparator + hseparator14 + + 0 + 2 + 3 + 4 + 0 + 0 + False + True + False + False + True + True + + + + + GtkLabel + sauthor + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 3 + 0 + + 1 + 2 + 1 + 2 + 5 + 5 + True + False + False + False + True + False + + + + + GtkLabel + spubinfo + + GTK_JUSTIFY_LEFT + False + 0 + 0.5 + 3 + 0 + + 1 + 2 + 2 + 3 + 5 + 5 + True + False + False + False + True + False + + + + + GtkCombo + source_title + True + False + False + True + False + + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + GtkEntry + GtkCombo:entry + source + True + True + + changed + on_source_changed + source_title + Thu, 16 Aug 2001 19:46:31 GMT + + + insert_text + on_combo_insert_text + source_title + Thu, 18 Oct 2001 01:57:50 GMT + + False + True + 0 + + + + + + + GtkTable + table19 + 5 + 2 + False + 0 + 0 + + 0 + True + True + + + + GtkScrolledWindow + scrolledwindow20 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 1 + 2 + 4 + 5 + 5 + 5 + False + False + False + False + True + True + + + + GtkText + scomment + 300 + True + True + + + + + + GtkScrolledWindow + scrolledwindow21 + 250 + GTK_POLICY_NEVER + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 1 + 2 + 3 + 4 + 5 + 5 + False + False + False + False + True + True + + + + GtkText + stext + True + True + + + + + + GtkEntry + sdate + True + True + True + 0 + + + 1 + 2 + 2 + 3 + 5 + 5 + True + False + False + False + True + False + + + + + GtkEntry + spage + True + True + True + 0 + + + 1 + 2 + 1 + 2 + 5 + 5 + True + False + False + False + True + False + + + + + GtkLabel + label180 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 1 + 2 + 0 + 0 + True + False + False + False + False + False + + + + + GtkLabel + label181 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 2 + 3 + 0 + 0 + True + False + False + False + True + False + + + + + GtkLabel + label182 + + GTK_JUSTIFY_CENTER + False + 1 + 0 + 5 + 5 + + 0 + 1 + 3 + 4 + 0 + 0 + True + False + False + False + True + True + + + + + GtkLabel + label183 + + GTK_JUSTIFY_CENTER + False + 1 + 0 + 5 + 10 + + 0 + 1 + 4 + 5 + 0 + 0 + True + False + False + False + True + True + + + + + GtkLabel + label243 + + GTK_JUSTIFY_CENTER + False + 1 + 0.5 + 5 + 0 + + 0 + 1 + 0 + 1 + 0 + 0 + False + False + False + False + True + False + + + + + GtkOptionMenu + conf + True + Very Low +Low +Normal +High +Very High + + 2 + + 1 + 2 + 0 + 1 + 5 + 5 + False + False + False + False + True + False + + + + + + + + + + GnomeDialog + sourcesel + Gramps - Source Reference Selection + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + False + True + False + False + False + + + GtkVBox + GnomeDialog:vbox + dialog-vbox18 + False + 8 + + 4 + True + True + + + + GtkHButtonBox + GnomeDialog:action_area + dialog-action_area18 + GTK_BUTTONBOX_END + 8 + 85 + 27 + 7 + 0 + + 0 + False + True + GTK_PACK_END + + + + GtkButton + button136 + True + True + + clicked + on_src_ok_clicked + slist + Sat, 06 Oct 2001 15:41:23 GMT + + GNOME_STOCK_BUTTON_OK + + + + GtkButton + button138 + True + True + + clicked + destroy_passed_object + sourcesel + Fri, 05 Oct 2001 02:26:38 GMT + + GNOME_STOCK_BUTTON_CANCEL + + + + + GtkVBox + vbox47 + False + 0 + + 0 + True + True + + + + GtkLabel + label253 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + GtkHSeparator + hseparator27 + + 5 + True + True + + + + + GtkScrolledWindow + scrolledwindow30 + 400 + 150 + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_UPDATE_CONTINUOUS + GTK_UPDATE_CONTINUOUS + + 0 + True + True + + + + GtkCList + slist + True + 2 + 80,80 + GTK_SELECTION_SINGLE + True + GTK_SHADOW_IN + + + GtkLabel + CList:title + label254 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + GtkLabel + CList:title + label255 + + GTK_JUSTIFY_CENTER + False + 0.5 + 0.5 + 0 + 0 + + + + + + GtkHButtonBox + hbuttonbox26 + GTK_BUTTONBOX_SPREAD + 30 + 85 + 27 + 7 + 0 + + 0 + True + True + + + + GtkButton + button139 + True + True + + clicked + on_add_src_clicked + slist + Sat, 06 Oct 2001 15:47:16 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + button140 + True + True + + clicked + on_edit_src_clicked + slist + Fri, 05 Oct 2001 02:49:15 GMT + + + GTK_RELIEF_NORMAL + + + + GtkButton + button141 + True + True + + clicked + on_del_src_clicked + slist + Sat, 06 Oct 2001 15:39:54 GMT + + + GTK_RELIEF_NORMAL + + + + + + + diff --git a/gramps/src/utils.py b/gramps/src/utils.py index aa032c314..e386eca98 100644 --- a/gramps/src/utils.py +++ b/gramps/src/utils.py @@ -188,7 +188,7 @@ else: # # #------------------------------------------------------------------------- -def get_detail_flags(obj): +def get_detail_flags(obj,priv=1): import Config detail = "" @@ -197,7 +197,7 @@ def get_detail_flags(obj): detail = "N" if len(obj.getSourceRefList()) > 0: detail = detail + "S" - if obj.getPrivacy(): + if priv and obj.getPrivacy(): detail = detail + "P" return detail @@ -206,7 +206,7 @@ def get_detail_flags(obj): # # #------------------------------------------------------------------------- -def get_detail_text(obj): +def get_detail_text(obj,priv=1): if obj.getNote() != "": details = "%s" % _("Note") else: @@ -216,7 +216,7 @@ def get_detail_text(obj): details = _("Source") else: details = "%s, %s" % (details,_("Source")) - if obj.getPrivacy() == 1: + if priv and obj.getPrivacy() == 1: if details == "": details = _("Private") else: