diff --git a/src/bin/bin.h b/src/bin/bin.h --- a/src/bin/bin.h +++ b/src/bin/bin.h @@ -610,7 +610,6 @@ void slotLoadClipMarkers(const QString &id); void slotSaveClipMarkers(const QString &id); void slotDuplicateClip(); - void slotLocateClip(); void slotDeleteEffect(const QString &id, QDomElement effect); /** @brief Request audio thumbnail for clip with id */ void slotCreateAudioThumb(const QString &id); @@ -676,7 +675,6 @@ QAction *m_openAction; QAction *m_reloadAction; QAction *m_duplicateAction; - QAction *m_locateAction; QAction *m_proxyAction; QAction *m_editAction; QAction *m_deleteAction; diff --git a/src/bin/bin.cpp b/src/bin/bin.cpp --- a/src/bin/bin.cpp +++ b/src/bin/bin.cpp @@ -52,8 +52,6 @@ #include #include -#include -#include #include #include #include @@ -830,35 +828,6 @@ } } -void Bin::slotLocateClip() -{ - QModelIndexList indexes = m_proxyModel->selectionModel()->selectedIndexes(); - foreach (const QModelIndex &ix, indexes) { - if (!ix.isValid() || ix.column() != 0) { - continue; - } - AbstractProjectItem *item = static_cast(m_proxyModel->mapToSource(ix).internalPointer()); - ProjectClip *currentItem = qobject_cast(item); - if (currentItem) { - QStringList folderInfo = getFolderInfo(ix); - QDomDocument doc; - QDomElement xml = currentItem->toXml(doc); - if (!xml.isNull()) { - QUrl url = QUrl::fromLocalFile(EffectsList::property(xml, "resource")); - if (url.isValid()) { - QUrl directoryURL = url.adjusted(QUrl::RemoveFilename); - QDesktopServices::openUrl(directoryURL); - qDebug()<<" / / "+url.toString(); - qDebug()<<" / / "+directoryURL.toString(); - } else { - emitMessage(i18n("Couldn't locate ") + QString(" ("+url.toString()+")"), ErrorMessage); - return; - } - } - } - } -} - void Bin::slotDuplicateClip() { QModelIndexList indexes = m_proxyModel->selectionModel()->selectedIndexes(); @@ -1285,9 +1254,6 @@ currentItem->setCurrent(true); if (currentItem->itemType() == AbstractProjectItem::ClipItem) { m_reloadAction->setEnabled(true); - #ifdef __linux__ - m_locateAction->setEnabled(true); - #endif m_duplicateAction->setEnabled(true); ClipType type = static_cast(currentItem)->clipType(); m_openAction->setEnabled(type == Image || type == Audio); @@ -1299,7 +1265,6 @@ // A folder was selected, disable editing clip m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); - m_locateAction->setEnabled(false); m_duplicateAction->setEnabled(false); m_deleteAction->setText(i18n("Delete Folder")); m_proxyAction->setText(i18n("Proxy Folder")); @@ -1307,7 +1272,6 @@ showClipProperties(static_cast(currentItem->parent()), false); m_openAction->setEnabled(false); m_reloadAction->setEnabled(false); - m_locateAction->setEnabled(false); m_duplicateAction->setEnabled(false); m_deleteAction->setText(i18n("Delete Clip")); m_proxyAction->setText(i18n("Proxy Clip")); @@ -1316,7 +1280,6 @@ } else { emit findInTimeline(QString()); m_reloadAction->setEnabled(false); - m_locateAction->setEnabled(false); m_duplicateAction->setEnabled(false); m_openAction->setEnabled(false); m_deleteAction->setEnabled(false); @@ -1483,7 +1446,6 @@ bool enableClipActions = false; ClipType type = Unknown; bool isFolder = false; - bool isImported = false; QString clipService; QString audioCodec; if (m_itemView) { @@ -1511,7 +1473,6 @@ audioCodec = clip->codec(true); QString videoCodec = clip->codec(false); type = clip->clipType(); - if (type == Video || type == Audio || type == AV || type == Image || type == SlideShow){isImported = true;} bool noCodecInfo = false; if (audioCodec.isEmpty() && videoCodec.isEmpty()) { noCodecInfo = true; @@ -1545,7 +1506,6 @@ m_proxyAction->setEnabled(m_doc->getDocumentProperty("enableproxy").toInt() && enableClipActions); m_openAction->setEnabled(type == Image || type == Audio); m_reloadAction->setEnabled(enableClipActions); - m_locateAction->setEnabled(enableClipActions); m_duplicateAction->setEnabled(enableClipActions); m_clipsActionsMenu->setEnabled(enableClipActions); m_extractAudioAction->setEnabled(enableClipActions); @@ -1561,7 +1521,7 @@ } m_clipsActionsMenu->menuAction()->setVisible(!isFolder && (clipService.contains(QStringLiteral("avformat")) || clipService.contains(QStringLiteral("xml")) || clipService.contains(QStringLiteral("consumer")))); m_extractAudioAction->menuAction()->setVisible(!isFolder && !audioCodec.isEmpty()); - m_locateAction->setVisible(!isFolder && (isImported)); + // Show menu if (enableClipActions) { @@ -1935,7 +1895,6 @@ m_inTimelineAction->setEnabled(!addMenu->isEmpty()); } - if (m_locateAction) m_menu->addAction(m_locateAction); if (m_reloadAction) m_menu->addAction(m_reloadAction); if (m_duplicateAction) m_menu->addAction(m_duplicateAction); if (m_proxyAction) m_menu->addAction(m_proxyAction); @@ -1968,7 +1927,6 @@ m_openAction = actions.value(QStringLiteral("open")); m_reloadAction = actions.value(QStringLiteral("reload")); m_duplicateAction = actions.value(QStringLiteral("duplicate")); - m_locateAction = actions.value(QStringLiteral("locate")); m_proxyAction = actions.value(QStringLiteral("proxy")); QMenu *m = new QMenu(this); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1317,10 +1317,6 @@ disableEffects->setData("disable_timeline_effects"); disableEffects->setCheckable(true); disableEffects->setChecked(false); - - QAction *locateClip = addAction(QStringLiteral("locate_clip"), i18n("Locate Clip..."), pCore->bin(), SLOT(slotLocateClip()), KoIconUtils::themedIcon(QStringLiteral("edit-file"))); - locateClip->setData("locate_clip"); - locateClip->setEnabled(false); QAction *duplicateClip = addAction(QStringLiteral("duplicate_clip"), i18n("Duplicate Clip"), pCore->bin(), SLOT(slotDuplicateClip()), KoIconUtils::themedIcon(QStringLiteral("edit-copy"))); duplicateClip->setData("duplicate_clip"); @@ -1339,7 +1335,6 @@ addAction(QStringLiteral("switch_track_target"), i18n("Toggle Track Target"), pCore->projectManager(), SLOT(slotSwitchTrackTarget()), QIcon(), Qt::SHIFT + Qt::Key_T); QHash actions; - actions.insert(QStringLiteral("locate"), locateClip); actions.insert(QStringLiteral("reload"), reloadClip); actions.insert(QStringLiteral("duplicate"), duplicateClip); actions.insert(QStringLiteral("proxy"), proxyClip);