Merge pull request #1622 from pypeclub/feature/tray_style

This commit is contained in:
Milan Kolar 2021-06-02 14:16:06 +02:00 committed by GitHub
commit bf410e95b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 10 deletions

View file

@ -481,6 +481,11 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
background: none;
}
/* Globally used names */
#Separator {
background: {color:bg-menu-separator};
}
#IconBtn {}
/* Project Manager stylesheets */

View file

@ -2,8 +2,9 @@ import os
import json
import collections
from avalon import style
from Qt import QtCore, QtGui, QtWidgets
from openpype import style
from openpype.api import resources
from openpype.settings.lib import get_local_settings
from openpype.lib.pype_info import (
@ -118,7 +119,6 @@ class EnvironmentsView(QtWidgets.QTreeView):
return super(EnvironmentsView, self).wheelEvent(event)
class ClickableWidget(QtWidgets.QWidget):
clicked = QtCore.Signal()
@ -144,16 +144,14 @@ class CollapsibleWidget(QtWidgets.QWidget):
button_toggle.setChecked(False)
label_widget = QtWidgets.QLabel(label, parent=top_part)
spacer_widget = QtWidgets.QWidget(top_part)
top_part_layout = QtWidgets.QHBoxLayout(top_part)
top_part_layout.setContentsMargins(0, 0, 0, 5)
top_part_layout.addWidget(button_toggle)
top_part_layout.addWidget(label_widget)
top_part_layout.addWidget(spacer_widget, 1)
top_part_layout.addStretch(1)
label_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
spacer_widget.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.setAttribute(QtCore.Qt.WA_TranslucentBackground)
self.button_toggle = button_toggle
@ -297,7 +295,7 @@ class PypeInfoSubWidget(QtWidgets.QWidget):
def _create_separator(self):
separator_widget = QtWidgets.QWidget(self)
separator_widget.setStyleSheet("background: #222222;")
separator_widget.setObjectName("Separator")
separator_widget.setMinimumHeight(2)
separator_widget.setMaximumHeight(2)
return separator_widget

View file

@ -5,13 +5,19 @@ import atexit
import subprocess
import platform
from avalon import style
from Qt import QtCore, QtGui, QtWidgets
from openpype.api import Logger, resources
import openpype.version
from openpype.api import (
Logger,
resources,
get_system_settings
)
from openpype.lib import get_pype_execute_args
from openpype.modules import TrayModulesManager, ITrayService
from openpype.settings.lib import get_system_settings
import openpype.version
from openpype import style
from .pype_info_widget import PypeInfoWidget