[pkg-fso-commits] [SCM] freesmartphone.org demo GUI branch, master, updated. milestone2-10-gb9e0ec4

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit b9e0ec491df4983b329a69aadc64f0d0f9e3228e
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Aug 11 02:16:46 2008 -0300

    sms: Replace newlines for list view
    
    sms: Replace newlines for list view
    
    In the list view, a newline in a SMS becomes an ugly square. This turns
    it into a simple space. It also adds a multi-line SMS to the
    offline-demo-set.

diff --git a/src/zhone b/src/zhone
index 7a797e0..d84f018 100755
--- a/src/zhone
+++ b/src/zhone
@@ -424,6 +424,9 @@ class pyphone_sms(edje_group):
                 self.cbMessagebookReply( [
                     (0, "read", "+4544555", "Hello World!"),
                     (1, "read", "+456663443", "Zhone!"),
+                    (2, "read", "+456663443", "Hi Guy\nGuess what, I now "+
+			"know to write multi-line SMSs.\nIsn't that "+
+			"nice?\n\nSome Buddy"),
                 ] )
 
     def onReadyStatus( self, status ):
@@ -449,7 +452,8 @@ class pyphone_sms(edje_group):
         for i in range( 0, len( self.current ) ):
             main_text = self.main.groups["contacts"].tryNumberToName( self.current[i][2] )
             self.part_text_set( "label_main_list_%i" % i, main_text )
-            self.part_text_set( "label_sub_list_%i" % i, u"(%s) %s" % ( self.current[i][1], self.current[i][3] ) )
+	    sub_text = " ".join(self.current[i][3].splitlines())
+            self.part_text_set( "label_sub_list_%i" % i, u"(%s) %s" % ( self.current[i][1], sub_text ) )
         for i in range( len( self.current ), 6):
             self.part_text_set( "label_main_list_%i" % i, u"" )
             self.part_text_set( "label_sub_list_%i" % i, u"" )

-- 
freesmartphone.org demo GUI