Author: reinhard
Date: 2006-10-10 17:40:46 -0500 (Tue, 10 Oct 2006)
New Revision: 8745
Modified:
trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
Minor function reorg.
Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py 2006-10-10 22:18:57 UTC (rev
8744)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2006-10-10 22:40:46 UTC (rev
8745)
@@ -647,18 +647,12 @@
if self._resultSet.isFirstRecord():
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.firstRecord()
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def prev_record(self):
@@ -674,18 +668,12 @@
if self._resultSet.isFirstRecord():
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.prevRecord()
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def next_record(self):
@@ -706,18 +694,12 @@
self.new_record()
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.nextRecord()
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def last_record(self):
@@ -733,18 +715,12 @@
if self._resultSet.isLastRecord():
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.lastRecord()
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def goto_record(self, record_number):
@@ -760,8 +736,6 @@
if self.mode == 'query':
return
- self._form.endEditing()
-
# If record_number is negative, move relative to last record
if record_number < 0:
record_number += self._resultSet.getRecordCount()
@@ -778,10 +752,6 @@
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def jump_records(self, count):
@@ -813,18 +783,12 @@
if self.mode == 'query':
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.insertRecord(self._lastValues)
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def duplicate_record(self, exclude=(), include=()):
@@ -841,18 +805,12 @@
if self.mode == 'query':
return
- self._form.endEditing()
-
self.__focus_out()
self._resultSet.duplicateRecord(exclude=exclude, include=include)
self.__focus_in()
- self._form.adjust_ui_focus()
-
- self._form.beginEditing()
-
# ---------------------------------------------------------------------------
def delete_record(self):
@@ -1107,11 +1065,16 @@
if self._form.get_focus_block() is self:
self.focus_in()
+ self._form.adjust_ui_focus()
+ self._form.beginEditing()
+
# ---------------------------------------------------------------------------
def __focus_out(self):
+ self._form.endEditing()
+
if self._form.get_focus_block() is self:
self.validate()
self.focus_out()
_______________________________________________
commit-gnue mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/commit-gnue
