calculate
/
calculate-utils-3-console-gui
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/develop'

Browse Source
master3.3
Хирецкий Михаил 12 years ago
parent 9eac1460cf 83c11af593
commit 4883c79f5e
8 changed files with 236 additions and 181 deletions
Show Stats Download Patch File Download Diff File

28
consolegui/application/ConnectionTabs.py
Unescape View File

@ -9,7 +9,7 @@ import sudsds, time, sys
from TrayIcon import TrayIcon from TrayIcon import TrayIcon
from more import show_question, get_sid, get_view_params from more import get_sid, get_view_params
from MainClass import ApiClient from MainClass import ApiClient
from calculate.consolegui.datavars import DataVarsGui from calculate.consolegui.datavars import DataVarsGui
from pid_information import client_pid_info from pid_information import client_pid_info
@ -18,6 +18,7 @@ class SelectedMethodWgt(QtGui.QWidget):
def __init__(self, app, args): def __init__(self, app, args):
QtGui.QWidget.__init__(self) QtGui.QWidget.__init__(self)
self.args = args self.args = args
self.user_changed_flag = False
self.lang = args.lang self.lang = args.lang
self.method = args.method self.method = args.method
self.ClientObj = ApiClient(app, self) self.ClientObj = ApiClient(app, self)
@ -31,7 +32,7 @@ class SelectedMethodWgt(QtGui.QWidget):
self.setWindowIcon(QtGui.QIcon('/usr/share/pixmaps/calculate3.png')) self.setWindowIcon(QtGui.QIcon('/usr/share/pixmaps/calculate3.png'))
if self.connect(): if self.connect():
return sys.exit(1)
# definition of screen resolution # definition of screen resolution
prim_screen = app.desktop().primaryScreen() prim_screen = app.desktop().primaryScreen()
d_size = app.desktop().screenGeometry(prim_screen).size() d_size = app.desktop().screenGeometry(prim_screen).size()
@ -81,7 +82,10 @@ class SelectedMethodWgt(QtGui.QWidget):
self.ClientObj.signaling.close() self.ClientObj.signaling.close()
self.ClientObj.signaling.wait() self.ClientObj.signaling.wait()
return 1 return 1
reply = self.show_close_messagebox() if not self.user_changed_flag:
reply = QtGui.QMessageBox.Yes
else:
reply = self.show_close_messagebox()
from mainframe import MainFrame from mainframe import MainFrame
if reply == QtGui.QMessageBox.Yes: if reply == QtGui.QMessageBox.Yes:
@ -110,6 +114,9 @@ class SelectedMethodWgt(QtGui.QWidget):
elif reply == QtGui.QMessageBox.No: elif reply == QtGui.QMessageBox.No:
return 0 return 0
def user_changed(self):
self.user_changed_flag = True
def show_close_messagebox(self): def show_close_messagebox(self):
msgBox = QtGui.QMessageBox(self) msgBox = QtGui.QMessageBox(self)
if self.ClientObj.method_names.has_key(self.method): if self.ClientObj.method_names.has_key(self.method):
@ -227,8 +234,7 @@ class ToolTabWidget(QtGui.QTabWidget):
self.setMinimumWidth(450) self.setMinimumWidth(450)
self.setWindowTitle(self.Name) self.setWindowTitle(self.Name)
self.setStyleSheet( self.setStyleSheet('''
'''
QTabBar::tab:last { QTabBar::tab:last {
background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #E1E1E1, stop: 0.4 #DDDDDD, stop: 0 #E1E1E1, stop: 0.4 #DDDDDD,
@ -237,8 +243,12 @@ class ToolTabWidget(QtGui.QTabWidget):
border-bottom-color: #C2C7CB; border-top-left-radius: 4px; border-bottom-color: #C2C7CB; border-top-left-radius: 4px;
border-top-right-radius: 4px; padding-left: 3px; border-top-right-radius: 4px; padding-left: 3px;
margin-left: 3px; margin-bottom: 5px; margin-top: 2px; width: 18px; margin-left: 3px; margin-bottom: 5px; margin-top: 2px; width: 18px;}
}''') QTabBar::tab:last::hover {background:
qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
stop: 0 #E9E9E9, stop: 0.4 #E5E5E5,
stop: 0.5 #E1E1E1, stop: 1.0 #DDDDDD);}
''')
self.setWindowIcon(QtGui.QIcon('/usr/share/pixmaps/calculate3.png')) self.setWindowIcon(QtGui.QIcon('/usr/share/pixmaps/calculate3.png'))
self.show() self.show()
@ -314,6 +324,10 @@ class ToolTabWidget(QtGui.QTabWidget):
self.insertTab(self.count() - 1, widget, self.gui_icon , \ self.insertTab(self.count() - 1, widget, self.gui_icon , \
self.new_con_txt) self.new_con_txt)
self.setCurrentIndex(self.count() - 2) self.setCurrentIndex(self.count() - 2)
if self.currentWidget().ClientObj.client:
self.tabbar.setTabEnabled(self.count() - 1, True)
else:
self.tabbar.setTabEnabled(self.count() - 1, False)
def rename_tab(self, text = None, ind = None): def rename_tab(self, text = None, ind = None):
if not text: if not text:

4
consolegui/application/conf_connection.py
Unescape View File

@ -350,6 +350,7 @@ class FrameConnection(QtGui.QWidget):
#If the certificate file misses #If the certificate file misses
if Connect_Error: if Connect_Error:
self.ClientObj.client = None
if crypto_Error and 'passwd' in locals(): if crypto_Error and 'passwd' in locals():
show_msg (_('Password is invalid'), \ show_msg (_('Password is invalid'), \
_('Connection Error'), self) _('Connection Error'), self)
@ -369,7 +370,8 @@ class FrameConnection(QtGui.QWidget):
'get new certificate from server.') 'get new certificate from server.')
show_msg (mess, parent = self) show_msg (mess, parent = self)
else: else:
show_msg (e, parent = self) if e.message or e.args:
show_msg (e, parent = self)
return return
CERT_FILE = None CERT_FILE = None
CERT_KEY = None CERT_KEY = None

