Improve layout of citation tree view

svn: r17962
This commit is contained in:
Nick Hall
2011-07-24 23:42:05 +00:00
parent 6df8226f11
commit 7b743e61af
2 changed files with 13 additions and 18 deletions

View File

@@ -151,7 +151,7 @@ class CitationBaseModel(object):
return format_time(data[COLUMN_CHANGE]) return format_time(data[COLUMN_CHANGE])
def sort_change(self,data): def sort_change(self,data):
return "%012x" % data[8] return "%012x" % data[COLUMN_CHANGE]
def column_src_title(self,data): def column_src_title(self,data):
source_handle = data[COLUMN_SOURCE] source_handle = data[COLUMN_SOURCE]
@@ -278,7 +278,7 @@ class CitationTreeModel(CitationBaseModel, TreeBaseModel):
# FIXME: What should the number in the next line be? # FIXME: What should the number in the next line be?
# FIXME: Only the first element of hmap ever seems to be populated. # FIXME: Only the first element of hmap ever seems to be populated.
# Why is this, and is it correct? # Why is this, and is it correct?
self.hmap = [self.column_header] + [None]*14 self.hmap = [self.column_header] + [None] * len(self.smap)
def get_tree_levels(self): def get_tree_levels(self):
""" """

View File

@@ -17,7 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# $Id: sourceview.py 17447 2011-05-07 18:42:31Z nick-h $ # $Id$
""" """
Citation View Citation View
@@ -74,12 +74,11 @@ class BaseCitationView(ListView):
""" """
# The data items here have to correspond, in order, to the items in # The data items here have to correspond, in order, to the items in
# src/giu.views/treemodels/citationmodel.py # src/giu.views/treemodels/citationmodel.py
COL_PAGE = 0 COL_TITLE_PAGE = 0
COL_ID = 1 COL_ID = 1
COL_DATE = 2 COL_DATE = 2
COL_CONFIDENCE = 3 COL_CONFIDENCE = 3
COL_CHAN = 4 COL_CHAN = 4
COL_SRC_TITLE = 5 COL_SRC_TITLE = 5
COL_SRC_ID = 6 COL_SRC_ID = 6
COL_SRC_AUTH = 7 COL_SRC_AUTH = 7
@@ -88,13 +87,13 @@ class BaseCitationView(ListView):
COL_SRC_CHAN = 10 COL_SRC_CHAN = 10
# name of the columns # name of the columns
COLUMN_NAMES = [ COLUMN_NAMES = [
_('Volume/Page'), _('Title/Page'),
_('ID'), _('ID'),
_('Date'), _('Date'),
_('Confidence'), _('Confidence'),
_('Last Changed'), _('Last Changed'),
_('Source: Title'),
_('Source: ID'), _('Source: ID'),
_('Source: Title'),
_('Source: Author'), _('Source: Author'),
_('Source: Abbreviation'), _('Source: Abbreviation'),
_('Source: Publication Information'), _('Source: Publication Information'),
@@ -102,16 +101,12 @@ class BaseCitationView(ListView):
] ]
# default setting with visible columns, order of the col, and their size # default setting with visible columns, order of the col, and their size
CONFIGSETTINGS = ( CONFIGSETTINGS = (
('columns.visible', [COL_SRC_TITLE, ('columns.visible', [COL_TITLE_PAGE, COL_ID, COL_DATE,
COL_PAGE, COL_ID, COL_DATE, COL_CONFIDENCE]), COL_CONFIDENCE]),
('columns.rank', [COL_SRC_TITLE, COL_SRC_ID, COL_SRC_AUTH, ('columns.rank', [COL_TITLE_PAGE, COL_ID, COL_DATE, COL_CONFIDENCE,
COL_SRC_ABBR, COL_SRC_PINFO, COL_SRC_CHAN, COL_CHAN, COL_SRC_TITLE, COL_SRC_ID, COL_SRC_AUTH,
COL_PAGE, COL_ID, COL_DATE, COL_CONFIDENCE, COL_SRC_ABBR, COL_SRC_PINFO, COL_SRC_CHAN]),
COL_CHAN]), ('columns.size', [200, 75, 100, 100, 100, 200, 75, 75, 100, 150, 100])
('columns.size', [200, 75, 150,
100, 150, 100,
75, 75, 100, 100,
100])
) )
ADD_MSG = _("Add a new citation") ADD_MSG = _("Add a new citation")
EDIT_MSG = _("Edit the selected citation") EDIT_MSG = _("Edit the selected citation")