[gnue] r9047 - in trunk: gnue-forms/src/uidrivers/win32 gnue-navigator/src

[btami]

Author: btami
Date: 2006-11-17 10:26:24 -0600 (Fri, 17 Nov 2006)
New Revision: 9047

Modified:
   trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-navigator/src/UIwin32.py
Log:
cleanup and pep8

Modified: trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py  2006-11-17 09:32:00 UTC 
(rev 9046)
+++ trunk/gnue-forms/src/uidrivers/win32/GFwin32App.py  2006-11-17 16:26:24 UTC 
(rev 9047)
@@ -18,35 +18,39 @@
 # Copyright 2000-2006 Free Software Foundation
 #
 # $Id$
-#
-# DESCRIPTION:
-# A PyWin32 based user interface driver for GNUe forms.
-#
-# NOTES:
-#
 
+
 import win32gui
 
-__win32App = None
+__all__ = ['get_win32_app']
 
-def getWin32App():
-    global __win32App
-    if not __win32App:
-        __win32App = GFwin32App()
-    return __win32App
+__win32app = None
 
 
+def get_win32_app():
+    """
+    Get the global win32 application instance
+    """
+    global __win32app
+    if not __win32app:
+        __win32app = GFwin32App()
+    return __win32app
+
+
 class GFwin32App:
-    _mainLoop= None
+    """
+    The win32 application object used in gnue-forms and gnue-navigator
+    """
+    _main_loop = None
 
     _HwndToTkObj = {}
     _MainWindowList = []
 
-    def MainLoop (self):
+    def main_loop (self):
+        """
+        Launch win32's mainloop
+        """
+        if self._main_loop is None:
         # just to launch one win32's mainloop
-        # otherwise, the app does not finishes cleanly when several windows 
are open
-        # 'cause the first mainloop gets all the events
-        # and the others just sit and wait for something to happen
-        if self._mainLoop==None:
-            self._mainLoop= 1
+            self._main_loop = 1
             win32gui.PumpMessages()

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-11-17 09:32:00 UTC 
(rev 9046)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2006-11-17 16:26:24 UTC 
(rev 9047)
@@ -18,25 +18,18 @@
 # Copyright 2000-2006 Free Software Foundation
 #
 # $Id$
-#
-# DESCRIPTION:
-# A PyWin32 based user interface driver for GNUe forms.
-#
-# NOTES:
-#
 
+
 import sys
-import string
-import types
-import math
 
 from gnue.common.apps import i18n
 from gnue.forms.uidrivers._base import Exceptions
 
 try:
-    import win32gui, win32con, afxres, commctrl, win32clipboard, win32ui
+    import win32gui, win32con, afxres, win32ui
 except ImportError:
