[gnue] r10265 - in trunk/gnue-forms: . src/GFObjects

[reinhard]

Author: reinhard
Date: 2010-12-03 11:29:41 -0600 (Fri, 03 Dec 2010)
New Revision: 10265

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFBlock.py
   trunk/gnue-forms/src/GFObjects/GFField.py
Log:
Some improvements for the display of forms in query mode.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-12-03 12:21:40.121000051 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-03 12:54:17.599999905 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/uidrivers/wx/widgets/entry.py  
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py

   + src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py
src/GFObjects/GFField.py        
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFField.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden

Name: bzr:text-parents
   - src/uidrivers/wx/widgets/entry.py  address@hidden

   + src/GFObjects/GFBlock.py   address@hidden
src/GFObjects/GFField.py        address@hidden


Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-03 17:29:37 UTC (rev 
10264)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py   2010-12-03 17:29:41 UTC (rev 
10265)
@@ -1140,8 +1140,8 @@
             for the current record.
         """
 
-        if self.mode == 'query' and self.queryable:
-            if record_number is None or record_number == 0:
+        if self.mode == 'query':
+            if self.queryable and record_number is None or record_number == 0:
                 return self.__query_values.get(field)
             else:
                 return None

Modified: trunk/gnue-forms/src/GFObjects/GFField.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFField.py   2010-12-03 17:29:37 UTC (rev 
10264)
+++ trunk/gnue-forms/src/GFObjects/GFField.py   2010-12-03 17:29:41 UTC (rev 
10265)
@@ -417,10 +417,13 @@
 
         db_value = self.__get_value(record_number)
 
-        if self._block.mode == 'query' and db_value == chr(0):
-            return u_("(empty)")
-        elif self._block.mode == 'query' and db_value is None:
-            return u_("(all)")
+        if self._block.mode == 'query' and self._block.queryable:
+            if record_number not in (0, None):
+                return None
+            if db_value == chr(0):
+                return u_("(empty)")
+            if db_value is None:
+                return u_("(all)")
 
         if self.__lookup_dict is None:
             return None
@@ -437,7 +440,7 @@
             return None
         else:
             # db returned value that is actually not allowed
-            return u"(invalid)"
+            return u_(u"(invalid)")
 
     # -------------------------------------------------------------------------
 
@@ -771,9 +774,13 @@
     def __refresh_ui_choices(self):
 
         if self._block.mode == 'query':
-            lookup = [u_("(all)"), u_("(empty)")] + self.__lookup_list
-            if '' in lookup:
-                lookup.remove('')
+            if self._block.queryable:
+                lookup = [u_("(all)"), u_("(empty)")] + self.__lookup_list
+                if "" in lookup:
+                    lookup.remove("")
+            else:
+                # Set to empty list so listboxes are shown empty.
+                lookup = []
         else:
             lookup = self.__lookup_list