master-3.5
parent cf39aa8fa1
commit 4f79375646

@ -132,6 +132,7 @@ class MainFrameRes(QtGui.QWidget):
self.updateGeometry()
def show_bottom(self):
debug(10, "SHOW BOTTOM PAGE")
max_val = self._parent.main_frame.verticalScrollBar().maximum()
current_val = \
self._parent.main_frame.verticalScrollBar().sliderPosition()
@ -196,6 +197,8 @@ class MainFrameRes(QtGui.QWidget):
for i in range(len(table.body[0][line][0])):
tablewidgetitem = QtGui.QTableWidgetItem(
table.body[0][line][0][i])
tablewidgetitem.setTextAlignment(
QtCore.Qt.AlignTop | QtCore.Qt.AlignLeft)
self.mytable.setItem(line, i, tablewidgetitem)
# set writeonly
self.mytable.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)

@ -1444,10 +1444,11 @@ class MainFrame(QtGui.QWidget):
def change_method(method_name):
def after_call(view):
view_method = self._parent.ClientObj.method_names[
method_name]
self._parent.ClientObj._parent.setWindowTitle(
view_method + ' - ' + self.ClientObj.Name)
debug(10, "CHANGE METHOD", self._parent.ClientObj.method_names)
#view_method = self._parent.ClientObj.method_names[
# method_name]
#self._parent.ClientObj._parent.setWindowTitle(
# view_method + ' - ' + self.ClientObj.Name)
self.ClientObj.MainWidget.main_frame_view(view,
method_name)

