From cc1a0275e9584c7f1100d28d60f5b45b5b43d3af Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sat, 22 Apr 2006 22:09:16 +0000 Subject: [PATCH] * src/DataViews/_MediaView.py: Shorten tab name * src/DataViews/_RepositoryView.py: Shorten tab name * src/DataViews/_SourceView.py: Shorten tab name * src/DataViews/_EventView.py: Shorten tab name * src/DataViews/_FamilyView.py: Shorten tab name * src/DataViews/_FamilyList.py: Shorten tab name * src/DataViews/_PedigreeView.py: Shorten tab name * src/DataViews/_PlaceView.py: Shorten tab name * src/DataViews/_PersonView.py: Shorten tab name * src/DataViews/_MapView.py: Shorten tab name * src/glade/gramps.glade: remove unused option * src/const.py.in: bugtracker address fix svn: r6416 --- gramps2/ChangeLog | 12 ++++ gramps2/src/DataViews/_EventView.py | 8 +-- gramps2/src/DataViews/_FamilyList.py | 9 +-- gramps2/src/DataViews/_FamilyView.py | 4 +- gramps2/src/DataViews/_MapView.py | 2 +- gramps2/src/DataViews/_MediaView.py | 8 +-- gramps2/src/DataViews/_PedigreeView.py | 3 +- gramps2/src/DataViews/_PersonView.py | 3 +- gramps2/src/DataViews/_PlaceView.py | 7 +- gramps2/src/DataViews/_RepositoryView.py | 8 +-- gramps2/src/DataViews/_SourceView.py | 7 +- gramps2/src/const.py.in | 2 +- gramps2/src/glade/gramps.glade | 89 ++---------------------- gramps2/src/gramps_main.py | 32 +++++---- 14 files changed, 67 insertions(+), 127 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f2dc2f9e7..289c6482c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,5 +1,17 @@ 2006-04-22 Don Allingham * src/GrampsDb/_ReadXML.py: fix Type str_from_xml calls + * src/DataViews/_MediaView.py: Shorten tab name + * src/DataViews/_RepositoryView.py: Shorten tab name + * src/DataViews/_SourceView.py: Shorten tab name + * src/DataViews/_EventView.py: Shorten tab name + * src/DataViews/_FamilyView.py: Shorten tab name + * src/DataViews/_FamilyList.py: Shorten tab name + * src/DataViews/_PedigreeView.py: Shorten tab name + * src/DataViews/_PlaceView.py: Shorten tab name + * src/DataViews/_PersonView.py: Shorten tab name + * src/DataViews/_MapView.py: Shorten tab name + * src/glade/gramps.glade: remove unused option + * src/const.py.in: bugtracker address fix 2006-04-21 Brian Matherly * src/PluginUtils/_ReportUtils.py: keep up with RelLib changes diff --git a/gramps2/src/DataViews/_EventView.py b/gramps2/src/DataViews/_EventView.py index 3d759fb09..1187385e8 100644 --- a/gramps2/src/DataViews/_EventView.py +++ b/gramps2/src/DataViews/_EventView.py @@ -75,10 +75,10 @@ class EventView(PageView.ListView): 'event-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Event View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.EventModel, - signal_map) + PageView.ListView.__init__( + self, _('Events'), dbstate, uistate, + column_names, len(column_names), DisplayModels.EventModel, + signal_map) def drag_info(self): return DdTargets.EVENT diff --git a/gramps2/src/DataViews/_FamilyList.py b/gramps2/src/DataViews/_FamilyList.py index 40ae8427f..089a4089f 100644 --- a/gramps2/src/DataViews/_FamilyList.py +++ b/gramps2/src/DataViews/_FamilyList.py @@ -69,10 +69,11 @@ class FamilyListView(PageView.ListView): 'family-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Family List View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.FamilyModel, - signal_map) + PageView.ListView.__init__( + self, _('Family List'), dbstate, uistate, + column_names, len(column_names), DisplayModels.FamilyModel, + signal_map) + self.updating = False def column_order(self): diff --git a/gramps2/src/DataViews/_FamilyView.py b/gramps2/src/DataViews/_FamilyView.py index 1bf3b9f10..9de5c6924 100644 --- a/gramps2/src/DataViews/_FamilyView.py +++ b/gramps2/src/DataViews/_FamilyView.py @@ -80,8 +80,8 @@ class FamilyView(PageView.PersonNavView): def __init__(self, dbstate, uistate): - PageView.PersonNavView.__init__(self, 'Relationship View', - dbstate, uistate) + PageView.PersonNavView.__init__( + self, _('Relationships'), dbstate, uistate) dbstate.connect('database-changed', self.change_db) dbstate.connect('active-changed', self.change_person) diff --git a/gramps2/src/DataViews/_MapView.py b/gramps2/src/DataViews/_MapView.py index ef798c616..28d3bc4eb 100644 --- a/gramps2/src/DataViews/_MapView.py +++ b/gramps2/src/DataViews/_MapView.py @@ -467,7 +467,7 @@ class MapPlacesList(gtk.TreeView): # Map View main class class MapView(PageView.PageView): def __init__(self,dbstate,uistate): - PageView.PageView.__init__(self,'Map View',dbstate,uistate) + PageView.PageView.__init__(self, ('Maps'), dbstate, uistate) dbstate.connect('database-changed',self.change_db) self.current_marker = None diff --git a/gramps2/src/DataViews/_MediaView.py b/gramps2/src/DataViews/_MediaView.py index 2bac9e808..45d2a4b62 100644 --- a/gramps2/src/DataViews/_MediaView.py +++ b/gramps2/src/DataViews/_MediaView.py @@ -70,10 +70,10 @@ class MediaView(PageView.ListView): 'media-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Media View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.MediaModel, - signal_map) + PageView.ListView.__init__( + self, _('Media'), dbstate, uistate, + column_names,len(column_names), DisplayModels.MediaModel, + signal_map) def define_actions(self): PageView.ListView.define_actions(self) diff --git a/gramps2/src/DataViews/_PedigreeView.py b/gramps2/src/DataViews/_PedigreeView.py index 5fe35695d..c970ccc65 100644 --- a/gramps2/src/DataViews/_PedigreeView.py +++ b/gramps2/src/DataViews/_PedigreeView.py @@ -405,7 +405,8 @@ class FormattingHelper: class PedigreeView(PageView.PersonNavView): def __init__(self,dbstate,uistate): - PageView.PersonNavView.__init__(self,'Pedigree View',dbstate,uistate) + PageView.PersonNavView.__init__(self, _('Pedigree'), dbstate, uistate) + dbstate.connect('database-changed',self.change_db) dbstate.connect('active-changed',self.goto_active_person) self.force_size = 0 # Automatic resize diff --git a/gramps2/src/DataViews/_PersonView.py b/gramps2/src/DataViews/_PersonView.py index 5d98911b6..27e737361 100644 --- a/gramps2/src/DataViews/_PersonView.py +++ b/gramps2/src/DataViews/_PersonView.py @@ -81,7 +81,8 @@ column_names = [ class PersonView(PageView.PersonNavView): def __init__(self,dbstate,uistate): - PageView.PersonNavView.__init__(self,'Person View',dbstate,uistate) + PageView.PersonNavView.__init__(self, _('People'), dbstate, uistate) + self.inactive = False dbstate.connect('database-changed',self.change_db) dbstate.connect('active-changed',self.goto_active_person) diff --git a/gramps2/src/DataViews/_PlaceView.py b/gramps2/src/DataViews/_PlaceView.py index 84577320b..0cc4ee3e7 100644 --- a/gramps2/src/DataViews/_PlaceView.py +++ b/gramps2/src/DataViews/_PlaceView.py @@ -77,10 +77,9 @@ class PlaceView(PageView.ListView): 'place-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Place View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.PlaceModel, - signal_map) + PageView.ListView.__init__( + self, _('Places'), dbstate, uistate, column_names, + len(column_names), DisplayModels.PlaceModel, signal_map) def define_actions(self): PageView.ListView.define_actions(self) diff --git a/gramps2/src/DataViews/_RepositoryView.py b/gramps2/src/DataViews/_RepositoryView.py index f3b149b05..cb58443fd 100644 --- a/gramps2/src/DataViews/_RepositoryView.py +++ b/gramps2/src/DataViews/_RepositoryView.py @@ -79,10 +79,10 @@ class RepositoryView(PageView.ListView): 'repository-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Repository View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.RepositoryModel, - signal_map) + PageView.ListView.__init__( + self, _('Repositories'), dbstate, uistate, + column_names, len(column_names), + DisplayModels.RepositoryModel, signal_map) def drag_info(self): return DdTargets.REPO_LINK diff --git a/gramps2/src/DataViews/_SourceView.py b/gramps2/src/DataViews/_SourceView.py index 8732480a8..2ac4ac492 100644 --- a/gramps2/src/DataViews/_SourceView.py +++ b/gramps2/src/DataViews/_SourceView.py @@ -73,10 +73,9 @@ class SourceView(PageView.ListView): 'source-rebuild' : self.build_tree, } - PageView.ListView.__init__(self,'Source View',dbstate,uistate, - column_names,len(column_names), - DisplayModels.SourceModel, - signal_map) + PageView.ListView.__init__( + self, _('Sources'), dbstate, uistate, column_names, + len(column_names), DisplayModels.SourceModel, signal_map) def drag_info(self): return DdTargets.SOURCE_LINK diff --git a/gramps2/src/const.py.in b/gramps2/src/const.py.in index 91a1d1493..5f8e36413 100644 --- a/gramps2/src/const.py.in +++ b/gramps2/src/const.py.in @@ -37,7 +37,7 @@ from TransUtils import sgettext as _ #------------------------------------------------------------------------- url_homepage = "http://gramps-project.org/" url_mailinglist = "http://sourceforge.net/mail/?group_id=25770" -url_burtracker = "http://sourceforge.net/tracker/?group_id=25770&atid=385137" +url_bugtracker = "http://bugs.gramps-project.org/bug_report_advanced_page.php" #------------------------------------------------------------------------- # diff --git a/gramps2/src/glade/gramps.glade b/gramps2/src/glade/gramps.glade index cd0743e2f..7bec2183b 100644 --- a/gramps2/src/glade/gramps.glade +++ b/gramps2/src/glade/gramps.glade @@ -2787,7 +2787,7 @@ Text Beside Icons 12 True - 11 + 6 2 False 6 @@ -2810,8 +2810,8 @@ Text Beside Icons 1 2 - 9 - 10 + 4 + 5 fill @@ -2838,8 +2838,8 @@ Text Beside Icons 0 2 - 8 - 9 + 3 + 4 fill @@ -2919,81 +2919,6 @@ Text Beside Icons - - - True - <b>Family view style</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 4 - 5 - fill - - - - - - - True - True - Left to right - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 1 - 2 - 5 - 6 - fill - - - - - - - True - True - Top to bottom - True - GTK_RELIEF_NORMAL - True - False - False - True - familyview1 - - - - 1 - 2 - 6 - 7 - fill - - - - 3 @@ -3010,8 +2935,8 @@ Text Beside Icons 1 2 - 10 - 11 + 5 + 6 fill diff --git a/gramps2/src/gramps_main.py b/gramps2/src/gramps_main.py index 8f6f97c1c..77d05fc3e 100644 --- a/gramps2/src/gramps_main.py +++ b/gramps2/src/gramps_main.py @@ -141,13 +141,13 @@ class Gramps: register_stock_icons() state = GrampsDb.DbState() - vm = ViewManager.ViewManager(state) + self.vm = ViewManager.ViewManager(state) for view in DataViews.get_views(): - vm.register_view(view) + self.vm.register_view(view) - ArgHandler.ArgHandler(state,vm,args) + ArgHandler.ArgHandler(state,self.vm,args) - vm.init_interface() + self.vm.init_interface() state.db.request_rebuild() state.change_active_person(state.db.get_default_person()) @@ -155,26 +155,24 @@ class Gramps: # This prevents a window from annoyingly popping up when # the command line args are sufficient to operate without it. Config.client.notify_add("/apps/gramps/researcher", - self.researcher_key_update) + self.researcher_key_update) Config.client.notify_add("/apps/gramps/interface/statusbar", - self.statusbar_key_update) -# Config.client.notify_add("/apps/gramps/interface/toolbar", -## self.toolbar_key_update) + self.statusbar_key_update) + Config.client.notify_add("/apps/gramps/interface/toolbar", + self.toolbar_key_update) # Config.client.notify_add("/apps/gramps/interface/toolbar-on", -# self.toolbar_on_key_update) +# self.toolbar_on_key_update) # Config.client.notify_add("/apps/gramps/interface/filter", # self.filter_key_update) # Config.client.notify_add("/apps/gramps/interface/view", # self.sidebar_key_update) -# Config.client.notify_add("/apps/gramps/interface/familyview", -# self.familyview_key_update) # Config.client.notify_add("/apps/gramps/preferences/name-format", # self.familyview_key_update) # Config.client.notify_add("/apps/gramps/preferences/date-format", # self.date_format_key_update) if Config.get_usetips(): - TipOfDay.TipOfDay(vm.uistate) + TipOfDay.TipOfDay(self.vm.uistate) ## # FIXME: THESE will have to be added (ViewManager?) ## # once bookmarks work again @@ -195,11 +193,15 @@ class Gramps: # self.db.set_event_id_prefix(Config.get_event_id_prefix()) def statusbar_key_update(self,client,cnxn_id,entry,data): - self.modify_statusbar() + self.vm.uistate.modify_statusbar() def toolbar_key_update(self,client,cnxn_id,entry,data): the_style = Config.get_toolbar() if the_style == -1: - self.toolbar.unset_style() + self.vm.toolbar.unset_style() else: - self.toolbar.set_style(the_style) + self.vm.toolbar.set_style(the_style) + +# def toolbar_on_key_update(self,client,cnxn_id,entry,data): +# is_on = COnfig.get_toolbar_on() +# self.enable_toolbar(is_on)