gnue/forms/src/uidrivers/gtk2 UIdriver.py

[Arturas Kriukovas]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Arturas Kriukovas <address@hidden>      02/08/28 09:39:17

Modified files:
        forms/src/uidrivers/gtk2: UIdriver.py 

Log message:
        Minor changes to login window to make it look a bit more friendly.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.3 
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.4
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.3       Wed Aug 28 06:20:00 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py   Wed Aug 28 09:39:17 2002
***************
*** 1359,1390 ****
          loginMesg = _('Login required for\n"%s"') % (loginData[1])
        else:
          loginMesg = _('Login required for %s') % (loginData[0])
  
!       self.dlg = gtk.Dialog("GitaPress: 
Login",loginWindow,gtk.DIALOG_MODAL|gtk.DIALOG_DESTROY_WITH_PARENT, ("LOGIN",  
gtk.RESPONSE_OK,"_CANCEL",gtk.RESPONSE_CANCEL ))
! 
!       table1 = gtk.Table(len(loginData[2]), 2)
        table1.set_row_spacings(4)
        table1.set_col_spacings(4)
!      
!       #$bmp = wxImage(images_dir+gConfig('smallPNG'), 
wxBITMAP_TYPE_PNG).ConvertToBitmap()
  
        messageField = gtk.Label(str(loginMesg))
!       table1.attach_defaults(messageField,0,2,0,1)
  
        self.textEntryList = []
        labelList = []
  
-       #$dlgWidth = max(bmp.GetWidth(), messageField.GetSize().GetWidth()+20)
- 
-       #$dlgHeight = bmp.GetHeight() + messageField.GetSize().GetHeight() + 80
- 
        xSpacing = 0
        ySpacing = 0
        fieldLabelWidth = 0
!       
        raghav=gtk.Entry()
        raghav.set_visibility(0)
!      
        for prompt in loginData[2]:
          s = gtk.Label('%s:' % prompt[1])
          s.set_use_underline(gtk.TRUE)
--- 1359,1389 ----
          loginMesg = _('Login required for\n"%s"') % (loginData[1])
        else:
          loginMesg = _('Login required for %s') % (loginData[0])
+       self.dlg = gtk.Dialog(_("GNU Enterprise: Login to %s") % loginData[0], 
loginWindow,
+         gtk.DIALOG_MODAL|gtk.DIALOG_DESTROY_WITH_PARENT,
+         (_("_LOGIN"), gtk.RESPONSE_OK,_("_CANCEL"), gtk.RESPONSE_CANCEL))
  
!       table1 = gtk.Table(len(loginData[2])+10, 6) # row, column
        table1.set_row_spacings(4)
        table1.set_col_spacings(4)
!       bmp = gtk.Image()
!       bmp.set_from_file(images_dir+gConfig('smallPNG'))
  
        messageField = gtk.Label(str(loginMesg))
!       # left, right, top, bottom
!       table1.attach_defaults(bmp,1,3,0,1)
!       table1.attach_defaults(messageField,1,3,2,3)
  
        self.textEntryList = []
        labelList = []
  
        xSpacing = 0
        ySpacing = 0
        fieldLabelWidth = 0
! 
        raghav=gtk.Entry()
        raghav.set_visibility(0)
! 
        for prompt in loginData[2]:
          s = gtk.Label('%s:' % prompt[1])
          s.set_use_underline(gtk.TRUE)
***************
*** 1394,1400 ****
            t.set_visibility(0)
          else:
            t = gtk.Entry()
!           
          myID = len(self.textEntryList)
          self.textEntryList.append(t)
          #$EVT_CHAR(t, LoginFieldHandler(self, myID).loginFieldEventTrap)
--- 1393,1399 ----
            t.set_visibility(0)
          else:
            t = gtk.Entry()
! 
          myID = len(self.textEntryList)
          self.textEntryList.append(t)
          #$EVT_CHAR(t, LoginFieldHandler(self, myID).loginFieldEventTrap)
***************
*** 1434,1446 ****
        #$xSpacing += 10        # Add whitespace between widgets
        #$ySpacing += 6 # Add whitespace between widgets
        #$xPos = dlgWidth/2 - fieldLabelWidth/2
!     
        num_rows=len(loginData[2])
        # Move the fields and labels into position
        for i in range(0, len(self.textEntryList)):
!        table1.attach_defaults(labelList[i],0,1,i+1,i+2)
!        table1.attach_defaults(self.textEntryList[i],1,2,i+1,i+2)
!       
         #$if errortext:
          #$errorField.SetPosition(
            #$wxPoint(dlgWidth/2 - errorField.GetSize().width/2,
--- 1433,1450 ----
        #$xSpacing += 10        # Add whitespace between widgets
        #$ySpacing += 6 # Add whitespace between widgets
        #$xPos = dlgWidth/2 - fieldLabelWidth/2
! 
        num_rows=len(loginData[2])
        # Move the fields and labels into position
        for i in range(0, len(self.textEntryList)):
!        table1.attach_defaults(labelList[i],1,2,i+3,i+4)
!        table1.attach_defaults(self.textEntryList[i],2,3,i+3,i+4)
! 
!       if errortext:
!         errorField = gtk.Label(str(errortext))
!         t = len(self.textEntryList)
!         table1.attach_defaults(errorField,1,3,t+4,t+5)
! 
         #$if errortext:
          #$errorField.SetPosition(
            #$wxPoint(dlgWidth/2 - errorField.GetSize().width/2,
***************
*** 1484,1489 ****
--- 1488,1495 ----
          self.loginCompleted(0)
          raise GLoginHandler.UserCanceledLogin
  
+     # To close this window when 'Login' is clicked
+     self.destroyLoginDialog()
      rv = {}
      for i in range(0, len(loginData[2])):
        rv[loginData[2][i][0]] = self.textEntryList[i].get_text()