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

[reinhard]

Author: reinhard
Date: 2010-12-12 15:50:29 -0600 (Sun, 12 Dec 2010)
New Revision: 10268

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFEntry.py
Log:
Don't switch to editing mode if the block behind the current entry has no
current record.



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

   + timestamp: 2010-12-08 00:43:52.178999901 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - defaults/default.gfd       
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault.gfd
defaults/default/de.gfd 
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fde.gfd
defaults/default/el.gfd 
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fel.gfd
defaults/default/es.gfd 
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fes.gfd
defaults/default/fr.gfd 
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Ffr.gfd
defaults/default/hu.gfd 
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault%2Fhu.gfd
samples/function/menu.gfd       
address@hidden:trunk%2Fgnue-forms:samples%2Ffunction%2Fmenu.gfd
samples/oldkeys.gfd     address@hidden:trunk%2Fgnue-forms:samples%2Foldkeys.gfd
src/GFForm.py   address@hidden:trunk%2Fgnue-forms:src%2FGFForm.py
src/uidrivers/curses/widgets/menu.py    
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fcurses%2Fwidgets%2Fmenu.py
src/uidrivers/qt3/widgets/menu.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Fmenu.py
src/uidrivers/qt3/widgets/toolbar.py    
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fqt3%2Fwidgets%2Ftoolbar.py
src/uidrivers/wx/widgets/menu.py        
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenu.py
src/uidrivers/wx/widgets/menuitem.py    
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fmenuitem.py
src/uidrivers/wx/widgets/toolbar.py     
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbar.py
src/uidrivers/wx/widgets/toolbutton.py  
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Ftoolbutton.py

   + src/GFObjects/GFEntry.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.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
3172 address@hidden
3173 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
3173 address@hidden
3174 address@hidden

Name: bzr:text-parents
   - defaults/default.gfd       address@hidden
defaults/default/de.gfd 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9490
defaults/default/el.gfd address@hidden
defaults/default/es.gfd 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
defaults/default/fr.gfd 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
defaults/default/hu.gfd 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
samples/function/menu.gfd       
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9436
samples/oldkeys.gfd     
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9423
src/GFForm.py   address@hidden
src/uidrivers/curses/widgets/menu.py    
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
src/uidrivers/qt3/widgets/menu.py       
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
src/uidrivers/qt3/widgets/toolbar.py    
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
src/uidrivers/wx/widgets/menu.py        
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10053
src/uidrivers/wx/widgets/menuitem.py    
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10106
src/uidrivers/wx/widgets/toolbar.py     
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10053
src/uidrivers/wx/widgets/toolbutton.py  
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10106

   + src/GFObjects/GFEntry.py   address@hidden


Modified: trunk/gnue-forms/src/GFObjects/GFEntry.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFEntry.py   2010-12-03 17:30:08 UTC (rev 
10267)
+++ trunk/gnue-forms/src/GFObjects/GFEntry.py   2010-12-12 21:50:29 UTC (rev 
10268)
@@ -197,10 +197,17 @@
 
     def beginEdit(self):
 
-        self._displayHandler.beginEdit()
+        # Check whether the entry is enabled. After the deletion of the last
+        # record in the current block, or on other occasions where the block
+        # behind the current entry jumps to a "no current record" situation,
+        # the entry has switched from enabled to disabled, and we should not
+        # try to switch it to editing mode.
+        if self._is_enabled_():
+            self._displayHandler.beginEdit()
 
     # -------------------------------------------------------------------------
 
     def endEdit(self):
 
-        self._displayHandler.endEdit()
+        if self._is_enabled_():
+            self._displayHandler.endEdit()