X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=e9a260dc0089611d3944b678120b1b7e719331bc;hb=e74ed82c3ebc6b5b86106632f5dabdc524ac695a;hp=919926068497326c85c738480971a3794a362a88;hpb=e9f56d1d2124e60ca64ce64d254da39fceac7bf4;p=kdenlive diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 91992606..e9a260dc 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -39,25 +40,23 @@ const int TypeRole = Qt::UserRole; const int IdRole = TypeRole + 1; -EffectsListWidget::EffectsListWidget(QMenu *menu, QWidget *parent) : +EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) : QTreeWidget(parent), - m_menu(menu) + m_menu(contextMenu) { - //setSelectionMode(QAbstractItemView::ExtendedSelection); - //setDragDropMode(QAbstractItemView::DragDrop); setColumnCount(1); - setDropIndicatorShown(true); - //setAlternatingRowColors(true); setDragEnabled(true); - setAcceptDrops(true); + setAcceptDrops(false); setHeaderHidden(true); setFrameShape(QFrame::NoFrame); setAutoFillBackground(false); - setRootIsDecorated(false); + setRootIsDecorated(true); + setIndentation(10); + //setSelectionMode(QAbstractItemView::ExtendedSelection); + setDragDropMode(QAbstractItemView::DragOnly); QPalette p = palette(); p.setBrush(QPalette::Base, Qt::NoBrush); setPalette(p); - initList(); connect(this, SIGNAL(activated(const QModelIndex &)), this, SLOT(slotExpandItem(const QModelIndex &))); } @@ -70,26 +69,22 @@ void EffectsListWidget::slotExpandItem(const QModelIndex & index) setExpanded(index, !isExpanded(index)); } -void EffectsListWidget::initList() +void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActions) { QString current; QString currentFolder; - QTreeWidgetItem *item; - QTreeWidgetItem *parentItem; + QTreeWidgetItem *item = NULL; bool found = false; - + effectsMenu->clear(); + if (currentItem()) { current = currentItem()->text(0); - if (currentItem()->parent()) currentFolder = currentItem()->parent()->text(0); + if (currentItem()->parent()) + currentFolder = currentItem()->parent()->text(0); + else if (currentItem()->data(0, TypeRole) == EFFECT_FOLDER) + currentFolder = currentItem()->text(0); } - QString effectName; - QStringList effectInfo; - KIcon videoIcon("kdenlive-show-video"); - KIcon audioIcon("kdenlive-show-audio"); - KIcon customIcon("kdenlive-custom-effect"); - KIcon folderIcon("folder"); - QString effectCategory = KStandardDirs::locate("config", "kdenliveeffectscategory.rc"); QDomDocument doc; QFile file(effectCategory); @@ -99,120 +94,146 @@ void EffectsListWidget::initList() QStringList folderNames; QDomNodeList groups = doc.documentElement().elementsByTagName("group"); for (int i = 0; i < groups.count(); i++) { - folderNames << groups.at(i).firstChild().firstChild().nodeValue(); + folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData()); } for (int i = 0; i < topLevelItemCount(); i++) { topLevelItem(i)->takeChildren(); - if (!folderNames.contains(topLevelItem(i)->text(0))) { + QString currentName = topLevelItem(i)->text(0); + if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) { takeTopLevelItem(i); i--; } } for (int i = 0; i < groups.count(); i++) { - QList result = findItems(folderNames.at(i), Qt::MatchExactly); - if (!result.isEmpty()) item = result.at(0); - else item = new QTreeWidgetItem((QTreeWidget*)0, QStringList(folderNames.at(i))); - item->setIcon(0, folderIcon); - item->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); - item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); + item = findFolder(folderNames.at(i)); + if (item) { + item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); + } else { + item = new QTreeWidgetItem((QTreeWidget*)0, QStringList(folderNames.at(i))); + item->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); + item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless); + insertTopLevelItem(0, item); + } folders.append(item); } - QTreeWidgetItem *misc = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Misc"))); - misc->setIcon(0, folderIcon); - misc->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + QTreeWidgetItem *misc = findFolder(i18n("Misc")); + if (misc == NULL) { + misc = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Misc"))); + misc->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + misc->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + insertTopLevelItem(0, misc); + } - QTreeWidgetItem *audio = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Audio"))); - audio->setIcon(0, folderIcon); - audio->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + QTreeWidgetItem *audio = findFolder(i18n("Audio")); + if (audio == NULL) { + audio = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Audio"))); + audio->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + audio->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + insertTopLevelItem(0, audio); + } - QTreeWidgetItem *custom = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Custom"))); - custom->setIcon(0, folderIcon); - custom->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + QTreeWidgetItem *custom = findFolder(i18nc("Folder Name", "Custom")); + if (custom == NULL) { + custom = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18nc("Folder Name", "Custom"))); + custom->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); + custom->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + insertTopLevelItem(0, custom); + } - insertTopLevelItem(0, custom); - insertTopLevelItem(0, misc); - insertTopLevelItem(0, audio); - insertTopLevelItems(0, folders); + //insertTopLevelItems(0, folders); + loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, QString::number((int) EFFECT_VIDEO), current, &found); + loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, QString::number((int) EFFECT_AUDIO), current, &found); + loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast *>(0), QString::number((int) EFFECT_CUSTOM), current, &found); - int ct = MainWindow::videoEffects.count(); - for (int ix = 0; ix < ct; ix ++) { - effectInfo = MainWindow::videoEffects.effectIdInfo(ix); - parentItem = NULL; - for (int i = 0; i < folders.count(); i++) { - QStringList l = folders.at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts); - if (l.contains(effectInfo.at(2))) { - parentItem = folders.at(i); + if (!found && !currentFolder.isEmpty()) { + // previously selected effect was removed, focus on its parent folder + for (int i = 0; i < topLevelItemCount(); i++) { + if (topLevelItem(i)->text(0) == currentFolder) { + setCurrentItem(topLevelItem(i)); break; } } - if (parentItem == NULL) parentItem = misc; - if (!effectInfo.isEmpty()) { - item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst())); - item->setIcon(0, videoIcon); - item->setData(0, TypeRole, QString::number((int) EFFECT_VIDEO)); - item->setData(0, IdRole, effectInfo); - if (item->text(0) == current) { - setCurrentItem(item); - found = true; - } + + } + setSortingEnabled(true); + sortByColumn(0, Qt::AscendingOrder); + + // populate effects menu + for (int i = 0; i < topLevelItemCount(); i++) { + if (!topLevelItem(i)->childCount()) + continue; + QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu); + effectsMenu->addMenu(sub); + for (int j = 0; j < topLevelItem(i)->childCount(); j++) { + QTreeWidgetItem *item = topLevelItem(i)->child(j); + KAction *a = new KAction(KIcon(item->icon(0)), item->text(0), sub); + QStringList data = item->data(0, IdRole).toStringList(); + QString id = data.at(1); + if (id.isEmpty()) id = data.at(0); + a->setData(data); + a->setIconVisibleInMenu(false); + sub->addAction(a); + effectActions->addAction("video_effect_" + id, a); } } +} + +void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, const QString type, const QString current, bool *found) +{ + QStringList effectInfo, l; + QTreeWidgetItem *parentItem; + QTreeWidgetItem *item; + int ct = effectlist->count(); - ct = MainWindow::audioEffects.count(); for (int ix = 0; ix < ct; ix ++) { - effectInfo = MainWindow::audioEffects.effectIdInfo(ix); + effectInfo = effectlist->effectIdInfo(ix); + effectInfo.append(type); parentItem = NULL; - for (int i = 0; i < folders.count(); i++) { - QStringList l = folders.at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts); - if (l.contains(effectInfo.at(2))) { - parentItem = folders.at(i); - break; + + if (folders) { + for (int i = 0; i < folders->count(); i++) { + l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts); + if (l.contains(effectInfo.at(2))) { + parentItem = folders->at(i); + break; + } } } - if (parentItem == NULL) parentItem = audio; + if (parentItem == NULL) + parentItem = defaultFolder; + if (!effectInfo.isEmpty()) { item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst())); - item->setIcon(0, audioIcon); - item->setData(0, TypeRole, QString::number((int) EFFECT_AUDIO)); + item->setIcon(0, icon); + item->setData(0, TypeRole, type); item->setData(0, IdRole, effectInfo); + item->setToolTip(0, effectlist->getInfo(effectInfo.at(0), effectInfo.at(1))); if (item->text(0) == current) { setCurrentItem(item); - found = true; + *found = true; } } } +} - ct = MainWindow::customEffects.count(); - kDebug() << "--- REBUILDING;: " << ct; - for (int ix = 0; ix < ct; ix ++) { - effectInfo = MainWindow::customEffects.effectIdInfo(ix); - if (!effectInfo.isEmpty()) { - item = new QTreeWidgetItem(custom, QStringList(effectInfo.takeFirst())); - item->setIcon(0, customIcon); - item->setData(0, TypeRole, QString::number((int) EFFECT_CUSTOM)); - item->setData(0, IdRole, effectInfo); - if (item->text(0) == current) { - setCurrentItem(item); - found = true; - } - } - } - if (!found && !currentFolder.isEmpty()) { - // previously selected effect was removed, focus on its parent folder - for (int i = 0; i < topLevelItemCount(); i++) { - if (topLevelItem(i)->text(0) == currentFolder) { - setCurrentItem(topLevelItem(i)); - topLevelItem(i)->setExpanded(true); +QTreeWidgetItem *EffectsListWidget::findFolder(const QString name) +{ + QTreeWidgetItem *item = NULL; + QList result = findItems(name, Qt::MatchExactly); + if (!result.isEmpty()) { + for (int j = 0; j < result.count(); j++) { + if (result.at(j)->data(0, TypeRole) == EFFECT_FOLDER) { + item = result.at(j); break; } } - } - setSortingEnabled(true); - sortByColumn(0, Qt::AscendingOrder); + return item; } const QDomElement EffectsListWidget::currentEffect() const @@ -261,57 +282,34 @@ QString EffectsListWidget::currentInfo() return info; } -// virtual -void EffectsListWidget::mousePressEvent(QMouseEvent *event) -{ - if (event->button() == Qt::LeftButton) { - m_DragStartPosition = event->pos(); - m_dragStarted = true; - } - QTreeWidget::mousePressEvent(event); -} - -// virtual -void EffectsListWidget::mouseMoveEvent(QMouseEvent *event) +//virtual +QMimeData * EffectsListWidget::mimeData(const QList list) const { - if (!m_dragStarted) return; - if ((event->pos() - m_DragStartPosition).manhattanLength() - < QApplication::startDragDistance()) - return; - - { - QTreeWidgetItem *clickItem = itemAt(event->pos()); - if (clickItem && clickItem->data(0, TypeRole).toInt() != (int)EFFECT_FOLDER) { - QDrag *drag = new QDrag(this); - QMimeData *mimeData = new QMimeData; - const QList list = selectedItems(); - QDomDocument doc; - foreach(QTreeWidgetItem *item, list) { - const QDomElement e = itemEffect(item); - if (!e.isNull()) doc.appendChild(doc.importNode(e, true)); - } - QByteArray data; - data.append(doc.toString().toUtf8()); - mimeData->setData("kdenlive/effectslist", data); - drag->setMimeData(mimeData); - //QPixmap pix = qVariantValue(clickItem->data(Qt::DecorationRole)); - //drag->setPixmap(pix); - //drag->setHotSpot(QPoint(0, 50)); - drag->start(Qt::CopyAction); + QDomDocument doc; + foreach(QTreeWidgetItem *item, list) { + if (item->flags() & Qt::ItemIsDragEnabled) { + const QDomElement e = itemEffect(item); + if (!e.isNull()) doc.appendChild(doc.importNode(e, true)); } - event->accept(); } + QMimeData *mime = new QMimeData; + QByteArray data; + data.append(doc.toString().toUtf8()); + mime->setData("kdenlive/effectslist", data); + return mime; } -void EffectsListWidget::dragMoveEvent(QDragMoveEvent * event) +//virtual +void EffectsListWidget::dragMoveEvent(QDragMoveEvent *event) { - event->setDropAction(Qt::CopyAction); - if (event->mimeData()->hasText()) { + if (event->mimeData()->hasFormat("kdenlive/effectslist")) { event->acceptProposedAction(); + } else { + event->ignore(); } - //} } + //virtual void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event) {