From 5ae515056b577fa0364f5af0a2a2d301a74e6969 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Wed, 8 Jun 2005 15:50:19 +0000 Subject: [PATCH] * src/gramps_main.py (init_interface): Set proper color for new icons. * src/gramps.glade (gramps): Label new buttons, left-align labels. * src/GrampsDbBase.py (get_event_column_order): Show date column. * src/EventView.py (Module): Add "Last Changed" column; do not hard-code handle column. * src/DisplayModels.py (EventModel.__init__): Switch column order. svn: r4807 --- ChangeLog | 8 ++++ src/DisplayModels.py | 4 +- src/EventView.py | 3 +- src/GrampsDbBase.py | 2 +- src/gramps.glade | 100 ++++++++++++++++++++++++------------------- src/gramps_main.py | 2 + 6 files changed, 72 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index df3fd77e6..3d153fa89 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-06-08 Alex Roitman + * src/gramps_main.py (init_interface): Set proper color for new icons. + * src/gramps.glade (gramps): Label new buttons, left-align labels. + * src/GrampsDbBase.py (get_event_column_order): Show date column. + * src/EventView.py (Module): Add "Last Changed" column; do not + hard-code handle column. + * src/DisplayModels.py (EventModel.__init__): Switch column order. + 2005-06-08 Martin Hawlisch * src/EventView.py (column_names): Add missing column * src/RepositoryView.py (column_names): Add missing columns diff --git a/src/DisplayModels.py b/src/DisplayModels.py index b0b179c9d..062827e1a 100644 --- a/src/DisplayModels.py +++ b/src/DisplayModels.py @@ -504,20 +504,20 @@ class EventModel(BaseModel): self.column_description, self.column_id, self.column_type, - self.column_change, self.column_date, self.column_place, self.column_cause, + self.column_change, self.column_handle, ] self.smap = [ self.column_description, self.column_id, self.column_type, - self.sort_change, self.column_date, self.column_place, self.column_cause, + self.sort_change, self.column_handle, ] BaseModel.__init__(self,db,scol,order) diff --git a/src/EventView.py b/src/EventView.py index be3dafee8..db450e62e 100644 --- a/src/EventView.py +++ b/src/EventView.py @@ -54,9 +54,10 @@ column_names = [ _('Date'), _('Place'), _('Cause'), + _('Last Changed'), ] -_HANDLE_COL = 7 +_HANDLE_COL = len(column_names) #------------------------------------------------------------------------- # diff --git a/src/GrampsDbBase.py b/src/GrampsDbBase.py index b9b628a07..51e9c50b5 100644 --- a/src/GrampsDbBase.py +++ b/src/GrampsDbBase.py @@ -1375,7 +1375,7 @@ class GrampsDbBase(GrampsDBCallback.GrampsDBCallback): Returns the Event display common information stored in the database's metadata. """ - default = [(1,0),(1,1),(1,2),(0,3),(1,4),(1,5),(0,6)] + default = [(1,0),(1,1),(1,2),(1,3),(1,4),(1,5),(0,6)] return self._get_column_order(EVENT_COL_KEY,default) def get_repository_column_order(self): diff --git a/src/gramps.glade b/src/gramps.glade index c132d449b..4b9c62998 100644 --- a/src/gramps.glade +++ b/src/gramps.glade @@ -1005,46 +1005,60 @@ - + True - False - 2 + 0 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - people48.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + False + 2 - - - True - <b>People</b> - True - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 + + + True + people48.png + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + <b>People</b> + True + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + - - 0 - False - False - @@ -1067,7 +1081,7 @@ True - 0.5 + 0 0.5 0 0 @@ -1141,7 +1155,7 @@ True - 0.5 + 0 0.5 0 0 @@ -1215,7 +1229,7 @@ True - 0.5 + 0 0.5 0 0 @@ -1279,7 +1293,7 @@ - + True True GTK_RELIEF_NONE @@ -1289,7 +1303,7 @@ True - 0.5 + 0 0.5 0 0 @@ -1364,7 +1378,7 @@ tories</b> True - 0.5 + 0 0.5 0 0 @@ -1438,7 +1452,7 @@ tories</b> True - 0.5 + 0 0.5 0 0 @@ -1502,7 +1516,7 @@ tories</b> - + True True GTK_RELIEF_NONE @@ -1512,7 +1526,7 @@ tories</b> True - 0.5 + 0 0.5 0 0 diff --git a/src/gramps_main.py b/src/gramps_main.py index 2f64838a0..edd5725b4 100755 --- a/src/gramps_main.py +++ b/src/gramps_main.py @@ -323,6 +323,8 @@ class Gramps(GrampsDBCallback.GrampsDBCallback): set_panel(self.gtop.get_widget('side_sources')) set_panel(self.gtop.get_widget('side_places')) set_panel(self.gtop.get_widget('side_media')) + set_panel(self.gtop.get_widget('side_events')) + set_panel(self.gtop.get_widget('side_repos')) self.sidebar_btn = self.gtop.get_widget("sidebar1") self.filter_btn = self.gtop.get_widget("filter1")