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 <[email protected]>
properties: 
        branch-nick: forms

   + timestamp: 2010-12-08 00:43:52.178999901 +0100
committer: Reinhard Müller <[email protected]>
properties: 
        branch-nick: forms

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

   + src/GFObjects/GFEntry.py   
1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py

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

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

Name: bzr:text-parents
   - defaults/default.gfd       
[email protected]
defaults/default/de.gfd 
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9490
defaults/default/el.gfd 
[email protected]
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   [email protected]
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   
[email protected]


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()


_______________________________________________
commit-gnue mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnue

Reply via email to