Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1703 from pypeclub/feature/log_viewer_style

Browse source 
Log Viewer with OpenPype style
This commit is contained in:
Jakub Trllo 2021-06-14 16:53:50 +02:00 • committed by GitHub
commit ca1fd1ff89
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openpype/modules/log_viewer/tray/app.py
View file

@ -1,6 +1,6 @@
from Qt import QtWidgets, QtCore
from .widgets import LogsWidget, OutputWidget
from avalon import style
from openpype import style
class LogsWindow(QtWidgets.QWidget):
@ -14,7 +14,7 @@ class LogsWindow(QtWidgets.QWidget):
main_layout = QtWidgets.QHBoxLayout()
log_splitter = QtWidgets.QSplitter()
log_splitter = QtWidgets.QSplitter(self)
log_splitter.setOrientation(QtCore.Qt.Horizontal)
log_splitter.addWidget(logs_widget)
log_splitter.addWidget(log_detail)

7
openpype/modules/log_viewer/tray/widgets.py
View file

@ -83,7 +83,6 @@ class CustomCombo(QtWidgets.QWidget):
self.setLayout(layout)
# toolmenu.selection_changed.connect(self.on_selection_changed)
toolmenu.selection_changed.connect(self.selection_changed)
self.toolbutton = toolbutton
@ -119,7 +118,6 @@ class LogsWidget(QtWidgets.QWidget):
filter_layout = QtWidgets.QHBoxLayout()
# user_filter = SearchComboBox(self, "Users")
user_filter = CustomCombo("Users", self)
users = model.dbcon.distinct("username")
user_filter.populate(users)
@ -128,21 +126,18 @@ class LogsWidget(QtWidgets.QWidget):
proxy_model.update_users_filter(users)
level_filter = CustomCombo("Levels", self)
# levels = [(level, True) for level in model.dbcon.distinct("level")]
levels = model.dbcon.distinct("level")
level_filter.addItems(levels)
level_filter.selection_changed.connect(self._level_changed)
detail_widget.update_level_filter(levels)
spacer = QtWidgets.QWidget()
icon = qtawesome.icon("fa.refresh", color="white")
refresh_btn = QtWidgets.QPushButton(icon, "")
filter_layout.addWidget(user_filter)
filter_layout.addWidget(level_filter)
filter_layout.addWidget(spacer, 1)
filter_layout.addStretch(1)
filter_layout.addWidget(refresh_btn)
view = QtWidgets.QTreeView(self)

23
openpype/style/style.css
View file

@ -97,6 +97,29 @@ QToolButton:disabled {
background: {color:bg-buttons-disabled};
}
QToolButton[popupMode="1"] {
/* make way for the popup button */
padding-right: 20px;
border: 1px solid {color:bg-buttons};
}
QToolButton::menu-button {
width: 16px;
/* Set border only of left side. */
border: 1px solid transparent;
border-left: 1px solid {color:bg-buttons};
}
QToolButton::menu-arrow {
/* Offset arrow a little bit to center. */
left: 1px; top: 1px;
}
QToolButton::menu-arrow:open {
/* Don't offset arrow on open. */
left: 0px; top: 0px;
}
/* QMenu */
QMenu {
border: 1px solid #555555;