Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Publisher: Show instances in report page #4915

Merged
merged 56 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
5e08a28
renamed 'validations_widget.py' to 'report_page.py'
iLLiCiTiT Apr 27, 2023
b9a14fc
Implemented base logic and widgets for logs
iLLiCiTiT Apr 27, 2023
6d9d872
make one report page
iLLiCiTiT Apr 27, 2023
826bef6
added missing imports
iLLiCiTiT Apr 27, 2023
0555d3b
added missing constants
iLLiCiTiT Apr 27, 2023
9d7e791
move and rename 'VerticallScrollArea' to 'VerticalScrollArea'
iLLiCiTiT Apr 27, 2023
2c1c122
Validation erro item have id
iLLiCiTiT Apr 27, 2023
9cd5624
use 'ReportPageWidget' in window
iLLiCiTiT Apr 27, 2023
9a47ba0
change 'bg-button-hover' key to 'bg-buttons-hover' in style colors
iLLiCiTiT Apr 28, 2023
843473a
move publish actions widgets
iLLiCiTiT Apr 28, 2023
53ba549
Refactored how validation error title is showed
iLLiCiTiT Apr 28, 2023
4ce5884
remove item id from validation error item but add id to group items
iLLiCiTiT Apr 28, 2023
3c6cc72
remove margins from actions widget
iLLiCiTiT Apr 28, 2023
e3eb0e2
shrink publish frame on finished publishing
iLLiCiTiT Apr 28, 2023
1236044
fix dash line draw
iLLiCiTiT Apr 28, 2023
437f6ae
add missing styles
iLLiCiTiT Apr 28, 2023
6ec24fb
fix dash line in thumbnail widget
iLLiCiTiT Apr 28, 2023
581f105
added crash widget and changed layout a little
iLLiCiTiT Apr 28, 2023
f256bf9
added infor overlay message
iLLiCiTiT Apr 28, 2023
bc28620
export and copy report happens in main window
iLLiCiTiT Apr 28, 2023
1f2ce0d
fix docstrings
iLLiCiTiT May 9, 2023
50b1352
added per plugin filtering for validation errors
iLLiCiTiT May 9, 2023
767727c
added implementation of 'FlowLayout'
iLLiCiTiT May 9, 2023
79244a1
actions buttons are in flow layout
iLLiCiTiT May 9, 2023
b08d38f
fix actions order
iLLiCiTiT May 10, 2023
e1b3544
implemented expanding text edit widget
iLLiCiTiT May 10, 2023
5e24f82
expand button has some signals and properties
iLLiCiTiT May 10, 2023
6f176ba
description and details are separated widgets
iLLiCiTiT May 10, 2023
b2c08ba
fix typo
iLLiCiTiT May 10, 2023
26a9f4b
added constans to '__all__'
iLLiCiTiT May 10, 2023
f0e90f2
parse icon def is a function
iLLiCiTiT May 10, 2023
dcea57b
change layout of widgets
iLLiCiTiT May 10, 2023
0f19d0d
fix log filtering
iLLiCiTiT May 10, 2023
b32c824
added state icon to instances
iLLiCiTiT May 10, 2023
37b7f95
fix pyside6 issues
iLLiCiTiT May 10, 2023
7965cfd
implemented 'ClassicExpandBtnLabel' with arrow images
iLLiCiTiT May 10, 2023
76a7193
modified details separator
iLLiCiTiT May 10, 2023
e060775
added some spacing to layouts
iLLiCiTiT May 10, 2023
ba4376c
fix syle of description inputs and progress color
iLLiCiTiT May 10, 2023
a532e54
removed unused import
iLLiCiTiT May 10, 2023
21adb2e
add 'is_validation_error' to errored result
iLLiCiTiT May 11, 2023
79977b9
validation error has different icon in logs view
iLLiCiTiT May 11, 2023
9c121e7
added plugin name to ValueError if happens
iLLiCiTiT May 11, 2023
d2fadf3
spacer before detail inputs moved out of detals widget
iLLiCiTiT May 11, 2023
9387420
fix actions visible in craash report
iLLiCiTiT May 11, 2023
1056e5e
ignore pyblish base classes
iLLiCiTiT May 12, 2023
7a64fec
filter base plugins in discovery
iLLiCiTiT May 12, 2023
3069f8c
use 'is' comparison instead of '__eq__'
iLLiCiTiT May 12, 2023
cf07e5e
fix action error handling
iLLiCiTiT May 17, 2023
e4a4533
Fix handling of 'None' values in comparison
iLLiCiTiT May 17, 2023
d4e7d27
formatting fix
iLLiCiTiT May 17, 2023
e75b92f
Merge branch 'develop' into feature/OP-5711_Add-instances-to-report-page
iLLiCiTiT May 22, 2023
5245fe6
Merge branch 'develop' into feature/OP-5711_Add-instances-to-report-page
iLLiCiTiT May 23, 2023
6dd5857
Report instance card have same margins as in create mode
iLLiCiTiT May 23, 2023
5b8bb28
publish instances are grouped by family
iLLiCiTiT May 23, 2023
dfd38a3
log messages are rstripped
iLLiCiTiT May 23, 2023
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
8 changes: 8 additions & 0 deletions openpype/pipeline/publish/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,14 @@ def publish_plugins_discover(paths=None):
continue

