Множественные изменения

pym/consolegui/application/Box.py

@@ -35,6 +35,14 @@ from CertificateClass import CertClass
 from pid_information import client_list_pid
 from more import icon_visible, client_del_sid, show_msg
 
+DEBUG_LEVEL = 20
+
+
+def debug(level, *args):
+    if level <= DEBUG_LEVEL:
+        for s in args:
+            print s,
+        print
 
 class MainWgt(QtGui.QMainWindow):
     def __init__(self, ClientObj):
@@ -152,6 +160,7 @@ class MainWgt(QtGui.QMainWindow):
         self.resize(self.cur_size)
 
     def back(self):
+        self.control_button.del_button()
         if len(self.ClientObj.back_step_list) < 2:
             self.delete_MainFrameWgt()
 

pym/consolegui/application/ControlButton.py

@@ -64,6 +64,8 @@ class MethodNameWgt(QtGui.QWidget):
         self.setLayout(self.hlayout)
         self.setFixedHeight(40)
         self.hide()
+        self.button_widget = None
+
 
     def setMethodName(self, method_name):
         for meth_inf in self.ClientObj.methods_list:
@@ -73,9 +75,10 @@ class MethodNameWgt(QtGui.QWidget):
         self.meth_name.setText(method_name)
 
     def _hide(self):
-        if hasattr(self, 'button_widget'):
+        if self.button_widget:
             self.hlayout.removeWidget(self.button_widget)
             self.button_widget.close()
+            self.button_widget = None
         self.hide()
 
 
@@ -131,6 +134,14 @@ class ControlButtonWgt(QtGui.QWidget):
         self.confirmWgt = None
         self.break_button = None
 
+        self.button_widget = None
+        self.next_button = None
+        self.prev_button = None
+        self.cancel_button = None
+        self.customs = None
+        self.default_button = None
+        self.clear_proc_cache_button = None
+
     def set_confirm_question(self, message):
         self.question_label.setText(message)
         self.question_label.show()
@@ -160,9 +171,10 @@ class ControlButtonWgt(QtGui.QWidget):
             self.break_button = None
 
     def _hide(self):
-        if hasattr(self, 'button_widget'):
+        if self.button_widget:
             self.hlayout.removeWidget(self.button_widget)
             self.button_widget.close()
+            self.button_widget = None
         self.hide()
 
     def add_custom_button(self, Group, x, y, brief=False,
@@ -178,17 +190,27 @@ class ControlButtonWgt(QtGui.QWidget):
 
         self.customs = []
         self.add_cancel_button(end_layout, Group, brief, next_button_text)
+        has_next = False
+        button = None
         for field, callback in buttons:
             if field.element == "button_next":
                 self.add_next_button(end_layout, Group, brief, next_button_text)
+                has_next = True
             else:
                 button = QtGui.QPushButton(self)
                 self.customs.append(button)
                 button.setText(field.label.decode('utf-8'))
+                button.clicked.connect(self.button_disabled)
                 button.clicked.connect(callback)
                 button.setMinimumWidth(62)
                 button.setFixedHeight(32)
+                if field.guitype == "readonly":
+                    button.setDisabled(True)
                 end_layout.addWidget(button)
+        if not has_next:
+            button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return))
+            button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Enter))
+            self.default_button = button
 
         self.hlayout.addWidget(self.button_widget)
 
@@ -216,19 +238,21 @@ class ControlButtonWgt(QtGui.QWidget):
                         next_button_text=None):
         # создать кнопку отмена
         main_frame = self._parent.MainFrameWgt
-        self.prev_button = QtGui.QPushButton(self)
-        self.prev_button.setText(_('Cancel').decode('utf-8'))
+        self.cancel_button = QtGui.QPushButton(self)
+        self.cancel_button.setText(_('Cancel').decode('utf-8'))
 
-        self.prev_button.clicked.connect(self.button_disabled)
-        self.prev_button.clicked.connect(self.clear_method_cache)
+        self.cancel_button.clicked.connect(self.button_disabled)
+        self.cancel_button.clicked.connect(self.clear_method_cache)
         method_name = main_frame.method_name
