Исправление стилей

pym/consolegui/application/Box.py

@@ -97,6 +97,9 @@ class MainWgt(qt.QMainWindow):
 
         self.setCentralWidget(self.Main)
 
+    def updateColors(self):
+        self.MainFrameWgt.updateColors()
+
     def onChanged(self, text):
         self.lbl.setText(text)
         self.lbl.adjustSize()

pym/consolegui/application/ConnectionTabs.py

@@ -348,25 +348,35 @@ class ToolTabWidget(qt.QTabWidget):
 
         self.connect_dict = {}
         self.connect_count = 0
-
         if not host or host == 'localhost':
-            host = '127.0.0.1'
+            self.host = '127.0.0.1'
+        else:
+            self.host = host
         if not port:
-            port = self.VarsGui.GetInteger('core.cl_core_port')
-        self.FirstWidget.connect_to_localhost(host, port)
-        if self.FirstWidget.ClientObj.client:
-            if host in ['127.0.0.1', 'localhost']:
-                self.localhost_ClientObj = self.FirstWidget.ClientObj
-            if not host in self.connect_dict:
-                self.connect_dict[host] = [port]
-            else:
-                if port:
-                    if not port in self.connect_dict[host]:
-                        self.connect_dict[host].append(port)
+            self.port = self.VarsGui.GetInteger('core.cl_core_port')
+        else:
+            self.port = port
+
+        self.setEnabled(False)
+        qt.QTimer.singleShot(200, self.connect_after_init)
         self.create_tray()
         if self.FirstWidget.ClientObj.client:
             self.tray.set_icon(True)
 
+    def connect_after_init(self):
+        self.FirstWidget.connect_to_localhost(self.host, self.port)
+        self.setEnabled(True)
+        if self.FirstWidget.ClientObj.client:
+            self.FirstWidget.updateColors()
+            if self.host in ['127.0.0.1', 'localhost']:
+                self.localhost_ClientObj = self.FirstWidget.ClientObj
+            if not self.host in self.connect_dict:
+                self.connect_dict[self.host] = [self.port]
+            else:
+                if self.port:
+                    if not self.port in self.connect_dict[self.host]:
+                        self.connect_dict[self.host].append(self.port)
+
     def set_offline_icon(self):
         if self.current_icon != "offline":
             self.current_icon = "offline"

pym/consolegui/application/DisplayMethod.py

@@ -17,7 +17,7 @@
 from calculate.consolegui import qt
 
 from more import ButtonMenu, FlowLayout, get_sid, ClientServiceThread, \
-                 get_view_params, show_msg, client_list_methods
+                 get_view_params, show_msg, client_list_methods, get_system_rgb
 
 class DisplayMethod(qt.QWidget):
     def __init__(self, parent, ClientObj):
@@ -41,40 +41,6 @@ class DisplayMethod(qt.QWidget):
         # set new Title
         self.ClientObj._parent.setWindowTitle(self.ClientObj.Name)
 
-        background_color = self.palette().color(qt.QPalette.Base)
-        background_color = background_color.getRgb()
-        background_color = "rgb%s"%str(background_color[0:3])
-
-        #text_color = self.palette().color(qt.QPalette.Text)
-        #text_color = text_color.getRgb()
-        #text_color = "rgb%s"%str(text_color[0:3])
-        text_color = "rgb(160,160,160)"
-
-        self._parent.main_frame.viewport().setStyleSheet(
-            "background-color: %s ; " %background_color
-        )
-
-        self.setStyleSheet(self.styleSheet() + \
-            'QWidget { background: transparent;}'
-
-            'QGroupBox {font-weight: bold;'
-            'border: 1px solid gray;'
-            'border-left-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,'
-                                        'stop: 0 gray, stop: 1 transparent);'
-            'border-top-color: qlineargradient( x1: 0, y1: 0, x2: 1, y2: 0,'
-                                       'stop: 0 gray, stop: 1 transparent);'
-            'border-right: 0px; border-bottom: 0px;'
-            'border-top-left-radius: 2px;'
-
-            'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
-            'stop: 0 rgba(200, 200, 200,75), stop: 0.5 transparent,'
-            'stop: 1 transparent);'
-            'padding-top: 18px; padding-bottom: 18px;}'
-            'QGroupBox::title {background-color: transparent;'
-
-            'color: %s; subcontrol-position: top left;'
-            'margin-top: 6px; margin-left: 8px;}'%text_color)
-
         # transform a list into the dictionary {'group': [methods], ...}
         guiMethods = {}
         if type(results) == int:
@@ -210,6 +176,44 @@ class DisplayMethod(qt.QWidget):
         self.layout.setAlignment(qt.Qt.AlignTop)
         self.setLayout(self.layout)
         self.resize(self.layout.sizeHint())
