From d58fd25bf8441e6dca9454f7431c2b5efd587668 Mon Sep 17 00:00:00 2001 From: Denis Spiridonov Date: Mon, 4 Jun 2012 10:35:02 +0400 Subject: [PATCH] fix text button. icons. connect after add cert to trust --- consolegui/application/Box.py | 2 +- consolegui/application/CertificateClass.py | 10 +- consolegui/application/TrayIcon.py | 8 +- consolegui/application/client_class.py | 6 +- consolegui/application/helpwidget.py | 4 +- consolegui/application/more.py | 42 ++++---- ru/console_gui.po | 106 +++++++++++---------- 7 files changed, 100 insertions(+), 78 deletions(-) diff --git a/consolegui/application/Box.py b/consolegui/application/Box.py index bb77436..0540961 100755 --- a/consolegui/application/Box.py +++ b/consolegui/application/Box.py @@ -260,7 +260,7 @@ class MainWgt(QtGui.QMainWindow): if hasattr (self.ClientObj._parent, 'set_localhost'): # Reconnet to current host self.cur_size = self.size() - self.ConnectWidget = FrameConnection (self, self.ClientObj) + self.ConnectWidget = FrameConnection(self, self.ClientObj) self.ConnectWidget.connect_to_host(server_host_name, \ self.ClientObj.port) diff --git a/consolegui/application/CertificateClass.py b/consolegui/application/CertificateClass.py index 97f98a6..6e7fd56 100755 --- a/consolegui/application/CertificateClass.py +++ b/consolegui/application/CertificateClass.py @@ -50,18 +50,18 @@ class CertClass (QtGui.QWidget): layout_button = QtGui.QHBoxLayout() - Send_button = QtGui.QPushButton(_("Send"), self) - Send_button.setFixedWidth(100) + Send_button = QtGui.QPushButton(_("Send request"), self) +# Send_button.setFixedWidth(140) Send_button.clicked.connect(self.send) layout_button.addWidget(Send_button) - Get_button = QtGui.QPushButton(_("Get"), self) - Get_button.setFixedWidth(100) + Get_button = QtGui.QPushButton(_("Get certificate"), self) +# Get_button.setFixedWidth(140) Get_button.clicked.connect(self.get) layout_button.addWidget(Get_button) Quit_button = QtGui.QPushButton(_("Quit"), self) - Quit_button.setFixedWidth(100) +# Quit_button.setFixedWidth(60) Quit_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return)) Quit_button.clicked.connect(self.close) layout_button.addWidget(Quit_button) diff --git a/consolegui/application/TrayIcon.py b/consolegui/application/TrayIcon.py index c966555..944ec9f 100644 --- a/consolegui/application/TrayIcon.py +++ b/consolegui/application/TrayIcon.py @@ -309,9 +309,9 @@ class RightButtonMenu(QtGui.QMenu): QtGui.QMenu.__init__(self) # Add about program - About_icon = (QtGui.QIcon('/usr/share/pixmaps/cl-install-gui.png')) + About_icon = (QtGui.QIcon('/usr/share/pixmaps/calculate3.png')) themeName = QtGui.QIcon.themeName() - if not About_icon.isNull(): + if About_icon.isNull(): about_icons = ['help-about','help-browser'] About_icon = QtGui.QIcon() for image in about_icons: @@ -324,8 +324,8 @@ class RightButtonMenu(QtGui.QMenu): if not About_icon.isNull(): break - self.about_action = QtGui.QAction(About_icon, _("About Program"), self, \ - triggered=parent.help) + self.about_action = QtGui.QAction(About_icon, _("About Program"), + self, triggered=parent.help) self.addAction(self.about_action) # Add Bug report diff --git a/consolegui/application/client_class.py b/consolegui/application/client_class.py index f2b2ad2..d798417 100755 --- a/consolegui/application/client_class.py +++ b/consolegui/application/client_class.py @@ -111,8 +111,8 @@ class AddServerCert (QtGui.QDialog): self.grid.addWidget(self.server_but, x, 0) self.ca_but = QtGui.QPushButton(_('Add CA and ROOT certificate'), self) - self.ca_but.clicked.connect(self.add_server) self.ca_but.clicked.connect(self.add_ca) + self.ca_but.clicked.connect(self.add_server) self.grid.addWidget(self.ca_but, x, 1) self.cancel_but = QtGui.QPushButton(_('Cancel'), self) @@ -168,6 +168,10 @@ class AddServerCert (QtGui.QDialog): fcl.close() show_msg (_('Server certificate add to trusted \n%s') \ %(self.parent.trusted_path + filename),_('Certificate add')) + + from conf_connection import FrameConnection + self.ConnectWidget = FrameConnection(self, self.ClientObj) + self.ConnectWidget.connect_to_host(host, self.ClientObj.port) def add_ca(self): cl_client_cert_dir = self.ClientObj.VarsApi.Get('cl_client_cert_dir') diff --git a/consolegui/application/helpwidget.py b/consolegui/application/helpwidget.py index 57b09ea..bfffd0b 100755 --- a/consolegui/application/helpwidget.py +++ b/consolegui/application/helpwidget.py @@ -85,7 +85,7 @@ class HelpWgt(QtGui.QWidget): # self.setFixedSize(400 + x ,200) self.setFixedSize(self.sizeHint().width() + 50, \ self.sizeHint().height()) - self.setWindowTitle (_('Calculate Utilities')) + self.setWindowTitle (_('Calculate Console ')) help_icon = QtGui.QIcon('/usr/share/pixmaps/cl-install-gui.png') if help_icon.isNull(): help_icon = QtGui.QIcon.fromTheme("help-about") @@ -164,7 +164,7 @@ class BugWgt(QtGui.QWidget): self.resize(350, 250) # Set title and icon - self.setWindowTitle (_('Calculate Utilities')) + self.setWindowTitle (_('Calculate Console ')) bug_icons = ['tools-report-bug','system-help','help-browser'] themeName = QtGui.QIcon.themeName() bug_icon = QtGui.QIcon() diff --git a/consolegui/application/more.py b/consolegui/application/more.py index 2ccf675..c0cfd21 100755 --- a/consolegui/application/more.py +++ b/consolegui/application/more.py @@ -128,7 +128,7 @@ class HelpMenu(TopMenu): TopMenu.mousePressEvent(self, event) menu = QtGui.QMenu(self) - About_icon = (QtGui.QIcon('/usr/share/pixmaps/cl-install-gui.png')) + About_icon = (QtGui.QIcon('/usr/share/pixmaps/calculate3.png')) themeName = QtGui.QIcon.themeName() if About_icon.isNull(): about_icons = ['help-about','help-browser'] @@ -2161,7 +2161,7 @@ class LabelTaskWgt(QtGui.QLabel): class TaskWidget(QtGui.QWidget): def __init__(self, text = '', parent = None): QtGui.QWidget.__init__(self) - layout = QtGui.QHBoxLayout(self) + self._layout = QtGui.QHBoxLayout(self) self.text = QtGui.QLabel(text, self) fm = QtGui.QFontMetrics(self.text.font()) @@ -2171,20 +2171,9 @@ class TaskWidget(QtGui.QWidget): self.text.setSizePolicy(exp, pref) self.text.setMinimumHeight(self.text.sizeHint().height()) self.text.setMinimumWidth(d_w) - layout.addWidget(self.text) - layout.setContentsMargins(0,0,0,0) - layout.setSpacing(8) - - point_lbl = LabelTaskWgt('', self) - layout.addWidget(point_lbl) - - self.image_lbl = QtGui.QLabel(self) - self.image_lbl.setFixedSize(16,16) - - layout.addWidget(self.image_lbl) - - layout.setStretch(0,0) - layout.setStretch(1,5) + self._layout.addWidget(self.text) + self._layout.setContentsMargins(0,0,0,0) + self._layout.setSpacing(8) self.set_status = False #class LabelTaskWgt(QtGui.QLabel): @@ -2224,6 +2213,17 @@ class TaskWidget(QtGui.QWidget): def set_ok(self): if not self.set_status: + point_lbl = LabelTaskWgt('', self) + self._layout.addWidget(point_lbl) + + self.image_lbl = QtGui.QLabel(self) + self.image_lbl.setFixedSize(16,16) + + self._layout.addWidget(self.image_lbl) + + self._layout.setStretch(0,0) + self._layout.setStretch(1,5) + i_path = '/usr/share/icons/Calculate/16x16/client-gui/console_ok' icon = QtGui.QIcon(i_path) self.image_lbl.setPixmap(icon.pixmap(16)) @@ -2231,6 +2231,16 @@ class TaskWidget(QtGui.QWidget): def set_error(self): if not self.set_status: + point_lbl = LabelTaskWgt('', self) + self._layout.addWidget(point_lbl) + + self.image_lbl = QtGui.QLabel(self) + self.image_lbl.setFixedSize(16,16) + + self._layout.addWidget(self.image_lbl) + self._layout.setStretch(0,0) + self._layout.setStretch(1,5) + i_path = '/usr/share/icons/Calculate/16x16/client-gui/' \ 'console_cancel' icon = QtGui.QIcon(i_path) diff --git a/ru/console_gui.po b/ru/console_gui.po index 2ea0bd3..de74810 100755 --- 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-04 09:19+0300\n" -"PO-Revision-Date: 2012-06-04 09:19+0300\n" +"POT-Creation-Date: 2012-06-04 10:21+0300\n" +"PO-Revision-Date: 2012-06-04 10:22+0300\n" "Last-Translator: Denis \n" "Language-Team: \n" "Language: \n" @@ -48,24 +48,24 @@ msgstr "При закрытии сессии данные %d процессов #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:408 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:124 -#: /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:1926 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2279 +#: /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:1928 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2292 msgid "Yes" msgstr "Да" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:409 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:125 -#: /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:1928 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2280 +#: /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:1930 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2293 msgid "No" msgstr "Нет" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:414 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:114 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1044 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2022 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1046 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2024 #: /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" @@ -198,8 +198,8 @@ msgid "Country (2 words)" msgstr "Страна (2 символа)" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:101 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1799 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2004 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1801 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2006 #: /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" @@ -341,8 +341,8 @@ msgstr "Сайт Дистрибутива" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:88 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:167 -msgid "Calculate Utilities" -msgstr "Calculate Utilities" +msgid "Calculate Console " +msgstr "Calculate Console " #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:117 msgid "Your name:" @@ -391,7 +391,7 @@ msgid "Previous" msgstr "Назад" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:115 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2016 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2018 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43 msgid "Ok" msgstr "Ok" @@ -519,79 +519,79 @@ msgstr "Справка" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:180 #: /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:394 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:395 msgid "Report Bug" msgstr "Сообщить об ошибке" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:486 -#: /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:600 msgid "Open" msgstr "Открыть" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:696 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1930 +#: /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:1932 msgid "Auto" msgstr "Авто" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:995 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:997 msgid "Clear Table" msgstr "Очистить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1096 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1235 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1301 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1414 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1098 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1237 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1303 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1416 msgid "Add row" msgstr "Добавить строку" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1107 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1109 msgid "Recover Table" msgstr "Восстановить таблицу" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1151 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1153 msgid "Check all" msgstr "Отметить все" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1314 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1316 msgid "Reset changes" msgstr "Сбросить изменения" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1802 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2010 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1804 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2012 msgid "Repeat" msgstr "Повтор" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2127 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2129 msgid "Break process" msgstr "Прервать процесс" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2313 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2326 msgid "You do not have a certificate. Please, generate new request and get new certificate from server." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2381 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2394 msgid "No methods available!" msgstr "Нет доступных методов!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2408 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2421 msgid "No access to file!" msgstr "Нет доступа к файлу!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2411 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2424 msgid "Failed to obtain certificate data!" msgstr "Не удалось получить данные сертификата!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2414 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2427 #, python-format msgid "Permission denied %s" msgstr "Доступ запрещён %s" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2417 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2421 +#: /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:2434 msgid "Sid Deleted!" msgstr "Сессия удалена!" -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2424 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2437 msgid "Server delete sid error" msgstr "Ошибка удаления сессии на сервере" @@ -606,12 +606,12 @@ msgid "Port" msgstr "Порт" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:53 -msgid "Send" -msgstr "Отправить" +msgid "Send request" +msgstr "Отправить запрос" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:58 -msgid "Get" -msgstr "Получить" +msgid "Get certificate" +msgstr "Получить сертификат" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:63 msgid "Quit" @@ -774,36 +774,41 @@ msgid "Error clear process cache on server" msgstr "Ошибка удаления кэша процесса на сервере" #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:366 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:491 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:493 msgid "Error get frame from 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:441 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:492 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:494 msgid "Error get frame from Server." msgstr "Ошибка получения фрейма с сервера." #: /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:442 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:484 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:493 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:495 msgid "Please, resfesh this Page later." msgstr "Пожалуйста, обновите эту страницу позже." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:440 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:566 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:568 msgid "Error get entire frame from Server..." msgstr "Ошибка получения полного фрейма с сервера." #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:482 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:483 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:615 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:617 msgid "Error get progress from Server." msgstr "Ошибка получения значения прогресса с сервера." +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:594 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:763 +msgid "Send" +msgstr "Отправить" + #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:627 -#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:794 +#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:796 msgid "Error send password to Server" msgstr "Ошибка отправки сообщения (пароля) на сервер" @@ -1122,6 +1127,9 @@ msgstr " Шаг " msgid "Run" msgstr "Выполнение" +#~ msgid "Get" +#~ msgstr "Получить" + #~ msgid "Password for Private Key" #~ msgstr "Пароль для секретного ключа"