Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/gramps_main.py (init_interface): Set proper color for new icons.

Browse Source 
* 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
This commit is contained in:
Alex Roitman
2005-06-08 15:50:19 +00:00
parent 97642f79f6
commit d4705aeb25
6 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/src/DisplayModels.py
View File

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

3
gramps2/src/EventView.py
View File

@@ -54,9 +54,10 @@ column_names = [
_('Date'),
_('Place'),
_('Cause'),
_('Last Changed'),
]
_HANDLE_COL = 7
_HANDLE_COL = len(column_names)
#-------------------------------------------------------------------------
#

2
gramps2/src/GrampsDbBase.py
View File

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

100
gramps2/src/gramps.glade
View File

@@ -1005,46 +1005,60 @@
<signal name="clicked" handler="on_person_list1_activate" last_modification_time="Thu, 05 Sep 2002 01:03:54 GMT"/>
<child>
<widget class="GtkHBox" id="hbox134">
<widget class="GtkAlignment" id="alignment13">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<property name="top_padding">0</property>
<property name="bottom_padding">0</property>
<property name="left_padding">0</property>
<property name="right_padding">0</property>
<child>
<widget class="GtkImage" id="image2654">
<widget class="GtkHBox" id="hbox134">
<property name="visible">True</property>
<property name="pixbuf">people48.png</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<property name="homogeneous">False</property>
<property name="spacing">2</property>
<child>
<widget class="GtkLabel" id="label525">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;People&lt;/b&gt;</property>
<property name="use_underline">True</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.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<child>
<widget class="GtkImage" id="image2654">
<property name="visible">True</property>
<property name="pixbuf">people48.png</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label525">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;People&lt;/b&gt;</property>
<property name="use_underline">True</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.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
</widget>
</child>
@@ -1067,7 +1081,7 @@
<child>
<widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1141,7 +1155,7 @@
<child>
<widget class="GtkAlignment" id="alignment7">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1215,7 +1229,7 @@
<child>
<widget class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1279,7 +1293,7 @@
</child>
<child>
<widget class="GtkButton" id="button198">
<widget class="GtkButton" id="side_repos">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
@@ -1289,7 +1303,7 @@
<child>
<widget class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1364,7 +1378,7 @@ tories&lt;/b&gt;</property>
<child>
<widget class="GtkAlignment" id="alignment10">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1438,7 +1452,7 @@ tories&lt;/b&gt;</property>
<child>
<widget class="GtkAlignment" id="alignment11">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
@@ -1502,7 +1516,7 @@ tories&lt;/b&gt;</property>
</child>
<child>
<widget class="GtkButton" id="button197">
<widget class="GtkButton" id="side_events">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NONE</property>
@@ -1512,7 +1526,7 @@ tories&lt;/b&gt;</property>
<child>
<widget class="GtkAlignment" id="alignment12">
<property name="visible">True</property>
<property name="xalign">0.5</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xscale">0</property>
<property name="yscale">0</property>

2
gramps2/src/gramps_main.py
View File

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