r6689 - in trunk/gnue-forms/src/uidrivers/win32: . widgets widgets/form

[btami]

Author: btami
Date: 2004-11-17 10:19:57 -0600 (Wed, 17 Nov 2004)
New Revision: 6689

Modified:
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
Log:
better support for dialog style forms in win32 uidriver

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2004-11-17 16:07:28 UTC 
(rev 6688)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2004-11-17 16:19:57 UTC 
(rev 6689)
@@ -156,10 +156,10 @@
 #      self.splash = UIWXSplashScreen()
 
 
-    font_name = gConfigForms('faceName') # f.e. Bitstream Vera Sans Mono for 
Ajmitch :)
+    font_name = gConfigForms('faceName')
     if not font_name:
       if gConfigForms ('fixedWidthFont'):
-        fnt = win32con.ANSI_FIXED_FONT # setting "faceName=Courier New" in 
gnue.conf is a bit better IMO
+        fnt = win32con.ANSI_FIXED_FONT
       else:
         fnt = win32con.ANSI_VAR_FONT
 
@@ -229,16 +229,17 @@
         self._win32app._MainWindowList.remove(child.mainWindow)
         #child.mainWindow.Destroy()
 
-    if formName != "__main__":
+    if self._form.style == 'dialog':
       win32gui.PostQuitMessage(0) # Terminate the dialog
     else:
       if len(self._win32app._MainWindowList) == 0:
         win32gui.PostQuitMessage(0) # Terminate the app.
 
-    for child in self._children:
-      if child._form.name != formName:
-        child.mainWindow.Enable(1)
-    win32gui.SetForegroundWindow(child.mainWindow.GetHwnd())
+    for window in self._win32app._MainWindowList:
+      # TODO: needs more work in case we have
+      # TODO: started a dialog from another dialog
+      window.Enable(1)
+
 
   def _beep(self):
     win32gui.MessageBeep(0)

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-11-17 
16:07:28 UTC (rev 6688)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/_base.py       2004-11-17 
16:19:57 UTC (rev 6689)
@@ -511,15 +511,16 @@
           not gfObject._field._allowedValues == widget._origAllowedValues:
         widget._origAllowedValues = gfObject._field._allowedValues
         if gfObject.style == "dropdown":
-          RESETCONTENT = CB_RESETCONTENT
-          ADDSTRING = CB_ADDSTRING
+          RESETCONTENT = win32con.CB_RESETCONTENT
+          ADDSTRING = win32con.CB_ADDSTRING
         else:
-          RESETCONTENT = LB_RESETCONTENT
-          ADDSTRING = LB_ADDSTRING
+          RESETCONTENT = win32con.LB_RESETCONTENT
+          ADDSTRING = win32con.LB_ADDSTRING
 
         win32gui.SendMessage(widget.GetHwnd(), RESETCONTENT, 0, 0)
         for value in gfObject._field.allowedValues()[1]:
-          win32gui.SendMessage(widget.GetHwnd(), ADDSTRING, 0, 
textEncode(value.encode))
+          print value, type(value)
+          win32gui.SendMessage(widget.GetHwnd(), ADDSTRING, 0, 
textEncode(value))
         widget.SetValue("")
     except AttributeError:
       pass

Modified: trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-11-17 
16:07:28 UTC (rev 6688)
+++ trunk/gnue-forms/src/uidrivers/win32/widgets/form/widget.py 2004-11-17 
16:19:57 UTC (rev 6689)
@@ -166,14 +166,21 @@
       win32gui.SendMessage(self.statusBar.GetHwnd(), commctrl.SB_SETTEXT, 4, 
string.strip("%s/%s" % (currentPage,maxPage)))
 
     return
+
 
-  def show(self):
+  def show(self):
     self.mainWindow.Show()
+
 
   def showModal(self):
-    self.mainWindow.Show()
-    for key in self._uiDriver._formNameToUIForm.keys():
-      if self._form.name != key:
-        self._uiDriver._formNameToUIForm[key].mainWindow.Enable(0)
+    self.mainWindow.Show()
+
+    for window in self._uiDriver._win32app._MainWindowList:
+      window.Enable(0)
+
+    for key in self._uiDriver._formNameToUIForm.keys():
+      if self._form.name == key:
+        self._uiDriver._formNameToUIForm[key].mainWindow.Enable(1)
+
     win32gui.PumpMessages()