diff --git a/consolegui/application/create_cert.py b/consolegui/application/create_cert.py index 7100c2b..27f7866 100755 --- a/consolegui/application/create_cert.py +++ b/consolegui/application/create_cert.py @@ -15,7 +15,6 @@ # limitations under the License. import socket -from M2Crypto import RSA, X509, EVP, m2 from PySide import QtGui, QtCore from more import LabelWordWrap, show_msg @@ -26,9 +25,11 @@ def passphrase_callback(v): return str(v) def generateRSAKey(): + from M2Crypto import RSA, m2 return RSA.gen_key(2048, m2.RSA_F4) def makePKey(key): + from M2Crypto import EVP pkey = EVP.PKey() pkey.assign_rsa(key) return pkey @@ -140,7 +141,7 @@ class RequestCreate (QtGui.QWidget): show_msg(_('The \"Country\" field must be two-character'), \ _('Input error')) return - + from M2Crypto import X509 ######################################### private_key_passwd = self.passwd_lineedit.text() rsa = generateRSAKey() diff --git a/consolegui/application/mainframe.py b/consolegui/application/mainframe.py index 49e8d13..cbda223 100755 --- a/consolegui/application/mainframe.py +++ b/consolegui/application/mainframe.py @@ -469,7 +469,7 @@ class MainFrame(QtGui.QWidget): if field.uncompatible: self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setDisabled(True) - + self.grid.addWidget(self.view_dict[field.name], x, y+1) self.error_label_dict[field.name] = ErrorLabel(self) diff --git a/ru/console_gui.po b/ru/console_gui.po index c8e3a16..5320e04 100644 --- a/ru/console_gui.po +++ b/ru/console_gui.po @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: console_gui_translate\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-27 09:27+0300\n" -"PO-Revision-Date: 2012-06-27 09:28+0300\n" +"POT-Creation-Date: 2012-06-27 14:19+0300\n" +"PO-Revision-Date: 2012-06-27 14:20+0300\n" "Last-Translator: Denis \n" "Language-Team: \n" "Language: \n" @@ -52,25 +52,25 @@ 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/more.py:700 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1957 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2284 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:702 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2286 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/more.py:702 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1959 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2285 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:704 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2287 msgid "No" msgstr "Нет" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:425 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:116 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:891 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1075 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2050 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:117 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:893 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1077 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2052 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:50 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132 msgid "Cancel" @@ -179,48 +179,48 @@ msgstr "Процесс id %d не найден" msgid "Permission denied" msgstr "Доступ запрещён" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:54 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:55 msgid "User@Server_HostName" msgstr "Пользователь@Имя_сервера" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:63 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:64 msgid "User Name" msgstr "Имя пользователя" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:69 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:70 msgid "Organization Name" msgstr "Название организации" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:75 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:76 msgid "Network address" msgstr "Сетевой адрес" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:81 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:82 msgid "State Name" msgstr "Город" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:88 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:89 msgid "Country (a two-character tag)" msgstr "Страна (2 символа)" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:102 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1830 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2034 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:103 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1832 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2036 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:36 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85 msgid "Password" msgstr "Пароль" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:109 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:128 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:110 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:129 msgid "Create a signature request" msgstr "Создать запрос на подпись сертификата" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:140 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:141 msgid "The \"Country\" field must be two-character" msgstr "Поле \"Страна\" должно состоять из двух символов" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:141 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:142 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:141 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:231 msgid "Input error" @@ -283,7 +283,7 @@ msgstr "Не удалось завершить процесс!" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:168 #: /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:138 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:224 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:225 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124 msgid "Close" msgstr "Закрыть" @@ -383,9 +383,9 @@ msgid "Send a Bug" msgstr "Отправить ошибку" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:183 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:179 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:330 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:393 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:181 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:332 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:395 msgid "Report Bug" msgstr "Сообщить об ошибке" @@ -406,7 +406,7 @@ msgid "Previous" msgstr "Назад" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2045 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2047 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "Ok" @@ -415,7 +415,7 @@ msgstr "Ok" msgid "Next" msgstr "Далее" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:241 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:242 msgid "Error when closing the process" msgstr "Ошибка закрытия процесса" @@ -516,79 +516,89 @@ msgstr "Кэш сессии удалён" msgid "User should be not root" msgstr "Пользователь должен быть не root" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:145 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:27 +#, python-format +msgid "No module named %s" +msgstr "Нет модуля %s" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:28 +#, python-format +msgid "Cannot import name %s" +msgstr "Не удалось импортировать %s" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:147 msgid "About" msgstr "О программе" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:162 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:164 msgid "Info" msgstr "Справка" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:488 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:599 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:490 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:601 msgid "Open" msgstr "Открыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:698 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:700 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1963 msgid "Auto" msgstr "Авто" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1026 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1028 msgid "Clear the table" msgstr "Очистить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1127 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1266 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1332 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1445 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1129 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1268 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1334 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1447 msgid "Add a row" msgstr "Добавить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1138 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1140 msgid "Recover the table" msgstr "Восстановить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1182 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1184 msgid "Check all" msgstr "Отметить все" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1345 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1347 msgid "Reset" msgstr "Сбросить изменения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1833 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2040 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1835 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2042 msgid "Repeat" msgstr "Повтор" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2154 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2156 msgid "Break the process" msgstr "Прервать процесс" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2318 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2320 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:360 msgid "You do not have a 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/more.py:2399 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2401 msgid "No methods available!" msgstr "Нет доступных методов!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2428 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2430 msgid "No access to the file!" msgstr "Нет доступа к файлу!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2431 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2433 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2434 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2436 #, python-format msgid "Permission denied %s" msgstr "Доступ запрещён %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2445 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2447 msgid "Error removing the session from the server" msgstr "Ошибка удаления сессии на сервере" @@ -1085,12 +1095,12 @@ msgstr "Удалить строку" msgid "View options" msgstr "Просмотреть параметры" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2257 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2255 msgid " Step " msgstr " Шаг " -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2260 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2264 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2258 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2262 msgid "Run" msgstr "Выполнение" diff --git a/scripts/cl-console-gui b/scripts/cl-console-gui index 6ac7003..09528d6 100755 --- a/scripts/cl-console-gui +++ b/scripts/cl-console-gui @@ -4,8 +4,6 @@ import sys, os, pwd from PySide import QtGui -from calculate.consolegui.application.ConnectionTabs import ToolTabWidget, \ - DBusWidget, parse, SelectedMethodWgt from calculate.consolegui.application.more import getRunProc, owner, _print import __builtin__ import dbus @@ -24,6 +22,8 @@ class Application(QtGui.QApplication): return QtGui.QApplication.event(self, e) def main(): + from calculate.consolegui.application.ConnectionTabs import ToolTabWidget,\ + DBusWidget, parse, SelectedMethodWgt __builtin__.__dict__['_print'] = _print host, port, args = None, None, None if len(sys.argv) > 1: @@ -96,4 +96,4 @@ def main(): sys.exit(app.exec_()) if __name__=='__main__': - main() \ No newline at end of file + main()