diff --git a/contrib/boobank_indicator/MANIFEST.in b/contrib/boobank_indicator/MANIFEST.in index c34622e253c7990eddee9ef387d647d3ce851307..a7c8ea703b10f6c510786d72f4135a2ad65ff31c 100644 --- a/contrib/boobank_indicator/MANIFEST.in +++ b/contrib/boobank_indicator/MANIFEST.in @@ -1,4 +1,6 @@ include boobank-indicator/data/indicator-boobank.png include boobank-indicator/data/green_light.png include boobank-indicator/data/red_light.png +include boobank-indicator/data/red_light.png +include boobank-indicator/data/personal-loan.png exclude screenshot.png \ No newline at end of file diff --git a/contrib/boobank_indicator/boobank_indicator/boobank_indicator.py b/contrib/boobank_indicator/boobank_indicator/boobank_indicator.py index fd1fe5415b2285a0f0eb0469df8848226cd760c9..4557fcdf05e8c8d54c85aa349925a1fd1b97faa3 100644 --- a/contrib/boobank_indicator/boobank_indicator/boobank_indicator.py +++ b/contrib/boobank_indicator/boobank_indicator/boobank_indicator.py @@ -11,7 +11,7 @@ from gi.repository import AppIndicator3 as appindicator from weboob.core import Weboob, CallErrors -from weboob.capabilities.bank import CapBank +from weboob.capabilities.bank import CapBank, Account from weboob.capabilities import UserError from weboob.tools.application.base import MoreResultsAvailable from weboob.exceptions import BrowserUnavailable, BrowserIncorrectPassword, BrowserForbidden, BrowserSSLError @@ -42,7 +42,7 @@ def run(self): account_history_menu = Gtk.Menu() for tr in self.weboob.do('iter_history', self.account, backends=self.account.backend): - label = "%s - %s: %s%s" % (tr.date, tr.label, tr.amount, self.account.currency_text) + label = u'%s - %s: %s%s' % (tr.date, tr.label, tr.amount, self.account.currency_text) image = "green_light.png" if tr.amount > 0 else "red_light.png" transaction_item = create_image_menu_item(label, image) account_history_menu.append(transaction_item) @@ -91,11 +91,14 @@ def check_boobank(self): if account.coming: balance += account.coming - total += balance - currency = account.currency_text + if account.type != Account.TYPE_LOAN: + total += balance + image = "green_light.png" if balance > 0 else "red_light.png" + else: + image = "personal-loan.png" + currency = account.currency_text label = "%s: %s%s" % (account.label, balance, account.currency_text) - image = "green_light.png" if balance > 0 else "red_light.png" account_item = create_image_menu_item(label, image) thread = BoobankTransactionsChecker(self.weboob, account_item, account) thread.start() diff --git a/contrib/boobank_indicator/boobank_indicator/data/personal-loan.png b/contrib/boobank_indicator/boobank_indicator/data/personal-loan.png new file mode 100755 index 0000000000000000000000000000000000000000..dd2f13d639e106484bfd9838231753fd251e8844 Binary files /dev/null and b/contrib/boobank_indicator/boobank_indicator/data/personal-loan.png differ diff --git a/contrib/boobank_indicator/setup.py b/contrib/boobank_indicator/setup.py index 563959d608eebbfd79d00d0ac71153dcf4f870bb..8cc6e229adb22de89357f358f44b4f17cbd16d43 100644 --- a/contrib/boobank_indicator/setup.py +++ b/contrib/boobank_indicator/setup.py @@ -12,7 +12,7 @@ author_email='bezleputh@gmail.com', packages=find_packages(), package_data={ - 'boobank_indicator.data': ['indicator-boobank.png', 'green_light.png', 'red_light.png'] + 'boobank_indicator.data': ['indicator-boobank.png', 'green_light.png', 'red_light.png', 'personal-loan.png'] }, entry_points={ 'console_scripts': ['boobank_indicator = boobank_indicator.boobank_indicator:main'],