← Back to branch summary

~kiwinote/+junk/action_bar

« back to all changes in this revision

Viewing changes to softwarecenter/view/pendingview.py

  • Committer: Kiwinote
  • Date: 2011-02-15 17:36:37 UTC
  • mfrom: (1422.2.86 software-center)
  • Revision ID: kiwinote@gmail.com-20110215173637-587yw3anmpmmi1fo
merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
softwarecenter/view/pendingview.py
31
31
from aptdaemon.enums import *
32
32
 
33
33
from softwarecenter.enums import *
 
34
from softwarecenter.utils import get_icon_from_iconname
34
35
from softwarecenter.backend import get_install_backend
35
36
from softwarecenter.backend.transactionswatcher import TransactionsWatcher
36
37
from softwarecenter.view.basepane import BasePane
99
100
        # add pending purchases as pseudo transactions
100
101
        for pkgname in self.backend.pending_purchases:
101
102
            iconname = self.backend.pending_purchases[pkgname].iconname
102
 
            icon = self._get_icon_from_iconname(iconname)
 
103
            icon = get_icon_from_iconname(self.icons, iconname=iconname, iconsize=self.ICON_SIZE)
103
104
            appname = self.backend.pending_purchases[pkgname].appname
104
105
            status_text = self._render_status_text(
105
106
                appname or pkgname, _(u'Installing purchase\u2026'))
106
107
            self.append([pkgname, icon, pkgname, status_text, 0, 1, None])
107
108
 
108
 
    def _get_icon_from_iconname(self, iconname=None):
109
 
        if not iconname:
110
 
            iconname = MISSING_APP_ICON
111
 
        try:
112
 
            icon = self.icons.load_icon(iconname, self.ICON_SIZE, 0)
113
 
        except Exception:
114
 
            icon = self.icons.load_icon(MISSING_APP_ICON, self.ICON_SIZE, 0)
115
 
        return icon
116
 
 
117
109
    def _pulse_purchase_helper(self):
118
110
        for item in self:
119
111
            if item[self.COL_PULSE] > 0:
148
140
        try:
149
141
            iconname = trans.meta_data["sc_iconname"]
150
142
        except KeyError:
151
 
            icon = self._get_icon_from_iconname()
 
143
            icon = get_icon_from_iconname(self.icons, iconsize=self.ICON_SIZE)
152
144
        else:
153
 
            icon = self._get_icon_from_iconname(iconname)
 
145
            icon = get_icon_from_iconname(self.icons, iconname=iconname, iconsize=self.ICON_SIZE)
154
146
        if trans.status == STATUS_WAITING_LOCK:
155
147
            status = trans.status_details
156
148
        else: