From fd4592637319f1b382066da1d9fff027869654c7 Mon Sep 17 00:00:00 2001 From: Jakub Trllo Date: Mon, 3 Oct 2022 14:23:23 +0200 Subject: [PATCH] changed how traypublisher buttons are added --- openpype/tools/publisher/window.py | 11 +++++++++-- openpype/tools/traypublisher/window.py | 4 +--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/openpype/tools/publisher/window.py b/openpype/tools/publisher/window.py index cc5d191ca3..0fc2c780bc 100644 --- a/openpype/tools/publisher/window.py +++ b/openpype/tools/publisher/window.py @@ -62,18 +62,23 @@ class PublisherWindow(QtWidgets.QDialog): # Header header_widget = QtWidgets.QWidget(self) + icon_pixmap = QtGui.QPixmap(resources.get_openpype_icon_filepath()) icon_label = PixmapLabel(icon_pixmap, header_widget) icon_label.setObjectName("PublishContextLabel") + context_label = QtWidgets.QLabel(header_widget) context_label.setObjectName("PublishContextLabel") + header_extra_widget = QtWidgets.QWidget(header_widget) + header_layout = QtWidgets.QHBoxLayout(header_widget) header_layout.setContentsMargins(15, 15, 15, 15) header_layout.setSpacing(15) header_layout.addWidget(icon_label, 0) header_layout.addWidget(context_label, 0) header_layout.addStretch(1) + header_layout.addWidget(header_extra_widget, 0) # Tabs widget under header tabs_widget = PublisherTabsWidget(self) @@ -230,8 +235,10 @@ class PublisherWindow(QtWidgets.QDialog): controller.add_publish_stopped_callback(self._on_publish_stop) controller.add_message_emitted_callback(self._on_overlay_message) - # Store header for TrayPublisher - self._header_layout = header_layout + # Store extra header widget for TrayPublisher + # - can be used to add additional widgets to header between context + # label and help button + self._header_extra_widget = header_extra_widget self._tabs_widget = tabs_widget self._create_tab = create_tab diff --git a/openpype/tools/traypublisher/window.py b/openpype/tools/traypublisher/window.py index d9f7b98771..6298059c13 100644 --- a/openpype/tools/traypublisher/window.py +++ b/openpype/tools/traypublisher/window.py @@ -196,7 +196,7 @@ class TrayPublishWindow(PublisherWindow): overlay_widget = StandaloneOverlayWidget(self) - btns_widget = QtWidgets.QWidget(self) + btns_widget = self._header_extra_widget back_to_overlay_btn = QtWidgets.QPushButton( "Change project", btns_widget @@ -211,8 +211,6 @@ class TrayPublishWindow(PublisherWindow): btns_layout.addWidget(save_btn, 0) btns_layout.addWidget(back_to_overlay_btn, 0) - self._header_layout.addWidget(btns_widget, 0) - overlay_widget.project_selected.connect(self._on_project_select) back_to_overlay_btn.clicked.connect(self._on_back_to_overlay) save_btn.clicked.connect(self._on_tray_publish_save)