#include <KMessageBox>
#include <KIO/NetAccess>
#include <KFileItem>
+#include <KApplication>
#ifdef NEPOMUK
#include <nepomuk/global.h>
#include <nepomuk/resourcemanager.h>
m_render(NULL),
m_fps(-1),
m_commandStack(NULL),
- m_editAction(NULL),
- m_deleteAction(NULL),
m_openAction(NULL),
m_reloadAction(NULL),
m_transcodeAction(NULL),
m_infoQueue(),
m_thumbnailQueue()
{
-
- m_listView = new ProjectListView(this);;
QVBoxLayout *layout = new QVBoxLayout;
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
// setup toolbar
- KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine(this);
- m_toolbar = new QToolBar("projectToolBar", this);
- m_toolbar->addWidget(searchView);
- int s = style()->pixelMetric(QStyle::PM_SmallIconSize);
- m_toolbar->setIconSize(QSize(s, s));
- searchView->setTreeWidget(m_listView);
+ QFrame *frame = new QFrame;
+ frame->setFrameStyle(QFrame::NoFrame);
+ QHBoxLayout *box = new QHBoxLayout;
+ KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine;
+
+ box->addWidget(searchView);
+ //int s = style()->pixelMetric(QStyle::PM_SmallIconSize);
+ //m_toolbar->setIconSize(QSize(s, s));
- m_addButton = new QToolButton(m_toolbar);
+ m_addButton = new QToolButton;
m_addButton->setPopupMode(QToolButton::MenuButtonPopup);
- m_toolbar->addWidget(m_addButton);
+ m_addButton->setAutoRaise(true);
+ box->addWidget(m_addButton);
- layout->addWidget(m_toolbar);
+ m_editButton = new QToolButton;
+ m_editButton->setAutoRaise(true);
+ box->addWidget(m_editButton);
+
+ m_deleteButton = new QToolButton;
+ m_deleteButton->setAutoRaise(true);
+ box->addWidget(m_deleteButton);
+ frame->setLayout(box);
+ layout->addWidget(frame);
+
+ m_listView = new ProjectListView;
layout->addWidget(m_listView);
setLayout(layout);
+ searchView->setTreeWidget(m_listView);
m_queueTimer.setInterval(100);
connect(&m_queueTimer, SIGNAL(timeout()), this, SLOT(slotProcessNextClipInQueue()));
ProjectList::~ProjectList()
{
delete m_menu;
- delete m_toolbar;
m_listView->blockSignals(true);
m_listView->clear();
delete m_listViewDelegate;
QList <QAction *> actions = addMenu->actions();
for (int i = 0; i < actions.count(); i++) {
if (actions.at(i)->data().toString() == "clip_properties") {
- m_editAction = actions.at(i);
- m_toolbar->addAction(m_editAction);
+ m_editButton->setDefaultAction(actions.at(i));
actions.removeAt(i);
i--;
} else if (actions.at(i)->data().toString() == "delete_clip") {
- m_deleteAction = actions.at(i);
- m_toolbar->addAction(m_deleteAction);
+ m_deleteButton->setDefaultAction(actions.at(i));
actions.removeAt(i);
i--;
} else if (actions.at(i)->data().toString() == "edit_clip") {
m_menu->addAction(m_reloadAction);
m_menu->addMenu(inTimelineMenu);
inTimelineMenu->setEnabled(false);
- m_menu->addAction(m_editAction);
+ m_menu->addAction(m_editButton->defaultAction());
m_menu->addAction(m_openAction);
- m_menu->addAction(m_deleteAction);
- m_menu->insertSeparator(m_deleteAction);
+ m_menu->addAction(m_deleteButton->defaultAction());
+ m_menu->insertSeparator(m_deleteButton->defaultAction());
}
// Gather all common properties
QMap <QString, QString> commonproperties;
QList <DocClipBase *> clipList;
- commonproperties.insert("force_aspect_ratio", "-");
+ commonproperties.insert("force_aspect_num", "-");
+ commonproperties.insert("force_aspect_den", "-");
commonproperties.insert("force_fps", "-");
commonproperties.insert("force_progressive", "-");
+ commonproperties.insert("force_tff", "-");
commonproperties.insert("threads", "-");
commonproperties.insert("video_index", "-");
commonproperties.insert("audio_index", "-");
+ commonproperties.insert("force_colorspace", "-");
+ commonproperties.insert("full_luma", "-");
bool allowDurationChange = true;
int commonDuration = -1;
if (item) {
if (item->clipType() == IMAGE) {
if (KdenliveSettings::defaultimageapp().isEmpty())
- KMessageBox::sorry(this, i18n("Please set a default application to open images in the Settings dialog"));
+ KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open images in the Settings dialog"));
else
QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path());
}
if (item->clipType() == AUDIO) {
if (KdenliveSettings::defaultaudioapp().isEmpty())
- KMessageBox::sorry(this, i18n("Please set a default application to open audio files in the Settings dialog"));
+ KMessageBox::sorry(kapp->activeWindow(), i18n("Please set a default application to open audio files in the Settings dialog"));
else
QProcess::startDetached(KdenliveSettings::defaultaudioapp(), QStringList() << item->clipUrl().path());
}
if (m_listView->currentItem()) {
if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) {
emit clipSelected(NULL);
- m_editAction->setEnabled(false);
- m_deleteAction->setEnabled(true);
+ m_editButton->defaultAction()->setEnabled(false);
+ m_deleteButton->defaultAction()->setEnabled(true);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
ProjectItem *clip;
if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
// this is a sub item, use base clip
- m_deleteAction->setEnabled(true);
+ m_deleteButton->defaultAction()->setEnabled(true);
clip = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
if (clip == NULL) kDebug() << "-----------ERROR";
SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
clip = static_cast <ProjectItem*>(m_listView->currentItem());
if (clip)
emit clipSelected(clip->referencedClip());
- m_editAction->setEnabled(true);
- m_deleteAction->setEnabled(true);
+ m_editButton->defaultAction()->setEnabled(true);
+ m_deleteButton->defaultAction()->setEnabled(true);
m_reloadAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
}
} else {
emit clipSelected(NULL);
- m_editAction->setEnabled(false);
- m_deleteAction->setEnabled(false);
+ m_editButton->defaultAction()->setEnabled(false);
+ m_deleteButton->defaultAction()->setEnabled(false);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
ProjectItem *item = getItemById(id);
if (item) {
slotUpdateClipProperties(item, properties);
- if (properties.contains("out") || properties.contains("force_fps")) {
+ if (properties.contains("out") || properties.contains("force_fps") || properties.contains("resource")) {
slotReloadClip(id);
- } else if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio") || properties.contains("templatetext")) {
+ } else if (properties.contains("colour") ||
+ properties.contains("xmldata") ||
+ properties.contains("force_aspect_num") ||
+ properties.contains("force_aspect_den") ||
+ properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
emit refreshClip();
+ } else if (properties.contains("full_luma") || properties.contains("force_colorspace")) {
+ emit refreshClip();
}
}
}
void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item)
{
bool enable = item ? true : false;
- m_editAction->setEnabled(enable);
- m_deleteAction->setEnabled(enable);
+ m_editButton->defaultAction()->setEnabled(enable);
+ m_deleteButton->defaultAction()->setEnabled(enable);
m_reloadAction->setEnabled(enable);
m_transcodeAction->setEnabled(enable);
if (enable) {
QUndoCommand *delCommand = new QUndoCommand();
delCommand->setText(i18n("Delete Clip Zone"));
-
for (int i = 0; i < selected.count(); i++) {
if (selected.at(i)->type() == PROJECTSUBCLIPTYPE) {
// subitem
folderids[folder->groupName()] = folder->clipId();
int children = folder->childCount();
- if (children > 0 && KMessageBox::questionYesNo(this, i18np("Delete folder <b>%2</b>?<br />This will also remove the clip in that folder", "Delete folder <b>%2</b>?<br />This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes)
+ if (children > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete folder <b>%2</b>?<br />This will also remove the clip in that folder", "Delete folder <b>%2</b>?<br />This will also remove the %1 clips in that folder", children, folder->text(1)), i18n("Delete Folder")) != KMessageBox::Yes)
return;
for (int i = 0; i < children; ++i) {
ProjectItem *child = static_cast <ProjectItem *>(folder->child(i));
} else {
ProjectItem *item = static_cast <ProjectItem *>(selected.at(i));
ids << item->clipId();
- if (item->numReferences() > 0 && KMessageBox::questionYesNo(this, i18np("Delete clip <b>%2</b>?<br />This will also remove the clip in timeline", "Delete clip <b>%2</b>?<br />This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes)
+ if (item->numReferences() > 0 && KMessageBox::questionYesNo(kapp->activeWindow(), i18np("Delete clip <b>%2</b>?<br />This will also remove the clip in timeline", "Delete clip <b>%2</b>?<br />This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip"), KStandardGuiItem::yes(), KStandardGuiItem::no(), "DeleteAll") == KMessageBox::No) {
+ KMessageBox::enableMessage("DeleteAll");
return;
+ }
}
}
-
+ KMessageBox::enableMessage("DeleteAll");
if (delCommand->childCount() == 0)
delete delCommand;
else
void ProjectList::updateButtons() const
{
if (m_listView->topLevelItemCount() == 0) {
- m_deleteAction->setEnabled(false);
+ m_deleteButton->defaultAction()->setEnabled(false);
} else {
- m_deleteAction->setEnabled(true);
+ m_deleteButton->defaultAction()->setEnabled(true);
if (!m_listView->currentItem())
m_listView->setCurrentItem(m_listView->topLevelItem(0));
QTreeWidgetItem *item = m_listView->currentItem();
if (item && item->type() == PROJECTCLIPTYPE) {
- m_editAction->setEnabled(true);
+ m_editButton->defaultAction()->setEnabled(true);
m_openAction->setEnabled(true);
m_reloadAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
}
}
- m_editAction->setEnabled(false);
+ m_editButton->defaultAction()->setEnabled(false);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
m_transcodeAction->setEnabled(false);
// Build list of mime types
QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/mlt-playlist" << "text/plain"
<< "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "video/mp4" << "video/quicktime"
- << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "application/mxf"
+ << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "application/mxf" << "application/x-shockwave-flash"
<< "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr";
QString allExtensions;
const QString dialogFilter = allExtensions + ' ' + QLatin1Char('|') + i18n("All Supported Files") + "\n* " + QLatin1Char('|') + i18n("All Files");
QCheckBox *b = new QCheckBox(i18n("Import image sequence"));
b->setChecked(KdenliveSettings::autoimagesequence());
- KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, this, b);
+ KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), b);
d->setOperationMode(KFileDialog::Opening);
d->setMode(KFile::Files);
d->exec();
if (fileName.at(fileName.size() - 1).isDigit()) {
KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url);
if (item.mimetype().startsWith("image")) {
- int count = 0;
// import as sequence if we found more than one image in the sequence
- QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &count);
+ QStringList list;
+ QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list);
+ int count = list.count();
if (count > 1) {
delete d;
QStringList groupInfo = getGroup();
if (item->referencedClip()->isPlaceHolder()) replace = false;
if (!path.isEmpty()) {
if (replace)
- KMessageBox::sorry(this, i18n("Clip <b>%1</b><br />is invalid, will be removed from project.", path));
- else if (KMessageBox::questionYesNo(this, i18n("Clip <b>%1</b><br />is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes)
+ KMessageBox::sorry(kapp->activeWindow(), i18n("Clip <b>%1</b><br />is invalid, will be removed from project.", path));
+ else if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("Clip <b>%1</b><br />is missing or invalid. Remove it from project?", path), i18n("Invalid clip")) == KMessageBox::Yes)
replace = true;
}
if (replace)
if (!templateFiles.isEmpty())
dia_ui.buttonBox->button(QDialogButtonBox::Ok)->setFocus();
- dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle");
+ dia_ui.template_list->fileDialog()->setFilter("application/x-kdenlivetitle");
//warning: setting base directory doesn't work??
KUrl startDir(path);
dia_ui.template_list->fileDialog()->setUrl(startDir);
slotAddClip(list.at(i), false);
m_listView->blockSignals(false);
- m_toolbar->setEnabled(true);
connect(m_doc->clipManager(), SIGNAL(reloadClip(const QString &)), this, SLOT(slotReloadClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(modifiedClip(const QString &)), this, SLOT(slotModifiedClip(const QString &)));
connect(m_doc->clipManager(), SIGNAL(missingClip(const QString &)), this, SLOT(slotMissingClip(const QString &)));
}
if (update)
emit projectModified();
- QTimer::singleShot(30, this, SLOT(slotProcessNextThumbnail()));
+
+ slotProcessNextThumbnail();
}
}
item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled);
toReload = clipId;
}
- //Q_ASSERT_X(item->referencedClip(), "void ProjectList::slotReplyGetFileProperties", QString("Item with groupName %1 does not have a clip associated").arg(item->groupName()).toLatin1());
item->referencedClip()->setProducer(producer, replace);
item->referencedClip()->askForAudioThumbs();
if (!replace && item->data(0, Qt::DecorationRole).isNull())
if (!toReload.isEmpty())
item->slotSetToolTip();
- //emit receivedClipDuration(clipId);
if (m_listView->isEnabled() && replace) {
// update clip in clip monitor
emit clipSelected(NULL);
requestClipThumbnail(clipId);
}*/
} else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS...";
- int max = m_doc->clipManager()->clipsCount();
if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) {
m_listView->setCurrentItem(item);
bool updatedProfile = false;
}
if (updatedProfile == false) emit clipSelected(item->referencedClip());
} else {
+ int max = m_doc->clipManager()->clipsCount();
emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
}
if (!toReload.isEmpty())
emit clipNeedsReload(toReload, true);
- // small delay so that the app can display the progress info
- QTimer::singleShot(30, this, SLOT(slotProcessNextClipInQueue()));
+
+ qApp->processEvents();
+ slotProcessNextClipInQueue();
}
bool ProjectList::adjustProjectProfileToItem(ProjectItem *item)
item = static_cast <ProjectItem*>(m_listView->currentItem());
}
if (item == NULL || item->referencedClip() == NULL) {
- KMessageBox::information(this, i18n("Cannot find profile from current clip"));
+ KMessageBox::information(kapp->activeWindow(), i18n("Cannot find profile from current clip"));
return false;
}
bool profileUpdated = false;
}
delete list;
delete label;
- } else KMessageBox::information(this, i18n("Your clip does not match current project's profile.\nNo existing profile found to match the clip's properties.\nClip size: %1\nFps: %2\n", size, fps));
+ } else if (fps > 0) {
+ KMessageBox::information(kapp->activeWindow(), i18n("Your clip does not match current project's profile.\nNo existing profile found to match the clip's properties.\nClip size: %1\nFps: %2\n", size, fps));
+ }
}
}
return profileUpdated;
if (clip) {
m_listView->setCurrentItem(clip);
m_listView->scrollToItem(clip);
- m_editAction->setEnabled(true);
- m_deleteAction->setEnabled(true);
+ m_editButton->defaultAction()->setEnabled(true);
+ m_deleteButton->defaultAction()->setEnabled(true);
m_reloadAction->setEnabled(true);
m_transcodeAction->setEnabled(true);
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
}
}
+void ProjectList::slotAddOrUpdateSequence(const QString frameName)
+{
+ QString fileName = KUrl(frameName).fileName().section('_', 0, -2);
+ QStringList list;
+ QString pattern = SlideshowClip::selectedPath(frameName, false, QString(), &list);
+ int count = list.count();
+ if (count > 1) {
+ const QList <DocClipBase *> existing = m_doc->clipManager()->getClipByResource(pattern);
+ if (!existing.isEmpty()) {
+ // Sequence already exists, update
+ QString id = existing.at(0)->getId();
+ //ProjectItem *item = getItemById(id);
+ QMap <QString, QString> oldprops;
+ QMap <QString, QString> newprops;
+ int ttl = existing.at(0)->getProperty("ttl").toInt();
+ oldprops["out"] = existing.at(0)->getProperty("out");
+ newprops["out"] = QString::number(ttl * count - 1);
+ slotUpdateClipProperties(id, newprops);
+ EditClipCommand *command = new EditClipCommand(this, id, oldprops, newprops, false);
+ m_commandStack->push(command);
+ } else {
+ // Create sequence
+ QStringList groupInfo = getGroup();
+ m_doc->slotCreateSlideshowClipFile(fileName, pattern, count, m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()),
+ false, false, false,
+ m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))), QString(), 0,
+ QString(), groupInfo.at(0), groupInfo.at(1));
+ }
+ } else emit displayMessage(i18n("Sequence not found"), -2);
+}
+
#include "projectlist.moc"