change request create and get certificate widget

console/gui/CertificateClass.py

@@ -34,62 +34,42 @@ class CertClass (QtGui.QWidget):
 #        self.default_cert_path = self.default_cert_path.replace("~",homePath)
         
         self.sendlayout = QtGui.QGridLayout()
-        self.getlayout = QtGui.QGridLayout()
+        self.sendlayout.setColumnStretch(0,5)
+        self.sendlayout.setColumnStretch(1,5)
+        self.sendlayout.setColumnStretch(2,5)
         self.mainlayout = QtGui.QVBoxLayout()
         
         # gen ceth by host
         self.sendlayout.addWidget(LabelWordWrap(_('Host'), self), 1,0)
         self.send_host = QtGui.QLineEdit('localhost', self)
-        self.sendlayout.addWidget(self.send_host, 1, 1)
+        self.sendlayout.addWidget(self.send_host, 1, 1, 1, 2)
         
         self.sendlayout.addWidget(LabelWordWrap(_('Port'), self), 2,0)
         
         self.send_port = QtGui.QLineEdit('8888', self)
         self.send_port.setValidator(QtGui.QIntValidator(self))
-        self.sendlayout.addWidget(self.send_port, 2, 1)
+        self.sendlayout.addWidget(self.send_port, 2, 1, 1, 2)
         
         Send_button = QtGui.QPushButton(_("Send"), self)
         Send_button.clicked.connect(self.send)
-        self.sendlayout.addWidget(Send_button, 3, 1)
-
-        self.GroupBoxSend = QtGui.QGroupBox \
-                                        (_('Send certificate signing request'))
-        self.GroupBoxSend.setLayout(self.sendlayout)
-        
-        # GroupBox get certificate
-        self.getlayout.addWidget(LabelWordWrap(_('Host'), self), 1,0)
-        self.get_host = QtGui.QLineEdit('localhost', self)
-        self.getlayout.addWidget(self.get_host, 1, 1)
-        
-        self.getlayout.addWidget(LabelWordWrap(_('Port'), self), 2,0)
-        
-        self.get_port = QtGui.QLineEdit('8888', self)
-        self.get_port.setValidator(QtGui.QIntValidator(self))
-        self.getlayout.addWidget(self.get_port, 2, 1)
+        self.sendlayout.addWidget(Send_button, 3, 0)
 
         Get_button = QtGui.QPushButton(_("Get"), self)
         Get_button.clicked.connect(self.get)
-        self.getlayout.addWidget(Get_button, 3, 1)
+        self.sendlayout.addWidget(Get_button, 3, 1)
         
-        self.GroupBoxGet = QtGui.QGroupBox(_('Get certificate from server'))
-        self.GroupBoxGet.setLayout(self.getlayout)
-
-        # group all in widget
         Quit_button = QtGui.QPushButton(_("Quit"), self)
         Quit_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return))
+        Quit_button.clicked.connect(self.close)
+        self.sendlayout.addWidget(Quit_button, 3, 2)
 
-
-        self.connect(Quit_button, QtCore.SIGNAL("clicked()"),
-                     self, QtCore.SLOT("close()"))
+        self.GroupBoxSend = QtGui.QGroupBox \
+                                        (_('Certificate signing request'))
+        self.GroupBoxSend.setLayout(self.sendlayout)
 
         self.resize(400,200)
         
-        
         self.mainlayout.addWidget(self.GroupBoxSend)
-        self.mainlayout.addWidget(self.GroupBoxGet)
-        
-        self.mainlayout.addWidget(Quit_button)
-
         self.setLayout(self.mainlayout)
         self.setFocus()
         # for clear memory after closed this window
@@ -134,7 +114,6 @@ class CertClass (QtGui.QWidget):
             elif reply == QtGui.QMessageBox.Yes:
                 pass
 
-        
         url = "https://%s:%d/?wsdl" %(by_host, int(port))
         print 'URL = ', url
         from suds.client import Client
@@ -214,12 +193,12 @@ class CertClass (QtGui.QWidget):
         req_id = fc.read()
         fc.close()
 
-        from_host = self.get_host.text()
+        from_host = self.send_host.text()
         if from_host == '':
             show_msg (_('Enter Hostname or IP adress'), \
                         _('Field "Host" Error!'))
             return 1
-        port = self.get_port.text()
+        port = self.send_port.text()
 
         if port == '' or not port.isdigit():
             show_msg (_('Enter Port'), _('Field "Port" Error!'))
@@ -295,7 +274,8 @@ class CertClass (QtGui.QWidget):
                 if ca_root in open(system_ca_db, 'r').read():
                     return 0
 
-            cl_client_cert_dir = self.ClientObj.VarsApi.Get('cl_client_cert_dir')
+            cl_client_cert_dir = self.ClientObj.VarsApi.Get \
+                                                    ('cl_client_cert_dir')
             homePath = self.ClientObj.VarsApi.Get('ur_home_path')
 
             cl_client_cert_dir = cl_client_cert_dir.replace("~",homePath)