fix closed task

consolegui/application/ControlButton.py

@@ -148,7 +148,7 @@ class ControlButtonWgt(QtGui.QWidget):
 #            self.grid.addWidget(self.prev_button, x, y)
         else:
             self.prev_button = QtGui.QPushButton(self)
-            self.prev_button.setText(_('Cancel'))
+            self.prev_button.setText(_('Cancel').decode('utf-8'))
 
             self.prev_button.clicked.connect(self.button_disabled)
             self.prev_button.clicked.connect(self.clear_method_cache)

consolegui/application/ShortFrameResult.py

@@ -214,6 +214,11 @@ class ShortFrameRes(QtGui.QWidget):
     def endFrame(self, item):
         self.work_layout.hide_kill_button()
         self.close_all_thread()
+
+        if hasattr (self, 'taskWidget'):
+            self.taskWidget.endCurrentTask()
+            if item.message:
+                self.taskWidget.setText(item.message)
         self._parent.control_button.add_clear_cache_button(self.cur_pid)
         self.initUI()
 

ru/console_gui.po

@@ -2,9 +2,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: console_gui_translate\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-02 10:16+0300\n"
+"POT-Creation-Date: 2012-07-05 09:37+0300\n"
-"PO-Revision-Date: 2012-07-02 10:16+0300\n"
+"PO-Revision-Date: 2012-07-05 09:37+0300\n"
-"Last-Translator: Denis <ds@mail.ru>\n"
+"Last-Translator: Denis Spiridonov <ds.calculate.ru>\n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "Once the session is closed, data on %d processes will be lost!"
 msgstr "При закрытии сессии данные %d процессa будут удалены!"
 
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:178
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:701
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1958
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2285
@@ -59,7 +59,7 @@ msgid "Yes"
 msgstr "Да"
 
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:420
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:174
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:179
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:703
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1960
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286
@@ -282,7 +282,7 @@ msgstr "Сессия не соответствует Вашему сертифи
 msgid "Failed to kill the process!"
 msgstr "Не удалось завершить процесс!"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:173
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:53
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:140
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:238
@@ -290,28 +290,28 @@ msgstr "Не удалось завершить процесс!"
 msgid "Close"
 msgstr "Закрыть"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:202
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:207
 msgid "show this help message and exit"
 msgstr "вывод этой справки и выход"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:205
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:210
 msgid "language for translation"
 msgstr "язык для перевода"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:208
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:213
 msgid "call method"
 msgstr "вызов метода"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:211
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:216
 msgid "port number"
 msgstr "номер порта"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:214
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:219
 msgid "destination host"
 msgstr "хост назначения"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:360
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:365
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:433
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:438
 msgid "New connection"
 msgstr "Новое соединение"
 
@@ -767,38 +767,38 @@ msgstr "Пароль неверен"
 msgid "You do not have a certificate or your certificate does not match the server certificate. Please generate a new request and get a new certificate from the server."
 msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертификат и получите сертификат с сервера."
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:367
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:373
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:368
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:374
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:442
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:448
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:513
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:514
 msgid "Failed to get the frame from the server."
 msgstr "Ошибка получения фрейма с сервера."
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:369
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:375
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:443
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:449
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:485
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:491
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:515
 msgid "Try resfeshing this page later."
 msgstr "Пожалуйста, обновите эту страницу позже."
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:441
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:447
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:588
 msgid "Failed to get the complete frame from the server."
 msgstr "Ошибка получения полного фрейма с сервера."
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:483
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:489
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:484
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:490
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:638
 msgid "Failed to get progress status from the server"
 msgstr "Ошибка получения значения прогресса с сервера"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:596
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:602
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:786
 msgid "Send"
 msgstr "Отправить"
 
-#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:629
+#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:635
 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:819
 msgid "Failed to send the message (password) to the server"
 msgstr "Ошибка отправки сообщения (пароля) на сервер"