diff --git a/app/dialog/otioproperties/otiopropertiesdialog.cpp b/app/dialog/otioproperties/otiopropertiesdialog.cpp index 4d9fffc36..e153aa47b 100644 --- a/app/dialog/otioproperties/otiopropertiesdialog.cpp +++ b/app/dialog/otioproperties/otiopropertiesdialog.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -34,8 +35,10 @@ OTIOPropertiesDialog::OTIOPropertiesDialog(const QList& sequences, Pr { QVBoxLayout* layout = new QVBoxLayout(this); - layout->addWidget(new QLabel(tr("OpenTimelineIO files to not store sequence properties (resolution, framerate etc.).\n" - "Set the correct parameters here or they will be left at the default setting."))); + QLabel *msg = new QLabel(tr("OpenTimelineIO files do not store sequence parameters (resolution, frame rate, etc.)\n\n" + "Please set the correct parameters on the sequences below (they have been set to your default sequence parameters as a starting point).")); + msg->setWordWrap(true); + layout->addWidget(msg); table_ = new QTreeWidget(); table_->setColumnCount(2); @@ -60,6 +63,11 @@ OTIOPropertiesDialog::OTIOPropertiesDialog(const QList& sequences, Pr table_->setItemWidget(item, 1, item_actions); } + // Stretch first column to take up as much space as possible, and second column to take as little + table_->header()->setSectionResizeMode(0, QHeaderView::Stretch); + table_->header()->setSectionResizeMode(1, QHeaderView::Fixed); + table_->header()->setStretchLastSection(false); + layout->addWidget(table_); QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel); @@ -67,7 +75,7 @@ OTIOPropertiesDialog::OTIOPropertiesDialog(const QList& sequences, Pr connect(buttons, &QDialogButtonBox::rejected, this, &OTIOPropertiesDialog::reject); layout->addWidget(buttons); - setWindowTitle(tr("Load OpenTimelineIO File")); + setWindowTitle(tr("Load OpenTimelineIO Project")); } void OTIOPropertiesDialog::SetupSequence() { diff --git a/app/task/project/loadotio/loadotio.cpp b/app/task/project/loadotio/loadotio.cpp index 7a0ec6f87..896d90737 100644 --- a/app/task/project/loadotio/loadotio.cpp +++ b/app/task/project/loadotio/loadotio.cpp @@ -128,8 +128,10 @@ bool LoadOTIOTask::Run() Q_ARG(QList,timeline_sequnce_map.values())); if (!accepted) { - SetError(tr("Loading OpenTimelineIO file(s) was canceled")); - return false; + // Cancel to indicate to caller that this task did not complete and to simply dispose of it + Cancel(); + qDeleteAll(timeline_sequnce_map); // Clear sequences + return true; } foreach (auto timeline, timeline_sequnce_map.keys()) {