[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r8904 - trunk/gnue-forms/src
|
From: |
reinhard |
|
Subject: |
[gnue] r8904 - trunk/gnue-forms/src |
|
Date: |
Mon, 23 Oct 2006 03:22:03 -0500 (CDT) |
Author: reinhard
Date: 2006-10-23 03:22:02 -0500 (Mon, 23 Oct 2006)
New Revision: 8904
Modified:
trunk/gnue-forms/src/GFInstance.py
Log:
Some pylint cleanup.
Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py 2006-10-23 07:56:00 UTC (rev 8903)
+++ trunk/gnue-forms/src/GFInstance.py 2006-10-23 08:22:02 UTC (rev 8904)
@@ -38,7 +38,9 @@
from gnue.forms.GFParser import loadFile
from gnue.forms.input import GFKeyMapper
+__all__ = ['FileOpenError', 'GFInstance']
+
# =============================================================================
# Exceptions
# =============================================================================
@@ -83,49 +85,49 @@
events.EventAware.__init__(self, self.eventController)
self.registerEventListeners({
# First, all events are passed to the focus widget
- '__before__' : self.__beforeEvent,
+ '__before__' : self.__before_event,
# Focus-related events
- 'requestENTER' : self.__execute_nextEntry,
- 'requestNEXTENTRY' : self.__execute_nextEntry,
- 'requestPREVENTRY' : self.__execute_previousEntry,
- 'requestNEXTBLOCK' : self.__execute_nextBlock,
- 'requestPREVBLOCK' : self.__execute_previousBlock,
- 'requestNEXTPAGE' : self.__execute_nextPage,
- 'requestPREVPAGE' : self.__execute_previousPage,
+ 'requestENTER' : self.__execute_next_entry,
+ 'requestNEXTENTRY' : self.__execute_next_entry,
+ 'requestPREVENTRY' : self.__execute_previous_entry,
+ 'requestNEXTBLOCK' : self.__execute_next_block,
+ 'requestPREVBLOCK' : self.__execute_previous_block,
+ 'requestNEXTPAGE' : self.__execute_next_page,
+ 'requestPREVPAGE' : self.__execute_previous_page,
# Clipboard and selection
'requestCUT' : self.__execute_cut,
'requestCOPY' : self.__execute_copy,
'requestPASTE' : self.__execute_paste,
- 'requestSELECTALL' : self.__execute_selectAll,
+ 'requestSELECTALL' : self.__execute_select_all,
# Record navigation
- 'requestFIRSTRECORD' : self.__execute_firstRecord,
- 'requestPREVRECORD' : self.__execute_prevRecord,
- 'requestNEXTRECORD' : self.__execute_nextRecord,
- 'requestLASTRECORD' : self.__execute_lastRecord,
- 'requestJUMPPROMPT' : self.__execute_jumpPrompt,
- 'requestJUMPROWSUP' : self.__execute_jumpRowsUp,
- 'requestJUMPROWSDOWN' : self.__execute_jumpRowsDown,
+ 'requestFIRSTRECORD' : self.__execute_first_record,
+ 'requestPREVRECORD' : self.__execute_prev_record,
+ 'requestNEXTRECORD' : self.__execute_next_record,
+ 'requestLASTRECORD' : self.__execute_last_record,
+ 'requestJUMPPROMPT' : self.__execute_jump_prompt,
+ 'requestJUMPROWSUP' : self.__execute_jump_rows_up,
+ 'requestJUMPROWSDOWN' : self.__execute_jump_rows_down,
# Record insertion/deletion
- 'requestNEWRECORD' : self.__execute_newRecord,
- 'requestMARKFORDELETE': self.__execute_markForDelete,
- 'requestUNDELETE' : self.__execute_undeleteRecord,
+ 'requestNEWRECORD' : self.__execute_new_record,
+ 'requestMARKFORDELETE': self.__execute_mark_for_delete,
+ 'requestUNDELETE' : self.__execute_undelete_record,
# Queries
- 'requestENTERQUERY' : self.__execute_enterQuery,
- 'requestCOPYQUERY' : self.__execute_copyQuery,
- 'requestCANCELQUERY' : self.__execute_cancelQuery,
- 'requestEXECQUERY' : self.__execute_execQuery,
+ 'requestENTERQUERY' : self.__execute_enter_query,
+ 'requestCOPYQUERY' : self.__execute_copy_query,
+ 'requestCANCELQUERY' : self.__execute_cancel_query,
+ 'requestEXECQUERY' : self.__execute_exec_query,
# Transactions
'requestCOMMIT' : self.__execute_commit,
'requestROLLBACK' : self.__execute_rollback,
# Miscellaneous stuff
- 'requestMODETOGGLE' : self.__execute_modeToggle,
+ 'requestMODETOGGLE' : self.__execute_mode_toggle,
'requestABOUT' : self.__execute_about,
'requestPRINTOUT' : self.__execute_printout,
'requestUSERCOMMAND' : self.__execute_user_command,
@@ -235,26 +237,17 @@
form = loadFile(fileHandle, self, initialize=0, url=url)
# Extract the child <dialog>s from the main form tree
- self.reapSubforms(form)
+ for child in form._children[:]:
+ if isinstance(child, GFForm.GFForm):
+ child.setParent(None)
+ self._formsDictionary[child.name] = child
+ form._children.remove(child)
# Add the main form into the dictionary
self._formsDictionary[form.name] = form
# -------------------------------------------------------------------------
- # Remove sub-forms from the main tree
- # -------------------------------------------------------------------------
-
- def reapSubforms(self, formTree):
-
- for child in formTree._children[:]:
- if isinstance(child, GFForm.GFForm):
- child.setParent(None)
- self._formsDictionary[child.name] = child
- formTree._children.remove(child)
-
-
- # -------------------------------------------------------------------------
# Initialize the UI and activate the main form
# -------------------------------------------------------------------------
@@ -277,7 +270,8 @@
if main_menu:
filename = os.path.join(paths.config, 'default.gfd')
filehandle = FileUtils.openResource(filename)
- default_form = loadFile(filehandle, self, initialize=0,
url=filename)
+ default_form = loadFile(filehandle, self, initialize=0,
+ url=filename)
filehandle.close()
menu = default_form.findChildNamed('__main__', 'GFMenu')
@@ -285,8 +279,8 @@
main_menu.assign(menu, True)
main_menu.name = '__main__'
- # Make sure that the Help menu ist the last one. If there is a
better
- # way to do this, please let me know. -- Reinhard
+ # Make sure that the Help menu ist the last one. If there is a
+ # better way to do this, please let me know. -- Reinhard
help_menu = main_menu.findChildNamed('__help__')
main_menu._children.remove(help_menu)
main_menu._children.append(help_menu)
@@ -312,10 +306,10 @@
# execution stops here until the dialog get's closed. So do *not*
# enter another main loop
assert gDebug(4, "Activating main form as dialog")
- self.activateForm('__main__', self._parameters, modal = True)
+ main_form.execute_open(self._parameters, True)
else:
assert gDebug(4, "Activating main form")
- self.activateForm('__main__', self._parameters)
+ main_form.execute_open(self._parameters, False)
assert gDebug(4, "Startup complete")
assert gDebug(4, "Entering main loop")
self._uiinstance.mainLoop()
@@ -325,27 +319,6 @@
# -------------------------------------------------------------------------
- # Activate a given form
- # -------------------------------------------------------------------------
-
- def activateForm(self, formName='__main__', parameters=None, modal=False):
-
- assert gEnter(4)
- self._formsDictionary[formName].execute_open(parameters, modal)
- assert gLeave(4)
-
-
- # -------------------------------------------------------------------------
- # Build a user interface for a form tree
- # -------------------------------------------------------------------------
-
- def buildForm(self, formName='__main__'):
-
- form = self._formsDictionary[formName]
- self._uiinstance.buildForm(form, formName)
-
-
- # -------------------------------------------------------------------------
# Show an exception
# -------------------------------------------------------------------------
@@ -391,7 +364,7 @@
# Handle an event before it's sent to usual event processing
# -------------------------------------------------------------------------
- def __beforeEvent(self, event):
+ def __before_event(self, event):
"""
This is called before any normal event processing is done. This method
passes the event to the current focus widget and sees if that widget
@@ -433,37 +406,37 @@
# Focus movement
# -------------------------------------------------------------------------
- def __execute_nextEntry(self, event):
+ def __execute_next_entry(self, event):
event._form.next_entry()
# -------------------------------------------------------------------------
- def __execute_previousEntry(self, event):
+ def __execute_previous_entry(self, event):
event._form.previous_entry()
# -------------------------------------------------------------------------
- def __execute_nextBlock(self,event):
+ def __execute_next_block(self, event):
event._form.next_block()
# -------------------------------------------------------------------------
- def __execute_previousBlock(self, event):
+ def __execute_previous_block(self, event):
event._form.previous_block()
# -------------------------------------------------------------------------
- def __execute_nextPage(self, event):
+ def __execute_next_page(self, event):
event._form.next_page()
# -------------------------------------------------------------------------
- def __execute_previousPage(self, event):
+ def __execute_previous_page(self, event):
event._form.previous_page()
@@ -490,7 +463,7 @@
# -------------------------------------------------------------------------
- def __execute_selectAll(self, event):
+ def __execute_select_all(self, event):
event._form.select_all()
@@ -498,37 +471,37 @@
# Record navigation
# -------------------------------------------------------------------------
- def __execute_firstRecord(self, event):
+ def __execute_first_record(self, event):
event._form.first_record()
# -------------------------------------------------------------------------
- def __execute_prevRecord(self, event):
+ def __execute_prev_record(self, event):
event._form.prev_record()
# -------------------------------------------------------------------------
- def __execute_nextRecord(self, event):
+ def __execute_next_record(self, event):
event._form.next_record()
# -------------------------------------------------------------------------
- def __execute_lastRecord(self, event):
+ def __execute_last_record(self, event):
event._form.last_record()
# -------------------------------------------------------------------------
- def __execute_jumpPrompt(self,event):
+ def __execute_jump_prompt(self, event):
event._form.ask_record()
# -------------------------------------------------------------------------
- def __execute_jumpRowsUp(self, event):
+ def __execute_jump_rows_up(self, event):
if event._form._currentEntry._rows > 1:
count = -event._form._currentEntry._rows + 1
@@ -541,7 +514,7 @@
# -------------------------------------------------------------------------
- def __execute_jumpRowsDown (self, event):
+ def __execute_jump_rows_down (self, event):
if event._form._currentEntry._rows > 1:
count = event._form._currentEntry._rows - 1
@@ -557,19 +530,19 @@
# Record insertion/deletion
# -------------------------------------------------------------------------
- def __execute_newRecord(self, event):
+ def __execute_new_record(self, event):
event._form.new_record()
# -------------------------------------------------------------------------
- def __execute_markForDelete(self, event):
+ def __execute_mark_for_delete(self, event):
event._form.delete_record()
# -------------------------------------------------------------------------
- def __execute_undeleteRecord(self, event):
+ def __execute_undelete_record(self, event):
event._form.undelete_record()
@@ -578,25 +551,25 @@
# Queries
# -------------------------------------------------------------------------
- def __execute_enterQuery(self, event):
+ def __execute_enter_query(self, event):
event._form.init_query()
# -------------------------------------------------------------------------
- def __execute_copyQuery(self, event):
+ def __execute_copy_query(self, event):
event._form.copy_query()
# -------------------------------------------------------------------------
- def __execute_cancelQuery(self, event):
+ def __execute_cancel_query(self, event):
event._form.cancel_query()
# -------------------------------------------------------------------------
- def __execute_execQuery(self, event):
+ def __execute_exec_query(self, event):
event._form.execute_query()
@@ -620,7 +593,7 @@
# Toggle insert mode
# -------------------------------------------------------------------------
- def __execute_modeToggle(self, event):
+ def __execute_mode_toggle(self, event):
event._form.toggle_insert_mode()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r8904 - trunk/gnue-forms/src,
reinhard <=