-        self.prev_button.clicked.connect(
+        self.cancel_button.clicked.connect(
             lambda:main_frame.clear_cache_info(method_name))
 
-        self.prev_button.setMinimumWidth(62)
-        self.prev_button.setFixedHeight(32)
-        if hasattr(self, 'button_widget'):
-            end_layout.addWidget(self.prev_button)
+        self.cancel_button.setMinimumWidth(62)
+        self.cancel_button.setFixedHeight(32)
+        if self.button_widget:
+            end_layout.addWidget(self.cancel_button)
+
+        self.cancel_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Escape))
 
 
     def add_prev_button(self, end_layout, Group, brief=False,
@@ -246,7 +270,7 @@ class ControlButtonWgt(QtGui.QWidget):
             #            self.prev_button.clicked.connect(self.button_enabled)
             self.prev_button.setMinimumWidth(62)
             self.prev_button.setFixedHeight(32)
-            if hasattr(self, 'button_widget'):
+            if self.button_widget:
                 end_layout.addWidget(self.prev_button)
 
     def add_next_button(self, end_layout, Group, brief=False,
@@ -268,7 +292,7 @@ class ControlButtonWgt(QtGui.QWidget):
                 self.next_button.clicked.connect(
                     main_frame.collect_object())
             self.next_button.clicked.connect(main_frame.calling(False))
-            if hasattr(self, 'button_widget'):
+            if self.button_widget:
                 end_layout.addWidget(self.next_button)
         else:
             debug(10, "CREATE NEXT BUTTON")
@@ -281,26 +305,35 @@ class ControlButtonWgt(QtGui.QWidget):
                     main_frame.collect_object())
             self.next_button.clicked.connect(main_frame.calling(True))
             self.next_button.clicked.connect(main_frame.button_call_view(+1))
-            if hasattr(self, 'button_widget'):
+            if self.button_widget:
                 end_layout.addWidget(self.next_button)
 
         self.next_button.setMinimumWidth(64)
         self.next_button.setFixedHeight(32)
         self.next_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return))
         self.next_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Enter))
+        self.default_button = self.next_button
 
     def del_button(self):
-        if hasattr(self, 'button_widget'):
+        if self.button_widget:
             self.hlayout.removeWidget(self.button_widget)
             self.button_widget.close()
-        if hasattr(self, 'prev_button'):
+            self.button_widget = None
+        if self.prev_button:
             self.prev_button.close()
-        if hasattr(self, 'next_button'):
+            self.prev_button = None
+        if self.cancel_button:
+            self.cancel_button.close()
+            self.cancel_button = None
+        if self.next_button:
             self.next_button.close()
-        if hasattr(self, 'customs'):
+            self.next_button = None
+        if self.customs:
             for but in self.customs:
                 but.close()
-
+                self.customs = None
+        if self.default_button:
+            self.default_button = None
 
     def pre_add_button(self):
         self.del_button()
@@ -316,8 +349,8 @@ class ControlButtonWgt(QtGui.QWidget):
 
     def add_clear_cache_button(self, pid=None):
         end_layout = self.pre_add_button()
-        print "ADD CLOSE"
         self.clear_proc_cache_button = QtGui.QPushButton(_('Close'), self)
+        self.default_button = self.clear_proc_cache_button
         self.ClientObj._parent.user_changed_flag = False
         if pid:
             self.pid = pid
@@ -376,26 +409,39 @@ class ControlButtonWgt(QtGui.QWidget):
             self._parent.back()
 
     def button_disabled(self):
-        if hasattr(self, 'next_button'):
+        if self.next_button:
             self.next_button.setDisabled(True)
-        if hasattr(self, 'prev_button'):
+        if self.prev_button:
             self.prev_button.setDisabled(True)
-        if hasattr(self, 'clear_proc_cache_button'):
+        if self.cancel_button:
+            self.cancel_button.setDisabled(True)
+        if self.clear_proc_cache_button:
             self.clear_proc_cache_button.setDisabled(True)
+        if self.customs:
+            for but in self.customs:
+                but.setDisabled(True)
         self.ClientObj.app.processEvents()
 
     def button_enabled(self):
-        if hasattr(self, 'next_button'):
+        if self.next_button:
             self.next_button.setEnabled(True)
-        if hasattr(self, 'prev_button'):
+        if self.prev_button:
             self.prev_button.setEnabled(True)
-        if hasattr(self, 'clear_proc_cache_button'):
+        if self.cancel_button:
+            self.cancel_button.setEnabled(True)
+        if self.clear_proc_cache_button:
             self.clear_proc_cache_button.setEnabled(True)
+        if self.customs:
+            for but in self.customs:
+                but.setEnabled(True)
         self.ClientObj.app.processEvents()
 
     def keyPressEvent(self, e):
         if e.key() == QtCore.Qt.Key_Return:
