X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=44a066b1569defbd0c9f1fbe1ed3cacf221fdb1e;hb=efa3eb3a43aeaee3a66956e5fe791260739b8aaf;hp=77a2dbf553f622ba01e1cbbf49665f2ede71ca2b;hpb=916c0d34e0c8c27fc4d8a8d66a1b7e8542c5736e;p=kdenlive diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 77a2dbf5..44a066b1 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -50,7 +50,8 @@ EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) : setHeaderHidden(true); setFrameShape(QFrame::NoFrame); setAutoFillBackground(false); - setRootIsDecorated(false); + setRootIsDecorated(true); + setIndentation(10); //setSelectionMode(QAbstractItemView::ExtendedSelection); setDragDropMode(QAbstractItemView::DragOnly); QPalette p = palette(); @@ -84,8 +85,6 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi currentFolder = currentItem()->text(0); } - KIcon folderIcon("folder"); - QString effectCategory = KStandardDirs::locate("config", "kdenliveeffectscategory.rc"); QDomDocument doc; QFile file(effectCategory); @@ -112,10 +111,10 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); } 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->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); + item->setChildIndicatorPolicy(QTreeWidgetItem::DontShowIndicatorWhenChildless); insertTopLevelItem(0, item); } folders.append(item); @@ -124,7 +123,6 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QTreeWidgetItem *misc = findFolder(i18n("Misc")); if (misc == NULL) { misc = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Misc"))); - misc->setIcon(0, folderIcon); misc->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); misc->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); insertTopLevelItem(0, misc); @@ -133,7 +131,6 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QTreeWidgetItem *audio = findFolder(i18n("Audio")); if (audio == NULL) { audio = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18n("Audio"))); - audio->setIcon(0, folderIcon); audio->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); audio->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); insertTopLevelItem(0, audio); @@ -142,7 +139,6 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QTreeWidgetItem *custom = findFolder(i18nc("Folder Name", "Custom")); if (custom == NULL) { custom = new QTreeWidgetItem((QTreeWidget*)0, QStringList(i18nc("Folder Name", "Custom"))); - custom->setIcon(0, folderIcon); custom->setData(0, TypeRole, QString::number((int) EFFECT_FOLDER)); custom->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); insertTopLevelItem(0, custom); @@ -150,9 +146,9 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi //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); + loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, EFFECT_VIDEO, current, &found); + loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, EFFECT_AUDIO, current, &found); + loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast *>(0), EFFECT_CUSTOM, current, &found); if (!found && !currentFolder.isEmpty()) { // previously selected effect was removed, focus on its parent folder @@ -168,10 +164,30 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi sortByColumn(0, Qt::AscendingOrder); // populate effects menu + QMenu *sub1 = NULL; + QMenu *sub2 = NULL; + QMenu *sub3 = NULL; + QMenu *sub4 = NULL; 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++) { + int effectsInCategory = topLevelItem(i)->childCount(); + bool hasSubCategories = false; + if (effectsInCategory > 60) { + // create subcategories if there are too many effects + hasSubCategories = true; + sub1 = new QMenu(i18nc("menu name for effects names between these 2 letters", "0 - F"), sub); + sub->addMenu(sub1); + sub2 = new QMenu(i18nc("menu name for effects names between these 2 letters", "G - L"), sub); + sub->addMenu(sub2); + sub3 = new QMenu(i18nc("menu name for effects names between these 2 letters", "M - R"), sub); + sub->addMenu(sub3); + sub4 = new QMenu(i18nc("menu name for effects names between these 2 letters", "S - Z"), sub); + sub->addMenu(sub4); + } + for (int j = 0; j < effectsInCategory; 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(); @@ -179,22 +195,42 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi if (id.isEmpty()) id = data.at(0); a->setData(data); a->setIconVisibleInMenu(false); - sub->addAction(a); + if (hasSubCategories) { + // put action in sub category + QRegExp rx("^[s-z].+"); + if (rx.exactMatch(item->text(0).toLower())) { + sub4->addAction(a); + } else { + rx.setPattern("^[m-r].+"); + if (rx.exactMatch(item->text(0).toLower())) { + sub3->addAction(a); + } + else { + rx.setPattern("^[g-l].+"); + if (rx.exactMatch(item->text(0).toLower())) { + sub2->addAction(a); + } + else sub1->addAction(a); + } + } + } + else 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) +void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, int type, const QString current, bool *found) { QStringList effectInfo, l; QTreeWidgetItem *parentItem; QTreeWidgetItem *item; int ct = effectlist->count(); + for (int ix = 0; ix < ct; ix ++) { effectInfo = effectlist->effectIdInfo(ix); - effectInfo.append(type); + effectInfo.append(QString::number(type)); parentItem = NULL; if (folders) { @@ -211,7 +247,8 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q if (!effectInfo.isEmpty()) { item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst())); - item->setIcon(0, icon); + if (effectInfo.count() == 4) item->setIcon(0, KIcon("folder")); + else 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))); @@ -248,7 +285,6 @@ const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const QDomElement effect; if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return effect; QStringList effectInfo = item->data(0, IdRole).toStringList(); - kDebug() << "// EFFECT SELECTED: " << effectInfo; switch (item->data(0, TypeRole).toInt()) { case 1: effect = MainWindow::videoEffects.getEffectByTag(effectInfo.at(0), effectInfo.at(1)).cloneNode().toElement(); @@ -284,6 +320,17 @@ QString EffectsListWidget::currentInfo() return info; } +//virtual +void EffectsListWidget::keyPressEvent(QKeyEvent *e) +{ + if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) { + emit applyEffect(currentEffect()); + e->accept(); + return; + } + QTreeWidget::keyPressEvent(e); +} + //virtual QMimeData * EffectsListWidget::mimeData(const QList list) const {