From a879c0239216424ea2353ad5bb132b845ac224c9 Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Wed, 13 Jun 2012 12:21:24 +0400 Subject: [PATCH] fix window title, fix collect page on object --- consolegui/application/DisplayMethod.py | 6 +++++- consolegui/application/MainFrameResult.py | 23 ++++++++++++++++++++--- consolegui/application/mainframe.py | 20 ++++++++++++++------ 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/consolegui/application/DisplayMethod.py b/consolegui/application/DisplayMethod.py index ffd83a9..d5231e6 100755 --- a/consolegui/application/DisplayMethod.py +++ b/consolegui/application/DisplayMethod.py @@ -244,8 +244,12 @@ class DisplayMethod(QtGui.QWidget): self._parent.main_frame.viewport().setStyleSheet('') # set new Title + if self.ClientObj.method_names.has_key(method_name): + view_method = self.ClientObj.method_names[method_name] + else: + view_method = method_name self.ClientObj._parent.setWindowTitle \ - (method_name + ' - ' + self.ClientObj._parent.windowTitle()) + (view_method + ' - ' + self.ClientObj._parent.windowTitle()) self.ClientObj.MainWidget.main_frame_view(view, method_name) def groupActivated(self, groups, sub_group, back = False): diff --git a/consolegui/application/MainFrameResult.py b/consolegui/application/MainFrameResult.py index 0bdde9b..e80a73b 100755 --- a/consolegui/application/MainFrameResult.py +++ b/consolegui/application/MainFrameResult.py @@ -59,6 +59,13 @@ class PlusButton(QtGui.QPushButton): self.get_Frame_thread.start() def after_call(self, view): + if self.ClientObj.method_names.has_key(self.method): + view_method = self._parent.ClientObj.method_names \ + [self.method] + else: + view_method = self.method + self._parent.ClientObj._parent.setWindowTitle(view_method + \ + ' - ' + self.ClientObj.Name) self._parent._parent.main_frame_view(view, self.method) class MainFrameRes(QtGui.QWidget): @@ -179,7 +186,12 @@ class MainFrameRes(QtGui.QWidget): except sudsds.MethodNotFound, e: _print(e) return - self._parent.ClientObj._parent.setWindowTitle(table.onClick + \ + if self._parent.ClientObj.method_names.has_key(table.onClick): + view_method = self._parent.ClientObj.method_names \ + [table.onClick] + else: + view_method = table.onClick + self._parent.ClientObj._parent.setWindowTitle(view_method + \ ' - ' + self.ClientObj.Name) self.ClientObj.param_objects[self.method_name]['offset'] = 0 self._parent.main_frame_view(view, table.onClick) @@ -232,9 +244,14 @@ class MainFrameRes(QtGui.QWidget): (sid, view_params) except sudsds.MethodNotFound: return - self._parent.ClientObj._parent.setWindowTitle(self.method_name + \ + if self._parent.ClientObj.method_names.has_key(self.method_name): + view_method = self._parent.ClientObj.method_names \ + [self.method_name] + else: + view_method = self.method_name + self._parent.ClientObj._parent.setWindowTitle(view_method + \ ' - ' + self.ClientObj.Name) - self._parent.main_frame_view(view, self.method_name, \ + self._parent.main_frame_view(view, view_method, \ change_offset = True) return wrapper diff --git a/consolegui/application/mainframe.py b/consolegui/application/mainframe.py index 2f73574..dff4f53 100755 --- a/consolegui/application/mainframe.py +++ b/consolegui/application/mainframe.py @@ -1066,6 +1066,12 @@ class MainFrame(QtGui.QWidget): if not method_name: method_name = self.method_name # display view in main frame + if self.ClientObj.method_names.has_key(method_name): + view_method = self._parent.ClientObj.method_names[method_name] + else: + view_method = method_name + self.ClientObj._parent.setWindowTitle(view_method + ' - ' \ + + self.ClientObj.Name) self.ClientObj.MainWidget.main_frame_view(view, method_name, \ step_change = True, error_output = False) @@ -1107,7 +1113,6 @@ class MainFrame(QtGui.QWidget): # Call server method if self.check_run_threads(): return - # _print ('========>>>>>>', self.param_object) self.button_call_thread = ClientServiceThread(self.ClientObj,\ method_name, int(self.ClientObj.sid),\ @@ -1158,7 +1163,11 @@ class MainFrame(QtGui.QWidget): ['layout'].setAlignment(QtCore.Qt.AlignTop) # set new window title - self.ClientObj._parent.setWindowTitle(method_name + '-' \ + if self.ClientObj.method_names.has_key(method_name): + view_method = self._parent.ClientObj.method_names[method_name] + else: + view_method = method_name + self.ClientObj._parent.setWindowTitle(view_method + ' - ' \ + self.ClientObj.Name) # Call method display process results @@ -1420,7 +1429,7 @@ class MainFrame(QtGui.QWidget): # if not readonly elif table.values.ChoiceValue[column].typefield in \ - ['combo', 'comboEdit']: + ['combo', 'comboEdit']: ChoiceValue = table.values.ChoiceValue[column] for row in range (len(table.body.stringArray)): val = table.body.stringArray[row].string[column] @@ -1862,13 +1871,10 @@ class MainFrame(QtGui.QWidget): def wrapper(): '''add variable values from widget in param_object''' # store params name if list for each step - for Group in self.view.groups.GroupField: if not Group.fields: continue for field in Group.fields.Field: - if not hasattr (self.param_object, field.name): - continue if hasattr (self.param_object, 'cl_page_count'): self.param_object.cl_page_count = \ self.ClientObj.count_row_res_table @@ -1876,6 +1882,8 @@ class MainFrame(QtGui.QWidget): self.param_object.cl_page_offset = str(0 + \ self.ClientObj.param_objects \ [self.method_name]['offset']) + if not hasattr (self.param_object, field.name): + continue if field.name == 'cl_page_count': self.param_object[field.name] = \ self.ClientObj.count_row_res_table