-            if hasattr(self, 'next_button'):
-                self.next_button.click()
+            if self.default_button:
+                self.default_button.click()
+        elif e.key() == QtCore.Qt.Key_Escape:
+            if self.cancel_button:
+                self.cancel_button.click()
         else:
             QtGui.QWidget.keyPressEvent(self, e)

pym/consolegui/application/DisplayMethod.py

@@ -227,11 +227,17 @@ class DisplayMethod(QtGui.QWidget):
         self.ClientObj.method_name = method_name
 
         self.ClientObj.sid = get_sid(self.ClientObj.client)
+        expert = None
         if self.ClientObj.param_objects.has_key(method_name):
             self.ClientObj.param_objects[method_name]['step'] = 0
+            if self.ClientObj.param_objects[method_name]['expert_changed']:
+                expert = True
+
 
         view_params = get_view_params(self.ClientObj.client, \
-                       str(method_name + '_view'), step = step, brief = brief)
+                       str(method_name + '_view'), step = step,
+                       expert = expert,
+                       brief = brief)
         self.onActivated_thread = ClientServiceThread(self.ClientObj, \
                         str(method_name + '_view'), int(self.ClientObj.sid), \
                         view_params, return_except = True)

pym/consolegui/application/MainFrameResult.py

@@ -166,7 +166,7 @@ class MainFrameRes(QtGui.QWidget):
             if len(table.body[0]) >= self.ClientObj.count_row_res_table or \
                     self.ClientObj.param_objects[self.method_name]['offset']:
 
-                if table.onClick:
+                if table.onClick and table.records != "0":
                     self.add_offset_buttons(len(table.body[0]),
                                             table.addAction,
                                             table.records)
@@ -197,8 +197,8 @@ class MainFrameRes(QtGui.QWidget):
                 for i in range(len(table.body[0][line][0])):
                     tablewidgetitem = QtGui.QTableWidgetItem(
                         table.body[0][line][0][i])
-                    tablewidgetitem.setTextAlignment(
-                        QtCore.Qt.AlignTop | QtCore.Qt.AlignLeft)
+                    #tablewidgetitem.setTextAlignment(
+                    #    QtCore.Qt.Align | QtCore.Qt.AlignLeft)
                     self.mytable.setItem(line, i, tablewidgetitem)
             # set writeonly
             self.mytable.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
@@ -223,8 +223,15 @@ class MainFrameRes(QtGui.QWidget):
             param_object = create_obj(self.client, table.onClick)
             for field in table.fields.string:
                 if field:
+                    if ":" in field:
+                        field, op, value = field.partition(":")
+                    else:
+                        value = None
                     if hasattr (param_object, field):
-                        param_object[field] = self.mytable.item(item.row(),0).\
+                        if value:
+                            param_object[field] = value
+                        else:
+                            param_object[field] = self.mytable.item(item.row(),0).\
                                               text()
             #print param_object, table.step
             param_object.CheckOnly = True

pym/consolegui/application/mainframe.py

@@ -32,7 +32,7 @@ from ReturnMessage import ReturnedMessage
 import urllib2, time
 from os import path
 
-DEBUG_LEVEL = 20
+DEBUG_LEVEL = 3
 
 
 def debug(level, *args):
@@ -106,7 +106,6 @@ class MainFrame(QtGui.QWidget):
         # структура отправляемая при вызове метода
         self.param_object = None
 
-
         self.buttons = []
 
         # for clear memory after closed this window
@@ -161,6 +160,8 @@ class MainFrame(QtGui.QWidget):
             params[method_name]['step'] = 0
             params[method_name]['info'] = None
             params[method_name]['error'] = None
+            params[method_name]['expert'] = False
+            params[method_name]['expert_changed'] = set()
             params[method_name]['offset'] = 0
             params[method_name]['fields'] = {}
             params[method_name]['steps_field'] = None
@@ -185,6 +186,8 @@ class MainFrame(QtGui.QWidget):
             debug(10, "CLEAR CACHE INFO for ", method_name)
             self.ClientObj.param_objects[method_name]['info'] = None
             self.ClientObj.param_objects[method_name]['offset'] = 0
+            self.ClientObj.param_objects[method_name]['expert'] = False
+            self.ClientObj.param_objects[method_name]['expert_changed'] = set()
 
     def initUI(self, change_offset=False):
         #        _print (self.view)
