[Luma-commit] luma/lib/luma/base/gui ServerDialogDesign.py,1.15,1.16 ServerDialogDesign.ui,1.11,1.12

[Wido D. <wi...@us...>]

Update of /cvsroot/luma/luma/lib/luma/base/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2835/lib/luma/base/gui

Modified Files:
	ServerDialogDesign.py ServerDialogDesign.ui 
Log Message:
Added support for connections via unix sockets.
Bugfix when selecting SASL GSSAPI.

Index: ServerDialogDesign.ui
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialogDesign.ui,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ServerDialogDesign.ui	12 Dec 2004 21:26:02 -0000	1.11
--- ServerDialogDesign.ui	31 Jan 2005 15:48:36 -0000	1.12
***************
*** 608,622 ****
                                      <item>
                                          <property name="text">
!                                             <string>SASL Plain</string>
                                          </property>
                                      </item>
                                      <item>
                                          <property name="text">
!                                             <string>SASL CRAM-MD5</string>
                                          </property>
                                      </item>
                                      <item>
                                          <property name="text">
!                                             <string>SASL DIGEST-MD5</string>
                                          </property>
                                      </item>
--- 608,627 ----
                                      <item>
                                          <property name="text">
!                                             <string>SASL CRAM-MD5</string>
                                          </property>
                                      </item>
                                      <item>
                                          <property name="text">
!                                             <string>SASL DIGEST-MD5</string>
                                          </property>
                                      </item>
                                      <item>
                                          <property name="text">
!                                             <string>SASL EXTERNAL</string>
!                                         </property>
!                                     </item>
!                                     <item>
!                                         <property name="text">
!                                             <string>SASL GSSAPI</string>
                                          </property>
                                      </item>
***************
*** 628,632 ****
                                      <item>
                                          <property name="text">
!                                             <string>SASL GSSAPI</string>
                                          </property>
                                      </item>
--- 633,637 ----
                                      <item>
                                          <property name="text">
!                                             <string>SASL Plain</string>
                                          </property>
                                      </item>

Index: ServerDialogDesign.py
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialogDesign.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ServerDialogDesign.py	12 Dec 2004 21:26:02 -0000	1.15
--- ServerDialogDesign.py	31 Jan 2005 15:48:36 -0000	1.16
***************
*** 3,7 ****
  # Form implementation generated from reading ui file '/home/wido/src/luma/lib/luma/base/gui/ServerDialogDesign.ui'
  #
! # Created: Thu Dec 2 22:23:24 2004
  #      by: The PyQt User Interface Compiler (pyuic) 3.13
  #
--- 3,7 ----
  # Form implementation generated from reading ui file '/home/wido/src/luma/lib/luma/base/gui/ServerDialogDesign.ui'
  #
! # Created: Fri Jan 28 16:27:13 2005
  #      by: The PyQt User Interface Compiler (pyuic) 3.13
  #
***************
*** 228,232 ****
          self.languageChange()
  
!         self.resize(QSize(600,444).expandedTo(self.minimumSizeHint()))
          self.clearWState(Qt.WState_Polished)
  
--- 228,232 ----
          self.languageChange()
  
!         self.resize(QSize(615,444).expandedTo(self.minimumSizeHint()))
          self.clearWState(Qt.WState_Polished)
  
***************
*** 264,268 ****
          self.cancelButton.setText(self.__tr("&Cancel"))
          self.cancelButton.setAccel(self.__tr("Alt+C"))
!         self.addButton.setText(self.__tr("&Add"))
          self.addButton.setAccel(self.__tr("Alt+A"))
          self.serverListView.header().setLabel(0,self.__tr("Server"))
--- 264,268 ----
          self.cancelButton.setText(self.__tr("&Cancel"))
          self.cancelButton.setAccel(self.__tr("Alt+C"))
!         self.addButton.setText(self.__tr("&Add..."))
          self.addButton.setAccel(self.__tr("Alt+A"))
          self.serverListView.header().setLabel(0,self.__tr("Server"))
***************
*** 285,293 ****
          self.methodBox.clear()
          self.methodBox.insertItem(self.__tr("Simple"))
-         self.methodBox.insertItem(self.__tr("SASL Plain"))
          self.methodBox.insertItem(self.__tr("SASL CRAM-MD5"))
          self.methodBox.insertItem(self.__tr("SASL DIGEST-MD5"))
!         self.methodBox.insertItem(self.__tr("SASL Login"))
          self.methodBox.insertItem(self.__tr("SASL GSSAPI"))
          self.textLabel4.setText(self.__tr("<b>Authentification mechanism</b>"))
          self.textLabel5.setText(self.__tr("<b>Credentials</b>"))
--- 285,294 ----
          self.methodBox.clear()
          self.methodBox.insertItem(self.__tr("Simple"))
          self.methodBox.insertItem(self.__tr("SASL CRAM-MD5"))
          self.methodBox.insertItem(self.__tr("SASL DIGEST-MD5"))
!         self.methodBox.insertItem(self.__tr("SASL EXTERNAL"))
          self.methodBox.insertItem(self.__tr("SASL GSSAPI"))
+         self.methodBox.insertItem(self.__tr("SASL Login"))
+         self.methodBox.insertItem(self.__tr("SASL Plain"))
          self.textLabel4.setText(self.__tr("<b>Authentification mechanism</b>"))
          self.textLabel5.setText(self.__tr("<b>Credentials</b>"))