mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 08:24:53 +01:00
Merge pull request #25 from pypeclub/resolve-rebrand
Resolve: rebranding to OpenPype
This commit is contained in:
commit
ba6ea35325
4 changed files with 26 additions and 24 deletions
|
|
@ -59,19 +59,19 @@ class OpenPypeMenu(QtWidgets.QWidget):
|
||||||
)
|
)
|
||||||
|
|
||||||
self.setWindowTitle("OpenPype")
|
self.setWindowTitle("OpenPype")
|
||||||
workfiles_btn = QtWidgets.QPushButton("Workfiles", self)
|
workfiles_btn = QtWidgets.QPushButton("Workfiles ...", self)
|
||||||
create_btn = QtWidgets.QPushButton("Create", self)
|
create_btn = QtWidgets.QPushButton("Create ...", self)
|
||||||
publish_btn = QtWidgets.QPushButton("Publish", self)
|
publish_btn = QtWidgets.QPushButton("Publish ...", self)
|
||||||
load_btn = QtWidgets.QPushButton("Load", self)
|
load_btn = QtWidgets.QPushButton("Load ...", self)
|
||||||
inventory_btn = QtWidgets.QPushButton("Inventory", self)
|
inventory_btn = QtWidgets.QPushButton("Inventory ...", self)
|
||||||
libload_btn = QtWidgets.QPushButton("Library", self)
|
libload_btn = QtWidgets.QPushButton("Library ...", self)
|
||||||
rename_btn = QtWidgets.QPushButton("Rename", self)
|
# rename_btn = QtWidgets.QPushButton("Rename ...", self)
|
||||||
set_colorspace_btn = QtWidgets.QPushButton(
|
# set_colorspace_btn = QtWidgets.QPushButton(
|
||||||
"Set colorspace from presets", self
|
# "Set colorspace from presets", self
|
||||||
)
|
# )
|
||||||
reset_resolution_btn = QtWidgets.QPushButton(
|
# reset_resolution_btn = QtWidgets.QPushButton(
|
||||||
"Reset Resolution from peresets", self
|
# "Reset Resolution from peresets", self
|
||||||
)
|
# )
|
||||||
|
|
||||||
layout = QtWidgets.QVBoxLayout(self)
|
layout = QtWidgets.QVBoxLayout(self)
|
||||||
layout.setContentsMargins(10, 20, 10, 20)
|
layout.setContentsMargins(10, 20, 10, 20)
|
||||||
|
|
@ -86,14 +86,14 @@ class OpenPypeMenu(QtWidgets.QWidget):
|
||||||
|
|
||||||
layout.addWidget(libload_btn)
|
layout.addWidget(libload_btn)
|
||||||
|
|
||||||
layout.addWidget(Spacer(15, self))
|
# layout.addWidget(Spacer(15, self))
|
||||||
|
|
||||||
layout.addWidget(rename_btn)
|
# layout.addWidget(rename_btn)
|
||||||
|
|
||||||
layout.addWidget(Spacer(15, self))
|
# layout.addWidget(Spacer(15, self))
|
||||||
|
|
||||||
layout.addWidget(set_colorspace_btn)
|
# layout.addWidget(set_colorspace_btn)
|
||||||
layout.addWidget(reset_resolution_btn)
|
# layout.addWidget(reset_resolution_btn)
|
||||||
|
|
||||||
self.setLayout(layout)
|
self.setLayout(layout)
|
||||||
|
|
||||||
|
|
@ -103,9 +103,9 @@ class OpenPypeMenu(QtWidgets.QWidget):
|
||||||
load_btn.clicked.connect(self.on_load_clicked)
|
load_btn.clicked.connect(self.on_load_clicked)
|
||||||
inventory_btn.clicked.connect(self.on_inventory_clicked)
|
inventory_btn.clicked.connect(self.on_inventory_clicked)
|
||||||
libload_btn.clicked.connect(self.on_libload_clicked)
|
libload_btn.clicked.connect(self.on_libload_clicked)
|
||||||
rename_btn.clicked.connect(self.on_rename_clicked)
|
# rename_btn.clicked.connect(self.on_rename_clicked)
|
||||||
set_colorspace_btn.clicked.connect(self.on_set_colorspace_clicked)
|
# set_colorspace_btn.clicked.connect(self.on_set_colorspace_clicked)
|
||||||
reset_resolution_btn.clicked.connect(self.on_reset_resolution_clicked)
|
# reset_resolution_btn.clicked.connect(self.on_reset_resolution_clicked)
|
||||||
|
|
||||||
def on_workfile_clicked(self):
|
def on_workfile_clicked(self):
|
||||||
print("Clicked Workfile")
|
print("Clicked Workfile")
|
||||||
|
|
|
||||||
|
|
@ -52,6 +52,8 @@ QLineEdit {
|
||||||
}
|
}
|
||||||
|
|
||||||
#OpenPypeMenu {
|
#OpenPypeMenu {
|
||||||
|
qproperty-alignment: AlignLeft;
|
||||||
|
min-width: 10em;
|
||||||
border: 1px solid #fef9ef;
|
border: 1px solid #fef9ef;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,7 @@ class CreatorWidget(QtWidgets.QDialog):
|
||||||
ok_btn.clicked.connect(self._on_ok_clicked)
|
ok_btn.clicked.connect(self._on_ok_clicked)
|
||||||
cancel_btn.clicked.connect(self._on_cancel_clicked)
|
cancel_btn.clicked.connect(self._on_cancel_clicked)
|
||||||
|
|
||||||
stylesheet = resolve.menu.load_stylesheet()
|
stylesheet = resolve.api.menu.load_stylesheet()
|
||||||
self.setStyleSheet(stylesheet)
|
self.setStyleSheet(stylesheet)
|
||||||
|
|
||||||
def _on_ok_clicked(self):
|
def _on_ok_clicked(self):
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# from pprint import pformat
|
# from pprint import pformat
|
||||||
from pype.hosts import resolve
|
from pype.hosts import resolve
|
||||||
from pype.hosts.resolve import lib
|
from pype.hosts.resolve.api import lib
|
||||||
|
|
||||||
|
|
||||||
class CreateShotClip(resolve.Creator):
|
class CreateShotClip(resolve.Creator):
|
||||||
|
|
@ -244,7 +244,7 @@ class CreateShotClip(resolve.Creator):
|
||||||
sq_markers = self.timeline.GetMarkers()
|
sq_markers = self.timeline.GetMarkers()
|
||||||
|
|
||||||
# create media bin for compound clips (trackItems)
|
# create media bin for compound clips (trackItems)
|
||||||
mp_folder = resolve.create_current_sequence_media_bin(self.timeline)
|
mp_folder = resolve.create_bin(self.timeline.GetName())
|
||||||
|
|
||||||
kwargs = {
|
kwargs = {
|
||||||
"ui_inputs": widget.result,
|
"ui_inputs": widget.result,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue