QPalette p = palette();
p.setBrush(QPalette::Base, Qt::NoBrush);
setPalette(p);
- connect(this, SIGNAL(activated(const QModelIndex &)), this, SLOT(slotExpandItem(const QModelIndex &)));
+ connect(this, SIGNAL(activated(QModelIndex)), this, SLOT(slotExpandItem(QModelIndex)));
}
EffectsListWidget::~EffectsListWidget()
QList <QTreeWidgetItem *> folders;
QStringList folderNames;
QDomNodeList groups = doc.documentElement().elementsByTagName("group");
- for (int i = 0; i < groups.count(); i++) {
+ for (int i = 0; i < groups.count(); ++i) {
folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData());
}
- for (int i = 0; i < topLevelItemCount(); i++) {
+ for (int i = 0; i < topLevelItemCount(); ++i) {
topLevelItem(i)->takeChildren();
QString currentName = topLevelItem(i)->text(0);
if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) {
takeTopLevelItem(i);
- i--;
+ --i;
}
}
- for (int i = 0; i < groups.count(); i++) {
+ for (int i = 0; i < groups.count(); ++i) {
item = findFolder(folderNames.at(i));
if (item) {
item->setData(0, IdRole, groups.at(i).toElement().attribute("list"));
//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<QList<QTreeWidgetItem *> *>(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<QList<QTreeWidgetItem *> *>(0), EFFECT_CUSTOM, current, &found);
if (!found && !currentFolder.isEmpty()) {
// previously selected effect was removed, focus on its parent folder
- for (int i = 0; i < topLevelItemCount(); i++) {
+ for (int i = 0; i < topLevelItemCount(); ++i) {
if (topLevelItem(i)->text(0) == currentFolder) {
setCurrentItem(topLevelItem(i));
break;
sortByColumn(0, Qt::AscendingOrder);
// populate effects menu
- for (int i = 0; i < topLevelItemCount(); i++) {
+ 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();
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<QTreeWidgetItem *> *folders, const QString type, const QString current, bool *found)
+void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList<QTreeWidgetItem *> *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) {
- for (int i = 0; i < folders->count(); i++) {
+ 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);
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)));
}
}
-QTreeWidgetItem *EffectsListWidget::findFolder(const QString name)
+QTreeWidgetItem *EffectsListWidget::findFolder(const QString &name)
{
QTreeWidgetItem *item = NULL;
QList<QTreeWidgetItem *> result = findItems(name, Qt::MatchExactly);
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();
}
-QString EffectsListWidget::currentInfo()
+QString EffectsListWidget::currentInfo() const
{
QTreeWidgetItem *item = currentItem();
if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString();
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<QTreeWidgetItem *> list) const
{
projects / kdenlive / blobdiff