Changeset 308

Timestamp:

05/11/09 20:14:26 (3 years ago)

Author:

ocjhb

Message:

more icons, more ui

Location:

trunk/sandbox/jhb/mobile

Files:

• icons (added)
• icons/Coin_Icon.svg (added)
• icons/coin.bmp (added)
• icons/coin.svg (added)
• icons/coin_icon.bmp (added)
• icons/coin_icon_mask.bmp (added)
• icons/coin_mask.bmp (added)
• icons/coins.bmp (added)
• icons/coins.svg (added)
• icons/coins_mask.bmp (added)
• icons/convert.py (added)
• icons/details.bmp (added)
• icons/details.svg (added)
• icons/details_mask.bmp (added)
• icons/down.bmp (added)
• icons/down.svg (added)
• icons/down_mask.bmp (added)
• icons/gtk-refresh.svg (added)
• icons/left.bmp (added)
• icons/left.svg (added)
• icons/left_mask.bmp (added)
• icons/makemask.py (added)
• icons/ocicons.mbm (added)
• icons/refresh.bmp (added)
• icons/refresh_mask.bmp (added)
• icons/restore.bmp (added)
• icons/restore.svg (added)
• icons/restore_mask.bmp (added)
• icons/right.bmp (added)
• icons/right.svg (added)
• icons/right_mask.bmp (added)
• icons/save.bmp (added)
• icons/save.svg (added)
• icons/save_mask.bmp (added)
• icons/up.bmp (added)
• icons/up.svg (added)
• icons/up_mask.bmp (added)
• icons/zoom-fit-best.bmp (added)
• icons/zoom-fit-best.svg (added)
• icons/zoom-fit-best_mask.bmp (added)
• ocwallet.py (modified) (9 diffs)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -9 +9 @@
         self.wallet.feedback = self.feedback
         self.displayWalletMenu()        
-        self.actions=[(u'Send',u'Send coins to someone',self.spendCoins),
-                      (u'Receive',u'Receive coins',self.receiveCoins),
-                      (u'Freshen up',u'Freshen up the coins',self.freshenUp),
-                      (u'Mint',u'new coins from issuer',self.mintCoins),
-                      (u'Redeem',u'redeem from issuer',self.redeemCoins),
-                      (u'Details',u'See what coins you hold',self.inspectCurrency),]
+        self.actions=[(u'Send',u'Send coins to someone',icons['right'],self.spendCoins),
+                      (u'Receive',u'Receive coins',icons['left'],self.receiveCoins),
+                      (u'Freshen up',u'Freshen up the coins',icons['refresh'],self.freshenUp),
+                      (u'Mint',u'new coins from issuer',icons['down'],self.mintCoins),
+                      (u'Redeem',u'redeem from issuer',icons['up'],self.redeemCoins),
+                      (u'Details',u'See what coins you hold',icons['coins'],self.inspectCurrency),]
 
         
@@ -30 +30 @@
             title = u'%s %ss' % (amount,cdd.currencyId)
             description = unicode(cdd.issuerServiceLocation)
-            self.wallet_list.append((title,description,icon))
+            self.wallet_list.append((title,description,icons['opencoin']))
         if not self.wallet_list:
             self.wallet_list.append(u'no currencies yet')
@@ -55 +55 @@
     def displayActionMenu(self):
 
-        action_list = [(action[0],action[1]) for action in self.actions]
+        action_list = [(action[0],action[1],action[2]) for action in self.actions]
         self.action_menu = appuifw.Listbox(action_list,self.selectAction)
         self.action_menu.bind(EKeyRightArrow,self.selectAction)
@@ -67 +67 @@
         current = self.action_menu.current()
         self.todo['action'] = self.actions[current][0]
-        self.actions[current][2]()
+        self.actions[current][3]()
 
 
@@ -108 +108 @@
         coinlist = []
         for coin in coins:
-            coinlist.append(u'%s %s' % (coin.denomination,cdd.currencyId))
+            coinlist.append((unicode(cdd.currencyId),unicode(coin.denomination),icons['coin']))
         self.currency_menu = appuifw.Listbox(coinlist,self.inspectCoin)
         self.currency_menu.bind(EKeyRightArrow,self.inspectCoin)
@@ -379 +379 @@
 
 
-def status(text):
+def status(text,icon=None):
     if ':' in text:
-        appuifw.app.body = appuifw.Listbox([tuple([unicode(p.strip()) for p in text.split(':')]),], lambda:None)
+        items = [unicode(p.strip()) for p in text.split(':',1)]
     else:        
-        appuifw.app.body = appuifw.Listbox([unicode(text)], lambda: None)
+        items = [unicode(text)]
+    if icon:
+        items.append(icon)
+    appuifw.app.body = appuifw.Listbox([tuple(items)], lambda: None)
+            
     e32.ao_sleep(0.3)
 
 def startup(text):
-    status('Welcome to opencoin!:loading... '+text)
+    status('opencoin: loading '+text,icons['restore'])
 ############################### main code ############################        
 app_lock = e32.Ao_lock()
@@ -393 +397 @@
 appuifw.app.exit_key_handler = app_lock.signal
 
-#startup('graphics')
+#only for documenting it
 #from graphics import *
 #filmIt()
 
+names = dict(coin=0,opencoin=1,coins=2,detail=3,down=4,left=5,refresh=6,
+             restore=7,right=8,save=9,up=10,zoom=11)
+icons = dict([(k,appuifw.Icon(u'e:\\python\\ocicons.mbm',v*2,v*2+1)) for k,v in names.items()])
 startup('network')
 import httplib, urllib
@@ -412 +419 @@
 from oc2 import transports
 
-
 startup('media')
-icon = appuifw.Icon(u'e:\\python\\coin_icon.mif',16384,16385)
+
+
+
 coinsound = audio.Sound.open('e:\\python\\coinsound.wav')
 
@@ -427 +435 @@
 import time
 app_lock.wait()
-status('Shut down:saving data...')
+status('Shut down:saving data...',icons['save'])
 storage.save()
-status('Shut down:exit')
+status('Shut down:exit',icons['save'])
 time.sleep(1)