95
consolegui/application/mainframe.py
Unescape View File

@ -26,8 +26,8 @@ from more import show_msg, LabelWordWrap, MultipleChoice, SelectTable, \
ReadonlyCheckBox, get_view_params, ImageLabel, SelectList, \ ReadonlyCheckBox, get_view_params, ImageLabel, SelectList, \
QComboWgt QComboWgt
from sudsds import WebFault from sudsds import WebFault
from ReturnMessage import ReturnedMessage
from SelectTable import SelectedTableWidget from SelectTable import SelectedTableWidget
from ReturnMessage import ReturnedMessage
import urllib2, time import urllib2, time
from os import path from os import path
@ -111,6 +111,8 @@ class MainFrame(QtGui.QWidget):
x = 1 x = 1
y = 0 y = 0
from ConnectionTabs import SelectedMethodWgt
self.tabWidget = SelectedMethodWgt
# for advanced settings # for advanced settings
self.expert = False self.expert = False
self.expert_list = [] self.expert_list = []
@ -284,7 +286,8 @@ class MainFrame(QtGui.QWidget):
self.add_standart_button.emit(Group, x, y, None, None) self.add_standart_button.emit(Group, x, y, None, None)
# self.grid.setSizeConstraint(self.grid.SizeConstraint.SetMinimumSize) # self.grid.setSizeConstraint(self.grid.SizeConstraint.SetMinimumSize)
self.grid.setSizeConstraint(QtGui.QLayout.SizeConstraint.SetMaximumSize) self.grid.setSizeConstraint \
(QtGui.QLayout.SizeConstraint.SetMaximumSize)
# hide expert settings # hide expert settings
self.grid.setContentsMargins(28, 28, 28, 28) self.grid.setContentsMargins(28, 28, 28, 28)
@ -457,6 +460,11 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_list.append(field.name) self.changed_expert_list.append(field.name)
self.view_dict[field.name].textChanged.connect( \ self.view_dict[field.name].textChanged.connect( \
self.changed_expert_input(field.name)) self.changed_expert_input(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].textChanged.connect( \
self.window().user_changed)
# set disable item if uncompatible # set disable item if uncompatible
if field.uncompatible: if field.uncompatible:
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
@ -516,6 +524,10 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_list.append(field.name) self.changed_expert_list.append(field.name)
self.view_dict[field.name].clicked.connect( \ self.view_dict[field.name].clicked.connect( \
self.changed_expert_check(field.name)) self.changed_expert_check(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].clicked.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
@ -624,6 +636,9 @@ class MainFrame(QtGui.QWidget):
if self.expert: if self.expert:
radiolist[i].clicked.connect(self.expert_remove\ radiolist[i].clicked.connect(self.expert_remove\
(field.name)) (field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
radiolist[i].clicked.connect(self.window().user_changed)
layout.addStretch(1) layout.addStretch(1)
# self.GroupBox.setLayout(layout) # self.GroupBox.setLayout(layout)
@ -709,10 +724,20 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_list.append(field.name) self.changed_expert_list.append(field.name)
self.view_dict[field.name].currentIndexChanged.connect( \ self.view_dict[field.name].currentIndexChanged.connect( \
self.changed_expert_combo(field.name)) self.changed_expert_combo(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].currentIndexChanged.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
self.grid.addWidget(self.view_dict[field.name], x, y+1) if self.view_dict[field.name].ComboBox.sizeHint().width() > 100:
self.view_dict[field.name].setFixedWidth(
self.view_dict[field.name].ComboBox.sizeHint().width())
else:
self.view_dict[field.name].setFixedWidth(148)
self.grid.addWidget(self.view_dict[field.name], x, y+1,
QtCore.Qt.AlignLeft)
self.error_label_dict[field.name] = ErrorLabel(self) self.error_label_dict[field.name] = ErrorLabel(self)
self.grid.addWidget(self.error_label_dict[field.name], x+1, y, 1, 2) self.grid.addWidget(self.error_label_dict[field.name], x+1, y, 1, 2)
@ -792,10 +817,26 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_combo(field.name)) self.changed_expert_combo(field.name))
self.view_dict[field.name].lineEdit().textChanged.connect( \ self.view_dict[field.name].lineEdit().textChanged.connect( \
self.changed_expert_input(field.name)) self.changed_expert_input(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].currentIndexChanged.connect( \
self.window().user_changed)
self.view_dict[field.name].lineEdit().textChanged.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
self.grid.addWidget(self.view_dict[field.name], x, y+1)
# import ipdb
# ipdb.set_trace()
w = self.view_dict[field.name].ComboBox.sizeHint().width()
if w > 100:
self.view_dict[field.name].setFixedWidth(w)
else:
self.view_dict[field.name].setFixedWidth(148)
self.grid.addWidget(self.view_dict[field.name], x, y+1,
QtCore.Qt.AlignLeft)
self.error_label_dict[field.name] = ErrorLabel(self) self.error_label_dict[field.name] = ErrorLabel(self)
self.grid.addWidget(self.error_label_dict[field.name], x+1, y, 1, 2) self.grid.addWidget(self.error_label_dict[field.name], x+1, y, 1, 2)
@ -806,7 +847,7 @@ class MainFrame(QtGui.QWidget):
else: else:
add_ability = False add_ability = False
choice = field.choice.string if field.choice else [] choice = field.choice.string if field.choice else []
if field.listvalue: if field.listvalue:
default = field.listvalue.string default = field.listvalue.string
elif field.value: elif field.value:
@ -830,7 +871,13 @@ class MainFrame(QtGui.QWidget):
self.expert_remove(field.name)) self.expert_remove(field.name))
self.view_dict[field.name].clear_button.clicked.connect( \ self.view_dict[field.name].clear_button.clicked.connect( \
self.expert_add(field.name)) self.expert_add(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].Changed.connect( \
self.window().user_changed)
self.view_dict[field.name].clear_button.clicked.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
self.label_dict[field.name].setDisabled(True) self.label_dict[field.name].setDisabled(True)
@ -848,14 +895,13 @@ class MainFrame(QtGui.QWidget):
else: else:
add_ability = True add_ability = True
choice = field.choice.string if field.choice else [] choice = field.choice.string if field.choice else []
if field.listvalue: if field.listvalue:
default = field.listvalue.string default = field.listvalue.string
elif field.value: elif field.value:
default = field.value.split(',') default = field.value.split(',')
else: else:
default = [] default = []
# print "=>> field.default =", field.default
comments = field.comments comments = field.comments
# if field.name in self.error_fields_name: # if field.name in self.error_fields_name:
# field.default = False # field.default = False
@ -871,6 +917,12 @@ class MainFrame(QtGui.QWidget):
self.expert_remove(field.name)) self.expert_remove(field.name))
self.view_dict[field.name].recover_but.clicked.connect( \ self.view_dict[field.name].recover_but.clicked.connect( \
self.expert_add(field.name)) self.expert_add(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].Changed.connect( \
self.window().user_changed)
self.view_dict[field.name].recover_but.clicked.connect( \
self.window().user_changed)
# self.view_dict[field.name].Changed.connect( \ # self.view_dict[field.name].Changed.connect( \
# self.selectList_changed(False, field)) # self.selectList_changed(False, field))
# self.view_dict[field.name].recover_but.clicked.connect( \ # self.view_dict[field.name].recover_but.clicked.connect( \
@ -910,6 +962,10 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_list.append(field.name) self.changed_expert_list.append(field.name)
self.view_dict[field.name].lineEdit.textChanged.connect( \ self.view_dict[field.name].lineEdit.textChanged.connect( \
self.changed_expert_input(field.name)) self.changed_expert_input(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].lineEdit.textChanged.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
@ -947,12 +1003,19 @@ class MainFrame(QtGui.QWidget):
self.expert_remove(field.name)) self.expert_remove(field.name))
self.view_dict[field.name].lineEdit.textChanged.connect( \ self.view_dict[field.name].lineEdit.textChanged.connect( \
self.expert_remove(field.name)) self.expert_remove(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].ComboBox.currentIndexChanged. \
connect(self.window().user_changed)
self.view_dict[field.name].lineEdit.textChanged.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
self.label_dict[field.name].setDisabled(True) self.label_dict[field.name].setDisabled(True)
self.view_dict[field.name].setToolTip(field.uncompatible) self.view_dict[field.name].setToolTip(field.uncompatible)
self.view_dict[field.name].setDisabled(True) self.view_dict[field.name].setDisabled(True)
self.grid.addWidget(self.view_dict[field.name], x, y+1) self.grid.addWidget(self.view_dict[field.name], x, y+1)
self.error_label_dict[field.name] = ErrorLabel(self) self.error_label_dict[field.name] = ErrorLabel(self)
@ -963,7 +1026,7 @@ class MainFrame(QtGui.QWidget):
self.label_dict[field.name] = LabelWordWrap(field.label, self) self.label_dict[field.name] = LabelWordWrap(field.label, self)
self.grid.addWidget(self.label_dict[field.name], x, y) self.grid.addWidget(self.label_dict[field.name], x, y)
self.view_dict[field.name] = PasswordWidget(self, field.value) self.view_dict[field.name] = PasswordWidget(self, field.value)
# advanced settings (expert) # advanced settings (expert)
if self.expert: if self.expert:
@ -973,6 +1036,10 @@ class MainFrame(QtGui.QWidget):
self.changed_expert_list.append(field.name) self.changed_expert_list.append(field.name)
self.view_dict[field.name].textChanged.connect( \ self.view_dict[field.name].textChanged.connect( \
self.expert_remove(field.name)) self.expert_remove(field.name))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.view_dict[field.name].textChanged.connect( \
self.window().user_changed)
if field.uncompatible: if field.uncompatible:
self.label_dict[field.name].setToolTip(field.uncompatible) self.label_dict[field.name].setToolTip(field.uncompatible)
@ -1259,6 +1326,10 @@ class MainFrame(QtGui.QWidget):
self.table_widget.itemClicked.connect(self.row_changed( \ self.table_widget.itemClicked.connect(self.row_changed( \
self.view_dict[field.name], self.table_dict[field.name])) self.view_dict[field.name], self.table_dict[field.name]))
if type(self.window()) == self.tabWidget:
if not self.window().user_changed_flag:
self.table_widget.itemClicked.connect \
(self.window().user_changed)
if self.expert: if self.expert:
if field.default: if field.default:
@ -2234,9 +2305,9 @@ class MainFrame(QtGui.QWidget):
if from_left_frame and left_frame.step != step_num: if from_left_frame and left_frame.step != step_num:
left_frame.check_step(str(self.method_name), \ left_frame.check_step(str(self.method_name), \
left_frame.step) left_frame.step)
# self.left_check_step.connect(left_frame.check_step\ # self.left_check_step.connect(left_frame.check_step\
# (str(self.method_name), left_frame.step)) # (str(self.method_name), left_frame.step))
# self.left_check_step.emit() # self.left_check_step.emit()
return return
if not self.error_fined: if not self.error_fined:

24
consolegui/application/more.py
Unescape View File

@ -574,7 +574,6 @@ class ComboFileWgt(QtGui.QWidget):
self.ComboBox.addItem(item) self.ComboBox.addItem(item)
if value == item: if value == item:
self.ComboBox.setCurrentIndex(self.ComboBox.count()-1) self.ComboBox.setCurrentIndex(self.ComboBox.count()-1)
else: else:
for item in range (len(self.comments)): for item in range (len(self.comments)):
try: try:
@ -1561,7 +1560,7 @@ class ExpertWidget (QtGui.QPushButton):
pm = pm.transformed(QtGui.QTransform().rotate(90)) pm = pm.transformed(QtGui.QTransform().rotate(90))
self.image_lbl.setPixmap(pm) self.image_lbl.setPixmap(pm)
self.image_lbl.setAlignment(QtCore.Qt.AlignCenter) self.image_lbl.setAlignment(QtCore.Qt.AlignCenter)
# add transparency # add transparency
self.image_lbl.setAttribute(QtCore.Qt.WA_NoSystemBackground) self.image_lbl.setAttribute(QtCore.Qt.WA_NoSystemBackground)
@ -1784,7 +1783,7 @@ class PlusRow (QtGui.QWidget):
self.ComboBox.setItemData(ch, values[ch]) self.ComboBox.setItemData(ch, values[ch])
if text and text == values[ch]: if text and text == values[ch]:
self.ComboBox.setCurrentIndex(self.ComboBox.count()-1) self.ComboBox.setCurrentIndex(self.ComboBox.count()-1)
if not text in values and text != None: if not text in values and text != None:
self.ComboBox.addItem(text) self.ComboBox.addItem(text)
self.ComboBox.setItemData(self.ComboBox.count(), text) self.ComboBox.setItemData(self.ComboBox.count(), text)
@ -1807,7 +1806,7 @@ class PlusRow (QtGui.QWidget):
text = self.table.item(num_row, col).text() text = self.table.item(num_row, col).text()
default = text.split(',') default = text.split(',')
def_res = [] def_res = []
if comments and hasattr (comments, 'string'): if comments and hasattr (comments, 'string'):
comm = comments.string comm = comments.string
else: comm = [] else: comm = []
@ -2027,9 +2026,8 @@ class PasswordWgt(QtGui.QWidget):
super(PasswordWgt, self).__init__() super(PasswordWgt, self).__init__()
self._parent = parent self._parent = parent
self.text = text self.text = text
self.layout = QtGui.QGridLayout(self) self.layout = QtGui.QGridLayout(self)
self.pass_edit = QtGui.QLineEdit(self) self.pass_edit = QtGui.QLineEdit(self)
self.pass_edit.setEchoMode(self.pass_edit.Password) self.pass_edit.setEchoMode(self.pass_edit.Password)
@ -2038,28 +2036,24 @@ class PasswordWgt(QtGui.QWidget):
self.pass_edit2 = QtGui.QLineEdit(self) self.pass_edit2 = QtGui.QLineEdit(self)
self.pass_edit2.setEchoMode(self.pass_edit2.Password) self.pass_edit2.setEchoMode(self.pass_edit2.Password)
self.layout.addWidget(LabelWordWrap(_('Repeat'), self), 1, 0) self.layout.addWidget(LabelWordWrap(_('Repeat'), self), 1, 0)
self.layout.addWidget(self.pass_edit2, 1, 1) self.layout.addWidget(self.pass_edit2, 1, 1)
self.pass_edit.textChanged.connect(self.check_passwd) self.pass_edit.textChanged.connect(self.check_passwd)
self.pass_edit2.textChanged.connect(self.check_passwd) self.pass_edit2.textChanged.connect(self.check_passwd)
self.ok_button = QtGui.QPushButton(_('Ok'), self) self.ok_button = QtGui.QPushButton(_('Ok'), self)
self.ok_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return)) self.ok_button.setShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return))
self.ok_button.clicked.connect(self.send_password) self.ok_button.clicked.connect(self.send_password)
self.layout.addWidget(self.ok_button,2,0) self.layout.addWidget(self.ok_button,2,0)
self.cancel_button = QtGui.QPushButton(_('Cancel'), self) self.cancel_button = QtGui.QPushButton(_('Cancel'), self)
self.cancel_button.setShortcut(QtGui.QKeySequence \ self.cancel_button.setShortcut(QtGui.QKeySequence \
(QtCore.Qt.Key_Escape)) (QtCore.Qt.Key_Escape))
self.cancel_button.clicked.connect(self.close) self.cancel_button.clicked.connect(self.close)
self.layout.addWidget(self.cancel_button,2,1) self.layout.addWidget(self.cancel_button,2,1)
self.move(QtGui.QCursor.pos()) self.move(QtGui.QCursor.pos())
def send_password(self): def send_password(self):
password = self.pass_edit.text() password = self.pass_edit.text()
if password == self.pass_edit2.text(): if password == self.pass_edit2.text():
@ -2298,7 +2292,7 @@ def show_question(parent, text, informative_text = None, cursor_pos = False,
else: else:
msgBox.move(parent.frameGeometry().x()+parent.size().width()/2 - 150,\ msgBox.move(parent.frameGeometry().x()+parent.size().width()/2 - 150,\
parent.frameGeometry().y() + parent.size().height()/2 - 100) parent.frameGeometry().y() + parent.size().height()/2 - 100)
reply = msgBox.exec_() reply = msgBox.exec_()
return reply return reply
@ -2328,13 +2322,13 @@ def client_post_auth(client):
show_msg (e.value) show_msg (e.value)
return 1 return 1
return 0 return 0
class ClientSignal(QtCore.QThread): class ClientSignal(QtCore.QThread):
sid_sig = QtCore.Signal(int, int) sid_sig = QtCore.Signal(int, int)
def __init__(self, ClientObj): def __init__(self, ClientObj):
QtCore.QThread.__init__(self) QtCore.QThread.__init__(self)
self.ClientObj = ClientObj self.ClientObj = ClientObj
def run(self): def run(self):
self.exit_flag = False self.exit_flag = False
try: try:

28
consolegui/application/session_function.py
Unescape View File

@ -51,13 +51,8 @@ def client_post_cert (client, lang):
sid = get_sid(client) sid = get_sid(client)
results = client.service.post_cert() results = client.service.post_cert()
if results[0][0] == -4: if results[0][0] == -4:
show_msg (_('Certificate added to database server. ') + \ show_msg (_("Certificate not found in Server Database!"), _('Error'))
_('Must restart the program.'),\ raise Exception()
_("Certificate not found in Server Database!"))
ip, mac = get_ip_mac()
cert_id = client.service.cert_add(mac, 'gui')
_print (_("Your certificate ID = %s") %cert_id)
sys.exit(1)
sid, new_session = client_sid(sid, client, results[0][0], lang) sid, new_session = client_sid(sid, client, results[0][0], lang)
if new_session: if new_session:
_print (_(" New Session")) _print (_(" New Session"))
@ -94,26 +89,7 @@ class ViewSessionInfo (QtGui.QWidget):
if results[0][0] == -4: if results[0][0] == -4:
self.layout.addWidget(LabelWordWrap(_('Certificate not found in' self.layout.addWidget(LabelWordWrap(_('Certificate not found in'
' Server Database!'), self), 0,0,1,2) ' Server Database!'), self), 0,0,1,2)
self.layout.addWidget(LabelWordWrap(_('Add certificate to server'
' Database...'), self), 1,0,1,2)
self.layout.addWidget(LabelWordWrap(_('Your IP adress - ')+ip,
self), 2,0,1,2)
self.layout.addWidget(LabelWordWrap(_('Your MAC adress - ')+mac,
self), 3,0,1,2)
try:
cert_id = client.service.cert_add(mac, 'gui')
except urllib2.URLError:
self.layout.addWidget(LabelWordWrap(_('Error adding '
'certificate to server!')), 4,0,1,2)
self.setLayout(self.layout)
return 1
self.layout.addWidget(LabelWordWrap(_('Your certificate ID = ') \
+ cert_id, self), 4,0,1,2)
self.setLayout(self.layout) self.setLayout(self.layout)
return 1 return 1
sid = get_sid(client) sid = get_sid(client)

5
consolegui/application/tools.py
Unescape View File

@ -521,7 +521,10 @@ class ToolOther(QtGui.QWidget):
ClientObj.lang = self.lang_ComboBox.itemData \ ClientObj.lang = self.lang_ComboBox.itemData \
(self.lang_ComboBox.currentIndex()) (self.lang_ComboBox.currentIndex())
if ClientObj.client: if ClientObj.client:
client_post_cert(ClientObj.client, ClientObj.lang) try:
client_post_cert(ClientObj.client, ClientObj.lang)
except:
return
ClientObj.methods_list = client_list_methods \ ClientObj.methods_list = client_list_methods \
(ClientObj.sid, ClientObj.client) (ClientObj.sid, ClientObj.client)
from DisplayMethod import DisplayMethod from DisplayMethod import DisplayMethod

2
data/cl-console-gui.desktop
Unescape View File

@ -6,4 +6,4 @@ Exec=cl-console-gui
Icon=calculate3 Icon=calculate3
Terminal=false Terminal=false
Type=Application Type=Application
Categories=Settings; Categories=Settings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;

231
ru/console_gui.po
Unescape View File

@ -2,8 +2,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: console_gui_translate\n" "Project-Id-Version: console_gui_translate\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-13 10:26+0300\n" "POT-Creation-Date: 2012-06-15 16:04+0300\n"
"PO-Revision-Date: 2012-06-13 10:27+0300\n" "PO-Revision-Date: 2012-06-15 16:04+0300\n"
"Last-Translator: Denis <ds@mail.ru>\n" "Last-Translator: Denis <ds@mail.ru>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: \n" "Language: \n"
@ -51,25 +51,26 @@ msgid "at closing session, data %d processes will be deleted!"
msgstr "При закрытии сессии данные %d процессов будут удалены!" msgstr "При закрытии сессии данные %d процессов будут удалены!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:416 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:416
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:124 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:131
#: /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:700
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1929 #: /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:2261 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2284
msgid "Yes" msgid "Yes"
msgstr "Да" msgstr "Да"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:417 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:417
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:125 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:132
#: /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:702
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1931 #: /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:2262 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2285
msgid "No" msgid "No"
msgstr "Нет" msgstr "Нет"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:422 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/Box.py:422
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/create_cert.py:114 #: /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:1047 #: /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:2025 #: /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:50
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:132
msgid "Cancel" msgid "Cancel"
@ -203,8 +204,8 @@ msgid "Country (2 words)"
msgstr "Страна (2 символа)" 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/create_cert.py:101
#: /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:1830
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2007 #: /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:36
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:85
msgid "Password" msgid "Password"
@ -279,32 +280,32 @@ msgstr "Сессия не соответствует Вашему сертифи
msgid "It was not possible to kill process!" msgid "It was not possible to kill process!"
msgstr "Не удалось завершить процесс!" msgstr "Не удалось завершить процесс!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:119 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:126
#: /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:53
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/helpwidget.py:138 #: /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:225 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:224
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:149 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:125
msgid "Close" msgid "Close"
msgstr "Закрыть" msgstr "Закрыть"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:140 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:147
msgid "language for translate" msgid "language for translate"
msgstr "язык для перевода" msgstr "язык для перевода"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:143 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:150
msgid "call method" msgid "call method"
msgstr "вызов метода" msgstr "вызов метода"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:146 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:153
msgid "port number" msgid "port number"
msgstr "номер порта" msgstr "номер порта"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:149 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:156
msgid "host destination" msgid "host destination"
msgstr "хост назначения" msgstr "хост назначения"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:273 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:283
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:342 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ConnectionTabs.py:356
msgid "New connection" msgid "New connection"
msgstr "Новое соединение" msgstr "Новое соединение"
@ -401,7 +402,7 @@ msgid "Previous"
msgstr "Назад" msgstr "Назад"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:163 #: /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:2019 #: /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 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:43
msgid "Ok" msgid "Ok"
msgstr "Ok" msgstr "Ok"
@ -410,63 +411,54 @@ msgstr "Ok"
msgid "Next" msgid "Next"
msgstr "Далее" msgstr "Далее"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:238 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ControlButton.py:241
msgid "Error close process" msgid "Error close process"
msgstr "Ошибка закрытия процесса" msgstr "Ошибка закрытия процесса"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
msgid "Certificate added to database server. " #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:90
msgstr "Сертификат добавлен в базу сервера. "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:55
msgid "Must restart the program."
msgstr "Необходимо перезапустить программу."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:56
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:95
msgid "Certificate not found in Server Database!" msgid "Certificate not found in Server Database!"
msgstr "Сертификат не найден в БД сервера!" msgstr "Сертификат не найден в БД сервера!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:59 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:54
#, python-format msgid "Error"
msgid "Your certificate ID = %s" msgstr "Ошибка"
msgstr "Номер Вашего сертификата = %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:63 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:58
msgid " New Session" msgid " New Session"
msgstr "Новая сессия" msgstr "Новая сессия"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:59
msgid " Old Session" msgid " Old Session"
msgstr "Старая сессия" msgstr "Старая сессия"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:65 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:60
#, python-format #, python-format
msgid " Your session id = %s" msgid " Your session id = %s"
msgstr "Номер Вашей сессии = %s" msgstr "Номер Вашей сессии = %s"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:67 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:62
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:124 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:100
msgid "Certificate not send!" msgid "Certificate not send!"
msgstr "Сертификат не отправлен!" msgstr "Сертификат не отправлен!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:69 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:64
#, python-format #, python-format
msgid " Your certifitate id = %d" msgid " Your certifitate id = %d"
msgstr "Номер Вашего сертификата = %d" msgstr "Номер Вашего сертификата = %d"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:72 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:67
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:131 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:107
msgid "expiry date certificate has passed" msgid "expiry date certificate has passed"
msgstr "Время жизни сертификата истекло" msgstr "Время жизни сертификата истекло"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:74 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:69
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:134 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:110
#, python-format #, python-format
msgid "shelf life expires after %d days" msgid "shelf life expires after %d days"
msgstr "Время жизни сертификата истекает через %d дней" msgstr "Время жизни сертификата истекает через %d дней"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:88 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:83
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:149 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:149
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:182 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:182
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:234 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/CertificateClass.py:234
@ -477,49 +469,35 @@ msgstr "Время жизни сертификата истекает через
msgid "Not connected!" msgid "Not connected!"
msgstr "Соединение отсутствует!" msgstr "Соединение отсутствует!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:98 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:96
msgid "Add certificate to server Database..." msgid "Your session id = "
msgstr "Добавление сертификата в БД сервера..." msgstr "Номер Вашей сессии = "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:103
msgid "Your certifitate id = "
msgstr "Номер Вашего сертификата = "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:101 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:114
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:138
msgid "Your IP adress - " msgid "Your IP adress - "
msgstr "Ваш IP адрес - " msgstr "Ваш IP адрес - "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:103 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:116
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:140
msgid "Your MAC adress - " msgid "Your MAC adress - "
msgstr "Ваш MAC адрес - " msgstr "Ваш MAC адрес - "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:109 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:121
msgid "Error adding certificate to server!"
msgstr "Ошибка добавления сертификата на сервер!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:113
msgid "Your certificate ID = "
msgstr "Номер Вашего сертификата = "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:120
msgid "Your session id = "
msgstr "Номер Вашей сессии = "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:127
msgid "Your certifitate id = "
msgstr "Номер Вашего сертификата = "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:145
msgid "Clear session cache" msgid "Clear session cache"
msgstr "Очистить кэш сессии" msgstr "Очистить кэш сессии"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:160 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:136
msgid "Session information" msgid "Session information"
msgstr "Информация о сессии" msgstr "Информация о сессии"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:175 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:151
msgid "Error clearing session cache" msgid "Error clearing session cache"
msgstr "Ошибка удаления кэша сессии" msgstr "Ошибка удаления кэша сессии"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:177 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/session_function.py:153
msgid "Session cache is cleared" msgid "Session cache is cleared"
msgstr "Кэш сессии удалён" msgstr "Кэш сессии удалён"
@ -532,75 +510,75 @@ msgid "Information"
msgstr "Справка" 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:488
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:600 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:599
msgid "Open" msgid "Open"
msgstr "Открыть" msgstr "Открыть"
#: /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:698
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1933 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1961
msgid "Auto" msgid "Auto"
msgstr "Авто" msgstr "Авто"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:998 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1026
msgid "Clear Table" msgid "Clear Table"
msgstr "Очистить таблицу" msgstr "Очистить таблицу"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1099 #: /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:1238 #: /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:1304 #: /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:1417 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1445
msgid "Add row" msgid "Add row"
msgstr "Добавить строку" msgstr "Добавить строку"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1110 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1138
msgid "Recover Table" msgid "Recover Table"
msgstr "Восстановить таблицу" msgstr "Восстановить таблицу"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1154 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1182
msgid "Check all" msgid "Check all"
msgstr "Отметить все" msgstr "Отметить все"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1317 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1345
msgid "Reset changes" msgid "Reset changes"
msgstr "Сбросить изменения" msgstr "Сбросить изменения"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:1805 #: /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:2013 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2040
msgid "Repeat" msgid "Repeat"
msgstr "Повтор" msgstr "Повтор"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2131 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2154
msgid "Break process" msgid "Break process"
msgstr "Прервать процесс" msgstr "Прервать процесс"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2295 #: /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:359 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/conf_connection.py:359
msgid "You do not have a certificate. Please, generate new request and get new certificate from server." msgid "You do not have a certificate. Please, generate new request and get new certificate from server."
msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." msgstr "У Вас нет сертификата. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2363 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2386
msgid "No methods available!" msgid "No methods available!"
msgstr "Нет доступных методов!" msgstr "Нет доступных методов!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2390 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2413
msgid "No access to file!" msgid "No access to file!"
msgstr "Нет доступа к файлу!" msgstr "Нет доступа к файлу!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2393 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2416
msgid "Failed to obtain certificate data!" msgid "Failed to obtain certificate data!"
msgstr "Не удалось получить данные сертификата!" msgstr "Не удалось получить данные сертификата!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2396 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2419
#, python-format #, python-format
msgid "Permission denied %s" msgid "Permission denied %s"
msgstr "Доступ запрещён %s" msgstr "Доступ запрещён %s"
#: /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:2422
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2403 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2426
msgid "Sid Deleted!" msgid "Sid Deleted!"
msgstr "Сессия удалена!" msgstr "Сессия удалена!"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2406 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/more.py:2429
msgid "Server delete sid error" msgid "Server delete sid error"
msgstr "Ошибка удаления сессии на сервере" msgstr "Ошибка удаления сессии на сервере"
@ -774,46 +752,42 @@ msgstr "Пароль неверен"
msgid "You do not have a certificate or your certificate does not match the server certificate. Please, generate new request andget new certificate from server." msgid "You do not have a certificate or your certificate does not match the server certificate. Please, generate new request andget new certificate from server."
msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера." msgstr "У вас нет сертификата или ваш сертификат не соответствует серверному сертификату. Пожалуйста, сгенерируйте запрос на сертитфикат и получите сертификат с сервера."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/ShortFrameResult.py:225
msgid "Error clear process cache on 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:367
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:495 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:512
msgid "Error get frame from Server..." msgid "Error get frame from Server..."
msgstr "Ошибка получения фрейма с сервера." 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: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:442
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:496 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:513
msgid "Error get frame from Server." msgid "Error get frame from Server."
msgstr "Ошибка получения фрейма с сервера." 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:369
#: /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:443
#: /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:485
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:497 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:514
msgid "Please, resfesh this Page later." msgid "Please, resfesh this Page later."
msgstr "Пожалуйста, обновите эту страницу позже." 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:441
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:570 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:587
msgid "Error get entire frame from Server..." msgid "Error get entire frame from Server..."
msgstr "Ошибка получения полного фрейма с сервера." 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:483
#: /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:484
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:619 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:637
msgid "Error get progress from Server." msgid "Error get progress from Server."
msgstr "Ошибка получения значения прогресса с сервера." 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:596
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:766 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:784
msgid "Send" msgid "Send"
msgstr "Отправить" 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:629
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:799 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/MainFrameResult.py:817
msgid "Error send password to Server" msgid "Error send password to Server"
msgstr "Ошибка отправки сообщения (пароля) на сервер" msgstr "Ошибка отправки сообщения (пароля) на сервер"
@ -959,7 +933,7 @@ msgstr "Настройки программы"
msgid "Update is already running" msgid "Update is already running"
msgstr "Обновление уже запущено" msgstr "Обновление уже запущено"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:319 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/DisplayMethod.py:344
msgid "Reconnect" msgid "Reconnect"
msgstr "Переподключиться" msgstr "Переподключиться"
@ -1094,35 +1068,56 @@ msgstr "Сертификат Центра Авторизации удалён и
msgid "CA certificate delete from system trusted certificate" msgid "CA certificate delete from system trusted certificate"
msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов" msgstr "Сертификат Центра Авторизации удалён из системного списка доверенных сертификатов"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:999 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1061
msgid "Advanced settings." msgid "Advanced settings."
msgstr "Дополнительные настройки." msgstr "Дополнительные настройки."
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1082 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1149
msgid "Clean expert parameters?" msgid "Clean expert parameters?"
msgstr "Очистить экспертные параметры?" msgstr "Очистить экспертные параметры?"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1301 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1375
msgid "Delete selected rows" msgid "Delete selected rows"
msgstr "Удалить выделенные строки" msgstr "Удалить выделенные строки"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1545 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1619
msgid "Delete row" msgid "Delete row"
msgstr "Удалить строку" msgstr "Удалить строку"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1682 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:1751
msgid "View options" msgid "View options"
msgstr "Просмотреть параметры" msgstr "Просмотреть параметры"
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2160 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2228
msgid " Step " msgid " Step "
msgstr " Шаг " msgstr " Шаг "
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2163 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2231
#: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2167 #: /var/calculate/mydir/source/spyder/cl-api-client/consolegui/application/mainframe.py:2235
msgid "Run" msgid "Run"
msgstr "Выполнение" msgstr "Выполнение"
#~ msgid "Certificate added to database server. "
#~ msgstr "Сертификат добавлен в базу сервера. "
#~ msgid "Must restart the program."
#~ msgstr "Необходимо перезапустить программу."
#~ msgid "Your certificate ID = %s"
#~ msgstr "Номер Вашего сертификата = %s"
#~ msgid "Add certificate to server Database..."
#~ msgstr "Добавление сертификата в БД сервера..."
#~ msgid "Error adding certificate to server!"
#~ msgstr "Ошибка добавления сертификата на сервер!"
#~ msgid "Your certificate ID = "
#~ msgstr "Номер Вашего сертификата = "
#~ msgid "Error clear process cache on server"
#~ msgstr "Ошибка удаления кэша процесса на сервере"
#~ msgid "Clear your cache session" #~ msgid "Clear your cache session"
#~ msgstr "Очистить кэш сессии" #~ msgstr "Очистить кэш сессии"

Write Preview
Loading…
Cancel
Save