Skip to content
This repository has been archived by the owner on Sep 20, 2024. It is now read-only.

Log Viewer with OpenPype style #1703

Merged
merged 4 commits into from
Jun 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openpype/modules/log_viewer/tray/app.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -14,7 +14,7 @@ def __init__(self, parent=None):

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)
Expand Down
7 changes: 1 addition & 6 deletions openpype/modules/log_viewer/tray/widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ def __init__(self, title, parent=None):

self.setLayout(layout)

# toolmenu.selection_changed.connect(self.on_selection_changed)
toolmenu.selection_changed.connect(self.selection_changed)

self.toolbutton = toolbutton
Expand Down Expand Up @@ -119,7 +118,6 @@ def __init__(self, detail_widget, parent=None):

filter_layout = QtWidgets.QHBoxLayout()

# user_filter = SearchComboBox(self, "Users")
user_filter = CustomCombo("Users", self)
users = model.dbcon.distinct("username")
user_filter.populate(users)
Expand All @@ -128,21 +126,18 @@ def __init__(self, detail_widget, parent=None):
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)
Expand Down
23 changes: 23 additions & 0 deletions openpype/style/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down