From e033a9da72dffab7efe7722c58875215b7eca5c6 Mon Sep 17 00:00:00 2001 From: idziubenko Date: Mon, 5 Jul 2021 09:33:42 +0300 Subject: [PATCH] cleared out libcrutch --- pym/consolegui/application/Box.py | 2 +- pym/consolegui/application/ConnectionTabs.py | 2 +- pym/consolegui/application/ControlButton.py | 10 +++++++++- pym/consolegui/application/DisplayMethod.py | 10 ++++++++++ pym/consolegui/application/LeftMenu.py | 1 + pym/consolegui/application/MainFrameResult.py | 3 ++- pym/consolegui/application/SelectTable.py | 8 ++++++++ pym/consolegui/application/TrayIcon.py | 3 --- pym/consolegui/application/dbus_service.py | 1 + pym/consolegui/application/mainframe.py | 10 +++++++--- pym/consolegui/application/more.py | 13 +++++++++++++ 11 files changed, 53 insertions(+), 10 deletions(-) diff --git a/pym/consolegui/application/Box.py b/pym/consolegui/application/Box.py index fe15c22..cf269d2 100644 --- a/pym/consolegui/application/Box.py +++ b/pym/consolegui/application/Box.py @@ -36,7 +36,7 @@ from .CertificateClass import CertClass from .pid_information import client_list_pid from .more import icon_visible, client_del_sid, show_msg, get_icon -DEBUG_LEVEL = 0 +DEBUG_LEVEL = 99999 def debug(level, *args): diff --git a/pym/consolegui/application/ConnectionTabs.py b/pym/consolegui/application/ConnectionTabs.py index 37a03c6..d1254ae 100644 --- a/pym/consolegui/application/ConnectionTabs.py +++ b/pym/consolegui/application/ConnectionTabs.py @@ -285,7 +285,7 @@ class ToolTabWidget(qt.QTabWidget): if args: if args.lang: self.lang = args.lang - + self.current_icon = None self.setContentsMargins(0,0,0,0) self.init_variables() diff --git a/pym/consolegui/application/ControlButton.py b/pym/consolegui/application/ControlButton.py index bb2c34f..53cd451 100644 --- a/pym/consolegui/application/ControlButton.py +++ b/pym/consolegui/application/ControlButton.py @@ -19,7 +19,7 @@ from __future__ import absolute_import from calculate.consolegui import qt from .more import LabelWordWrap, _print, get_system_rgb, ParameterWindow, dpivalue -DEBUG_LEVEL = 0 +DEBUG_LEVEL = 99999 def debug(level, *args): @@ -38,6 +38,8 @@ class MethodNameWgt(qt.QWidget): # Set style self.setAttribute(qt.Qt.WA_StyledBackground) self.setObjectName('ControlButton') + # self.setStyleSheet("QWidget#ControlButton " + # "{background-color: rgb(255,0,0);}") self.setStyleSheet("QWidget#ControlButton " "{background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," "stop: 0 #111111, stop: 0.95 #777777, stop: 1 #666666);}") @@ -147,6 +149,7 @@ class ControlButtonWgt(qt.QWidget): def set_confirm_question(self, message): self.question_label.setText(message) + debug(11, "set_confirm_question") self.question_label.show() def set_confirmation(self, wgt): @@ -205,6 +208,11 @@ class ControlButtonWgt(qt.QWidget): # button.setText(field.label.decode('utf-8')) button.setText(field.label) button.clicked.connect(self.button_disabled) + #DEBUG + # def f(*args, **kwargs): + # print(f"Click on {field.label}") + # return callback(*args, **kwargs) + button.clicked.connect(callback) button.setMinimumWidth(62) button.setFixedHeight(dpivalue(32)) diff --git a/pym/consolegui/application/DisplayMethod.py b/pym/consolegui/application/DisplayMethod.py index 0578ec1..5438709 100644 --- a/pym/consolegui/application/DisplayMethod.py +++ b/pym/consolegui/application/DisplayMethod.py @@ -21,6 +21,14 @@ from .more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \ get_view_params, show_msg, client_list_methods, get_system_rgb, \ get_icon, dpivalue +DEBUG_LEVEL = 99999 + +def debug(level, *args): + if level <= DEBUG_LEVEL: + for s in args: + print(s, end=' ') + print() + class DisplayMethod(qt.QWidget): def __init__(self, parent, ClientObj): super().__init__(parent) @@ -52,6 +60,7 @@ class DisplayMethod(qt.QWidget): if type(results) == int: # self.layout.addWidget(LabelWordWrap(_('No Methods!'),self)) self.setLayout(self.layout) + debug(11, "DEBUG DisplayMethod") self.show() return 1 for num in range (0, len(results)): @@ -322,6 +331,7 @@ class DisplayMethod(qt.QWidget): self.ClientObj.MainWidget.main_frame.setWidgetResizable(True) self.ClientObj.MainWidget.left_frame.update() + debug(11, "DEBUG groupActivated") self.ClientObj.MainWidget.left_frame.show() try: diff --git a/pym/consolegui/application/LeftMenu.py b/pym/consolegui/application/LeftMenu.py index fae7c00..a5386f4 100644 --- a/pym/consolegui/application/LeftMenu.py +++ b/pym/consolegui/application/LeftMenu.py @@ -344,6 +344,7 @@ class LeftMenu(qt.QScrollArea): # self.verticalScrollBar().sizeHint().width()) if not self.isVisible(): + print("DEBUG create steps") self.show() # create helper signals diff --git a/pym/consolegui/application/MainFrameResult.py b/pym/consolegui/application/MainFrameResult.py index e850c92..20785ab 100644 --- a/pym/consolegui/application/MainFrameResult.py +++ b/pym/consolegui/application/MainFrameResult.py @@ -18,7 +18,7 @@ from __future__ import print_function from __future__ import absolute_import from calculate.consolegui import qt -DEBUG_LEVEL = 0 +DEBUG_LEVEL = 99999 def debug(level, *args): if level <= DEBUG_LEVEL: @@ -986,6 +986,7 @@ class MainFrameRes(qt.QWidget): def send_Message(self, sid, pid, item): """ send answer to the question """ self.message = MessageDialog(self, item, sid, pid) + debug(11, f"send message{item}") self.message.show() def send_Password(self, sid, pid, item): diff --git a/pym/consolegui/application/SelectTable.py b/pym/consolegui/application/SelectTable.py index 5e9dd89..99e79e9 100644 --- a/pym/consolegui/application/SelectTable.py +++ b/pym/consolegui/application/SelectTable.py @@ -38,6 +38,7 @@ class Delegate(qt.QStyledItemDelegate): class SelectedTableWidget(qt.QTableWidget): def __init__(self, rows, columns, parent, readonly = False, brief = False): super().__init__(rows, columns, parent) + # print("CREATED selected table widget") self.currHovered = -1 self.brief = brief self.bFixedHeight = True @@ -68,6 +69,11 @@ class SelectedTableWidget(qt.QTableWidget): 'QHeaderView::section {background-color: %s;' % item_background + 'border: 1px solid #B3ABA7; border-radius: 1px;}') + # self.horizontalHeader().setStyleSheet( + # "QHeaderView {background-color: rgb(255,0,0);" + # "border: none; }" + # 'QHeaderView::section {background-color: rbg(0,0,255);' + # 'border: 1px solid #B3ABA7; border-radius: 1px;}') self.unsetErrorBorder() def setColor(self, row = -1): @@ -84,6 +90,8 @@ class SelectedTableWidget(qt.QTableWidget): item.setBackground(brush) def mousePressEvent(self, event): + print("MOUSE PRESS EVENT") + print(event) if self.readonly: event.ignore() return diff --git a/pym/consolegui/application/TrayIcon.py b/pym/consolegui/application/TrayIcon.py index 7083a11..ea1d0e3 100644 --- a/pym/consolegui/application/TrayIcon.py +++ b/pym/consolegui/application/TrayIcon.py @@ -59,9 +59,6 @@ class TrayUpdateSystem(qt.QThread): try: param_object = create_obj(self._parent.localhost_ClientObj.client, "update") - print("DEBUG") - print(sid) - print(param_object) meth_result_temp = \ self._parent.localhost_ClientObj.client.service[0]['update'](sid, param_object) # self._parent.localhost_ClientObj.client.service.update(sid, param_object) diff --git a/pym/consolegui/application/dbus_service.py b/pym/consolegui/application/dbus_service.py index e26dec3..3b15c72 100644 --- a/pym/consolegui/application/dbus_service.py +++ b/pym/consolegui/application/dbus_service.py @@ -35,6 +35,7 @@ class DBusWidget(dbus.service.Object): @dbus.service.method(DBUS_NAME, in_signature='', out_signature='') def show(self): self._parent.hide() + debug(11, "DEBUG DBusWidget") self._parent.show() self._parent.showNormal() diff --git a/pym/consolegui/application/mainframe.py b/pym/consolegui/application/mainframe.py index 9d422eb..14ef9a7 100644 --- a/pym/consolegui/application/mainframe.py +++ b/pym/consolegui/application/mainframe.py @@ -1167,6 +1167,7 @@ class MainFrame(qt.QWidget): self.grid.addWidget(self.error_label_dict[field.name], x + 1, y, 1, 2) def add_element_selecttable(self, field, x, y): + debug(11 , "PRINT SELECTTABLE") if field.element == 'selecttable': add_ability = False else: @@ -1632,7 +1633,8 @@ class MainFrame(qt.QWidget): def add_element_table(self, field, x, y, brief=False, gb_layout=None): self.table_dict[field.name] = field table = field.tablevalue - + debug(11, "DEBUG add element table") + debug(11, table) lenColumn = 0 lenBody = 0 if table.body and hasattr(table.body, 'stringArray'): @@ -1670,6 +1672,8 @@ class MainFrame(qt.QWidget): self.table_widget.setSizePolicy(minimum, expanding) self.view_dict[field.name] = self.table_widget + print("DEBUG view dict") + print(self.view_dict) self.label_dict[field.name] = LabelWordWrap(field.label, self) self.label_dict[field.name].setContentsMargins(0, 0, 0, 0) self.table_dict[field.name] = field @@ -2510,8 +2514,7 @@ class MainFrame(qt.QWidget): val = self.view_dict[field.name].get_text() debug(15, "Password value", val.__repr__()) param_object[paramname] = self.fix_string_value(val) - elif type(self.view_dict[field.name]) == \ - SelectedTableWidget: + elif type(self.view_dict[field.name]) == SelectedTableWidget: self.collect_table(field, paramname, param_object) if self.expert: @@ -3031,6 +3034,7 @@ class MainFrame(qt.QWidget): self.ClientObj.app.processEvents() def check_run_threads(self): + if hasattr(self, 'button_call_thread'): if self.button_call_thread.isRunning(): return 1 diff --git a/pym/consolegui/application/more.py b/pym/consolegui/application/more.py index f498ce9..64feec7 100644 --- a/pym/consolegui/application/more.py +++ b/pym/consolegui/application/more.py @@ -22,6 +22,14 @@ import urllib.request as urllib2 import pwd import sys +DEBUG_LEVEL = 99999 + +def debug(level, *args): + if level <= DEBUG_LEVEL: + for s in args: + print(s, end=' ') + print() + from calculate.consolegui import qt # from calculate.core.client.function import create_obj # from .utils import create_obj @@ -405,6 +413,7 @@ class ErrorWgt(qt.QWidget): if event.button() == qt.Qt.RightButton: if hasattr(self, 'menu'): self.menu.move(qt.QCursor.pos()) + self.menu.show() event.accept() @@ -822,6 +831,7 @@ class MultipleChoiceDialog (qt.QWidget): def __init__(self, parent, Available_dict, Available_list, Selected_list, \ add_ability): super().__init__() + debug(11, "Creating multiple choice dialog") self._parent = parent self.layout = qt.QGridLayout(self) self.layout.setColumnStretch(0,5) @@ -1076,6 +1086,7 @@ class MultipleChoice (qt.QWidget): self.button.setText('+') self.button.setStyleSheet("border: none;") self.button.setFixedWidth(24) + # debug(11, "ADDED mouse press event") self.button.clicked.connect(self.mousePressEvent) layout.addWidget(self.button, qt.Qt.AlignRight) @@ -1103,6 +1114,7 @@ class MultipleChoice (qt.QWidget): self.Selected, self.ability) self.MCD.setWindowModality(qt.Qt.WindowModal) self.MCD.move(qt.QCursor.pos ()) + debug(11, "MultipleChoice mouse event") self.MCD.show() def change_value(self): @@ -1147,6 +1159,7 @@ class AddLineWidget (qt.QWidget): close_button.clicked.connect(self.close) self.setWindowTitle(text) self.move(qt.QCursor.pos()) + debug(11, "AddLineWidget init") self.show() class MultipleCheckBox(qt.QCheckBox):