-    raise Exceptions.DriverNotSupported, _("The GNUe-Forms Win32 driver 
requires PyWin32.")
+    raise Exceptions.DriverNotSupported, \
+        _("The GNUe-Forms Win32 driver requires PyWin32.")
 from pywin.mfc import window
 
 from gnue.common import events
@@ -46,7 +39,7 @@
 
 from gnue.forms import VERSION
 from gnue.forms.GFForm import *
-from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
+from gnue.forms.uidrivers._commonGuiToolkit import UIdriver as commonToolkit
 
 from gnue.forms.uidrivers.win32.GFwin32App import *
 #from gnue.forms.uidrivers.wx.UIWXSplashScreen import *
@@ -55,29 +48,29 @@
 from gnue.forms.uidrivers.win32 import dialogs
 
 
-def OnWMVScroll(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMVScroll(hwnd, msg, wParam, lParam)
+def OnWMVScroll(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMVScroll(hwnd, msg, wparam, lparam)
 
-def OnWMMenuselect(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMMenuselect(hwnd, msg, wParam, lParam)
+def OnWMMenuselect(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMMenuselect(hwnd, msg, wparam, lparam)
 
-def OnWMNotify(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMNotify(hwnd, msg, wParam, lParam)
+def OnWMNotify(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMNotify(hwnd, msg, wparam, lparam)
 
-def OnWMDestroy(hwnd, msg, wParam, lParam, widget):
+def OnWMDestroy(hwnd, msg, wparam, lparam, widget):
     win32gui.DestroyWindow(hwnd)
 
-def OnWMClose(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMClose(hwnd, msg, wParam, lParam)
+def OnWMClose(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMClose(hwnd, msg, wparam, lparam)
 
-def OnWMSize(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMSize(hwnd, msg, wParam, lParam)
+def OnWMSize(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMSize(hwnd, msg, wparam, lparam)
 
-def OnWMCommand(hwnd, msg, wParam, lParam, widget):
-    return widget.OnWMCommand(hwnd, msg, wParam, lParam)
+def OnWMCommand(hwnd, msg, wparam, lparam, widget):
+    return widget.OnWMCommand(hwnd, msg, wparam, lparam)
 
-def OnWMDefault(hwnd, msg, wParam, lParam, widget):
-    return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
+def OnWMDefault(hwnd, msg, wparam, lparam, widget):
+    return win32gui.DefWindowProc(hwnd, msg, wparam, lparam)
 
 #
 # GFUserInterface
@@ -96,37 +89,37 @@
                      win32con.WM_COMMAND    : OnWMCommand }
 
     _wndclass = None
-  
-    # 
---------------------------------------------------------------------------
-    # Constructor
-    # 
---------------------------------------------------------------------------
-  
-    def __init__(self, eventHandler, name="Undefined", disableSplash=None,
-            parentContainer=None, moduleName=None):
-  
-        commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
-                disableSplash, parentContainer, moduleName)
-        self.__splash = None
-  
+  
+    # 
---------------------------------------------------------------------------
+    # Constructor
+    # 
---------------------------------------------------------------------------
+  
+    def __init__(self, eventHandler, name="Undefined", disableSplash=None,
+            parentContainer=None, moduleName=None):
+  
+        commonToolkit.GFUserInterface.__init__(self, eventHandler, name,
+                disableSplash, parentContainer, moduleName)
+        self.__splash = None
+  
 
-    def _wndproc(self, hwnd, msg, wParam, lParam):
+    def _wndproc(self, hwnd, msg, wparam, lparam):
         try:
             widget = self._win32app._HwndToTkObj[hwnd]
         except:
-            return win32gui.DefWindowProc(hwnd, msg, wParam, lParam)
-      
+            return win32gui.DefWindowProc(hwnd, msg, wparam, lparam)
+      
         OnWM = self._message_map.get(msg, OnWMDefault)
-        return OnWM(hwnd, msg, wParam, lParam, widget)
+        return OnWM(hwnd, msg, wparam, lparam, widget)
 
 
-    # 
---------------------------------------------------------------------------
-    # Initialize the user interface
-    # 
---------------------------------------------------------------------------
-  
+    # 
---------------------------------------------------------------------------
+    # Initialize the user interface
+    # 
---------------------------------------------------------------------------
+  
     def _initialize(self):
 
         self._disabledColour = afxres.AFX_IDC_COLOR_LIGHTGRAY
-        self._win32app = getWin32App()
+        self._win32app = get_win32_app()
         win32gui.InitCommonControls()
 
         try:
@@ -150,7 +143,7 @@
         #
 #    if not self._disableSplash:
 #      self.splash = UIWXSplashScreen()
-
+
         font_name = gConfigForms('faceName')
         if not font_name:
             # explicite boolean check forces generated report parameter dialog
@@ -162,7 +155,7 @@
 
             lf = win32gui.GetObject(win32gui.GetStockObject(fnt))
             font_name = lf.lfFaceName
-      
+      
         font_spec = {'name':font_name, 'height':int(gConfigForms('pointSize'))}
         self._font = win32ui.CreateFont(font_spec)
 
@@ -177,17 +170,17 @@
         maxHeight = metrics["tmHeight"]
         maxDescent = metrics["tmDescent"]
         maxLeading = metrics["tmExternalLeading"]
-    
+    
         self.textWidth    = int(maxWidth+maxLeading)  # The pixel width of 
text inside a widget
-        self.textWidth    = int(self.textWidth)
+        self.textWidth    = int(self.textWidth)
         self.textHeight   = int(maxHeight+maxDescent)  # The pixel height of 
text inside a widget
         self.widgetWidth  = self.textWidth             # The pixel width of a 
1 char widget (for things like buttons)
         self.widgetHeight = self.textHeight + 4       # The pixel height of a 
1 char widget (for things like buttons)
-    
-        font_spec = {'name':font_name, 'height':int(gConfigForms('pointSize')) 
or -1}
-        self._font = win32ui.CreateFont(font_spec)
-    
-        dummyWindow.ReleaseDC(dc)
+    
+        font_spec = {'name':font_name, 'height':int(gConfigForms('pointSize')) 
or -1}
+        self._font = win32ui.CreateFont(font_spec)
+    
+        dummyWindow.ReleaseDC(dc)
 
 
     # mainLoop
@@ -196,7 +189,7 @@
     # fully activated
     #
     def mainLoop(self):
-        self._win32app.MainLoop()
+        self._win32app.main_loop()
 
 
     # 
---------------------------------------------------------------------------
@@ -204,15 +197,15 @@
     # 
---------------------------------------------------------------------------
 
     def _getInput (self, title, fields, cancel = True):
-  
-        try:
-            parent = self._win32app._MainWindowList[0].GetHwnd()
-        except:
-            parent = 0
-        dialog = dialogs.InputDialog (parent, title, fields, cancel)
-        dialog.DoModal ()
-        return dialog.inputData
-    
+  
+        try:
+            parent = self._win32app._MainWindowList[0].GetHwnd()
+        except:
+            parent = 0
+        dialog = dialogs.InputDialog (parent, title, fields, cancel)
+        dialog.DoModal ()
+        return dialog.inputData
+    
 
     # 
---------------------------------------------------------------------------
     # Show a simple error message
@@ -229,12 +222,12 @@
     # 
---------------------------------------------------------------------------
 
     def _ui_show_exception_(self, group, name, message, detail):
-      
-        try:
-            parent = self._win32app._MainWindowList[0].GetHwnd()
-        except:
-            parent = 0
-        dialog = dialogs.ExceptionDialog (parent, group, name, message, detail)
+      
+        try:
+            parent = self._win32app._MainWindowList[0].GetHwnd()
+        except:
+            parent = 0
+        dialog = dialogs.ExceptionDialog (parent, group, name, message, detail)
         dialog.DoModal ()
 
 
@@ -247,14 +240,14 @@
         Exit the application.
         """
 
-        for child in self._children:
+        for child in self._children:
             self._win32app._MainWindowList.remove(child.mainWindow)
             child.mainWindow.Destroy()
 
-        if len(self._win32app._MainWindowList) == 0:
+        if len(self._win32app._MainWindowList) == 0:
             win32gui.PostQuitMessage(0) # Terminate the app.
 
         #~ for window in self._win32app._MainWindowList:
-            #~ if isinstance(window, Win32Window):
+            #~ if isinstance(window, Win32Window):
                 #~ window.Enable(1)
                 #~ win32gui.SetActiveWindow(window.GetHwnd())

Modified: trunk/gnue-navigator/src/UIwin32.py
===================================================================
--- trunk/gnue-navigator/src/UIwin32.py 2006-11-17 09:32:00 UTC (rev 9046)
+++ trunk/gnue-navigator/src/UIwin32.py 2006-11-17 16:26:24 UTC (rev 9047)
@@ -114,7 +114,7 @@
     self.connections = connections
     self.connections.setLoginHandler(ui.UILoginHandler())
 
-    app = getWin32App()
+    app = get_win32_app()
     self._app = app
 
     style = win32con.WS_OVERLAPPEDWINDOW | win32con.WS_CLIPCHILDREN 
@@ -142,7 +142,7 @@
 
     win32gui.SendMessage(self.hTree, commctrl.TVM_EXPAND, commctrl.TVE_EXPAND 
, self.processes.__node)
 
-    app.MainLoop()
+    app.main_loop()
 
 
   def CreateMenu(self):