@ -45,7 +45,7 @@ class TopMenu(QtGui.QPushButton):
self.layout = QtGui.QVBoxLayout(self)
self.image_lbl = QtGui.QLabel(self)
themeName = QtGui.QIcon.themeName()
icon = QtGui.QIcon()
for image in images:
@ -70,21 +70,21 @@ class TopMenu(QtGui.QPushButton):
self.image_lbl.setPixmap(pm2)
# self.image_lbl.adjustSize()
self.image_lbl.setAlignment(QtCore.Qt.AlignCenter)
# add transparency
self.image_lbl.setAttribute(QtCore.Qt.WA_NoSystemBackground)
self.layout.addWidget(self.image_lbl)
self.setFlat(True)
self.lbl = QtGui.QLabel(label, self)
self.lbl.setAlignment(QtCore.Qt.AlignCenter)
# add transparency
self.lbl.setAttribute(QtCore.Qt.WA_NoSystemBackground)
self.layout.addWidget(self.lbl)
self.layout.setContentsMargins(2,4,2,2)
self.layout.setSpacing(0)
@ -271,9 +271,9 @@ class ErrorLabel (QtGui.QWidget):
QtGui.QWidget.__init__(self, parent)
self._parent = parent
layout = QtGui.QHBoxLayout(self)
self.image_lbl = QtGui.QLabel(self)
icon = QtGui.QIcon.fromTheme('dialog-warning')
pm1 = icon.pixmap(16)
@ -282,13 +282,13 @@ class ErrorLabel (QtGui.QWidget):
self.image_lbl.setPixmap(pm2)
self.image_lbl.setAlignment(QtCore.Qt.AlignCenter)
# add transparency
self.image_lbl.setAttribute(QtCore.Qt.WA_NoSystemBackground)
self.image_lbl.setAlignment(QtCore.Qt.AlignVCenter)
layout.addWidget(self.image_lbl)
self.text_lbl = QtGui.QLabel()
self.text_lbl.setWordWrap(True)
self.text_lbl.setAlignment(QtCore.Qt.AlignVCenter)
@ -302,25 +302,25 @@ class ErrorLabel (QtGui.QWidget):
layout.addWidget(self.text_lbl)
layout.setAlignment(QtCore.Qt.AlignLeft)
layout.setContentsMargins (0,0,0,0)
if text:
self.setText(text)
self.hide()
# for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
def mousePressEvent(self, event):
if event.button() == QtCore.Qt.MouseButton.RightButton:
if hasattr(self, 'menu'):
self.menu.move(QtGui.QCursor.pos())
self.menu.show()
event.accept()
def setText(self, txt):
txt.replace('\n',' ')
self.text_lbl.setText(txt)
if not hasattr(self, 'menu'):
themeName = QtGui.QIcon.themeName()
self.menu = QtGui.QMenu(self)
@ -335,11 +335,11 @@ class ErrorLabel (QtGui.QWidget):
bug_icon = bug_icon.fromTheme(image)
if not bug_icon.isNull():
break
bug = QtGui.QAction(bug_icon, _("Report a Bug"), self, \
triggered=self.bug_report)
self.menu.addAction(bug)
def bug_report(self):
self._parent.ClientObj.MainWidget.bug_report()
self._parent.ClientObj.MainWidget.bugWidget.set_message_text\
@ -436,7 +436,7 @@ class LabelWordWrap(QtGui.QLabel):
else:
self.setStyleSheet('margin-left:%dpx;margin-top:%d;'%(
leftMargin*5, margin_top))
minimum = QtGui.QSizePolicy.Policy.Minimum
exp = QtGui.QSizePolicy.Policy.Expanding
self.setSizePolicy(exp, minimum)
@ -461,14 +461,14 @@ class ClearLineEdit(QtGui.QLineEdit):
self.button.setStyleSheet("border: none;")
self.textChanged.connect(self.changed)
self.button.clicked.connect(self.clear)
# for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
layout=QtGui.QVBoxLayout(self)
layout.addWidget(self.button,0,QtCore.Qt.AlignRight)
layout.setSpacing(0)
def changed(self,text):
if len(text)==0: self.button.hide()
else: self.button.show()
@ -493,7 +493,7 @@ class FileOpenWgt(QtGui.QWidget):
self.hlayout = QtGui.QHBoxLayout(self)
self.lineEdit = QtGui.QLineEdit(self)
self.lineEdit = QtGui.QLineEdit(self)
self.lineEdit.textChanged.connect(self.textChanged)
self.button=QtGui.QToolButton(self)
@ -507,7 +507,7 @@ class FileOpenWgt(QtGui.QWidget):
self.button.clicked.connect(self.file_dialog)
# for clear memory after closed this window
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.hlayout.addWidget(self.lineEdit)
self.hlayout.addWidget(self.button)
@ -952,8 +952,8 @@ class MultipleChoiceDialog (QtGui.QWidget):
self.layout.addWidget(buttons_wgt, 4,3,1,2, QtCore.Qt.AlignRight)
#add Items in list
self.left_ListWidget.addItems(map(lambda x: Available_dict[x],
filter (lambda x: x not in Selected_list,
self.left_ListWidget.addItems(map(lambda x: Available_dict[x],
filter (lambda x: x not in Selected_list,
Available_list)))
self.right_ListWidget.addItems(map(lambda x: Available_dict[x],
filter (lambda x: x in Available_dict.keys(),
@ -1004,21 +1004,22 @@ class MultipleChoiceDialog (QtGui.QWidget):
def ok_pressed(self):
# save all lists and close this widget
self._parent.Selected = []
revertDict = {y:x for x,y in self.Available_dict.items()}
for i in range(self.right_ListWidget.count()):
text = self.right_ListWidget.takeItem(0).text()
if text in self.Available_dict:
self._parent.Selected.append(self.Available_dict[text])
if text in revertDict:
self._parent.Selected.append(revertDict[text])
else:
self._parent.Selected.append(text)
self._parent.avail = []
for i in range(self.left_ListWidget.count()):
text = self.left_ListWidget.takeItem(0).text()
if text in self.Available_dict:
self._parent.avail.append(self.Available_dict[text])
if text in revertDict:
self._parent.avail.append(revertDict[text])
else:
self._parent.avail.append(text)
# self._parent.Selected = ','.join(self._parent.select)
self._parent.change_value()
self.close()
@ -1027,13 +1028,13 @@ class MultipleChoiceDialog (QtGui.QWidget):
if key.key() in [QtCore.Qt.Key_Enter, QtCore.Qt.Key_Return]:
if hasattr (self, 'add_Button'):
self.add_new_item()
class MultipleButton(QtGui.QPushButton):
def __init__(self, text, parent):
QtGui.QPushButton.__init__(self, text, parent)
self.setStyleSheet("text-align: left; padding: 3px;")
self.setFocusPolicy(QtCore.Qt.NoFocus)
def mousePressEvent(self, button = None):
self.parent().mousePressEvent()
@ -1047,13 +1048,13 @@ class MultipleChoice (QtGui.QWidget):
add_ability is boolean'''
self.avail = Available_list
self.Selected = Selected if Selected else []
if hasattr (comments, 'string'):
if hasattr(comments, 'string'):
self.Comments = comments.string
else:
self.Comments = []
# self.select = Selected if Selected else []
self.ability = add_ability
self.value_dict = None
self.value_dict = {}
for i in range (len(self.avail)):
@ -1061,7 +1062,7 @@ class MultipleChoice (QtGui.QWidget):
self.value_dict[self.avail[i]] = self.Comments[i]
else:
self.value_dict[self.avail[i]] = self.avail[i]
layout = QtGui.QHBoxLayout(self)
layout.setSpacing(0)
layout.setContentsMargins(0, 0, 0, 0)
@ -1070,13 +1071,13 @@ class MultipleChoice (QtGui.QWidget):
filter (lambda x: x in self.value_dict.keys(),
self.Selected)))
self.lbl = MultipleButton(self.label_text, self)
self.lbl.setMaximumWidth(450)
maximum = QtGui.QSizePolicy.Policy.Maximum
exp = QtGui.QSizePolicy.Policy.Expanding
self.lbl.setSizePolicy(exp, maximum)
layout.addWidget(self.lbl)
self.button=QtGui.QToolButton(self)
# self.button.hide()
self.button.setFocusPolicy(QtCore.Qt.NoFocus)
@ -1088,7 +1089,7 @@ class MultipleChoice (QtGui.QWidget):
self.button.setFixedWidth(24)
self.button.clicked.connect(self.mousePressEvent)
layout.addWidget(self.button, QtCore.Qt.AlignRight)
if expert:
self.clear_button = QtGui.QPushButton(self)
self.clear_button.setFocusPolicy(QtCore.Qt.NoFocus)
@ -1101,9 +1102,9 @@ class MultipleChoice (QtGui.QWidget):
self.clear_button.setFixedWidth(24)
self.clear_button.clicked.connect(self.default_value)
layout.addWidget(self.clear_button, QtCore.Qt.AlignRight)
self.setAttribute(QtCore.Qt.WA_DeleteOnClose)
self.setLayout(layout)
def mousePressEvent(self, button = None):
@ -1113,23 +1114,24 @@ class MultipleChoice (QtGui.QWidget):
self.MCD.setAttribute(QtCore.Qt.WA_ShowModal)
self.MCD.move(QtGui.QCursor.pos ())
self.MCD.show()
def change_value(self):
# show values in label
# self.select = self.Selected.split(',') if self.Selected else []
self.label_text = ','.join(self.Selected)
self.label_text = ','.join(
self.value_dict.get(x, x) for x in self.Selected)
self.lbl.setText(self.label_text)
self.Changed.emit()
def text(self):
return self.lbl.text()
def values(self):
res_dict = {}
for key in self.value_dict:
res_dict[self.value_dict[key]] = key
res = map(lambda x: res_dict[x],
res = map(lambda x: res_dict[x],
filter (lambda x: x in res_dict, self.Selected))
res += filter (lambda x: not x in res_dict, self.Selected)
return res
@ -1146,11 +1148,11 @@ class AddLineWidget (QtGui.QWidget):
self.add_line.setFixedWidth(100)
add_button = QtGui.QPushButton(text, self)
close_button = QtGui.QPushButton(_("Cancel"), self)
layout.addWidget(self.add_line)
layout.addWidget(add_button)
layout.addWidget(close_button)
add_button.clicked.connect(parent.add_line)
close_button.clicked.connect(self.close)
self.setWindowTitle(text)
@ -1176,12 +1178,12 @@ class SelectTable(QtGui.QWidget):
self.expert = expert
self.set_auto = expert if default else False
self.default = default
if hasattr(comments, 'string'):
comments = comments.string
else:
comments = None
self.grid = QtGui.QGridLayout(self)
self.grid.setContentsMargins(0, 0, 0, 0)
self.grid.setSpacing(0)
@ -1197,25 +1199,25 @@ class SelectTable(QtGui.QWidget):
plus_but.setIcon(QtGui.QIcon.fromTheme('list-add'))
except:
plus_but.setText('+')
plus_but.setToolTip(_('Add a row'))
plus_but.setFixedWidth(30)
plus_but.clicked.connect(self.line_add)
unit_layout.addWidget(plus_but)
self.recover_but = QtGui.QPushButton(self)
try:
self.recover_but.setIcon(QtGui.QIcon.fromTheme('edit-clear'))
except:
self.recover_but.setText('R')
self.recover_but.setToolTip(_('Recover the table'))
self.recover_but.setFixedWidth(30)
self.recover_but.clicked.connect(self.recover_table)
unit_layout.addWidget(self.recover_but)
unit_layout.setAlignment(QtCore.Qt.AlignLeft)
self.grid.addLayout(unit_layout, 0,0)
@ -1265,18 +1267,18 @@ class SelectTable(QtGui.QWidget):
if self.items_dict[self.comments[row]] in self.Selected:
if not hard_auto:
self.table.cellWidget(row + 1 ,0).setChecked(True)
# if not add_ability:
self.table.setEditTriggers(QtGui.QAbstractItemView.NoEditTriggers)
self.table.setSelectionMode \
(QtGui.QAbstractItemView.SelectionMode.NoSelection)
self.table.horizontalHeader().setStretchLastSection(True)
self.table.horizontalScrollBar().hide()
self.table.setColumnWidth(0, 24)
self.table.verticalHeader().hide()
self.table.horizontalHeader().hide()
self.resize_table()
@ -1463,7 +1465,7 @@ class SelectList(QtGui.QGroupBox):
'padding-top: 8px; padding-bottom: 0px;'
'padding-left: 5px; padding-right: 5px;'
'border: 1px solid transparent;'
'border-top-color: gray;'
'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);'
@ -2175,7 +2177,7 @@ class PasswordWidget(QtGui.QLineEdit):
self.set_text(text)
self.setReadOnly(True)
def mousePressEvent(self, button = None):
self.passwgt = PasswordWgt(self, self.text)
self.passwgt.setAttribute(QtCore.Qt.WA_ShowModal)
@ -2381,7 +2383,7 @@ def show_msg(text, title = None, parent = None):
msgBox.setWindowIcon (QtGui.QIcon('calculate-install.png'))
msgBox.exec_()
def show_question(parent, text, informative_text = None, cursor_pos = False,
def show_question(parent, text, informative_text = None, cursor_pos = False,
not_move = False, title = None):
msgBox = QtGui.QMessageBox()
msgBox.setText(text)
@ -2394,7 +2396,7 @@ def show_question(parent, text, informative_text = None, cursor_pos = False,
msgBox.button(msgBox.Yes).setText(_('Yes'))
msgBox.button(msgBox.No).setText(_('No'))
if not_move:
if not_move:
reply = msgBox.exec_()
return reply
if cursor_pos:
@ -2410,7 +2412,7 @@ def show_question(parent, text, informative_text = None, cursor_pos = False,
# seen = set()
# seen_add = seen.add
# return [ x for x in seq if x not in seen and not seen_add(x)]
def uniq(seq):
seen = set()
return [ x for x in seq if x not in seen and not seen.add(x)]
@ -2478,7 +2480,7 @@ class ClientSignal(QtCore.QThread):
self.ClientObj.port, 0)
return 1
self.connect_count.emit(self.ClientObj.host_name,self.ClientObj.port,0)
def close(self):
self.exit_flag = True
@ -2505,7 +2507,7 @@ def post_connect_action(client, ClientObj):
icon_visible(ClientObj.MainWidget, 'Processes', True)
icon_visible(ClientObj.MainWidget, 'Session', True)
icon_visible(ClientObj.MainWidget, 'Connect', False)
icon_visible(ClientObj.MainWidget, 'Certificates', False)
icon_visible(ClientObj.MainWidget, 'Certificates', False)
ClientObj.methods_list = client_list_methods(ClientObj.sid, client)
if ClientObj.methods_list == 1:
@ -2547,7 +2549,7 @@ def client_del_sid(client):
return -2
if s[0][0] == "Permission denied":
_print (_("%s: Permission denied") % s[1][1])
return -3
return -3
if s[0][0] == '0':
pass
# _print (_("SID deleted!"))
@ -2612,7 +2614,7 @@ class ClientServiceThread(QtCore.QThread):
# установка kwargs с провркой на лишние
self.return_except, self.sleeptime, self.through_object = \
(lambda return_except=False,sleeptime=None,
through_object=None:
through_object=None:
(return_except,sleeptime,through_object))(**kwargs)
self.close_flag = False

Loading…
Cancel
Save