@@ -214,13 +217,14 @@ class MainFrame(QtGui.QWidget):
         y = 0
 
         from ConnectionTabs import SelectedMethodWgt
+
         self.hidden_fields = {}
 
         self.tabWidget = SelectedMethodWgt
         # for advanced settings
         self.expert = False
         self.expert_list = []
-        self.changed_expert_list = []
+        self.changed_expert_list = set()
         add_button_flag = False
         self.calling_error = False
         #        self.error_output = self.error_output
@@ -237,6 +241,9 @@ class MainFrame(QtGui.QWidget):
         self.param_object = self.get_param_object(self.method_name)
         cached_info = self.ClientObj.param_objects[self.method_name]['info']
         cached = cached_info == self.param_object
+        if cached:
+            self.changed_expert_list = self.ClientObj.param_objects[
+                self.method_name]['expert_changed']
 
         if self.ClientObj.param_objects[self.method_name]['error']:
             self.error_fields_name = map(lambda x: x.field,
@@ -305,6 +312,8 @@ class MainFrame(QtGui.QWidget):
 
             if not Group.fields:
                 continue
+            if cached:
+                debug(10, "CACHE DEBUG",self.param_object)
             for field in Group.fields.Field:
                 if lastTable:
                     self.resize_table(lastTable)
@@ -316,12 +325,17 @@ class MainFrame(QtGui.QWidget):
                             field.value = str(self.ClientObj.param_objects[
                                                   self.method_name]['offset'])
                         value = getattr(self.param_object, field.name)
-                        debug(10, "GET VALUE", value.__repr__(), "for field",
+                        debug(5, "GET VALUE", value.__repr__(), "for field",
                               field.name, "FROM CACHE")
+                        debug(5, "FIELD VALUE", field)
                         if "list" in field.type:
                             field.listvalue = value
+                            if field.name in self.changed_expert_list:
+                                field.default = False
                         else:
                             field.value = value
+                            if field.name in self.changed_expert_list:
+                                field.default = False
                 if field.guitype == "hidden":
                     self.hidden_fields[field.name] = field.value
                     continue
@@ -345,10 +359,16 @@ class MainFrame(QtGui.QWidget):
                         self._parent.control_button.del_button()
                         self._parent.control_button.add_clear_cache_button()
 
+                elif "button" in field.element:
+                    add_button_flag = True
+                    callback = self.button_callback(field, self.isBrief())
+                    self.buttons.append((field, callback))
+                    self.mutable = True
+
                 elif (field.element == 'input' or
                               field.guitype == "readonly" or
                               field.element == 'readonly' or
-                                field.type and "onepassword" in field.type):
+                              field.type and "onepassword" in field.type):
                     if field.name in ['cl_page_count', 'cl_page_offset']:
                         pager = True
                         continue
@@ -421,12 +441,6 @@ class MainFrame(QtGui.QWidget):
                         x += 1
                     self.mutable = True
 
-                elif "button" in field.element:
-                    add_button_flag = True
-                    callback = self.button_callback(field, self.isBrief())
-                    self.buttons.append((field, callback))
-                    self.mutable = True
-
         if self.mutable:
             debug(10, "METHOD", self.method_name, "is mutable")
         else:
@@ -664,7 +678,7 @@ class MainFrame(QtGui.QWidget):
         if readonly or field.uncompatible:
             if field.uncompatible:
                 self.label_dict[field.name].setToolTip(field.uncompatible)
-            #self.label_dict[field.name].setDisabled(True)
+                # self.label_dict[field.name].setDisabled(True)
 
         self.grid.addWidget(self.label_dict[field.name], x, y)
 
@@ -693,7 +707,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].textChanged.connect( \
                 self.changed_expert_input(field.name))
         if type(self.window()) == self.tabWidget:
@@ -763,7 +777,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].clicked.connect( \
                 self.changed_expert_check(field.name))
         if type(self.window()) == self.tabWidget:
@@ -892,7 +906,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
         if field.uncompatible:
             self.view_dict[field.name].setToolTip(field.uncompatible)
             self.view_dict[field.name].setDisabled(True)
@@ -967,7 +981,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].currentIndexChanged.connect( \
                 self.changed_expert_combo(field.name))
         if type(self.window()) == self.tabWidget:
@@ -1055,7 +1069,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].currentIndexChanged.connect(
                 self.changed_expert_combo(field.name))
             self.view_dict[field.name].lineEdit().textChanged.connect(
@@ -1101,7 +1115,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].Changed.connect( \
                 self.expert_remove(field.name))
             self.view_dict[field.name].clear_button.clicked.connect( \
@@ -1148,7 +1162,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].Changed.connect( \
                 self.expert_remove(field.name))
             self.view_dict[field.name].recover_but.clicked.connect( \
@@ -1195,7 +1209,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].lineEdit.textChanged.connect( \
                 self.changed_expert_input(field.name))
         if type(self.window()) == self.tabWidget:
@@ -1236,7 +1250,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].ComboBox.currentIndexChanged.connect( \
                 self.expert_remove(field.name))
             self.view_dict[field.name].lineEdit.textChanged.connect( \
@@ -1272,7 +1286,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
             self.view_dict[field.name].textChanged.connect( \
                 self.expert_remove(field.name))
         if type(self.window()) == self.tabWidget:
@@ -1312,19 +1326,18 @@ class MainFrame(QtGui.QWidget):
                                                        (field.name))
         if field.value != 'open':
             debug(10, "Close expert")
-            self.view_dict[field.name].clicked.connect \
-                (self.collect_object())
+            self.view_dict[field.name].clicked.connect(self.collect_object())
             self.view_dict[field.name].clicked.connect(self.calling(True))
-            self.view_dict[field.name].clicked.connect \
-                (self.expert_clicked(field))
+            self.view_dict[field.name].clicked.connect(
+                self.expert_clicked(field))
         else:
             debug(10, "Open expert")
             self.expert_signal.connect(self.collect_object())
             self.expert_signal.connect(self.calling(True))
             self.expert_signal.connect(self.expert_clicked(field))