for plugin in pyblish.plugin.plugins_from_module(module):
# Ignore base plugin classes
# NOTE 'pyblish.api.discover' does not ignore them!
if (
plugin is pyblish.api.Plugin
or plugin is pyblish.api.ContextPlugin
or plugin is pyblish.api.InstancePlugin
):
continue
if not allow_duplicates and plugin.__name__ in plugin_names:
result.duplicated_plugins.append(plugin)
log.debug("Duplicate plug-in found: %s", plugin)
Expand Down
9 changes: 6 additions & 3 deletions openpype/style/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

"bg": "#2C313A",
"bg-inputs": "#21252B",
"bg-buttons": "#434a56",
"bg-button-hover": "rgb(81, 86, 97)",
"bg-buttons": "rgb(67, 74, 86)",
"bg-buttons-hover": "rgb(81, 86, 97)",
"bg-inputs-disabled": "#2C313A",
"bg-buttons-disabled": "#434a56",

Expand Down Expand Up @@ -66,7 +66,9 @@
"bg-success": "#458056",
"bg-success-hover": "#55a066",
"bg-error": "#AD2E2E",
"bg-error-hover": "#C93636"
"bg-error-hover": "#C93636",
"bg-info": "rgb(63, 98, 121)",
"bg-info-hover": "rgb(81, 146, 181)"
},
"tab-widget": {
"bg": "#21252B",
Expand Down Expand Up @@ -94,6 +96,7 @@
"crash": "#FF6432",
"success": "#458056",
"warning": "#ffc671",
"progress": "rgb(194, 226, 236)",
"tab-bg": "#16191d",
"list-view-group": {
"bg": "#434a56",
Expand Down
64 changes: 53 additions & 11 deletions openpype/style/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ QPushButton {
}

QPushButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
color: {color:font-hover};
}

Expand Down Expand Up @@ -166,7 +166,7 @@ QToolButton {
}

QToolButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
color: {color:font-hover};
}

Expand Down Expand Up @@ -722,6 +722,13 @@ OverlayMessageWidget[type="error"]:hover {
background: {color:overlay-messages:bg-error-hover};
}

OverlayMessageWidget[type="info"] {
background: {color:overlay-messages:bg-info};
}
OverlayMessageWidget[type="info"]:hover {
background: {color:overlay-messages:bg-info-hover};
}

OverlayMessageWidget QWidget {
background: transparent;
}
Expand Down Expand Up @@ -749,10 +756,11 @@ OverlayMessageWidget QWidget {
}

#InfoText {
padding-left: 30px;
padding-top: 20px;
padding-left: 0px;
padding-top: 0px;
padding-right: 20px;
background: transparent;
border: 1px solid {color:border};
border: none;
}

#TypeEditor, #ToolEditor, #NameEditor, #NumberEditor {
Expand Down Expand Up @@ -914,7 +922,7 @@ PixmapButton{
background: {color:bg-buttons};
}
PixmapButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
}
PixmapButton:disabled {
background: {color:bg-buttons-disabled};
Expand All @@ -925,7 +933,7 @@ PixmapButton:disabled {
background: {color:bg-view};
}
#ThumbnailPixmapHoverButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
}

