diff --git a/plugins/dockers/storyboarddocker/storyboardItem.cpp b/plugins/dockers/storyboarddocker/storyboardItem.cpp index bd5ef5b9fc..06606568c7 100644 --- a/plugins/dockers/storyboarddocker/storyboardItem.cpp +++ b/plugins/dockers/storyboarddocker/storyboardItem.cpp @@ -1,68 +1,62 @@ /* * Copyright (c) 2020 Saurabh Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "storyboardItem.h" -//create 3 rows by default StoryboardItem::StoryboardItem() -{ - insertChild(childCount(), 1); - insertChild(childCount(), QString("scene 1")); - insertChild(childCount(), 100); //duration-seconds - insertChild(childCount(), 23); //duration-frames -} +{} StoryboardItem::~StoryboardItem() { qDeleteAll(m_childData); } void StoryboardItem::appendChild(QVariant data) { StoryboardChild* child = new StoryboardChild(data, this); m_childData.append(child); } void StoryboardItem::insertChild(int row, QVariant data) { StoryboardChild* child = new StoryboardChild(data, this); m_childData.insert(row, child); } void StoryboardItem::removeChild(int row) { delete m_childData.at(row); m_childData.removeAt(row); } void StoryboardItem::moveChild(int from, int to) { m_childData.move(from, to); } int StoryboardItem::childCount() const { return m_childData.count(); } StoryboardChild* StoryboardItem::child(int row) { if (row < 0 || row >= m_childData.size()) return nullptr; return m_childData.at(row); } diff --git a/plugins/dockers/storyboarddocker/storyboardItem.h b/plugins/dockers/storyboarddocker/storyboardItem.h index 945eb7fdc2..6ca55ad678 100644 --- a/plugins/dockers/storyboarddocker/storyboardItem.h +++ b/plugins/dockers/storyboarddocker/storyboardItem.h @@ -1,64 +1,63 @@ /* * Copyright (c) 2020 Saurabh Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef STORYBOARD_ITEM #define STORYBOARD_ITEM #include #include //each storyboardItem contains pointer to child data class StoryboardItem; class StoryboardChild { public: StoryboardChild(QVariant data, StoryboardItem *parent) : m_data(data) , m_parentItem(parent) {} StoryboardItem *parent(){ return m_parentItem;} QVariant data(){ return m_data;} void setData(QVariant value){ m_data = value; } private: QVariant m_data; StoryboardItem *m_parentItem; }; class StoryboardItem { public: - //see later if the constructor needs data - explicit StoryboardItem(/*const QVector &data*/); + explicit StoryboardItem(); ~StoryboardItem(); - void appendChild(QVariant data); - void insertChild(int row, QVariant data); + void appendChild(QVariant data = QVariant()); + void insertChild(int row, QVariant data = QVariant()); void removeChild(int row); void moveChild(int from, int to); int childCount() const; StoryboardChild *child(int row); private: QVector m_childData; }; #endif diff --git a/plugins/dockers/storyboarddocker/storyboardModel.cpp b/plugins/dockers/storyboarddocker/storyboardModel.cpp index 6e8df2a22c..df677f5855 100644 --- a/plugins/dockers/storyboarddocker/storyboardModel.cpp +++ b/plugins/dockers/storyboarddocker/storyboardModel.cpp @@ -1,415 +1,438 @@ /* * Copyright (c) 2020 Saurabh Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "storyboardModel.h" #include #include #include StoryboardModel::StoryboardModel(QObject *parent) : QAbstractItemModel(parent) , m_commentCount(0) -{} +{ + connect(this, SIGNAL(rowsInserted(const QModelIndex, int, int)), + this, SLOT(slotInsertCommentRows(const QModelIndex, int, int))); +} QModelIndex StoryboardModel::index(int row, int column, const QModelIndex &parent) const { if (!hasIndex(row, column, parent)) return QModelIndex(); if (row < 0 || row >= rowCount(parent)) return QModelIndex(); if (column !=0) return QModelIndex(); //1st level node has invalid parent if (!parent.isValid()){ return createIndex(row, column, m_items.at(row)); } else if (!parent.parent().isValid()){ StoryboardItem *parentItem = static_cast(parent.internalPointer()); StoryboardChild *childItem = parentItem->child(row); if (childItem) return createIndex(row, column, childItem); } return QModelIndex(); } QModelIndex StoryboardModel::parent(const QModelIndex &index) const { if (!index.isValid()) return QModelIndex(); - { //no parent for 1st level node StoryboardItem *childItem = static_cast(index.internalPointer()); if (m_items.contains(childItem)){ return QModelIndex(); } } //return parent only for 2nd level nodes StoryboardChild *childItem = static_cast(index.internalPointer()); StoryboardItem *parentItem = childItem->parent(); int indexOfParent = m_items.indexOf(const_cast(parentItem)); return createIndex(indexOfParent, 0, parentItem); } int StoryboardModel::rowCount(const QModelIndex &parent) const { if (!parent.isValid()) return m_items.count(); else if (!parent.parent().isValid()){ StoryboardItem *parentItem = static_cast(parent.internalPointer()); return parentItem->childCount(); } return 0; //2nd level nodes have no child } int StoryboardModel::columnCount(const QModelIndex &parent) const { if (!parent.isValid()){ return 1; } //1st level nodes have 1 column if (!parent.parent().isValid()){ return 1; } //end level nodes have no child return 0; } QVariant StoryboardModel::data(const QModelIndex &index, int role) const { if (!index.isValid()) return QVariant(); //return data only for the storyboardChild i.e. 2nd level nodes if (!index.parent().isValid()){ return QVariant(); } if (role == Qt::DisplayRole || role == Qt::EditRole || role == Qt::UserRole) { StoryboardChild *child = static_cast(index.internalPointer()); if (index.row() > 3){ if (role == Qt::UserRole){ //scroll bar position CommentBox commentBox = qvariant_cast(child->data()); return commentBox.scrollValue; } else { CommentBox commentBox = qvariant_cast(child->data()); return commentBox.content; } } return child->data(); } return QVariant(); } bool StoryboardModel::setData(const QModelIndex & index, const QVariant & value, int role) { if (index.isValid() && (role == Qt::EditRole || role == Qt::DisplayRole)) { if (!index.parent().isValid()) return false; StoryboardChild *child = static_cast(index.internalPointer()); if (child){ int fps = 24; if(index.row() == 3 && value.toInt() >= fps){ //TODO : set fps QModelIndex secondIndex = index.siblingAtRow(2); setData(secondIndex, secondIndex.data().toInt() + value.toInt() / fps, role); child->setData(value.toInt() % fps); } else if (index.row() > 3){ CommentBox commentBox = qvariant_cast(child->data()); commentBox.content = value.toString(); child->setData(QVariant::fromValue(commentBox)); } else { child->setData(value); } emit dataChanged(index, index); return true; } } return false; } bool StoryboardModel::setCommentScrollData(const QModelIndex & index, const QVariant & value) { StoryboardChild *child = static_cast(index.internalPointer()); if (child){ CommentBox commentBox = qvariant_cast(child->data()); commentBox.scrollValue = value.toInt(); child->setData(QVariant::fromValue(commentBox)); return true; } return false; } Qt::ItemFlags StoryboardModel::flags(const QModelIndex & index) const { if(!index.isValid()) return Qt::ItemIsDropEnabled; //1st level nodes if (!index.parent().isValid()) return Qt::ItemIsDragEnabled | Qt::ItemIsSelectable | Qt::ItemIsEnabled; //2nd level nodes return Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemNeverHasChildren; } bool StoryboardModel::insertRows(int position, int rows, const QModelIndex &parent) { if (!parent.isValid()){ beginInsertRows(QModelIndex(), position, position+rows-1); for (int row = 0; row < rows; ++row) { StoryboardItem *newItem = new StoryboardItem(); m_items.insert(position, newItem); } endInsertRows(); - for (int row = 0; row < rows; ++row) { - insertRows(rowCount(index(position + row, 0)), m_commentList.count(), index(position + row, 0)); - } return true; } else if (!parent.parent().isValid()){ //insert 2nd level nodes StoryboardItem *item = static_cast(parent.internalPointer()); beginInsertRows(parent, position, position+rows-1); for (int row = 0; row < rows; ++row) { item->insertChild(position, QVariant()); } endInsertRows(); return true; } //we can't insert to 2nd level nodes as they are leaf nodes return false; } bool StoryboardModel::removeRows(int position, int rows, const QModelIndex &parent) { //remove 1st level nodes if (!parent.isValid()){ beginRemoveRows(QModelIndex(), position, position+rows-1); for (int row = 0; row < rows; ++row){ + //deleting all the child nodes QModelIndex currentIndex = index(position, 0); removeRows(0, rowCount(currentIndex), currentIndex); + + //deleting the actual parent node delete m_items.at(position); m_items.removeAt(position); } endRemoveRows(); return true; } else if (!parent.parent().isValid()){ //remove 2nd level nodes StoryboardItem *item = static_cast(parent.internalPointer()); if (m_items.contains(item)){ beginRemoveRows(parent, position, position+rows-1); for (int row = 0; row < rows; ++row) { item->removeChild(position); } endRemoveRows(); return true; } } //2nd level node has no child return false; } bool StoryboardModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) { if (sourceParent != destinationParent){ return false; } if (destinationChild == sourceRow || destinationChild == sourceRow + 1){ return false; } if (destinationChild > sourceRow + count - 1){ //we adjust for the upward shift, see qt doc for why this is needed beginMoveRows(sourceParent, sourceRow, sourceRow + count - 1, destinationParent, destinationChild + count - 1); destinationChild = destinationChild - count; } else { beginMoveRows(sourceParent, sourceRow, sourceRow + count - 1, destinationParent, destinationChild); } //for moves within the 1st level nodes for comment nodes if (sourceParent == destinationParent && sourceParent.isValid() && !sourceParent.parent().isValid()){ const QModelIndex parent = sourceParent; for (int row = 0; row < count; row++){ if (sourceRow < 4 || sourceRow >= rowCount(parent)) return false; if (destinationChild + row < 4 || destinationChild + row >= rowCount(parent)) return false; StoryboardItem *item = static_cast(parent.internalPointer()); item->moveChild(sourceRow, destinationChild + row); } endMoveRows(); return true; } else if (!sourceParent.isValid()){ //for moves of 1st level nodes for (int row = 0; row < count; row++){ if (sourceRow < 0 || sourceRow >= rowCount()) return false; if (destinationChild + row < 0 || destinationChild + row >= rowCount()) return false; m_items.move(sourceRow, destinationChild + row); } endMoveRows(); return true; } else { return false; } } QMimeData *StoryboardModel::mimeData(const QModelIndexList &indexes) const { QMimeData *mimeData = new QMimeData(); QByteArray encodeData; QDataStream stream(&encodeData, QIODevice::WriteOnly); //take the row number of the index where drag started foreach (QModelIndex index, indexes){ if (index.isValid()) { int row = index.row(); stream << row; } } mimeData->setData("application/x-qabstractitemmodeldatalist", encodeData); //default mimetype return mimeData; } bool StoryboardModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) { if (action == Qt::IgnoreAction) return false; if (action == Qt::MoveAction && data->hasFormat("application/x-qabstractitemmodeldatalist")){ QByteArray bytes = data->data("application/x-qabstractitemmodeldatalist"); QDataStream stream(&bytes, QIODevice::ReadOnly); if (parent.isValid()){ return false; } int sourceRow; QModelIndexList moveRowIndexes; while (!stream.atEnd()) { stream >> sourceRow; QModelIndex index = createIndex(sourceRow, 0); moveRowIndexes.append(index); } moveRows(QModelIndex(), moveRowIndexes.at(0).row(), moveRowIndexes.count(), parent, row); //returning true deletes the source row return false; } return false; } Qt::DropActions StoryboardModel::supportedDropActions() const { return Qt::CopyAction | Qt::MoveAction; } Qt::DropActions StoryboardModel::supportedDragActions() const { return Qt::CopyAction | Qt::MoveAction; } int StoryboardModel::visibleCommentCount() const { int visibleComments = 0; foreach(Comment comment, m_commentList){ if (comment.visibility){ visibleComments++; } } return visibleComments; } int StoryboardModel::visibleCommentsUpto(QModelIndex index) const { int commentRow = index.row() - 4; int visibleComments = 0; for (int row = 0; row < commentRow; row++){ if (m_commentList.at(row).visibility){ visibleComments++; } } return visibleComments; } void StoryboardModel::setCommentModel(CommentModel *commentModel) { m_commentModel = commentModel; connect(m_commentModel, SIGNAL(dataChanged(const QModelIndex ,const QModelIndex)), this, SLOT(slotCommentDataChanged())); connect(m_commentModel, SIGNAL(rowsRemoved(const QModelIndex ,int, int)), this, SLOT(slotCommentRowRemoved(const QModelIndex ,int, int))); connect(m_commentModel, SIGNAL(rowsInserted(const QModelIndex, int, int)), this, SLOT(slotCommentRowInserted(const QModelIndex, int, int))); connect(m_commentModel, SIGNAL(rowsMoved(const QModelIndex, int, int, const QModelIndex, int)), this, SLOT(slotCommentRowMoved(const QModelIndex, int, int, const QModelIndex, int))); } Comment StoryboardModel::getComment(int row) const { return m_commentList.at(row); } void StoryboardModel::slotCommentDataChanged() { m_commentList = m_commentModel->m_commentList; emit(dataChanged(QModelIndex(), QModelIndex())); } void StoryboardModel::slotCommentRowInserted(const QModelIndex parent, int first, int last) { int numItems = rowCount(); for(int row = 0; row < numItems; row++){ QModelIndex parentIndex = index(row, 0); insertRows(4 + first, last - first + 1, parentIndex); //four indices are already there } slotCommentDataChanged(); } void StoryboardModel::slotCommentRowRemoved(const QModelIndex parent, int first, int last) { int numItems = rowCount(); for(int row = 0; row < numItems; row++){ QModelIndex parentIndex = index(row, 0); removeRows(4 + first, last - first + 1, parentIndex); } slotCommentDataChanged(); } void StoryboardModel::slotCommentRowMoved(const QModelIndex &sourceParent, int start, int end, const QModelIndex &destinationParent, int destinationRow) { int numItems = rowCount(); for(int row = 0; row < numItems; row++){ QModelIndex parentIndex = index(row, 0); moveRows(parentIndex, start + 4, end - start + 1, parentIndex, destinationRow + 4); } slotCommentDataChanged(); -} \ No newline at end of file +} + +void StoryboardModel::slotInsertCommentRows(const QModelIndex parent, int first, int last) +{ + if (!parent.isValid()){ + int rows = last - first + 1; + for (int row = 0; row < rows; ++row) { + QModelIndex parentIndex = index(first + row, 0); + insertRows(0, 4 + m_commentList.count(), parentIndex); + + setData (index (0, 0, parentIndex), m_lastFrame); + m_lastFrame++; + + QString sceneName = "scene " + QString::number(m_lastScene); + setData (index (1, 0, parentIndex), sceneName); + m_lastScene++; + + setData (index (2, 0, parentIndex), 20); + setData (index (3, 0, parentIndex), 20); + } + } +} diff --git a/plugins/dockers/storyboarddocker/storyboardModel.h b/plugins/dockers/storyboarddocker/storyboardModel.h index 4d8b4200e6..0764c51f7a 100644 --- a/plugins/dockers/storyboarddocker/storyboardModel.h +++ b/plugins/dockers/storyboarddocker/storyboardModel.h @@ -1,100 +1,104 @@ /* * Copyright (c) 2020 Saurabh Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef STORYBOARD_MODEL #define STORYBOARD_MODEL #include #include #include "storyboardItem.h" #include "commentModel.h" /* The main storyboard model. */ class CommentBox { public: CommentBox() : content("") , scrollValue(0) {} CommentBox(const CommentBox& other) : content(other.content) , scrollValue(other.scrollValue) {} ~CommentBox() {} QVariant content; QVariant scrollValue; }; Q_DECLARE_METATYPE(CommentBox) class StoryboardModel : public QAbstractItemModel { Q_OBJECT public: //if we don't need this constructor change it StoryboardModel(QObject *parent = nullptr); QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex parent(const QModelIndex &index) const override; int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setCommentScrollData(const QModelIndex & index, const QVariant & value); Qt::ItemFlags flags(const QModelIndex &index) const override; //for removing and inserting rows bool insertRows(int position, int rows, const QModelIndex &index = QModelIndex()); bool removeRows(int position, int rows, const QModelIndex &index = QModelIndex()); bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild); //for drag and drop QMimeData *mimeData(const QModelIndexList &indexes) const; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); Qt::DropActions supportedDropActions() const override; Qt::DropActions supportedDragActions() const override; //these function access the value from the comment model int visibleCommentCount() const; int visibleCommentsUpto(QModelIndex index) const; void setCommentModel(CommentModel *commentModel); Comment getComment(int row) const; private Q_SLOTS: void slotCommentDataChanged(); void slotCommentRowInserted(const QModelIndex, int, int); void slotCommentRowRemoved(const QModelIndex, int, int); void slotCommentRowMoved(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild); + void slotInsertCommentRows(const QModelIndex parent, int first, int last); private: QVector m_items; int m_commentCount = 0; QVector m_commentList; CommentModel *m_commentModel; + + int m_lastFrame = 0; + int m_lastScene = 0; }; #endif \ No newline at end of file diff --git a/plugins/dockers/storyboarddocker/storyboardView.cpp b/plugins/dockers/storyboarddocker/storyboardView.cpp index e010c5f45f..6363058778 100644 --- a/plugins/dockers/storyboarddocker/storyboardView.cpp +++ b/plugins/dockers/storyboarddocker/storyboardView.cpp @@ -1,224 +1,247 @@ /* Copyright (c) 2020 Saurabh Kumar This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include #include #include +#include #include "storyboardView.h" #include "storyboardModel.h" /** * This view draws the children of every index in the first column of * the model inside the parent * * */ StoryboardView::StoryboardView(QWidget *parent) : QListView(parent) , m_commentIsVisible(true) , m_thumbnailIsVisible(true) { setSelectionBehavior(SelectRows); setDefaultDropAction(Qt::MoveAction); setResizeMode(QListView::Adjust); setUniformItemSizes(true); setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); setHorizontalScrollMode(QAbstractItemView::ScrollPerPixel); QWidget::setMouseTracking(true); + setContextMenuPolicy(Qt::CustomContextMenu); setDragEnabled(true); viewport()->setAcceptDrops(true); setDropIndicatorShown(true); setDragDropMode(QAbstractItemView::InternalMove); + + connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), + this, SLOT(slotContextMenuRequested(const QPoint &))); } StoryboardView::~StoryboardView() {} void StoryboardView::paintEvent(QPaintEvent *event) { event->accept(); QListView::paintEvent(event); //ask delegate to draw the child nodes too QPainter painter(viewport()); int itemNum = model()->rowCount(); for (int row = 0; row < itemNum; row++){ QModelIndex index = model()->index(row, 0); int childNum = model()->rowCount(index); for (int childRow = 0; childRow < childNum; childRow++){ QModelIndex childIndex = model()->index(childRow, 0, index); QStyleOptionViewItem option; if (selectionModel()->isSelected(childIndex)) { option.state |= QStyle::State_Selected; } if (childIndex == selectionModel()->currentIndex()) { option.state |= QStyle::State_HasFocus; } if (childIndex == m_hoverIndex){ option.state |= QStyle::State_MouseOver; } option.font = font(); option.fontMetrics = fontMetrics(); option.rect = visualRect(childIndex); itemDelegate()->paint(&painter, option, childIndex); } } } QRect StoryboardView::visualRect(const QModelIndex &index) const { if (!index.isValid() || !index.parent().isValid()) { return QListView::visualRect(index); } else { QRect parentRect = visualRect(index.parent()); parentRect.setTopLeft(parentRect.topLeft() + QPoint(5, 5)); parentRect.setBottomRight(parentRect.bottomRight() - QPoint(5, 5)); int fontHeight = fontMetrics().height() + 3; int numericFontWidth = fontMetrics().width("0"); - int height = parentRect.height(); int parentWidth = parentRect.width(); int childRow = index.row(); int thumbnailWidth = parentWidth; if (m_itemOrientation == Qt::Horizontal){ thumbnailWidth = 250; } switch (childRow) { case 0: { //the frame thumbnail rect if (!thumbnailIsVisible()){ parentRect.setSize(QSize(3*numericFontWidth + 2, fontHeight)); return parentRect; } parentRect.setSize(QSize(thumbnailWidth, 120)); parentRect.translate(0, fontHeight); return parentRect; } case 1: { QRect itemNameRect = parentRect; itemNameRect.setSize(QSize(thumbnailWidth - (10 * numericFontWidth + 22), fontHeight)); itemNameRect.moveLeft(parentRect.left() + 3*numericFontWidth + 2); return itemNameRect; } case 2: { QRect secondRect = parentRect; secondRect.setSize(QSize(4 * numericFontWidth + 10, fontHeight)); //secondRect.moveRight(parentRect.right() - 3*numericFontWidth -10); secondRect.moveLeft(parentRect.left() - 7*numericFontWidth + thumbnailWidth -20); return secondRect; } case 3: { QRect frameRect = parentRect; frameRect.setSize(QSize(3 * numericFontWidth + 10, fontHeight)); frameRect.moveRight(parentRect.right()); frameRect.moveLeft(parentRect.left() - 3*numericFontWidth + thumbnailWidth - 10); return frameRect; } default: { //comment rect if (!commentIsVisible()) return QRect(); int thumbnailheight = thumbnailIsVisible() ? 120 : 0; if (m_itemOrientation == Qt::Vertical){ const StoryboardModel* Model = dynamic_cast(model()); parentRect.setTop(parentRect.top() + thumbnailheight + fontHeight + Model->visibleCommentsUpto(index) * 100); parentRect.setHeight(100); return parentRect; } else { const StoryboardModel* Model = dynamic_cast(model()); int numVisibleComments = Model->visibleCommentCount(); int commentWidth = 200; if (numVisibleComments){ commentWidth = qMax(200, (viewport()->width() - 250) / numVisibleComments); } parentRect.setSize(QSize(commentWidth, thumbnailheight + fontHeight)); parentRect.moveLeft(parentRect.left() + thumbnailWidth + Model->visibleCommentsUpto(index) * commentWidth); return parentRect; } } } } return QRect(); } QModelIndex StoryboardView::indexAt(const QPoint &point) const { QModelIndex index = QListView::indexAt(point); if (index.isValid()) { //look for the index in children of the current index int numChild = model()->rowCount(index); for (int row = 0; row < numChild; row++) { QRect childRect = visualRect(model()->index(row, 0, index)); if (childRect.contains(point)) { return model()->index(row, 0, index); } } } return index; } void StoryboardView::mouseMoveEvent(QMouseEvent *event) { event->accept(); QListView::mouseMoveEvent(event); m_hoverIndex = indexAt(event->pos()); } void StoryboardView::setItemOrientation(Qt::Orientation orientation) { m_itemOrientation = orientation; } Qt::Orientation StoryboardView::itemOrientation() { return m_itemOrientation; } bool StoryboardView::commentIsVisible() const { return m_commentIsVisible; } bool StoryboardView::thumbnailIsVisible() const { return m_thumbnailIsVisible; } void StoryboardView::setCommentVisibility(bool value) { m_commentIsVisible = value; } void StoryboardView::setThumbnailVisibility(bool value) { m_thumbnailIsVisible = value; } + +void StoryboardView::slotContextMenuRequested(const QPoint &point) +{ + QMenu contextMenu; + QModelIndex index = indexAt(point); + if (!index.isValid()) { + contextMenu.addAction("Add Stroyboard Item", [this, index] {model()->insertRows(model()->rowCount(), 1); }); + } + else if (index.parent().isValid()){ + index = index.parent(); + contextMenu.addAction("Add Stroyboard Item After", [this, index] {model()->insertRows(index.row() + 1, 1); }); + } + + if (index.isValid()){ + contextMenu.addAction("Add Stroyboard Item Before", [this, index] {model()->insertRows(index.row(), 1); }); + contextMenu.addAction("Remove Stroyboard Item", [this, index] {model()->removeRows(index.row(), 1); }); + } + contextMenu.exec(viewport()->mapToGlobal(point)); +} diff --git a/plugins/dockers/storyboarddocker/storyboardView.h b/plugins/dockers/storyboarddocker/storyboardView.h index 037a9f0521..ea1c372f0d 100644 --- a/plugins/dockers/storyboarddocker/storyboardView.h +++ b/plugins/dockers/storyboarddocker/storyboardView.h @@ -1,60 +1,63 @@ /* Copyright (c) 2020 Saurabh Kumar This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef STORYBOARD_VIEW_H #define STORYBOARD_VIEW_H #include #include class QStyleOptionViewItem; class StoryboardModel; /** * This view draws the children of every index in the first column of * the model inside the parent index * * */ class StoryboardView: public QListView { Q_OBJECT public: explicit StoryboardView(QWidget *parent = 0); ~StoryboardView() override; void paintEvent(QPaintEvent *event) override; QRect visualRect(const QModelIndex &index) const override; QModelIndex indexAt(const QPoint &point) const override; void mouseMoveEvent(QMouseEvent *event) override; void setItemOrientation(Qt::Orientation orientation); Qt::Orientation itemOrientation(); bool commentIsVisible() const; bool thumbnailIsVisible() const; void setCommentVisibility(bool value); void setThumbnailVisibility(bool value); +private Q_SLOTS: + void slotContextMenuRequested(const QPoint &); + private: QModelIndex m_hoverIndex; Qt::Orientation m_itemOrientation; bool m_commentIsVisible; bool m_thumbnailIsVisible; }; #endif