From: Ed Page Date: Fri, 22 Apr 2011 22:58:24 +0000 (-0500) Subject: Switching to icons to see if this makes things more visible X-Git-Url: http://git.maemo.org/git/?p=gc-dialer;a=commitdiff_plain;h=33d8861523477b07fd7e5f9277ac2ecdfc3318e5 Switching to icons to see if this makes things more visible --- diff --git a/data/LICENSE b/data/LICENSE index 08e7d3f..fb44a62 100644 --- a/data/LICENSE +++ b/data/LICENSE @@ -5,3 +5,7 @@ http://creativecommons.org/licenses/by-nc-nd/3.0/ Sound: http://www.freesound.org/samplesViewSingle.php?id=2166 http://creativecommons.org/licenses/sampling+/1.0/ + +placed.png, received.png, placed.png +Free for commercial use +http://www.iconeden.com/icon/free/get/bright-free-stock-iconset diff --git a/data/missed.png b/data/missed.png new file mode 100644 index 0000000..34f71c4 Binary files /dev/null and b/data/missed.png differ diff --git a/data/placed.png b/data/placed.png new file mode 100644 index 0000000..329771d Binary files /dev/null and b/data/placed.png differ diff --git a/data/received.png b/data/received.png new file mode 100644 index 0000000..2b45263 Binary files /dev/null and b/data/received.png differ diff --git a/src/gv_views.py b/src/gv_views.py index db05d11..a989f97 100644 --- a/src/gv_views.py +++ b/src/gv_views.py @@ -271,7 +271,7 @@ class History(object): HISTORY_ALL = "All" HISTORY_ITEM_TYPES = [HISTORY_RECEIVED, HISTORY_MISSED, HISTORY_PLACED, HISTORY_ALL] - HISTORY_COLUMNS = ["Details", "From"] + HISTORY_COLUMNS = ["", "From"] assert len(HISTORY_COLUMNS) == MAX_IDX def __init__(self, app, session, errorLog): @@ -313,6 +313,7 @@ class History(object): self._itemView.setModel(self._itemStore) self._itemView.setUniformRowHeights(True) self._itemView.setRootIsDecorated(False) + self._itemView.setIndentation(0) self._itemView.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) self._itemView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) self._itemView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) @@ -327,6 +328,12 @@ class History(object): self._widget = QtGui.QWidget() self._widget.setLayout(self._layout) + self._actionIcon = { + "Placed": self._app.get_icon("placed.png"), + "Missed": self._app.get_icon("missed.png"), + "Received": self._app.get_icon("received.png"), + } + self._populate_items() @property @@ -381,19 +388,21 @@ class History(object): if self._selectedFilter not in [self.HISTORY_ITEM_TYPES[-1], event["action"]]: continue - relTime = misc_utils.abbrev_relative_date(event["relTime"]) + relTime = event["relTime"] action = event["action"] number = event["number"] prettyNumber = misc_utils.make_pretty(number) + if prettyNumber.startswith("+1 "): + prettyNumber = prettyNumber[len("+1 "):] name = event["name"] if not name or name == number: name = event["location"] if not name: name = "Unknown" - detailsItem = QtGui.QStandardItem("%s - %s\n%s" % (relTime, action, prettyNumber)) + detailsItem = QtGui.QStandardItem(self._actionIcon[action], "%s\n%s" % (prettyNumber, relTime)) detailsFont = detailsItem.font() - detailsFont.setPointSize(max(detailsFont.pointSize() - 7, 5)) + detailsFont.setPointSize(max(detailsFont.pointSize() - 6, 5)) detailsItem.setFont(detailsFont) nameItem = QtGui.QStandardItem(name) nameFont = nameItem.font() @@ -403,7 +412,7 @@ class History(object): for item in row: item.setEditable(False) item.setCheckable(False) - row[0].setData(event) + row[self.DETAILS_IDX].setData(event) self._categoryManager.add_row(event["time"], row) self._itemView.expandAll()