* 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
This commit is contained in:
Don Allingham 2006-04-22 22:09:16 +00:00
parent 5b35a24272
commit cc1a0275e9
14 changed files with 67 additions and 127 deletions

View File

@ -1,5 +1,17 @@
2006-04-22 Don Allingham <don@gramps-project.org>
* 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 <pez4brian@users.sourceforge.net>
* src/PluginUtils/_ReportUtils.py: keep up with RelLib changes

View File

@ -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

View File

@ -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):

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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"
#-------------------------------------------------------------------------
#

View File

@ -2787,7 +2787,7 @@ Text Beside Icons</property>
<widget class="GtkTable" id="table16">
<property name="border_width">12</property>
<property name="visible">True</property>
<property name="n_rows">11</property>
<property name="n_rows">6</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">6</property>
@ -2810,8 +2810,8 @@ Text Beside Icons</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">9</property>
<property name="bottom_attach">10</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@ -2838,8 +2838,8 @@ Text Beside Icons</property>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">2</property>
<property name="top_attach">8</property>
<property name="bottom_attach">9</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
@ -2919,81 +2919,6 @@ Text Beside Icons</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label139">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Family view style&lt;/b&gt;</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="familyview1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Left to right</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_object_toggled" last_modification_time="Tue, 26 Aug 2003 03:33:34 GMT"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkRadioButton" id="familyview2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Top to bottom</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
<property name="group">familyview1</property>
<signal name="toggled" handler="on_object_toggled" last_modification_time="Tue, 26 Aug 2003 03:33:46 GMT"/>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="usetips">
<property name="border_width">3</property>
@ -3010,8 +2935,8 @@ Text Beside Icons</property>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">10</property>
<property name="bottom_attach">11</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
<property name="x_options">fill</property>
<property name="y_options"></property>
</packing>

View File

@ -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)