+        self.updateColors()
+
+    def updateColors(self):
+        background_color = get_system_rgb(self._parent.main_frame, qt.QPalette.Base)
+        self._parent.main_frame.viewport().setStyleSheet(
+            "background-color: %s ; " %background_color
+        )
+        text_color = "rgb(160,160,160)"
+        self.setStyleSheet(self.styleSheet() + \
+            'QWidget { background: transparent;}'
+
+            'QGroupBox {font-weight: bold;'
+            'border: 1px solid gray;'
+            'border-left-color: qlineargradient( x1: 0, y1: 0, x2: 0, y2: 1,'
+                                        'stop: 0 gray, stop: 1 transparent);'
+            'border-top-color: qlineargradient( x1: 0, y1: 0, x2: 1, y2: 0,'
+                                       'stop: 0 gray, stop: 1 transparent);'
+            'border-right: 0px; border-bottom: 0px;'
+            'border-top-left-radius: 2px;'
+
+            'background-color: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 1,'
+            'stop: 0 rgba(200, 200, 200,75), stop: 0.5 transparent,'
+            'stop: 1 transparent);'
+            'padding-top: 18px; padding-bottom: 18px;}'
+            'QGroupBox::title {background-color: transparent;'
+
+            'color: %s; subcontrol-position: top left;'
+            'margin-top: 6px; margin-left: 8px;}'%text_color)
+
+        for group in self.button_list.values():
+            for button in group:
+                button.updateColors()
+
+    def disableButtons(self):
+        for group in self.button_list.values():
+            for button in group:
+                button.setEnabled(False)
+                button.updateColors()
 
     def refresh(self):
         self.ClientObj.methods_list = client_list_methods(self.ClientObj.sid,
@@ -222,12 +226,14 @@ class DisplayMethod(qt.QWidget):
                     self._parent.main_frame.viewport().palette()
         self.ClientObj._parent.setWindowTitle(_("Calculate Console"))
 
+
     def onActivated(self):
         # Call server method
         if hasattr (self, 'onActivated_thread'):
             if self.onActivated_thread.isRunning():
                 return 1
-        self.setDisabled(True)
+        self.setEnabled(False)
+        self.updateColors()
         method_name = self.sender().objectName()
 #        view_method_name = self.sender().text()
         step = 0

pym/consolegui/application/MainFrameResult.py

@@ -30,7 +30,7 @@ from calculate.core.client.function import switch, create_obj
 from calculate.lib.utils.colortext.converter import XmlConverter
 from calculate.lib.utils.colortext.output import SpanCssOutput
 from calculate.lib.utils.tools import imap_regexp
-from more import WorkPalette
+from more import WorkPalette, ParameterWindow, get_system_rgb
 
 from more import get_sid, ClientServiceThread, show_msg, TaskWidget, ErrorWgt,\
                  ResultLayout, get_view_params
@@ -121,7 +121,7 @@ class MainFrameRes(qt.QWidget):
         #                                    "{background-color: #FFFFFF;}")
         #                                    #"{background-color: #E4E1E0;}")
         self.setObjectName("Frame_Res")
-        self.setStyleSheet("#Frame_Res {background-color: transparent;}")
+        self.setStyleSheet("#Frame_Res {background-color: %s;}"% get_system_rgb(self, ParameterWindow))
         #self.setStyleSheet("#Frame_Res {background-color: green;}")
 #                           "QWidget {border: 1px solid red;}")
 

pym/consolegui/application/mainframe.py

@@ -1686,8 +1686,8 @@ class MainFrame(qt.QWidget):
         x += 1
 
         widget_for_grid = qt.QWidget(self)
-        #if brief:
-        #    widget_for_grid.setStyleSheet("background: transparent;")
+        if brief:
+            widget_for_grid.setStyleSheet("background: transparent;")
         wfg_layout = qt.QVBoxLayout(widget_for_grid)
         wfg_layout.setSpacing(0)
         wfg_layout.setContentsMargins(0, 0, 0, 0)

pym/consolegui/application/more.py

@@ -266,6 +266,10 @@ class ButtonMenu(qt.QPushButton):
 
         # rgb(218,218,218)
         # rgb(230,230,230)
+        self.updateColors()
+        self.updateGeometry()
+
+    def updateColors(self):
         self.setStyleSheet(
             "QPushButton:flat {border: None;}"
             "QPushButton:hover:pressed {border: none;"
@@ -275,22 +279,21 @@ class ButtonMenu(qt.QPushButton):
             "%s; border-radius: 7px;}" %
             (alphed(get_system_rgb(self, qt.QPalette.Highlight),255),
              alphed(get_system_rgb(self, qt.QPalette.Highlight),100)))
-        self.updateGeometry()
 
-    def mousePressEvent(self, *args, **kwargs):
-        self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
-                               get_system_rgb(self, qt.QPalette.HighlightedText))
-        return super(ButtonMenu, self).mousePressEvent(*args, **kwargs)
+    #def mousePressEvent(self, *args, **kwargs):
+    #    self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
+    #                           get_system_rgb(self, qt.QPalette.Base))
+    #    return super(ButtonMenu, self).mousePressEvent(*args, **kwargs)
 
-    def enterEvent(self, *args, **kwargs):
-        self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
-                               get_system_rgb(self, qt.QPalette.Text))
-        return super(ButtonMenu, self).enterEvent(*args, **kwargs)
+    #def enterEvent(self, *args, **kwargs):
+    #    self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
+    #                           get_system_rgb(self, qt.QPalette.Text))
+    #    return super(ButtonMenu, self).enterEvent(*args, **kwargs)
 
-    def leaveEvent(self, *args, **kwargs):
-        self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
-                               get_system_rgb(self, qt.QPalette.Text))
-        return super(ButtonMenu, self).leaveEvent(*args, **kwargs)
+    #def leaveEvent(self, *args, **kwargs):
+    #    self.lbl.setStyleSheet("QLabel {border: None; color: %s;}"%
+    #                           get_system_rgb(self, qt.QPalette.Text))
+    #    return super(ButtonMenu, self).leaveEvent(*args, **kwargs)
 
     def text(self):
         return self.lbl.text()

pym/consolegui/qt.py

@@ -14,7 +14,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-#from PySide import QtGui as QtGui, QtCore as QtCore
 from PyQt5 import QtGui, QtCore, QtWidgets
 
 QAbstractItemView = QtWidgets.QAbstractItemView