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;
QMenu *sub2 = NULL;
QMenu *sub3 = NULL;
QMenu *sub4 = NULL;
- for (int i = 0; i < topLevelItemCount(); i++) {
+ for (int i = 0; i < topLevelItemCount(); ++i) {
if (!topLevelItem(i)->childCount())
continue;
QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu);
}
}
-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);
}
}
-QTreeWidgetItem *EffectsListWidget::findFolder(const QString name)
+QTreeWidgetItem *EffectsListWidget::findFolder(const QString &name)
{
QTreeWidgetItem *item = NULL;
QList<QTreeWidgetItem *> result = findItems(name, Qt::MatchExactly);
}
-QString EffectsListWidget::currentInfo()
+QString EffectsListWidget::currentInfo() const
{
QTreeWidgetItem *item = currentItem();
if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString();
{
if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
emit applyEffect(currentEffect());
+ e->accept();
+ return;
}
QTreeWidget::keyPressEvent(e);
}