From 70e6191124754e9a8caa2b198eea6f193d38340e Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Tue, 15 May 2012 10:28:45 +0400 Subject: [PATCH] fix reconnect port, fix collect table --- console/gui/Box.py | 25 ++++++++++++------------- console/gui/MainFrameResult.py | 17 ++++++++--------- console/gui/client_class.py | 12 ++++++------ console/gui/conf_connection.py | 3 ++- console/gui/mainframe.py | 2 +- 5 files changed, 29 insertions(+), 30 deletions(-) diff --git a/console/gui/Box.py b/console/gui/Box.py index e9ad320..4ca66f4 100755 --- a/console/gui/Box.py +++ b/console/gui/Box.py @@ -248,7 +248,7 @@ class MainWgt(QtGui.QMainWindow): # set new Title self.ClientObj._parent.setWindowTitle (self.ClientObj.Name) return 0 - + def reconnect_to_host(self): self.sender().setDisabled(True) self.ClientObj.app.processEvents() @@ -259,8 +259,9 @@ 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) self.main_frame.setEnabled(True) @@ -292,7 +293,7 @@ class MainWgt(QtGui.QMainWindow): pass except urllib2.URLError, e: show_msg(e, 'URLError') - + else: self.delete_MainFrameWgt() if self.ClientObj.expert or meth_result.expert: @@ -305,7 +306,7 @@ class MainWgt(QtGui.QMainWindow): self.main_frame.setWidgetResizable(True) self.left_frame.hide() - + try: self.MainFrameWgt.analysis(meth_result) except (RuntimeError, ValueError): @@ -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) @@ -384,11 +384,10 @@ class MainWgt(QtGui.QMainWindow): if self.con_lost_lbl.isVisible(): self.con_lost_lbl.resize_widget() event.accept() - def show_close_messagebox(self): list_pid = client_list_pid(self.ClientObj.client) - + msgBox = QMessageBox(self) msgBox.setText(_("Close your session") +' ' +_('with %s?') \ %self.ClientObj.host_name + '\t') @@ -420,7 +419,7 @@ class MainWgt(QtGui.QMainWindow): def _closeEvent(self): if self.ClientObj.client: reply = self.show_close_messagebox() - + if reply == QtGui.QMessageBox.Yes or reply == QtGui.QMessageBox.No: self.topmenu.Processes.setEnabled(True) self.topmenu.Session.setEnabled(True) @@ -432,12 +431,12 @@ class MainWgt(QtGui.QMainWindow): if self.ClientObj.signaling.isRunning(): self.ClientObj.signaling.close() self.ClientObj.signaling.wait() - + if hasattr (self.ClientObj._parent, 'set_localhost'): if self.ClientObj.client.server_host_name in \ ['127.0.0.1', 'localhost']: self.ClientObj._parent.set_localhost(None) - + if reply == QtGui.QMessageBox.Yes: # Closing session client_del_sid(self.ClientObj.client) diff --git a/console/gui/MainFrameResult.py b/console/gui/MainFrameResult.py index d05b336..79a9ddf 100755 --- a/console/gui/MainFrameResult.py +++ b/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 ############################### @@ -170,7 +167,7 @@ class MainFrameRes(QtGui.QWidget): # Calling method sid = int(self.ClientObj.sid) self.client.service[0][table.onClick](sid, param_object) - + # Calling View try: view_params = get_view_params(self.client, \ @@ -190,7 +187,7 @@ class MainFrameRes(QtGui.QWidget): offset_buttons = QtGui.QWidget() layout = QtGui.QHBoxLayout(offset_buttons) layout.setAlignment(QtCore.Qt.AlignLeft) - + minus_offset = QtGui.QPushButton(offset_buttons) minus_offset.setIcon(QtGui.QIcon.fromTheme('go-previous')) minus_offset.setToolTip('Previous page') @@ -200,7 +197,7 @@ class MainFrameRes(QtGui.QWidget): if not self.ClientObj.param_objects[self.method_name]['offset']: minus_offset.setDisabled(True) - + layout.addWidget(minus_offset) plus_offset = QtGui.QPushButton(offset_buttons) @@ -215,9 +212,9 @@ class MainFrameRes(QtGui.QWidget): layout.addWidget(plus_offset) if addAction: layout.addWidget(PlusButton(self, self.ClientObj, addAction)) - + self.work_layout._addWidget(offset_buttons) - + def call_method_with_offset(self, offset): def wrapper(): print 'offset = ', offset @@ -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) diff --git a/console/gui/client_class.py b/console/gui/client_class.py index 6e253a9..7810cd4 100755 --- a/console/gui/client_class.py +++ b/console/gui/client_class.py @@ -49,20 +49,20 @@ 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 self.issuer_wgt = QtGui.QWidget(self) self.issuer_layout = QtGui.QVBoxLayout() - + Issuer = certobj.get_issuer().get_components() for i in Issuer: self.issuer_layout.addWidget(LabelWordWrap \ ("%s : %s" %(i[0], i[1]),self)) - + self.issuer_wgt.setLayout(self.issuer_layout) self.tab.addTab(self.issuer_wgt, _('Issuer')) @@ -74,7 +74,7 @@ class AddServerCert (QtGui.QWidget): for item in Subject: self.subject_layout.addWidget(LabelWordWrap \ ("%s : %s" %(item[0], item[1]),self)) - + self.subject_wgt.setLayout(self.subject_layout) self.tab.addTab(self.subject_wgt, _('Subject')) diff --git a/console/gui/conf_connection.py b/console/gui/conf_connection.py index a2c5f17..52e738c 100755 --- a/console/gui/conf_connection.py +++ b/console/gui/conf_connection.py @@ -215,11 +215,12 @@ class FrameConnection(QtGui.QWidget): return 1 except AttributeError: pass - + if not port: 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: diff --git a/console/gui/mainframe.py b/console/gui/mainframe.py index 4bc96b6..ea11380 100755 --- a/console/gui/mainframe.py +++ b/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'