#CreatorDetailedDescription {
Expand All @@ -946,7 +954,7 @@ PixmapButton:disabled {
}

#CreateDialogHelpButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
}
#CreateDialogHelpButton QWidget {
background: transparent;
Expand Down Expand Up @@ -1005,7 +1013,7 @@ PixmapButton:disabled {
border-radius: 0.2em;
}
#CardViewWidget:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
}
#CardViewWidget[state="selected"] {
background: {color:bg-view-selection};
Expand All @@ -1032,14 +1040,19 @@ PixmapButton:disabled {
}

#PublishInfoFrame[state="3"], #PublishInfoFrame[state="4"] {
background: rgb(194, 226, 236);
background: {color:publisher:progress};
}

#PublishInfoFrame QLabel {
color: black;
font-style: bold;
}

#PublishReportHeader {
font-size: 14pt;
font-weight: bold;
}

#PublishInfoMainLabel {
font-size: 12pt;
}
Expand All @@ -1060,7 +1073,7 @@ ValidationArtistMessage QLabel {
}

#ValidationActionButton:hover {
background: {color:bg-button-hover};
background: {color:bg-buttons-hover};
color: {color:font-hover};
}

Expand Down Expand Up @@ -1090,6 +1103,35 @@ ValidationArtistMessage QLabel {
border-left: 1px solid {color:border};
}

#PublishInstancesDetails {
border: 1px solid {color:border};
border-radius: 0.3em;
}

#InstancesLogsView {
border: 1px solid {color:border};
background: {color:bg-view};
border-radius: 0.3em;
}

#PublishLogMessage {
font-family: "Noto Sans Mono";
}

#PublishInstanceLogsLabel {
font-weight: bold;
}

#PublishCrashMainLabel{
font-weight: bold;
font-size: 16pt;
}

#PublishCrashReportLabel {
font-weight: bold;
font-size: 13pt;
}

#AssetNameInputWidget {
background: {color:bg-inputs};
border: 1px solid {color:border};
Expand Down
24 changes: 14 additions & 10 deletions openpype/tools/attribute_defs/files_widget.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,29 +198,33 @@ def _on_update_size_timer(self):

def paintEvent(self, event):
super(DropEmpty, self).paintEvent(event)
painter = QtGui.QPainter(self)

pen = QtGui.QPen()
pen.setWidth(1)
pen.setBrush(QtCore.Qt.darkGray)
pen.setStyle(QtCore.Qt.DashLine)
painter.setPen(pen)
content_margins = self.layout().contentsMargins()
pen.setWidth(1)

left_m = content_margins.left()
top_m = content_margins.top()
rect = QtCore.QRect(
content_margins = self.layout().contentsMargins()
rect = self.rect()
left_m = content_margins.left() + pen.width()
top_m = content_margins.top() + pen.width()
new_rect = QtCore.QRect(
left_m,
top_m,
(
self.rect().width()
rect.width()
- (left_m + content_margins.right() + pen.width())
),
(
self.rect().height()
rect.height()
- (top_m + content_margins.bottom() + pen.width())
)
)
painter.drawRect(rect)

painter = QtGui.QPainter(self)
painter.setRenderHint(QtGui.QPainter.Antialiasing)
painter.setPen(pen)
painter.drawRect(new_rect)


class FilesModel(QtGui.QStandardItemModel):
Expand Down
6 changes: 6 additions & 0 deletions openpype/tools/publisher/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,13 @@

__all__ = (
"CONTEXT_ID",
"CONTEXT_LABEL",

"VARIANT_TOOLTIP",

"INPUTS_LAYOUT_HSPACING",
"INPUTS_LAYOUT_VSPACING",

"INSTANCE_ID_ROLE",
"SORT_VALUE_ROLE",
"IS_GROUP_ROLE",
Expand All @@ -47,4 +51,6 @@
"FAMILY_ROLE",
"GROUP_ROLE",
"CONVERTER_IDENTIFIER_ROLE",

"ResetKeySequence",
)
Loading
Loading