-            self.view_dict[field.name].clicked.connect(self.expert_question( \
+            self.view_dict[field.name].clicked.connect(self.expert_question(
                 field))
-            self.view_dict[field.name].clicked.connect( \
+            self.view_dict[field.name].clicked.connect(
                 self.set_disabled_expert(field.name, False))
 
     expert_signal = QtCore.Signal()
@@ -1346,8 +1359,15 @@ class MainFrame(QtGui.QWidget):
                 return 1
             if cur_field.value == 'open':
                 expert = False
+                debug(3, "@DROP changed expert for ", self.method_name)
+                self.ClientObj.param_objects[
+                    self.method_name]['expert_changed'] = set()
+                self.changed_expert_list = set()
             else:
                 expert = True
+            # Save expert option
+            debug(3, "@SAVE expert option", expert)
+            self.ClientObj.param_objects[self.method_name]['expert'] = expert
             num = self.ClientObj.param_objects[self.method_name]['step']
 
             # Call server method
@@ -1361,14 +1381,12 @@ class MainFrame(QtGui.QWidget):
             if brief:
                 num = None
                 expert = True
-            view_params = get_view_params(self.ClientObj.client, \
-                                          self.method_name + '_view', step=num, \
+            view_params = get_view_params(self.ClientObj.client,
+                                          self.method_name + '_view', step=num,
                                           expert=expert, brief=brief)
-            self.button_call_thread = ClientServiceThread(self.ClientObj, \
-                                                          self.method_name + '_view', \
-                                                          int(
-                                                              self.ClientObj.sid),
-                                                          view_params)
+            self.button_call_thread = ClientServiceThread(
+                self.ClientObj, self.method_name + '_view',
+                int(self.ClientObj.sid), view_params)
             self.button_call_thread.signal.connect(self.expert_clicked_after)
             self.button_call_thread.start()
 
@@ -1382,9 +1400,9 @@ class MainFrame(QtGui.QWidget):
             view_method = self._parent.ClientObj.method_names[method_name]
         else:
             view_method = method_name
-        self.ClientObj._parent.setWindowTitle(view_method + ' - ' \
+        self.ClientObj._parent.setWindowTitle(view_method + ' - '
                                               + self.ClientObj.Name)
-        self.ClientObj.MainWidget.main_frame_view(view, method_name, \
+        self.ClientObj.MainWidget.main_frame_view(view, method_name,
                                                   step_change=True,
                                                   error_output=False)
 
@@ -1445,9 +1463,9 @@ class MainFrame(QtGui.QWidget):
         def change_method(method_name):
             def after_call(view):
                 debug(10, "CHANGE METHOD", self._parent.ClientObj.method_names)
-                #view_method = self._parent.ClientObj.method_names[
+                # view_method = self._parent.ClientObj.method_names[
                 #    method_name]
-                #self._parent.ClientObj._parent.setWindowTitle(
+                # self._parent.ClientObj._parent.setWindowTitle(
                 #    view_method + ' - ' + self.ClientObj.Name)
                 self.ClientObj.MainWidget.main_frame_view(view,
                                                           method_name)
@@ -1463,14 +1481,15 @@ class MainFrame(QtGui.QWidget):
                     self.ClientObj, method_name + '_view', sid, view_params)
                 self.get_Frame_thread.signal.connect(after_call)
                 self.get_Frame_thread.start()
+
             return wrapper
+
         if field.element == 'button_view':
             return change_method(field.value)
         else:
             return button_clicked(
                 field.value, self.button_variable_mapper[field.name], brief)
 
-
     def button_clicked_after(self, result, method_name):
         meth_result = []
         error = False
@@ -1618,7 +1637,7 @@ class MainFrame(QtGui.QWidget):
             if field.default:
                 self.expert_list.append(field.name)
             else:
-                self.changed_expert_list.append(field.name)
+                self.changed_expert_list.add(field.name)
 
         if brief:
             gb_layout.addWidget(self.label_dict[field.name], x, y, 1, 2)
@@ -2245,8 +2264,7 @@ class MainFrame(QtGui.QWidget):
             if field_name in self.expert_list:
                 self.expert_list.remove(field_name)
 
-            if not field_name in self.changed_expert_list:
-                self.changed_expert_list.append(field_name)
+            self.changed_expert_list.add(field_name)
 
         return wrapper
 
@@ -2254,8 +2272,7 @@ class MainFrame(QtGui.QWidget):
         if field_name in self.expert_list:
             self.expert_list.remove(field_name)
 
-        if field_name not in self.changed_expert_list:
-            self.changed_expert_list.append(field_name)
+        self.changed_expert_list.add(field_name)
 
     def expert_add(self, field_name):
         def wrapper():
@@ -2295,6 +2312,11 @@ class MainFrame(QtGui.QWidget):
             method_name = self.method_name
 
         def wrapper():
+            debug(3, "@@@@EXPERT LIST CHANGED", self.changed_expert_list)
+            debug(3, "@@@@EXPERT LIST ", self.expert_list)
+            self.ClientObj.param_objects[method_name]['expert_changed'] = \
+                self.changed_expert_list
+
             debug(10, "COLLECT OBJECT for method", method_name, "by view form",
                   self.method_name)
             # store params name if list for each step
@@ -2613,7 +2635,8 @@ class MainFrame(QtGui.QWidget):
                     temp.pop()
                     self.ClientObj._parent.setWindowTitle(
                         u"{title} - {action}".format(
-                            title="-".join(temp), action=_("Running").decode('utf-8')))
+                            title="-".join(temp),
+                            action=_("Running").decode('utf-8')))
 
                 self.calling_error = False
                 # Call method display process results

pym/consolegui/application/mainmenu.py

@@ -27,9 +27,9 @@ class MainMenu(QtGui.QWidget):
         self.hlayout.setAlignment(QtCore.Qt.AlignLeft)
 
 ######### Back on one step
-        self.Back = TopMenu(_('Back'),['go-previous'], self)
-        self.Back.setStatusTip(_('Back'))
-        self.Back.setToolTip(_('Back'))
+        self.Back = TopMenu(_('All settings'),['go-previous'], self)
+        self.Back.setStatusTip(_('All settings'))
+        self.Back.setToolTip(_('All settings'))
         self.Back.clicked.connect(parent.back)
         self.Back.setVisible(False)
         self.hlayout.addWidget(self.Back)
@@ -122,9 +122,9 @@ class MainMenu(QtGui.QWidget):
 
     def refresh(self):
 ######### Back on one step
-        self.Back.setText(_('Back'))
-        self.Back.setStatusTip(_('Back'))
-        self.Back.setToolTip(_('Back'))   
+        self.Back.setText(_('All settings'))
+        self.Back.setStatusTip(_('All settings'))
+        self.Back.setToolTip(_('All settings'))
 
 ######### View information about the running processes
         self.Processes.setText(_('Processes'))

pym/consolegui/application/more.py

@@ -1244,6 +1244,7 @@ class SelectTable(QtGui.QWidget):
         self.grid.addWidget(self.table, 1, 0, 1, 2)
         self.resize(self.sizeHint())
 
+
     def create_table(self, hard_auto = False):
         self.table.setColumnCount(2)
         self.table.setRowCount(self.row_count + 1)