diff --git a/gramps/src/Config.py b/gramps/src/Config.py index 3c4018cba..98b18128d 100644 --- a/gramps/src/Config.py +++ b/gramps/src/Config.py @@ -36,6 +36,7 @@ import PaperMenu #------------------------------------------------------------------------- import GTK import gtk +import gnome.ui import libglade from gnome.config import get_string, get_bool, get_int, set_string, sync, set_bool, set_int @@ -463,7 +464,11 @@ def save_config_color(name,color): #------------------------------------------------------------------------- def get_config_text(panel,key): - return get_string("/gramps/%s/%s" % (panel,key)) + val = get_string("/gramps/%s/%s" % (panel,key)) + if val: + return val + else: + return "" def get_config_bool(panel,key): return get_bool("/gramps/%s/%s" % (panel,key)) @@ -506,17 +511,25 @@ class ConfigEntry(ConfigWidget): class ConfigInt(ConfigWidget): + def set_range(self,lower,upper): + self.lower = lower + self.upper = upper + def get_widgets(self): l = gtk.GtkLabel(self.l) l.show() self.w = gtk.GtkSpinButton(digits=0) self.w.show() - val = get_int(self.tag) + val = get_string(self.tag) if val == None: - self.w.set_value(int(self.d)) + val = int(self.d) else: - self.w.set_value(val) + val = int(val) + + adj = gtk.GtkAdjustment(val,self.lower,self.upper,1,1,1) + + self.w.set_adjustment(adj) return [l,self.w] def set(self): @@ -539,11 +552,37 @@ class ConfigCheckbox(ConfigWidget): val = self.w.get_active() set_bool(self.tag,val) + +class ConfigFile(ConfigWidget): + + def get_widgets(self): + self.w = gnome.ui.GnomeFileEntry(self.tag) + lbl = gtk.GtkLabel(self.l) + self.w.show() + lbl.show() + val = get_string(self.tag) + self.w.set_title("%s -- GRAMPS" % (self.l)) + if val == None: + self.w.gtk_entry().set_text(self.d) + else: + self.w.gtk_entry().set_text(val) + return [lbl,self.w] + + def set(self): + val = self.w.get_full_path(0) + set_string(self.tag,val) + + def add_text(category,panel,frame,config_tag,label,default): ext_items.append(category,panel,frame,ConfigEntry(panel,config_tag,label,default)) -def add_int(category,panel,frame,config_tag,label,default): - ext_items.append(category,panel,frame,ConfigInt(panel,config_tag,label,default)) +def add_file_entry(category,panel,frame,config_tag,label,default): + ext_items.append(category,panel,frame,ConfigFile(panel,config_tag,label,default)) + +def add_int(category,panel,frame,config_tag,label,default,range=(0,100)): + cfgint = ConfigInt(panel,config_tag,label,default) + cfgint.set_range(range[0],range[1]) + ext_items.append(category,panel,frame,cfgint) def add_checkbox(category,panel,frame,config_tag,label,default): ext_items.append(category,panel,frame,ConfigCheckbox(panel,config_tag,label,default)) diff --git a/gramps/src/EditPerson.glade b/gramps/src/EditPerson.glade index 6cb6ba430..3a204efea 100644 --- a/gramps/src/EditPerson.glade +++ b/gramps/src/EditPerson.glade @@ -21,7 +21,7 @@ on_delete_event Fri, 03 Aug 2001 01:42:42 GMT - Gramps - Edit Person + Edit Person - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False @@ -286,36 +286,6 @@ - - GtkButton - button99 - 1 - Invoke birth event editor - True - - clicked - on_edit_birth_clicked - editPerson - Tue, 02 Oct 2001 22:28:32 GMT - - - GTK_RELIEF_NORMAL - - 2 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - False - False - - - GtkCombo bpcombo @@ -382,6 +352,36 @@ False + + + GtkButton + button99 + 1 + Invoke birth event editor + True + + clicked + on_edit_birth_clicked + editPerson + Tue, 02 Oct 2001 22:28:32 GMT + + + GTK_RELIEF_NORMAL + + 0 + 3 + 2 + 3 + 0 + 0 + False + False + False + False + False + False + + @@ -544,36 +544,6 @@ - - GtkButton - button126 - 1 - Invoke death event editor - True - - clicked - on_edit_death_clicked - editPerson - Tue, 02 Oct 2001 22:28:47 GMT - - - GTK_RELIEF_NORMAL - - 2 - 3 - 2 - 3 - 0 - 0 - False - False - False - False - False - False - - - GtkCombo dpcombo @@ -615,6 +585,36 @@ + + + GtkButton + button126 + 1 + Invoke death event editor + True + + clicked + on_edit_death_clicked + editPerson + Tue, 02 Oct 2001 22:28:47 GMT + + + GTK_RELIEF_NORMAL + + 0 + 3 + 2 + 3 + 0 + 0 + False + False + False + False + False + False + + @@ -5318,7 +5318,7 @@ GnomeDialog name_edit - Gramps - Alternate Name Editor + Alternate Name Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -5732,7 +5732,7 @@ GnomeDialog addr_edit - Gramps - Address Editor + Address Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -6308,7 +6308,7 @@ French GnomeDialog url_edit - Gramps - Internet Address Editor + Internet Address Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/bookmarks.glade b/gramps/src/bookmarks.glade index 6559d6354..caadc3832 100644 --- a/gramps/src/bookmarks.glade +++ b/gramps/src/bookmarks.glade @@ -15,7 +15,7 @@ GnomeDialog top - Gramps - Edit Bookmarks + Edit Bookmarks - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/config.glade b/gramps/src/config.glade index 6c691957e..37bc75995 100644 --- a/gramps/src/config.glade +++ b/gramps/src/config.glade @@ -12,2797 +12,10 @@ True - - GnomePropertyBox - propertybox - - apply - on_propertybox_apply - Tue, 05 Dec 2000 01:32:51 GMT - - - close - destroy_passed_object - propertybox - Tue, 05 Dec 2000 01:34:12 GMT - - - help - on_propertybox_help - Wed, 22 Aug 2001 02:13:46 GMT - - Gramps - Preferences - GTK_WIN_POS_NONE - False - False - False - False - - - GtkNotebook - GnomePropertyBox:notebook - notebook3 - True - True - True - GTK_POS_TOP - False - 2 - 2 - False - - 0 - True - True - - - - GtkVBox - vbox29 - False - 0 - - - GtkFrame - frame14 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkTable - table13 - 4 - 3 - False - 0 - 0 - - - GtkLabel - label205 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 3 - 3 - False - False - False - False - True - False - - - - - GnomeFileEntry - dbdir - dbdir - 10 - Gramps - Select default database directory - True - False - - 1 - 3 - 3 - 4 - 3 - 3 - True - False - False - False - True - False - - - - GtkEntry - GnomeEntry:entry - combo-entry1 - The default directory for storing databases - True - - changed - on_object_toggled - propertybox - Thu, 28 Jun 2001 13:50:08 GMT - - True - True - 0 - - - - - - GtkCheckButton - autoload - True - - toggled - on_object_toggled - propertybox - Sat, 09 Dec 2000 18:11:20 GMT - - - True - True - - 0 - 3 - 0 - 1 - 3 - 3 - False - False - False - False - True - False - - - - - GtkCheckButton - uncompress - True - - toggled - on_object_toggled - propertybox - Sat, 09 Dec 2000 18:11:20 GMT - - - False - True - - 0 - 3 - 1 - 2 - 3 - 3 - False - False - False - False - True - False - - - - - GtkLabel - label217 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkSpinButton - save_interval - True - - changed - on_object_toggled - propertybox - Mon, 31 Dec 2001 16:51:59 GMT - - 1 - 0 - True - GTK_UPDATE_IF_VALID - True - False - 0 - 0 - 100 - 1 - 10 - 10 - - 1 - 2 - 2 - 3 - 3 - 3 - False - False - False - False - True - False - - - - - - - GtkFrame - frame18 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkCheckButton - autocomp - True - - toggled - on_object_toggled - propertybox - Wed, 12 Dec 2001 03:34:00 GMT - - - True - True - - - - - GtkFrame - frame17 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkVBox - vbox35 - False - 0 - - - GtkRadioButton - tool1 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:01 GMT - - - True - True - toolbar - - 0 - False - False - - - - - GtkRadioButton - tool2 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:16 GMT - - - False - True - toolbar - - 0 - False - False - - - - - GtkRadioButton - tool3 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:29 GMT - - - False - True - toolbar - - 0 - False - False - - - - - - - GtkFrame - frame11 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkTable - table27 - 2 - 2 - False - 0 - 0 - - - GtkOptionMenu - vc_menu - True - RCS - - 0 - - 1 - 2 - 0 - 1 - 5 - 5 - False - False - False - False - True - False - - - - - GtkCheckButton - use_vc - True - - toggled - on_object_toggled - propertybox - Tue, 02 Oct 2001 14:14:35 GMT - - - False - True - - 0 - 1 - 0 - 1 - 3 - 3 - False - False - False - False - True - False - - - - - GtkCheckButton - vc_comment - True - - toggled - on_object_toggled - propertybox - Thu, 04 Oct 2001 13:26:10 GMT - - - False - True - - 0 - 2 - 1 - 2 - 3 - 3 - False - False - False - False - True - False - - - - - - - - GtkLabel - Notebook:tab - label61 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkTable - table21 - 3 - 2 - False - 0 - 0 - - - GtkFrame - frame8 - - 0 - GTK_SHADOW_ETCHED_IN - - 1 - 2 - 2 - 3 - 5 - 5 - False - False - False - False - True - True - - - - GtkVBox - vbox26 - False - 0 - - - GtkCheckButton - display_altnames - True - - toggled - on_object_toggled - propertybox - Sun, 22 Apr 2001 21:20:17 GMT - - - False - True - - 0 - False - False - - - - - GtkCheckButton - showdetail - True - - toggled - on_object_toggled - propertybox - Sat, 09 Jun 2001 14:12:06 GMT - - - False - True - - 0 - False - False - - - - - GtkCheckButton - show_child_id - True - - toggled - on_object_toggled - propertybox - Mon, 29 Oct 2001 22:58:03 GMT - - - False - True - - 0 - False - False - - - - - GtkCheckButton - gid_visible - True - - toggled - on_object_toggled - propertybox - Thu, 12 Jul 2001 13:42:44 GMT - - - False - True - - 0 - False - False - - - - - - - GtkFrame - frame7 - - 0 - GTK_SHADOW_ETCHED_IN - - 1 - 2 - 0 - 1 - 5 - 5 - True - False - False - False - True - True - - - - GtkVBox - vbox25 - False - 0 - - - GtkRadioButton - stat1 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:01 GMT - - - True - True - status - - 0 - False - False - - - - - GtkRadioButton - stat2 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:16 GMT - - - False - True - status - - 0 - False - False - - - - - GtkRadioButton - stat3 - True - - toggled - on_object_toggled - propertybox - Wed, 30 May 2001 02:18:29 GMT - - - False - True - status - - 0 - False - False - - - - - - - GtkFrame - frame4 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - 1 - 0 - 3 - 5 - 5 - True - True - False - False - True - True - - - - GtkTable - table22 - 6 - 2 - False - 0 - 0 - - - GnomeColorPicker - oddForeground - True - - color_set - on_color_set - propertybox - Sat, 17 Feb 2001 14:14:00 GMT - - True - False - Pick a color - - 1 - 2 - 1 - 2 - 5 - 5 - False - False - False - False - False - False - - - - - GnomeColorPicker - oddBackground - True - - color_set - on_color_set - propertybox - Sat, 17 Feb 2001 14:21:31 GMT - - True - False - Pick a color - - 1 - 2 - 2 - 3 - 5 - 5 - False - False - False - False - False - False - - - - - GnomeColorPicker - evenForeground - True - - color_set - on_color_set - propertybox - Sat, 17 Feb 2001 14:21:44 GMT - - True - False - Pick a color - - 1 - 2 - 3 - 4 - 5 - 5 - False - False - False - False - False - False - - - - - GnomeColorPicker - evenBackground - True - - color_set - on_color_set - propertybox - Sat, 17 Feb 2001 14:21:58 GMT - - True - False - Pick a color - - 1 - 2 - 4 - 5 - 5 - 5 - False - False - False - False - False - False - - - - - GtkLabel - label195 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label196 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label197 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label198 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 4 - 5 - 5 - 0 - False - False - False - False - True - False - - - - - GtkCheckButton - enableColors - True - - toggled - on_color_toggled - propertybox - Sat, 17 Feb 2001 14:19:39 GMT - - - False - True - - 0 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GnomeColorPicker - ancestorForeground - True - - color_set - on_color_set - propertybox - Fri, 02 Nov 2001 05:09:36 GMT - - True - False - Pick a color - - 1 - 2 - 5 - 6 - 5 - 5 - False - False - False - False - False - False - - - - - GtkLabel - label215 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 5 - 6 - 5 - 0 - False - False - False - False - True - False - - - - - - - GtkFrame - frame12 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 1 - 2 - 1 - 2 - 0 - 0 - False - False - False - False - True - True - - - - GtkVBox - vbox31 - False - 0 - - - GtkCheckButton - usetabs - 3 - True - - toggled - on_object_toggled - propertybox - Thu, 15 Feb 2001 21:32:23 GMT - - - False - True - - 0 - False - False - - - - - GtkCheckButton - uselds - 3 - True - - toggled - on_object_toggled - propertybox - Sun, 30 Dec 2001 00:13:47 GMT - - - False - True - - 0 - False - False - - - - - GtkHBox - hbox1 - 3 - False - 0 - - 0 - False - False - - - - GtkCheckButton - attr_display - True - - toggled - on_object_toggled - propertybox - Thu, 24 May 2001 21:14:10 GMT - - - False - True - - 0 - False - False - - - - - GtkEntry - attr_name - True - - changed - on_object_toggled - propertybox - Thu, 24 May 2001 21:14:30 GMT - - True - True - 0 - - - 5 - True - True - - - - - - - - - GtkLabel - Notebook:tab - label194 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox24 - False - 0 - - - GtkFrame - frame5 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkTable - table23 - 2 - 2 - False - 0 - 0 - - - GtkLabel - label199 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label200 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - date_format - True - - - 0 - - 1 - 2 - 0 - 1 - 5 - 5 - True - False - False - False - True - False - - - - - GtkOptionMenu - name_format - True - - - 0 - - 1 - 2 - 1 - 2 - 5 - 5 - True - False - False - False - True - False - - - - - - - GtkFrame - frame6 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - - - - GtkTable - table24 - 1 - 2 - False - 0 - 0 - - - GtkLabel - label201 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 5 - 5 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - date_entry_format - True - - - 0 - - 1 - 2 - 0 - 1 - 5 - 5 - True - False - False - False - True - False - - - - - - - GtkFrame - frame10 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkVBox - vbox28 - False - 0 - - - GtkCheckButton - calendar - True - - toggled - on_object_toggled - propertybox - Tue, 20 Nov 2001 16:35:48 GMT - - - False - True - - 5 - False - False - - - - - - - - GtkLabel - Notebook:tab - label187 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkTable - table14 - 8 - 2 - False - 0 - 0 - - - GtkLabel - label143 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label144 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label145 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label146 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label147 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 4 - 5 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label148 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 5 - 6 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label149 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 6 - 7 - 5 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label150 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 7 - 8 - 5 - 0 - False - False - False - False - True - False - - - - - GtkEntry - resaddr - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:34:37 GMT - - True - True - 0 - - - 1 - 2 - 1 - 2 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - resname - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:33:49 GMT - - True - True - 0 - - - 1 - 2 - 0 - 1 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - rescity - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:35:00 GMT - - True - True - 0 - - - 1 - 2 - 2 - 3 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - resstate - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:35:18 GMT - - True - True - 0 - - - 1 - 2 - 3 - 4 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - rescountry - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:35:38 GMT - - True - True - 0 - - - 1 - 2 - 4 - 5 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - respostal - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:35:53 GMT - - True - True - 0 - - - 1 - 2 - 5 - 6 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - resphone - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:36:08 GMT - - True - True - 0 - - - 1 - 2 - 6 - 7 - 5 - 3 - True - False - False - False - True - False - - - - - GtkEntry - resemail - True - - changed - on_object_toggled - propertybox - Thu, 14 Jun 2001 14:36:27 GMT - - True - True - 0 - - - 1 - 2 - 7 - 8 - 5 - 3 - True - False - False - False - True - False - - - - - - GtkLabel - Notebook:tab - label142 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkTable - table25 - 4 - 3 - False - 0 - 0 - - - GtkLabel - label203 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 5 - 5 - False - False - False - False - True - False - - - - - GtkLabel - label204 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 5 - 5 - False - False - False - False - True - False - - - - - GtkLabel - label206 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 2 - 3 - 5 - 5 - False - False - False - False - True - False - - - - - GtkLabel - label208 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 0 - 0 - - 0 - 1 - 3 - 4 - 5 - 5 - False - False - False - False - True - False - - - - - GnomeFileEntry - repdir - repdir - 10 - Gramps - Select default report directory - True - False - - 1 - 3 - 2 - 3 - 5 - 5 - True - False - False - False - True - False - - - - GtkEntry - GnomeEntry:entry - entry1 - The default directory for the output of many report generators - True - - changed - on_object_toggled - propertybox - Thu, 28 Jun 2001 13:49:30 GMT - - True - True - 0 - - - - - - GnomeFileEntry - htmldir - webdir - 10 - Gramps - Select default report directory - True - False - - 1 - 3 - 3 - 4 - 5 - 5 - True - False - False - False - True - False - - - - GtkEntry - GnomeEntry:entry - entry2 - The default directory for the output of the Web Site report generators - True - - changed - on_object_toggled - propertybox - Thu, 28 Jun 2001 13:49:30 GMT - - True - True - 0 - - - - - - GtkOptionMenu - output_format - True - OpenOffice -HTML -PDF -AbiWord - - 0 - - 1 - 2 - 0 - 1 - 5 - 5 - False - False - False - False - True - False - - - - - GtkOptionMenu - paper_size - True - Letter -A4 - - 0 - - 1 - 2 - 1 - 2 - 5 - 5 - False - False - False - False - True - False - - - - - - GtkLabel - Notebook:tab - label202 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox32 - False - 0 - - - GtkFrame - frame15 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkVBox - vbox33 - False - 0 - - - GtkRadioButton - mediaref - 5 - True - - toggled - on_object_toggled - propertybox - Fri, 30 Nov 2001 01:29:56 GMT - - - True - True - ref - - 0 - False - False - - - - - GtkRadioButton - mediacopy - 5 - True - - toggled - on_object_toggled - propertybox - Fri, 30 Nov 2001 01:30:09 GMT - - - False - True - ref - - 0 - False - False - - - - - GtkCheckButton - globalprop - 5 - True - - toggled - on_object_toggled - propertybox - Fri, 30 Nov 2001 01:30:24 GMT - - - True - True - - 0 - False - False - - - - - - - GtkFrame - frame16 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - - - - GtkVBox - vbox34 - False - 0 - - - GtkCheckButton - localprop - 5 - True - - toggled - on_object_toggled - propertybox - Fri, 30 Nov 2001 01:30:36 GMT - - - True - True - - 0 - False - False - - - - - - - - GtkLabel - Notebook:tab - label209 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox27 - False - 0 - - - GtkFrame - frame9 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 5 - False - True - - - - GtkTable - table28 - 5 - 2 - False - 0 - 0 - - - GtkLabel - label210 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 2 - 2 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label211 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 2 - 2 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label212 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 2 - 2 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label213 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 2 - 2 - - 0 - 1 - 3 - 4 - 0 - 0 - False - False - False - False - True - False - - - - - GtkLabel - label214 - - GTK_JUSTIFY_CENTER - False - 1 - 0.5 - 2 - 2 - - 0 - 1 - 4 - 5 - 0 - 0 - False - False - False - False - True - False - - - - - GtkEntry - iprefix - True - - changed - on_object_toggled - propertybox - Sat, 20 Oct 2001 13:59:28 GMT - - True - True - 0 - I - - 1 - 2 - 0 - 1 - 5 - 5 - True - False - False - False - True - False - - - - - GtkEntry - fprefix - True - - changed - on_object_toggled - propertybox - Sat, 20 Oct 2001 14:00:26 GMT - - True - True - 0 - F - - 1 - 2 - 1 - 2 - 5 - 5 - True - False - False - False - True - False - - - - - GtkEntry - pprefix - True - - changed - on_object_toggled - propertybox - Sat, 20 Oct 2001 14:00:13 GMT - - True - True - 0 - P - - 1 - 2 - 2 - 3 - 5 - 5 - True - False - False - False - True - False - - - - - GtkEntry - sprefix - True - - changed - on_object_toggled - propertybox - Sat, 20 Oct 2001 14:00:46 GMT - - True - True - 0 - S - - 1 - 2 - 3 - 4 - 5 - 5 - True - False - False - False - True - False - - - - - GtkEntry - oprefix - True - - changed - on_object_toggled - propertybox - Sat, 20 Oct 2001 14:01:09 GMT - - True - True - 0 - O - - 1 - 2 - 4 - 5 - 5 - 5 - True - False - False - False - True - False - - - - - - - GtkFrame - frame13 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - False - True - - - - GtkVBox - vbox30 - False - 0 - - - GtkCheckButton - gid_edit - 5 - True - - toggled - on_object_toggled - propertybox - Thu, 12 Jul 2001 13:42:44 GMT - - - False - True - - 0 - False - False - - - - - - - - GtkLabel - Notebook:tab - label216 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkVBox - vbox36 - False - 0 - - - GtkFrame - frame19 - 5 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - True - True - - - - GtkTable - table29 - 3 - 3 - False - 0 - 0 - - - GtkLabel - label219 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 3 - 3 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - - - GtkOptionMenu - lastnamegen - True - - - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - - - Placeholder - - - - Placeholder - - - - - GtkLabel - Notebook:tab - label218 - - GTK_JUSTIFY_CENTER - False - 0.5 - 0.5 - 0 - 0 - - - - GtkWindow initDruid - Gramps Startup Druid + Getting Started - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True diff --git a/gramps/src/dialog.glade b/gramps/src/dialog.glade index 020190a51..fc89d203c 100644 --- a/gramps/src/dialog.glade +++ b/gramps/src/dialog.glade @@ -15,7 +15,7 @@ GnomeDialog event_edit - Gramps - Event Editor + Event Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -581,7 +581,7 @@ French GnomeDialog attr_edit - Gramps - Attribute Editor + Attribute Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -943,7 +943,7 @@ French GnomeDialog loc_edit - Gramps - Event Editor + Event Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/editnote.glade b/gramps/src/editnote.glade index e421089e2..67fce8d39 100644 --- a/gramps/src/editnote.glade +++ b/gramps/src/editnote.glade @@ -15,7 +15,7 @@ GnomeDialog editnote - Gramps - Edit Note + Edit Note - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/find.glade b/gramps/src/find.glade index 6c68f8958..33add76da 100644 --- a/gramps/src/find.glade +++ b/gramps/src/find.glade @@ -17,7 +17,7 @@ GnomeDialog find - Gramps - Find Person + Find Person - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/gramps.glade b/gramps/src/gramps.glade index 58ea3c4b1..2c703fe68 100644 --- a/gramps/src/gramps.glade +++ b/gramps/src/gramps.glade @@ -32,7 +32,7 @@ on_gramps_configure_event Sat, 25 Aug 2001 22:08:28 GMT - Gramps + GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -4236,7 +4236,7 @@ GtkFileSelection fileselection 10 - Gramps - Select File + Select File - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE True @@ -4281,7 +4281,7 @@ GnomeDialog spouseDialog - Gramps - Choose Spouse + Choose Spouse - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE True @@ -4690,7 +4690,7 @@ GnomeDialog familyDialog - Gramps - Choose Parents + Choose Parents - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -5264,7 +5264,7 @@ Unknown GnomeDialog selectChild - Gramps - Add Child + Add Child - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -5645,12 +5645,13 @@ Unknown GnomeDialog marriageQuery - Gramps - Marriage Editor + 280 + Marriage Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True False - False + True False False False @@ -5803,7 +5804,7 @@ Unknown GnomeDialog sourceEditor - Gramps - Source Editor + Source Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -6306,7 +6307,7 @@ Unknown GnomeDialog addChild - Gramps - Add New Child + Add New Child - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -6807,7 +6808,7 @@ Unknown GnomeDialog addperson - Gramps - Edit Person + Edit Person - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -7137,7 +7138,7 @@ Unknown on_opendb_delete_event Mon, 24 Dec 2001 16:08:13 GMT - Gramps - Open a Database + Open a Database - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True diff --git a/gramps/src/gramps_main.py b/gramps/src/gramps_main.py index b2def61a7..8529e218c 100755 --- a/gramps/src/gramps_main.py +++ b/gramps/src/gramps_main.py @@ -407,7 +407,7 @@ def clear_database(): const.familyRelations = const.initialize_family_relation_list() database.new() - topWindow.set_title("Gramps") + topWindow.set_title("GRAMPS") active_person = None active_father = None active_family = None @@ -567,7 +567,8 @@ def read_file(filename): statusbar.set_status(_("Loading %s ...") % filename) if load_database(filename) == 1: - topWindow.set_title("%s - %s" % (_("Gramps"),filename)) + name = os.path.basename(filename[:-1]) + topWindow.set_title("%s - %s" % (name,_("GRAMPS"))) else: statusbar.set_status("") Config.save_last_file("") diff --git a/gramps/src/imagesel.glade b/gramps/src/imagesel.glade index fdf89db72..3d8c23e59 100644 --- a/gramps/src/imagesel.glade +++ b/gramps/src/imagesel.glade @@ -15,7 +15,7 @@ GnomeDialog imageSelect - Gramps - Select a Media Object + Select a Media Object - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False @@ -352,7 +352,7 @@ GnomeDialog change_description - Gramps - Change Local Media Object Properties + Change Local Media Object Properties - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -1308,7 +1308,7 @@ GnomeDialog change_global - Gramps - Change Global Media Object Properties + Change Global Media Object Properties - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/places.glade b/gramps/src/places.glade index 2b95434d8..149e7e4da 100644 --- a/gramps/src/places.glade +++ b/gramps/src/places.glade @@ -17,7 +17,7 @@ GnomeDialog placeEditor - Gramps - Place Editor + Place Editor - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False diff --git a/gramps/src/plugins.glade b/gramps/src/plugins.glade index d5c7ad417..bfb43fc94 100644 --- a/gramps/src/plugins.glade +++ b/gramps/src/plugins.glade @@ -15,7 +15,7 @@ GnomeDialog pluginsel - Gramps - Plugin Selection + Tool Selection - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False @@ -231,7 +231,7 @@ GnomeDialog report - Gramps - Report Selection + Report Selection - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE False diff --git a/gramps/src/preferences.glade b/gramps/src/preferences.glade index adcc7105e..975a37c24 100644 --- a/gramps/src/preferences.glade +++ b/gramps/src/preferences.glade @@ -21,7 +21,7 @@ GTK_WIN_POS_NONE False False - False + True False False False @@ -196,7 +196,7 @@ GtkNotebook GnomePropertyBox:notebook panel - 450 + 490 350 False False diff --git a/gramps/src/revision.glade b/gramps/src/revision.glade index 8547f25d9..89f465b98 100644 --- a/gramps/src/revision.glade +++ b/gramps/src/revision.glade @@ -17,7 +17,7 @@ GnomeDialog dbopen - Gramps - Open a database + Open a database - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE True @@ -200,7 +200,7 @@ GnomeDialog revselect - Gramps - Select an older revision + Select an older revision - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -391,7 +391,7 @@ GnomeDialog revcom - Gramps - Revison Control Comment + Revison Control Comment - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/srcsel.glade b/gramps/src/srcsel.glade index bceed72ee..d9555134c 100644 --- a/gramps/src/srcsel.glade +++ b/gramps/src/srcsel.glade @@ -17,7 +17,7 @@ GnomeDialog sourceDisplay - Gramps - Source Information + Source Information - GRAMPS GTK_WINDOW_DIALOG GTK_WIN_POS_NONE True @@ -640,7 +640,7 @@ Very High GnomeDialog sourcesel - Gramps - Source Reference Selection + Source Reference Selection - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False diff --git a/gramps/src/styles.glade b/gramps/src/styles.glade index 3bda6999c..f770b34c9 100644 --- a/gramps/src/styles.glade +++ b/gramps/src/styles.glade @@ -18,7 +18,7 @@ GnomeDialog styles - Gramps - Document Styles + Document Styles - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -256,7 +256,7 @@ GnomeDialog editor - Gramps - Style Editor + Style Editor - GRAMPS GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -531,75 +531,6 @@ - - GtkCheckButton - bold - True - - False - True - - 1 - 2 - 3 - 4 - 5 - 5 - False - False - False - False - True - False - - - - - GtkCheckButton - italic - True - - False - True - - 1 - 2 - 4 - 5 - 5 - 5 - False - False - False - False - True - False - - - - - GtkCheckButton - underline - True - - False - True - - 1 - 2 - 5 - 6 - 5 - 5 - False - False - False - False - True - False - - - GtkLabel label5 @@ -634,8 +565,8 @@ False 1 0.5 - 0 - 0 + 5 + 5 0 1 @@ -654,8 +585,8 @@ GtkLabel - label7 - + label4 + GTK_JUSTIFY_CENTER False 1 @@ -665,6 +596,29 @@ 0 1 + 0 + 1 + 5 + 5 + False + False + False + False + True + True + + + + + GtkCheckButton + bold + True + + False + True + + 1 + 3 3 4 5 @@ -679,24 +633,47 @@ - GnomeColorPicker - color + GtkCheckButton + italic True - True - False - Pick a color + + False + True 1 - 2 - 2 - 3 + 3 + 4 + 5 5 5 False False False False - False + True + False + + + + + GtkCheckButton + underline + True + + False + True + + 1 + 3 + 5 + 6 + 5 + 5 + False + False + False + False + True False @@ -708,7 +685,7 @@ 0 1 - 2 + 3 0 1 0 @@ -752,10 +729,33 @@ + + GnomeColorPicker + color + True + True + False + Pick a color + + 1 + 3 + 2 + 3 + 5 + 5 + False + False + False + False + False + False + + + GtkLabel - label4 - + label7 + GTK_JUSTIFY_CENTER False 1 @@ -765,8 +765,8 @@ 0 1 - 0 - 1 + 3 + 6 5 5 False @@ -906,29 +906,6 @@ - - GnomeColorPicker - bgcolor - True - True - False - Pick a color - - 1 - 2 - 1 - 2 - 5 - 5 - False - False - False - False - False - False - - - GtkLabel label17 @@ -1080,119 +1057,55 @@ - GtkTable - table5 - 2 - 2 - True - 0 - 0 + GtkLabel + label9 + + GTK_JUSTIFY_CENTER + False + 1 + 0 + 5 + 5 - 1 - 2 - 5 - 6 + 0 + 1 + 0 + 1 5 5 False - False + True False False True True + - - GtkCheckButton - lborder - True - - False - True - - 0 - 1 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkCheckButton - tborder - True - - False - True - - 0 - 1 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - - - - GtkCheckButton - rborder - True - - False - True - - 1 - 2 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - - - - - GtkCheckButton - bborder - True - - False - True - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - False - - + + GtkLabel + label14 + + GTK_JUSTIFY_CENTER + False + 1 + 0 + 5 + 5 + + 0 + 1 + 5 + 6 + 5 + 5 + False + True + False + False + True + True + @@ -1205,7 +1118,7 @@ 0 1 - 2 + 3 0 1 0 @@ -1316,55 +1229,142 @@ - GtkLabel - label9 - - GTK_JUSTIFY_CENTER - False - 1 - 0 - 5 - 5 + GtkTable + table5 + 2 + 2 + True + 0 + 0 - 0 - 1 - 0 - 1 - 5 - 5 - False - True - False - False - True - True - - - - - GtkLabel - label14 - - GTK_JUSTIFY_CENTER - False - 1 - 0 - 5 - 5 - - 0 - 1 + 1 + 3 5 6 5 5 False - True + False False False True True + + + GtkCheckButton + lborder + True + + False + True + + 0 + 1 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + GtkCheckButton + tborder + True + + False + True + + 0 + 1 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + GtkCheckButton + rborder + True + + False + True + + 1 + 2 + 0 + 1 + 0 + 0 + True + False + False + False + True + False + + + + + GtkCheckButton + bborder + True + + False + True + + 1 + 2 + 1 + 2 + 0 + 0 + True + False + False + False + True + False + + + + + + GnomeColorPicker + bgcolor + True + True + False + Pick a color + + 1 + 3 + 1 + 2 + 5 + 5 + False + False + False + False + False + False +