Исправление заголовков окон

pym/consolegui/application/CertificateClass.py

@@ -193,7 +193,7 @@ class CertClass (QtGui.QWidget):
         fc.close()
         show_msg (_("Your request ID: %s") %res + '\n' + \
                   _("To submit the certificate request on the server use command") + \
-                  '\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
+                  '\n'+'cl-core --sign-client %s' %res,
                   title = _('Request'), parent=self)
         return 0
 
@@ -272,7 +272,7 @@ class CertClass (QtGui.QWidget):
             show_msg (_("The request has not been reviewed yet.") + '\n' + \
                       _("Your request ID: %s") %req_id + '\n'+\
                       _("To submit the certificate request on the server use command")+\
-                      '\n'+'cl-core --sign-client ID_CLIENT_REQUEST',
+                      '\n'+'cl-core --sign-client %s'%req_id,
                       title = _('Request'), parent = self)
             return 1
         elif cert == '3':

pym/consolegui/application/ConnectionTabs.py

@@ -393,10 +393,10 @@ class ToolTabWidget(QtGui.QTabWidget):
         except:
             self.Version = ''
 
-        try:
-            self.Name = self.VarsGui.Get('cl_name')
-        except:
-            self.Name = 'Calculate Console'
+        #try:
+        #    self.Name = self.VarsGui.Get('cl_name')
+        #except:
+        self.Name = 'Calculate Console'
 
         self.new_con_txt = _('New connection')
         self.sys_update_pid = None

pym/consolegui/application/MainClass.py

@@ -33,10 +33,7 @@ class ApiClient(QtGui.QWidget):
         except:
             self.Version = ''
 
-        try:
-            self.Name = self.VarsGui.Get('cl_name')
-        except:
-            self.Name = 'calculate-console'
+        self.Name = 'Calculate Console'
 
         # Initialization of system variables
         self.VarsApi = self.VarsGui

pym/consolegui/application/more.py

@@ -1168,6 +1168,7 @@ class SelectTable(QtGui.QWidget):
                  add_ability = False, expert = False, default = None):
         QtGui.QWidget.__init__(self, parent)
         self._parent = parent
+
         self.Available_list = Available_list
         self.Selected = Selected
         self.items_dict = {}
@@ -1735,6 +1736,8 @@ class PlusRow (QtGui.QWidget):
         x = 0
         y = 0
         self.widget_dict = {}
+        if hasattr(field,"label"):
+            self.setWindowTitle(field.label or field.name)
 
         for i in range (len(field.tablevalue.values.ChoiceValue)):
             col = i+1
@@ -2361,6 +2364,8 @@ def show_msg(text, title = None, parent = None):
     msgBox = QtGui.QMessageBox(parent)
     if title:
         msgBox.setWindowTitle(title)
+    else:
+        msgBox.setWindowTitle("Calculate Console")
     if not text:
         return 1
     if not type(text) in [str,unicode]: