From b3c7a00654334a4c282e76ed2d8b8537b34d9367 Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Wed, 27 Jun 2012 10:12:54 +0400 Subject: [PATCH 1/2] next step by pressing Return --- consolegui/application/ControlButton.py | 1 + consolegui/application/more.py | 1 + consolegui/application/session_function.py | 2 +- consolegui/application/tools.py | 2 +- ru/console_gui.po | 120 +++++++++++---------- scripts/cl-console-gui | 2 + 6 files changed, 68 insertions(+), 60 deletions(-) diff --git a/consolegui/application/ControlButton.py b/consolegui/application/ControlButton.py index e422589..d4a48c6 100644 --- a/consolegui/application/ControlButton.py +++ b/consolegui/application/ControlButton.py @@ -192,6 +192,7 @@ class ControlButtonWgt(QtGui.QWidget): self.next_button.setMinimumWidth(64) self.next_button.setFixedHeight(32) + self.next_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return)) # self.next_button.setMaximumHeight(38) # self.set_button_style() diff --git a/consolegui/application/more.py b/consolegui/application/more.py index 76ee415..8bb6d70 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -23,6 +23,7 @@ import Image import pwd, sys from calculate.lib.utils.files import listDirectory +_('User should be not root') class TopMenu(QtGui.QPushButton): def __init__(self, label, images, parent = None): QtGui.QPushButton.__init__(self, parent) diff --git a/consolegui/application/session_function.py b/consolegui/application/session_function.py index 72e61d8..09edc90 100755 --- a/consolegui/application/session_function.py +++ b/consolegui/application/session_function.py @@ -15,7 +15,7 @@ # limitations under the License. from PySide import QtGui, QtCore -import sys, urllib2 +import urllib2 from more import show_msg, LabelWordWrap, get_ip_mac, get_sid diff --git a/consolegui/application/tools.py b/consolegui/application/tools.py index 208fffa..250f9da 100755 --- a/consolegui/application/tools.py +++ b/consolegui/application/tools.py @@ -17,7 +17,7 @@ import os from PySide import QtGui, QtCore -from PySide.QtGui import QComboBox, QColorDialog +from PySide.QtGui import QComboBox from more import LabelWordWrap, FileOpenWgt, show_msg, show_question, \ client_list_methods diff --git a/ru/console_gui.po b/ru/console_gui.po index 3add373..c8e3a16 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-26 10:03+0300\n" -"PO-Revision-Date: 2012-06-26 10:04+0300\n" +"POT-Creation-Date: 2012-06-27 09:27+0300\n" +"PO-Revision-Date: 2012-06-27 09:28+0300\n" "Last-Translator: Denis \n" "Language-Team: \n" "Language: \n" @@ -15,62 +15,62 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-SearchPath-0: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application\n" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:362 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:363 msgid "Connection lost!" msgstr "Соединение потеряно!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:385 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:386 msgid "The Server was restarted." msgstr "Сервер был перезапущен." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:386 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:387 msgid "Please try reconnecting to the server." msgstr "Пожалуйста, подключитесь к серверу снова." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:403 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:404 msgid "Closing session" msgstr "Закрытие сессии" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:404 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:405 msgid "Close this session" msgstr "Закрыть данную сессию" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:404 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:405 #, python-format msgid "with %s?" msgstr "c %s?" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:408 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:409 #, python-format msgid "Once the session is closed, data on %d process will be lost!" msgstr "При закрытии сессии данные %d процессa будут удалены!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:411 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:412 #, python-format 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:418 +#: /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:699 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1956 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2283 +#: /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 msgid "Yes" msgstr "Да" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:419 +#: /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: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: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:2285 msgid "No" msgstr "Нет" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:424 +#: /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:890 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1074 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2049 +#: /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/conf_connection.py:50 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132 msgid "Cancel" @@ -204,8 +204,8 @@ 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:1829 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2033 +#: /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/conf_connection.py:36 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85 msgid "Password" @@ -288,28 +288,28 @@ msgstr "Не удалось завершить процесс!" msgid "Close" msgstr "Закрыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:189 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:202 msgid "show this help message and exit" msgstr "вывод этой справки и выход" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:192 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:205 msgid "language for translation" msgstr "язык для перевода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:195 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:208 msgid "call method" msgstr "вызов метода" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:198 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:211 msgid "port number" msgstr "номер порта" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:201 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:214 msgid "destination host" msgstr "хост назначения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:347 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:420 +#: /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:433 msgid "New connection" 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:178 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:329 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:392 +#: /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 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:2044 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2045 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "Ok" @@ -512,79 +512,83 @@ msgstr "Ошибка удаления кэша сессии" msgid "Session cache cleared" msgstr "Кэш сессии удалён" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:144 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:26 +msgid "User should be not root" +msgstr "Пользователь должен быть не root" + +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:145 msgid "About" msgstr "О программе" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:161 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:162 msgid "Info" msgstr "Справка" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:487 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:598 +#: /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 msgid "Open" msgstr "Открыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:697 -#: /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:698 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961 msgid "Auto" msgstr "Авто" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1025 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1026 msgid "Clear the table" msgstr "Очистить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1126 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1265 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1331 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1444 +#: /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 msgid "Add a row" msgstr "Добавить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1137 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1138 msgid "Recover the table" msgstr "Восстановить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1181 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1182 msgid "Check all" msgstr "Отметить все" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1344 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1345 msgid "Reset" msgstr "Сбросить изменения" -#: /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:2039 +#: /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 msgid "Repeat" msgstr "Повтор" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2153 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2154 msgid "Break the process" msgstr "Прервать процесс" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2317 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2318 #: /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:2398 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2399 msgid "No methods available!" msgstr "Нет доступных методов!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2427 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2428 msgid "No access to the file!" msgstr "Нет доступа к файлу!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2430 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2431 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2433 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2434 #, python-format msgid "Permission denied %s" msgstr "Доступ запрещён %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2444 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2445 msgid "Error removing the session from the server" msgstr "Ошибка удаления сессии на сервере" diff --git a/scripts/cl-console-gui b/scripts/cl-console-gui index 71f9b4d..6ac7003 100755 --- a/scripts/cl-console-gui +++ b/scripts/cl-console-gui @@ -12,6 +12,8 @@ import dbus import dbus.mainloop.glib reload(sys) sys.setdefaultencoding("utf-8") +from calculate.lib.cl_lang import setLocalTranslate +setLocalTranslate('console_gui',sys.modules[__name__]) class Application(QtGui.QApplication): def __init__(self, argv): From dc405fb05e8665f3fa78474961a4de03dfd02964 Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Wed, 27 Jun 2012 10:37:08 +0400 Subject: [PATCH 2/2] fix brief style --- consolegui/application/ShortFrameResult.py | 2 +- consolegui/application/mainframe.py | 50 +++++++++++----------- consolegui/application/more.py | 4 +- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/consolegui/application/ShortFrameResult.py b/consolegui/application/ShortFrameResult.py index becdaa9..dbdf7c4 100644 --- a/consolegui/application/ShortFrameResult.py +++ b/consolegui/application/ShortFrameResult.py @@ -36,7 +36,7 @@ class TaskWidget(QtGui.QWidget): layout = QtGui.QGridLayout(self) self.text_lbl = LabelWordWrap('', self) layout.addWidget(self.text_lbl, 0, 0) - layout.setContentsMargins(0,0,0,0) + layout.setContentsMargins(0,4,0,4) layout.setSpacing(10) self.image_lbl = QtGui.QLabel(self) diff --git a/consolegui/application/mainframe.py b/consolegui/application/mainframe.py index be4fb2b..49e8d13 100755 --- a/consolegui/application/mainframe.py +++ b/consolegui/application/mainframe.py @@ -1786,37 +1786,35 @@ class MainFrame(QtGui.QWidget): GroupBox.setObjectName('GroupBoxBrief') # brief_widget.setStyleSheet("#Brief_w " GroupBox.setStyleSheet('#GroupBoxBrief {' -# "QGroupBox {" - 'font-weight: bold; font-color: red;' - 'padding-top: 24px; padding-bottom: 0px;' - 'padding-left: 5px; padding-right: 5px;' - 'border: 1px solid transparent;' - 'border-top-color: gray;' - 'border-left-color: qlineargradient ' - '(x1: 0, y1: 0, x2: 0, y2: 1,' - 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' - - 'border-right-color: qlineargradient' - '(x1: 0, y1: 0, x2: 0, y2: 1,' - 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' - - 'background-color: qlineargradient ' - '(x1: 0, y1: 0, x2: 0, y2: 1,' - 'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);' - 'border-bottom: 0px;' - 'border-top-left-radius: 4px;' - 'border-top-right-radius: 4px;}' - - 'QGroupBox::title {' - 'background-color: transparent;' - 'subcontrol-position: top center;' - 'margin-top: 6px;}') + 'font-weight: bold;' + 'padding-top: 24px; padding-bottom: 0px;' + 'padding-left: 5px; padding-right: 5px;' + 'border: 1px solid transparent;' + 'border-top-color: gray;' + + 'border-left-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' + + 'border-right-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);' + + 'background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,' + 'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);' + + 'border-bottom: 0px;' + 'border-top-left-radius: 4px;' + 'border-top-right-radius: 4px;}' + + 'QGroupBox::title {' + 'background-color: transparent;' + 'subcontrol-position: top center;' + 'margin-top: 6px;}') else: return grid_x gb_layout = QtGui.QGridLayout(GroupBox) gb_layout.setContentsMargins(10,10,10,10) - gb_layout.setSpacing(0) + gb_layout.setSpacing(4) gb_layout.setColumnStretch(0,10) gb_layout.setColumnStretch(1,17) diff --git a/consolegui/application/more.py b/consolegui/application/more.py index 8bb6d70..2e0e6bb 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -2149,7 +2149,7 @@ class ResultLayout(QtGui.QVBoxLayout): self.setAlignment(QtCore.Qt.AlignTop) # self.setDirection(QtGui.QBoxLayout.TopToBottom) self.setContentsMargins(28,28,28,10) - self.setSpacing(10) + self.setSpacing(2) self.kill_process_button = QtGui.QPushButton(_('Break the process')) self.kill_process_button.setFixedWidth(144) @@ -2197,7 +2197,7 @@ class TaskWidget(QtGui.QWidget): self.text.setMinimumHeight(self.text.sizeHint().height()) self.text.setMinimumWidth(d_w) self._layout.addWidget(self.text) - self._layout.setContentsMargins(0,0,0,0) + self._layout.setContentsMargins(0,4,0,4) self._layout.setSpacing(8) self.set_status = False