[Luma-commit] luma/lib/luma/base/gui ServerDialog.py,1.23,1.24 ServerDialogDesign.py,1.19,1.20 ServerDialogDesign.ui,1.14,1.15

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

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

Modified Files:
	ServerDialog.py ServerDialogDesign.py ServerDialogDesign.ui 
Log Message:
Some code refactoring.

Index: ServerDialogDesign.ui
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialogDesign.ui,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ServerDialogDesign.ui	3 Apr 2005 14:29:00 -0000	1.14
--- ServerDialogDesign.ui	3 Apr 2005 17:23:12 -0000	1.15
***************
*** 987,997 ****
          <signal>toggled(bool)</signal>
          <receiver>ServerDialogDesign</receiver>
!         <slot>sslSettingsChanged()</slot>
!     </connection>
!     <connection>
!         <sender>tlsCheckBox</sender>
!         <signal>toggled(bool)</signal>
!         <receiver>ServerDialogDesign</receiver>
!         <slot>sslSettingsChanged()</slot>
      </connection>
      <connection>
--- 987,991 ----
          <signal>toggled(bool)</signal>
          <receiver>ServerDialogDesign</receiver>
!         <slot>tlsChanged()</slot>
      </connection>
      <connection>

Index: ServerDialog.py
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialog.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ServerDialog.py	3 Apr 2005 14:29:00 -0000	1.23
--- ServerDialog.py	3 Apr 2005 17:23:12 -0000	1.24
***************
*** 258,271 ****
  
      def tlsChanged(self, tmpBool):
-         self.applyButton.setEnabled(1)
-         
          tlsBool = self.tlsCheckBox.isChecked()
          
          if tlsBool:
              self.portSpinBox.setValue(636)
          else:
              self.portSpinBox.setValue(389)
              
          self.currentServer.tls = tlsBool
              
  ###############################################################################
--- 258,289 ----
  
      def tlsChanged(self, tmpBool):
          tlsBool = self.tlsCheckBox.isChecked()
          
          if tlsBool:
+             # Set port value
              self.portSpinBox.setValue(636)
+             
+             # Enable certificate widgets
+             self.useClientCertBox.setEnabled(True)
+             
+             tmpBool = self.useClientCertBox.isChecked()
+             
+             self.certFileEdit.setEnabled(tmpBool)
+             self.certKeyfileEdit.setEnabled(tmpBool)
+             self.certFileButton.setEnabled(tmpBool)
+             self.certKeyFileButton.setEnabled(tmpBool)
          else:
+             # Set port value
              self.portSpinBox.setValue(389)
              
+             # Enable certificate widgets
+             self.useClientCertBox.setEnabled(False)
+             self.certFileEdit.setEnabled(False)
+             self.certKeyfileEdit.setEnabled(False)
+             self.certFileButton.setEnabled(False)
+             self.certKeyFileButton.setEnabled(False)
+             
          self.currentServer.tls = tlsBool
+         self.applyButton.setEnabled(True)
              
  ###############################################################################
***************
*** 396,420 ****
          self.applyButton.setEnabled(True)
          self.currentServer.followAliases = self.aliasBox.isChecked()
-         
- ###############################################################################
- 
-     def sslSettingsChanged(self, tmpBool):
-         if self.tlsCheckBox.isChecked():
-             self.useClientCertBox.setEnabled(True)
-             
-             tmpBool = self.useClientCertBox.isChecked()
-             
-             self.certFileEdit.setEnabled(tmpBool)
-             self.certKeyfileEdit.setEnabled(tmpBool)
-             self.certFileButton.setEnabled(tmpBool)
-             self.certKeyFileButton.setEnabled(tmpBool)
-         else:
-             self.useClientCertBox.setEnabled(False)
-             self.certFileEdit.setEnabled(False)
-             self.certKeyfileEdit.setEnabled(False)
-             self.certFileButton.setEnabled(False)
-             self.certKeyFileButton.setEnabled(False)
-             
-         self.applyButton.setEnabled(True)
  
  ###############################################################################
--- 414,417 ----

Index: ServerDialogDesign.py
===================================================================
RCS file: /cvsroot/luma/luma/lib/luma/base/gui/ServerDialogDesign.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ServerDialogDesign.py	3 Apr 2005 14:29:00 -0000	1.19
--- ServerDialogDesign.py	3 Apr 2005 17:23:12 -0000	1.20
***************
*** 3,7 ****
  # Form implementation generated from reading ui file '/home/wido/src/luma/lib/luma/base/gui/ServerDialogDesign.ui'
  #
! # Created: Sun Apr 3 16:14:22 2005
  #      by: The PyQt User Interface Compiler (pyuic) 3.14
  #
--- 3,7 ----
  # Form implementation generated from reading ui file '/home/wido/src/luma/lib/luma/base/gui/ServerDialogDesign.ui'
  #
! # Created: Sun Apr 3 19:21:18 2005
  #      by: The PyQt User Interface Compiler (pyuic) 3.14
  #
***************
*** 290,295 ****
          self.connect(self.baseBox,SIGNAL("clicked()"),self.useServerBase)
          self.connect(self.aliasBox,SIGNAL("clicked()"),self.aliasesChanged)
!         self.connect(self.useClientCertBox,SIGNAL("toggled(bool)"),self.sslSettingsChanged)
!         self.connect(self.tlsCheckBox,SIGNAL("toggled(bool)"),self.sslSettingsChanged)
          self.connect(self.certFileEdit,SIGNAL("textChanged(const QString&)"),self.certFileChanged)
          self.connect(self.certKeyfileEdit,SIGNAL("textChanged(const QString&)"),self.certKeyFileChanged)
--- 290,294 ----
          self.connect(self.baseBox,SIGNAL("clicked()"),self.useServerBase)
          self.connect(self.aliasBox,SIGNAL("clicked()"),self.aliasesChanged)
!         self.connect(self.useClientCertBox,SIGNAL("toggled(bool)"),self.tlsChanged)
          self.connect(self.certFileEdit,SIGNAL("textChanged(const QString&)"),self.certFileChanged)
          self.connect(self.certKeyfileEdit,SIGNAL("textChanged(const QString&)"),self.certKeyFileChanged)