Changeset 305 for trunk

Timestamp:

05/10/09 03:53:57 (3 years ago)

Author:

ocjhb

Message:

ui improvmenets. Icons, sounds, more messages, disabled bt port selection dialog

Location:

trunk/sandbox/jhb

Files:

• mobile/coin_icon.mbg (added)
• mobile/coin_icon.mif (added)
• mobile/coinsound.wav (added)
• mobile/ocwallet.py (modified) (9 diffs)
• oc2/wallet.py (modified) (1 diff)

trunk/sandbox/jhb/mobile/ocwallet.py

@@ -5 +5 @@
 from oc2 import storage,wallet, transports
 import sys
+import audio
+
+icon = appuifw.Icon(u'e:\\python\\coin_icon.mif',16384,16385)
+coinsound = audio.Sound.open('e:\\python\\coinsound.wav')
+
 
 class WalletClient:
@@ -35 +40 @@
             title = u'%s %ss' % (amount,cdd.currencyId)
             description = unicode(cdd.issuerServiceLocation)
-            self.wallet_list.append((title,description))
+            self.wallet_list.append((title,description,icon))
         if not self.wallet_list:
             self.wallet_list.append(u'no currencies yet')
@@ -123 +128 @@
         details.append((u'Currency Id',unicode(coin.currencyId)))
         details.append((u'Denomination',unicode(coin.denomination)))
+        details.append((u'Serial',unicode(coin.serial)))
+        details.append((u'Signature',unicode(coin.signature)))
         self.coin_menu = appuifw.Listbox(details,self.inspectCurrency)
         self.coin_menu.bind(EKeyLeftArrow,self.inspectCurrency)
@@ -163 +170 @@
         transport = self.getHTTPTransport(url)
         self.wallet.mintCoins(transport,amount,target)
+        coinsound.play() 
         self.makeWalletMenu()
         self.displayWalletMenu()
@@ -189 +197 @@
         transport = self.getHTTPTransport(cdd.issuerServiceLocation)
         self.wallet.freshenUp(transport,cdd)
+        coinsound.play() 
         self.makeWalletMenu()
         self.displayWalletMenu()
@@ -208 +217 @@
         else:
             self.receiveCoinsHTTP(transport)
-        
+
+        coinsound.play() 
         self.makeWalletMenu()
         self.displayWalletMenu()
@@ -260 +270 @@
         addr,services=btsocket.bt_discover()
         if len(services)>0:
-            choices=services.keys()
-            choices.sort()
-            choice=appuifw.popup_menu([unicode(services[x])+": "+x for x in choices],u'Choose port:')
-            port=services[choices[choice]]
+            #choices=services.keys()
+            #choices.sort()
+            #choice=appuifw.popup_menu([unicode(services[x])+": "+x for x in choices],u'Choose port:')
+            #port=services[choices[choice]]
+            port = services[u'opencoin']
         else:
             port=services[services.keys()[0]]
@@ -281 +292 @@
             btsocket.bt_advertise_service( u"opencoin", server_socket, True, btsocket.RFCOMM)
             btsocket.set_security(server_socket, btsocket.AUTH)
-            appuifw.note(u'waiting for bt connection')
+            self.feedback(u'waiting for bt connection')
             (sock,peer_addr) = server_socket.accept()
 
@@ -297 +308 @@
             sock, client_info = server_sock.accept()
 
-        
         bt = transports.BTTransport(sock)
         self.wallet.getApproval = self.getApproval 

trunk/sandbox/jhb/oc2/wallet.py

@@ -312 +312 @@
         tid = self.makeSerial()
         
+        self.feedback(u'Announcing transfer')
         self.announceSum(transport,tid,amount,target)
-
+        self.feedback(u'Transferring coins. Wating for other side...')
         response = self.requestSpend(transport,tid,picked)
         if response == True: