fix reconnect port, fix collect table

console/gui/Box.py

@@ -259,7 +259,8 @@ class MainWgt(QtGui.QMainWindow):
             # Reconnet to current host
             self.cur_size = self.size()
             self.ConnectWidget = FrameConnection (self, self.ClientObj)
-            self.ConnectWidget.connect_to_host(server_host_name)
+            self.ConnectWidget.connect_to_host(server_host_name, \
+                                               self.ClientObj.port)
 
             if not self.main_frame.isEnabled():
                 self.left_frame.setEnabled(True)
@@ -366,14 +367,13 @@ class MainWgt(QtGui.QMainWindow):
                 self.topmenu.Back.setEnabled(True)
                 if hasattr (self.MainFrameWgt, 'button_enabled'):
                     self.MainFrameWgt.button_enabled()
-
         else:
             if hasattr (self, 'con_lost_lbl'):
                 self.con_lost_lbl.hide()
                 self.con_lost_lbl.close()
             self.con_lost_lbl = ConnectLostLabel(_('Server was restarted.')+ \
-                               '\n' +  _('Please, connect to server again.'), \
-                               self, True)
+                              '\n' +  _('Please, connect to server again.'), \
+                              self, True)
             self.topmenu.Processes.setDisabled(True)
             self.topmenu.Session.setDisabled(True)
             self.topmenu.Back.setDisabled(True)
@@ -385,7 +385,6 @@ class MainWgt(QtGui.QMainWindow):
                 self.con_lost_lbl.resize_widget()
         event.accept()
 
-
     def show_close_messagebox(self):
         list_pid = client_list_pid(self.ClientObj.client)
 

console/gui/MainFrameResult.py

@@ -100,9 +100,6 @@ class MainFrameRes(QtGui.QWidget):
         self.setStyleSheet("#Frame_Res {background-color: transparent;}")
 
     def initUI(self):
-#        if self.meth_result.type == "pid":
-#            self.ClientObj.process_dict [self.meth_result.message]['layout'] = \
-#                                                self.work_layout
         self.updateGeometry()
 
 ################# API FUNCTION ###############################
@@ -240,7 +237,6 @@ class MainFrameRes(QtGui.QWidget):
                         ' - ' + self.ClientObj.Name)
             self._parent.main_frame_view(view, self.method_name, \
                                          change_offset = True)
-
         return wrapper
 
     def show_normal(self, item):
@@ -340,6 +336,9 @@ class MainFrameRes(QtGui.QWidget):
 
         self._parent.control_button.add_clear_cache_button(self.cur_pid)
         self.initUI()
+        self.ClientObj.app.processEvents()
+#        cm = self.work_layout.contentsMargins()
+        self.setMaximumHeight(self.sizeHint().height())
 
     def clear_pid_cache(self):
         self.clear_proc_cache_button.setDisabled(True)

console/gui/client_class.py

@@ -49,9 +49,9 @@ class AddServerCert (QtGui.QWidget):
         certobj = OpenSSL.crypto.load_certificate \
                     (OpenSSL.SSL.FILETYPE_PEM, cert)
         self.grid.addWidget(LabelWordWrap (_('Fingerprint = %s') \
-                                % certobj.digest('SHA1'), self), 1, 0, 1, 3)
+                            % certobj.digest('SHA1'), self), 1, 0, 1, 3)
         self.grid.addWidget(LabelWordWrap (_('Serial Number =  %s') \
-                                % certobj.get_serial_number(), self), 2, 0, 1, 3)
+                            % certobj.get_serial_number(), self), 2, 0, 1, 3)
 
         self.tab = QtGui.QTabWidget(self)
         # add Issuer tab

console/gui/conf_connection.py

@@ -220,6 +220,7 @@ class FrameConnection(QtGui.QWidget):
             port = 8888
         # get server hostname
         url = "https://%s:%d/?wsdl" %(host_name, port)
+        self.ClientObj.port = port
         print url
         path_to_cert = self.ClientObj.path_to_cert
         try:

console/gui/mainframe.py

@@ -1989,7 +1989,7 @@ class MainFrame(QtGui.QWidget):
                             text = ','.join(res_list)
 
                 elif typefield in ['check', 'check_tristate']:
-                    if text == 'auto' or not text:
+                    if text.lower() == 'auto' or not text:
                         text = ''
                     elif text.lower() == 'yes':
                         text = 'on'