[gnue] r7537 - trunk/gnue-forms/src/uidrivers/win32

[btami]

Author: btami
Date: 2005-05-07 12:10:58 -0500 (Sat, 07 May 2005)
New Revision: 7537

Modified:
   trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
   trunk/gnue-forms/src/uidrivers/win32/dialog.py
Log:
added error icon to ExceptionDisplay dialog

Modified: trunk/gnue-forms/src/uidrivers/win32/UIdriver.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-05-06 21:49:28 UTC 
(rev 7536)
+++ trunk/gnue-forms/src/uidrivers/win32/UIdriver.py    2005-05-07 17:10:58 UTC 
(rev 7537)
@@ -200,7 +200,7 @@
 
     self.textWidth    = int(maxWidth+maxLeading)  # The pixel width of text 
inside a widget
     self.textHeight   = int(maxHeight+maxDescent)  # The pixel height of text 
inside a widget
-    self.widgetWidth  = self.textWidthxxx            # The pixel width of a 1 
char widget (for things like buttons)
+    self.widgetWidth  = self.textWidth            # The pixel width of a 1 
char widget (for things like buttons)
     self.widgetHeight = self.textHeight + 5       # The pixel height of a 1 
char widget (for things like buttons)
 
     #
@@ -437,9 +437,9 @@
     cs = win32con.WS_CHILD | win32con.WS_VISIBLE
     position = (0, 0, 0, 0)
 
-#    self.iconID = ID = getNextId()
-#    s = cs | win32con.SS_ICON | win32con.WS_BORDER
-#    self.template.append([STATIC, 'icon', ID, (0,0,32,32), s])
+    self.iconID = ID = getNextId()
+    s = cs | win32con.SS_ICON #| win32con.WS_BORDER
+    self.template.append([STATIC, 'icon', ID, (5,8,32,32), s])
 
     self.messageID = ID = getNextId()
     s = cs | win32con.SS_LEFT
@@ -468,14 +468,13 @@
     item = win32gui.GetDlgItem(self.hwnd, self.detailID)
     win32gui.EnableWindow(item, 0)
 
-#    ico = win32gui.LoadImage(0, win32con.IDI_WARNING, win32con.IMAGE_ICON, 0, 
0, win32con.LR_DEFAULTSIZE)
-#    ico = win32gui.LoadIcon(0, win32con.IDI_WARNING)
-#    bmCtrl = win32gui.GetDlgItem(self.hwnd, self.iconID)
-#    win32gui.SendMessage(bmCtrl, win32con.STM_SETICON, win32con.IMAGE_ICON, 
ico)
+    ico = win32gui.LoadIcon(0, win32con.IDI_ERROR)
+    bmCtrl = win32gui.GetDlgItem(self.hwnd, self.iconID)
+    win32gui.SendMessage(bmCtrl, win32con.STM_SETICON, ico, 0)
 
     self.Recalculate()
 
-
+
   def OnCommand(self, hwnd, msg, wparam, lparam):
     id = win32api.LOWORD(wparam)
     if id == win32con.IDCLOSE:
@@ -504,7 +503,7 @@
 
     ypos = border
 
-    self.SetPosition(self.messageID, border, ypos)
+    self.SetPosition(self.messageID, border+40, ypos)
     ypos += self.Height(self.messageID) + 10
     
     if self._showsDetail:

Modified: trunk/gnue-forms/src/uidrivers/win32/dialog.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/win32/dialog.py      2005-05-06 21:49:28 UTC 
(rev 7536)
+++ trunk/gnue-forms/src/uidrivers/win32/dialog.py      2005-05-07 17:10:58 UTC 
(rev 7537)
@@ -21,6 +21,7 @@
 #
 # $Id$
 
+import sys
 import struct
 
 import win32ui
@@ -110,7 +111,14 @@
     
   def _RegisterWndClass(self):
     className = "GNUe dialog"
-    global g_registeredClass
+    global g_registeredClass
+
+    try:
+      icon = win32gui.LoadImage(0, sys.prefix+'\py.ico', win32con.IMAGE_ICON,
+                                0, 0, win32con.LR_LOADFROMFILE | 
win32con.LR_DEFAULTSIZE)
+    except:
+      icon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
+
     if not g_registeredClass:
       message_map = {}
       wc = win32gui.WNDCLASS()
@@ -119,7 +127,8 @@
       wc.lpszClassName = className
       wc.style = win32con.CS_VREDRAW | win32con.CS_HREDRAW
       wc.hCursor = win32gui.LoadCursor( 0, win32con.IDC_ARROW )
-      wc.hIcon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
+#      wc.hIcon = win32gui.LoadIcon(0, win32con.IDI_APPLICATION)
+      wc.hIcon = icon
       wc.hbrBackground = win32con.COLOR_WINDOW
       wc.lpfnWndProc = message_map # could also specify a wndproc.
       wc.cbWndExtra = win32con.DLGWINDOWEXTRA + struct.calcsize("Pi")