gnue/forms/src/uidrivers/win32 UILoginHandler.p...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/01 05:04:30

Modified files:
        forms/src/uidrivers/win32: UILoginHandler.py 
Added files:
        forms/src/uidrivers/win32: TODO 

Log message:
        adding image to login gialog

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/TODO?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/win32/UILoginHandler.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/win32/UILoginHandler.py
diff -c gnue/forms/src/uidrivers/win32/UILoginHandler.py:1.2 
gnue/forms/src/uidrivers/win32/UILoginHandler.py:1.3
*** gnue/forms/src/uidrivers/win32/UILoginHandler.py:1.2        Sat Mar 22 
12:34:38 2003
--- gnue/forms/src/uidrivers/win32/UILoginHandler.py    Thu May  1 05:04:30 2003
***************
*** 28,34 ****
  #
  
  import win32api, win32gui, win32con, commctrl
! import struct
  
  from gnue.common.datasources import GLoginHandler
  from gnue.common.apps import GConfig
--- 28,34 ----
  #
  
  import win32api, win32gui, win32con, commctrl
! import os, struct
  
  from gnue.common.datasources import GLoginHandler
  from gnue.common.apps import GConfig
***************
*** 68,78 ****
        else:
          loginMesg = _('Login required for %s') % (loginData[0])
  
        message_map = {
              win32con.WM_COMMAND: self.OnCommand,
              win32con.WM_INITDIALOG: self.OnInitDialog,
              win32con.WM_CLOSE: self.OnClose,
-             win32con.WM_DESTROY: self.OnDestroy,
              }
        dlgClassName = self._RegisterWndClass()
  
--- 68,86 ----
        else:
          loginMesg = _('Login required for %s') % (loginData[0])
  
+ # TODO:
+ #      if os.path.isabs(gConfigForms('loginPNG')):
+ #        imageFile = gConfigForms('loginPNG')
+ #      else:
+ #        imageFile = images_dir+gConfigForms('loginPNG')
+       imageFile = images_dir + 'gnue.bmp'
+       self._bmp = win32gui.LoadImage(0, imageFile, win32con.IMAGE_BITMAP, 
+                                           0, 0, win32con.LR_LOADFROMFILE | 
win32con.LR_DEFAULTSIZE)
+ 
        message_map = {
              win32con.WM_COMMAND: self.OnCommand,
              win32con.WM_INITDIALOG: self.OnInitDialog,
              win32con.WM_CLOSE: self.OnClose,
              }
        dlgClassName = self._RegisterWndClass()
  
***************
*** 80,93 ****
        cs = win32con.WS_CHILD | win32con.WS_VISIBLE
        title = _("GNU Enterprise: Login to %s") % loginData[0]
  
!       dlg = [ [title, (0, 0, 200, 160), style, None, (8, "MS Sans Serif"), 
None, dlgClassName], ]
  
-       Y=20
        dlg.append([130, str(loginMesg), -1, (5, Y, 195, 100), cs | 
win32con.SS_CENTER])
  
        self.textctrlList = []
  
!       Y += 20
        for prompt in loginData[2]:
          Y += 20
          dlg.append([130, '%s:' % prompt[1], -1, (5, Y, 200, 12), cs | 
win32con.SS_LEFT])
--- 88,105 ----
        cs = win32con.WS_CHILD | win32con.WS_VISIBLE
        title = _("GNU Enterprise: Login to %s") % loginData[0]
  
!       dlg = [ [title, (0, 0, 200, 180), style, None, (8, "MS Sans Serif"), 
None, dlgClassName], ]
! 
!       Y=10
!       self.ID_BITMAP = getNextId()
!       dlg.append([130, "", self.ID_BITMAP, (55, Y, 0, 0), win32con.WS_VISIBLE 
| win32con.SS_BITMAP])
!       Y += 40
  
        dlg.append([130, str(loginMesg), -1, (5, Y, 195, 100), cs | 
win32con.SS_CENTER])
  
        self.textctrlList = []
  
!       Y += 10
        for prompt in loginData[2]:
          Y += 20
          dlg.append([130, '%s:' % prompt[1], -1, (5, Y, 200, 12), cs | 
win32con.SS_LEFT])
***************
*** 149,154 ****
--- 161,170 ----
          # TODO: calculate and reposition the dialog items
          # TODO: and resize the dialog window
          self.hwnd = hwnd
+ 
+         bmCtrl = win32gui.GetDlgItem(self.hwnd, self.ID_BITMAP)
+         win32gui.SendMessage(bmCtrl, win32con.STM_SETIMAGE, 
win32con.IMAGE_BITMAP, self._bmp)
+ 
          # centre the dialog
          desktop = win32gui.GetDesktopWindow()
          l,t,r,b = win32gui.GetWindowRect(hwnd)
***************
*** 158,167 ****
  
    def OnClose(self, hwnd, msg, wparam, lparam):
          win32gui.EndDialog(hwnd, 0)
- 
-   def OnDestroy(self, hwnd, msg, wparam, lparam):
-         print "OnDestroy"
-         #win32gui.PostQuitMessage(0) # Terminate the app.
  
  
    def OnCommand(self, hwnd, msg, wparam, lparam):
--- 174,179 ----